Changeset 548 for trunk/Database.pas

Timestamp:

Apr 21, 2024, 10:57:18 AM (3 weeks ago)

Author:

chronos

Message:

• Fixed: Bad unit drawing in battle dialog.
• Modified: Code cleanup.

File:

• trunk/Database.pas (modified) (8 diffs)

trunk/Database.pas

@@ -262 +262 @@
 begin
   c0 := TechFormula_M[diff] * (nTech + 4) *
-    exp((nTech + 4) / TechFormula_D[diff]);
+    Exp((nTech + 4) / TechFormula_D[diff]);
   if c0 >= $10000000 then
     Result := $10000000
   else
-    Result := trunc(c0);
+    Result := Trunc(c0);
 end;
 
@@ -652 +652 @@
     Result := 0;
     for I := 1 to D do
-      Result := Result + sin(f1[I] * ((X * 2 + Y and 1) * sa[I] + Y * 1.5 *
+      Result := Result + Sin(f1[I] * ((X * 2 + Y and 1) * sa[I] + Y * 1.5 *
         ca[I])) * f2[I];
     { x values effectively multiplied with 2 to get 2 horizantal periods
@@ -662 +662 @@
   begin
 {$IFNDEF SCR} if X = 1 then
-      V := pi / 2 { first wave goes horizontal }
-    else {$ENDIF} V := DelphiRandom * 2 * pi;
-    sa[X] := sin(V) / lx;
-    ca[X] := cos(V) / ly;
-    f1[X] := 2 * pi * exp(Detail * (X - 1));
-    f2[X] := exp(-X * Smooth);
+      V := Pi / 2 { first wave goes horizontal }
+    else {$ENDIF} V := DelphiRandom * 2 * Pi;
+    sa[X] := Sin(V) / lx;
+    ca[X] := Cos(V) / ly;
+    f1[X] := 2 * Pi * Exp(Detail * (X - 1));
+    f2[X] := Exp(-X * Smooth);
   end;
 
@@ -679 +679 @@
       if X * 2 < imerge then
         V := (X * 2 * V + (imerge - X * 2) * Value(X + lx, Y)) / imerge;
-      V := V - sqr(sqr(2 * Y / ly - 1)); { soft cut at poles }
+      V := V - Sqr(Sqr(2 * Y / ly - 1)); { soft cut at poles }
       if V > maxv then
         maxv := V;
@@ -705 +705 @@
       I := A;
       A := B;
-      B := I
+      B := I;
     end;
     if A > B then
@@ -763 +763 @@
 // must be done after FindContinents
 var
-  I, J, Cnt, X, Y, dx, dy, Loc0, Loc1, xworst, yworst, totalrare, RareMaxWater,
+  I, J, Cnt, X, Y, dx, dy, Loc0, Loc1, xworst, yworst, TotalRare, RareMaxWater,
     RareType, iBest, jbest, MinDist, xBlock, yBlock, V8: Integer;
   AreaCount, RareByArea, RareAdjacent: array [0 .. 7, 0 .. 4] of Integer;
@@ -804 +804 @@
         end;
     end;
-    totalrare := 0;
+    TotalRare := 0;
     for X := 0 to 7 do
       for Y := 0 to 4 do
         if AreaCount[X, Y] > 0 then
-          Inc(totalrare);
+          Inc(TotalRare);
     Inc(RareMaxWater);
-  until totalrare >= 12;
-
-  while totalrare > 12 do
+  until TotalRare >= 12;
+
+  while TotalRare > 12 do
   begin // remove rarebyarea resources too close to each other
     FillChar(RareAdjacent, SizeOf(RareAdjacent), 0);
@@ -876 +876 @@
         end;
     AreaCount[xworst, yworst] := 0;
-    Dec(totalrare);
+    Dec(TotalRare);
   end;