Changeset 531 for trunk/Database.pas

Timestamp:

Mar 27, 2024, 12:31:14 PM (8 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/Database.pas

@@ -559 +559 @@
 procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
 var
-  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
-  dst: ^Integer;
+  dx, dy, Bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
+  Dst: ^Integer;
 begin
   y0 := Loc0 div lx;
@@ -571 +571 @@
   xCompSwitch := xCompSwitch xor xComp0;
   yComp := lx * (y0 - 3);
-  dst := @VicinityLoc;
-  bit := 1;
+  Dst := @VicinityLoc;
+  Bit := 1;
   for dy := 0 to 6 do
   begin
@@ -579 +579 @@
     for dx := 0 to 3 do
     begin
-      if bit and $67F7F76 <> 0 then
-        dst^ := xComp + yComp
+      if Bit and $67F7F76 <> 0 then
+        Dst^ := xComp + yComp
       else
-        dst^ := -1;
+        Dst^ := -1;
       Inc(xComp);
       if xComp >= lx then
         Dec(xComp, lx);
-      Inc(dst);
-      bit := bit shl 1;
+      Inc(Dst);
+      Bit := Bit shl 1;
     end;
     Inc(yComp, lx);
@@ -1317 +1317 @@
   Radius: TVicinity21Loc;
   Adjacent: TVicinity8Loc;
-  ok: Boolean;
+  Ok: Boolean;
 
 begin
@@ -1414 +1414 @@
     end;
 
-    ok := True;
+    Ok := True;
     for C := 1 to nsc do
       if nCityLoc[C] < sccount[C] * (8 - MinGood) div (7 - MinGood) then
-        ok := False;
-  until ok;
+        Ok := False;
+  until Ok;
 
   FineDistSQR := MapSize * LandMass * 9 div (nAlive * 100);
@@ -1478 +1478 @@
       end;
     end;
-    p1 := p1 + sccount[C]
+    p1 := p1 + sccount[C];
   end;
 
@@ -1603 +1603 @@
   I, p1, Loc1, nAlive, nStartLoc0, nPrefStartLoc0, imax: Integer;
   StartLoc0: array [0 .. lxmax * lymax - 1] of Integer;
-  ishuman: Boolean;
+  IsHuman: Boolean;
 begin
   nAlive := 0;
@@ -1636 +1636 @@
 
   StartLoc[0] := 0;
-  for ishuman := True downto False do
+  for IsHuman := True downto False do
     for p1 := 0 to nPl - 1 do
-      if (1 shl p1 and GAlive <> 0) and ((1 shl p1 and Human <> 0) = ishuman)
+      if (1 shl p1 and GAlive <> 0) and ((1 shl p1 and Human <> 0) = IsHuman)
       then
       begin
@@ -1790 +1790 @@
 
   TerritoryCount[nPl] := MapSize;
-  // fillchar(NewContact, sizeof(NewContact), false);
+  // FillChar(NewContact, SizeOf(NewContact), False);
 end;
 
@@ -3487 +3487 @@
   I: Integer;
   miSender, miTarget: TModelInfo;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   // only if target doesn't already have a model like this
-  ok := RW[pTarget].nModel < nmmax;
+  Ok := RW[pTarget].nModel < nmmax;
   MakeModelInfo(pSender, mix, RW[pSender].Model[mix], miSender);
   for I := 0 to RW[pTarget].nModel - 1 do
@@ -3496 +3496 @@
     MakeModelInfo(pTarget, I, RW[pTarget].Model[I], miTarget);
     if IsSameModel(miSender, miTarget) then
-      ok := False;
-  end;
-  if ok then
+      Ok := False;
+  end;
+  if Ok then
   begin
     RW[pTarget].Model[RW[pTarget].nModel] := RW[pSender].Model[mix];