Changeset 531 for trunk/AI/StdAI/ToolAI.pas

Timestamp:

Mar 27, 2024, 12:31:14 PM (6 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/AI/StdAI/ToolAI.pas (modified) (7 diffs)

trunk/AI/StdAI/ToolAI.pas

@@ -355 +355 @@
   UnitsToAssign: Boolean;
   Adjacent: TVicinity8Loc;
-  SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of smallint;
+  SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of SmallInt;
   // DistToLoc is only defined where SettlerOfJobLoc>=0
   TileChecked: array[0..lxmax * lymax - 1] of Boolean;
@@ -471 +471 @@
   I, J, Loc, Loc1, V8, Count, Kind, MostIndex: Integer;
   Adjacent: TVicinity8Loc;
-  IndexOfID: array[0..lxmax * lymax - 1] of smallint;
-  IDOfIndex: array[0..lxmax * lymax div 2 - 1] of smallint;
+  IndexOfID: array[0..lxmax * lymax - 1] of SmallInt;
+  IDOfIndex: array[0..lxmax * lymax div 2 - 1] of SmallInt;
 begin
   FillChar(District, MapSize * 4, $FF);
@@ -1107 +1107 @@
   nSelectedLoad, F, OriginContinent, A, B: Integer;
   CompleteFlag, NotReachedFlag, ContinueUnit: Cardinal;
-  IsComplete, ok, IsFirstLoc: Boolean;
+  IsComplete, Ok, IsFirstLoc: Boolean;
   StartLocPtr, ArrivedEnd: pinteger;
   Adjacent: TVicinity8Loc;
@@ -1113 +1113 @@
   tuixSelectedLoad: array[0..15] of Integer;
   Arrived: array[0..lxmax * lymax] of Cardinal;
-  ResponsibleTransport: array[0..lxmax * lymax - 1] of smallint;
+  ResponsibleTransport: array[0..lxmax * lymax - 1] of SmallInt;
   TurnsBeforeLoad: array[0..lxmax * lymax - 1] of ShortInt;
   GroupComplete: array[0..lxmax * lymax - 1] of Boolean;
@@ -1191 +1191 @@
     FillChar(ResponsibleTransport, MapSize * 2, $FF); // -1
     FillChar(TurnsBeforeLoad, MapSize, $FF); // -1
-    ok := False;
+    Ok := False;
     for uix := 0 to RO.nUn - 1 do
       if TransportAvailable[uix] > 0 then
       begin
-        ok := True;
+        Ok := True;
         Pile.Put(MyUnit[uix].Loc, ($800 - MyUnit[uix].Movement) shl 12 + uix);
       end;
-    if not ok then // no transports
+    if not Ok then // no transports
     begin
       TransportPlan.LoadLoc := -1;
@@ -1392 +1392 @@
             begin
               Arrived[Loc0] := (Arrived[Loc0] or CompleteFlag) and not NotReachedFlag;
-              continue;
+              Continue;
             end;
             IsComplete := True;
@@ -1400 +1400 @@
               if Loc1 >= 0 then
               begin
-                ok := False;
+                Ok := False;
                 case CheckStep(MoveStyle, Time0, V8 and 1, ArriveTime,
                     RecoverTurns, Map[Loc0], Map[Loc1], False) of
-                  csOk: ok := True;
+                  csOk: Ok := True;
                   csForbiddenTile:
                     ;// !!! don't check moving there again
                   csCheckTerritory:
-                    ok := RO.Territory[Loc1] = RO.Territory[Loc0];
+                    Ok := RO.Territory[Loc1] = RO.Territory[Loc0];
                 end;
-                if ok and Pile.TestPut(Loc1, ArriveTime) then
+                if Ok and Pile.TestPut(Loc1, ArriveTime) then
                   if ArriveTime < $2000 then
                     Pile.Put(Loc1, ArriveTime)