Changeset 447 for trunk/AI/StdAI

Timestamp:

May 19, 2022, 10:39:34 PM (3 years ago)

Author:

chronos

Message:

• Modified: Use first capital letter in identifiers.

Location:

trunk/AI/StdAI

Files:

• AI.pas (modified) (133 diffs)
• Barbarina.pas (modified) (74 diffs)
• CustomAI.pas (modified) (47 diffs)
• CustomAI_Reload.pas (modified) (34 diffs)
• Pile.pas (modified) (6 diffs)
• Protocol.pas (modified) (10 diffs)
• StdAI.lpr (modified) (2 diffs)
• ToolAI.pas (modified) (67 diffs)

trunk/AI/StdAI/AI.pas

@@ -23 +23 @@
 
   nResearchOrder = 46;
-  ResearchOrder: array[0..1, 0..nResearchOrder - 1] of integer =
+  ResearchOrder: array[0..1, 0..nResearchOrder - 1] of Integer =
     ((adWheel, adWarriorCode, adHorsebackRiding, adCeremonialBurial, adPolytheism,
     adMonarchy, adMysticism, adPoetry, adAstronomy, adMonotheism,
@@ -76 +76 @@
 
   // mil research
-  BetterQuality: array[0..nModelCat - 1] of integer = (50, 50, 80, 80);
+  BetterQuality: array[0..nModelCat - 1] of Integer = (50, 50, 80, 80);
   MaxBuildWorseThanBestModel = 20;
   MaxExistWorseThanBestModel = 50;
@@ -85 +85 @@
   nRequestedTechs = 48;
 
-  PlayerHash: array[0..nPl - 1] of integer =
+  PlayerHash: array[0..nPl - 1] of Integer =
     (7, 6, 0, 2, 10, 8, 12, 14, 4, 1, 3, 5, 9, 11, 13);
 
@@ -92 +92 @@
 
   TPersistentData = record
-    LastResearchTech, BehaviorFlags, TheologyPartner: integer;
+    LastResearchTech, BehaviorFlags, TheologyPartner: Integer;
     RejectTurn: array[Suggestion, 0..15] of smallint;
-    RequestedTechs: array[0..nRequestedTechs - 1] of integer;
+    RequestedTechs: array[0..nRequestedTechs - 1] of Integer;
     // ad + p shl 8 + Turn shl 16
   end;
 
   TAI = class(TBarbarina)
-    constructor Create(Nation: integer); override;
+    constructor Create(Nation: Integer); override;
 
     procedure SetDataDefaults; override;
@@ -106 +106 @@
     Data: ^TPersistentData;
     WarNations, BombardingNations, mixSettlers, mixCaravan, mixTownGuard,
-    mixSlaves, mixMilitia, mixCruiser, OceanWithShip: integer;
+    mixSlaves, mixMilitia, mixCruiser, OceanWithShip: Integer;
     NegoCause: (Routine, CheckBarbarina);
-    SettlerSurplus: array[0..maxCOD - 1] of integer;
-    uixPatrol: array[0..maxCOD - 1] of integer;
-
-    ContinentPresence: array[0..maxCOD - 1] of integer;
-    OceanPresence: array[0..maxCOD - 1] of integer;
-    UnitLack: array[0..maxCOD - 1, mctGroundDefender..mctGroundAttacker] of integer;
-
-    TotalPopulation: array[0..nPl - 1] of integer;
-    ContinentPopulation: array[0..nPl - 1, 0..maxCOD - 1] of integer;
+    SettlerSurplus: array[0..maxCOD - 1] of Integer;
+    uixPatrol: array[0..maxCOD - 1] of Integer;
+
+    ContinentPresence: array[0..maxCOD - 1] of Integer;
+    OceanPresence: array[0..maxCOD - 1] of Integer;
+    UnitLack: array[0..maxCOD - 1, mctGroundDefender..mctGroundAttacker] of Integer;
+
+    TotalPopulation: array[0..nPl - 1] of Integer;
+    ContinentPopulation: array[0..nPl - 1, 0..maxCOD - 1] of Integer;
     // 1 means enemy territory spotted but no city
-    DistrictPopulation: array[0..maxCOD - 1] of integer;
-
-    ModelCat: array[0..nMmax - 1] of integer;
-    ModelQuality: array[0..nMmax - 1] of integer;
-    ModelBestQuality: array[0..nModelCat - 1] of integer;
-
-    AdvanceValue: array[0..nAdv - 1] of integer;
-    AdvanceValuesSet: boolean;
+    DistrictPopulation: array[0..maxCOD - 1] of Integer;
+
+    ModelCat: array[0..nMmax - 1] of Integer;
+    ModelQuality: array[0..nMmax - 1] of Integer;
+    ModelBestQuality: array[0..nModelCat - 1] of Integer;
+
+    AdvanceValue: array[0..nAdv - 1] of Integer;
+    AdvanceValuesSet: Boolean;
 
     procedure DoTurn; override;
     procedure DoNegotiation; override;
-    function ChooseResearchAdvance: integer; override;
-    function ChooseStealAdvance: integer; override;
-    function ChooseGovernment: integer; override;
-    function WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean; override;
-    function OnNegoRejected_CancelTreaty: boolean; override;
-
-    procedure FindBestTrade(Nation: integer; var adWanted, adGiveAway: integer);
+    function ChooseResearchAdvance: Integer; override;
+    function ChooseStealAdvance: Integer; override;
+    function ChooseGovernment: Integer; override;
+    function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; override;
+    function OnNegoRejected_CancelTreaty: Boolean; override;
+
+    procedure FindBestTrade(Nation: Integer; var adWanted, adGiveAway: Integer);
     procedure CheckGender;
     procedure AnalyzeMap;
@@ -141 +141 @@
     procedure AttackAndPatrol;
     procedure MoveUnitsHome;
-    procedure CheckAttack(uix: integer);
-    procedure Patrol(uix: integer);
+    procedure CheckAttack(uix: Integer);
+    procedure Patrol(uix: Integer);
     procedure SetCityProduction;
     procedure SetAdvanceValues;
-    function HavePort: boolean;
-  {$IFDEF DEBUG}procedure TraceAdvanceValues(Nation: integer);{$ENDIF}
+    function HavePort: Boolean;
+  {$IFDEF DEBUG}procedure TraceAdvanceValues(Nation: Integer);{$ENDIF}
 
     // research
-    procedure RateModel(const mi: TModelInfo; var Category, Quality: integer);
-    procedure RateMyModel(mix: integer; var Category, Quality: integer);
-    function IsBetterModel(const mi: TModelInfo): boolean;
+    procedure RateModel(const mi: TModelInfo; var Category, Quality: Integer);
+    procedure RateMyModel(mix: Integer; var Category, Quality: Integer);
+    function IsBetterModel(const mi: TModelInfo): Boolean;
 
     //terraforming
-    procedure TileWorkPlan(Loc, cix: integer; var Value, NextJob, TotalWork: integer);
+    procedure TileWorkPlan(Loc, cix: Integer; var Value, NextJob, TotalWork: Integer);
     procedure ProcessSettlers;
 
     // diplomacy
-    function MostWanted(Nation, adGiveAway: integer): integer;
+    function MostWanted(Nation, adGiveAway: Integer): Integer;
 
   end;
@@ -174 +174 @@
 
 var
-  LeaveOutValue: array[0..nAdv - 1] of integer;
-
-constructor TAI.Create(Nation: integer);
+  LeaveOutValue: array[0..nAdv - 1] of Integer;
+
+constructor TAI.Create(Nation: Integer);
 begin
   inherited;
-  Data := pointer(RO.Data);
+  Data := Pointer(RO.Data);
 {$IFDEF DEBUG}
   if Nation = 1 then
@@ -192 +192 @@
   begin
     LastResearchTech := -1;
-    if PlayerHash[me] > 7 then
+    if PlayerHash[Me] > 7 then
       BehaviorFlags := bFemale
     else
@@ -198 +198 @@
     DebugMessage(1, 'Gender:=' + char(48 + BehaviorFlags and bGender));
     TheologyPartner := -1;
-    fillchar(RejectTurn, sizeof(RejectTurn), $FF);
-    Fillchar(RequestedTechs, sizeof(RequestedTechs), $FF);
+    FillChar(RejectTurn, SizeOf(RejectTurn), $FF);
+    Fillchar(RequestedTechs, SizeOf(RequestedTechs), $FF);
   end;
 end;
 
-function TAI.OnNegoRejected_CancelTreaty: boolean;
+function TAI.OnNegoRejected_CancelTreaty: Boolean;
 begin
   Data.RejectTurn[suContact, Opponent] := RO.Turn;
@@ -213 +213 @@
 //-------------------------------
 
-procedure TAI.RateModel(const mi: TModelInfo; var Category, Quality: integer);
+procedure TAI.RateModel(const mi: TModelInfo; var Category, Quality: Integer);
 var
-  EffectiveTransport: integer;
+  EffectiveTransport: Integer;
 begin
   if mi.Kind >= mkScout then
   begin
     Category := mctNone;
-    exit;
+    Exit;
   end;
   case mi.Domain of
@@ -292 +292 @@
 end;
 
-procedure TAI.RateMyModel(mix: integer; var Category, Quality: integer);
+procedure TAI.RateMyModel(mix: Integer; var Category, Quality: Integer);
 var
   mi: TModelInfo;
 begin
-  MakeModelInfo(me, mix, MyModel[mix], mi);
+  MakeModelInfo(Me, mix, MyModel[mix], mi);
   RateModel(mi, Category, Quality);
 end;
 
-function TAI.IsBetterModel(const mi: TModelInfo): boolean;
+function TAI.IsBetterModel(const mi: TModelInfo): Boolean;
 var
-  mix, Cat, Quality, Cat1, Quality1: integer;
+  mix, Cat, Quality, Cat1, Quality1: Integer;
 begin
   RateModel(mi, Cat, Quality);
@@ -312 +312 @@
       begin
         Result := False;
-        exit;
+        Exit;
       end;
     end;
@@ -318 +318 @@
 end;
 
-function TAI.ChooseResearchAdvance: integer;
+function TAI.ChooseResearchAdvance: Integer;
 var
-  adNext, iad, i, ad, Count, EarliestNeeded, EarliestNeeded_NoLeaveOut,
-  NewResearch, StateOfArt, mix: integer;
+  adNext, iad, I, ad, Count, EarliestNeeded, EarliestNeeded_NoLeaveOut,
+  NewResearch, StateOfArt, mix: Integer;
   mi: TModelInfo;
-  Entry: array[0..nAdv - 1] of boolean;
-  ok: boolean;
-
-  function MarkEntry(ad: integer): boolean;
+  Entry: array[0..nAdv - 1] of Boolean;
+  ok: Boolean;
+
+  function MarkEntry(ad: Integer): Boolean;
   begin
     if RO.Tech[ad] >= tsApplicable then
@@ -373 +373 @@
   end;
 
-  procedure OptimizeDevModel(OptimizeCaps: integer);
+  procedure OptimizeDevModel(OptimizeCaps: Integer);
   var
-    f, Cat, OriginalCat, Quality, BestQuality, Best: integer;
+    F, Cat, OriginalCat, Quality, BestQuality, Best: Integer;
     mi: TModelInfo;
   begin
-    MakeModelInfo(me, 0, RO.DevModel, mi);
+    MakeModelInfo(Me, 0, RO.DevModel, mi);
     RateModel(mi, OriginalCat, BestQuality);
     repeat
       Best := -1;
-      for f := 0 to nFeature - 1 do
-        if (1 shl f and OptimizeCaps <> 0) and
-          ((Feature[f].Preq < 0) or IsResearched(Feature[f].Preq)) // check prerequisite
-          and (RO.DevModel.Weight + Feature[f].Weight <= RO.DevModel.MaxWeight) and
-          not ((f >= mcFirstNonCap) and (RO.DevModel.Cap[f] > 0)) then
-        begin
-          if SetNewModelFeature(f, RO.DevModel.Cap[f] + 1) >= rExecuted then
+      for F := 0 to nFeature - 1 do
+        if (1 shl F and OptimizeCaps <> 0) and
+          ((Feature[F].Preq < 0) or IsResearched(Feature[F].Preq)) // check prerequisite
+          and (RO.DevModel.Weight + Feature[F].Weight <= RO.DevModel.MaxWeight) and
+          not ((F >= mcFirstNonCap) and (RO.DevModel.Cap[F] > 0)) then
+        begin
+          if SetNewModelFeature(F, RO.DevModel.Cap[F] + 1) >= rExecuted then
           begin
-            MakeModelInfo(me, 0, RO.DevModel, mi);
+            MakeModelInfo(Me, 0, RO.DevModel, mi);
             RateModel(mi, Cat, Quality);
-            assert(Cat = OriginalCat);
+            Assert(Cat = OriginalCat);
             if Quality > BestQuality then
             begin
-              Best := f;
+              Best := F;
               BestQuality := Quality;
             end;
-            SetNewModelFeature(f, RO.DevModel.Cap[f] - 1);
+            SetNewModelFeature(F, RO.DevModel.Cap[F] - 1);
           end;
         end;
@@ -406 +406 @@
   end;
 
-  function LeaveOutsMissing(ad: integer): boolean;
+  function LeaveOutsMissing(ad: Integer): Boolean;
   var
-    i: integer;
+    I: Integer;
   begin
     Result := False;
@@ -422 +422 @@
         Result := True
       else
-        for i := 0 to 1 do
-          if AdvPreq[ad, i] >= 0 then
-            Result := Result or LeaveOutsMissing(AdvPreq[ad, i]);
+        for I := 0 to 1 do
+          if AdvPreq[ad, I] >= 0 then
+            Result := Result or LeaveOutsMissing(AdvPreq[ad, I]);
   end;
 
@@ -432 +432 @@
     Result := Barbarina_ChooseResearchAdvance;
     if Result >= 0 then
-      exit;
+      Exit;
   end;
 
@@ -444 +444 @@
       Result := ad;
   if Result >= 0 then
-    exit;
+    Exit;
 
   if Data.BehaviorFlags and bBarbarina = 0 then
@@ -460 +460 @@
       OptimizeDevModel(1 shl mcOffense + 1 shl mcDefense + 1 shl
         mcMob + 1 shl mcLongRange + 1 shl mcFanatic);
-      MakeModelInfo(me, 0, RO.DevModel, mi);
+      MakeModelInfo(Me, 0, RO.DevModel, mi);
       if IsBetterModel(mi) then
       begin
         Result := adMilitary;
-        exit;
+        Exit;
       end;
 
@@ -471 +471 @@
       SetNewModelFeature(mcOffense, 1);
       OptimizeDevModel(1 shl mcOffense + 1 shl mcDefense + 1 shl mcFanatic);
-      MakeModelInfo(me, 0, RO.DevModel, mi);
+      MakeModelInfo(Me, 0, RO.DevModel, mi);
       if IsBetterModel(mi) then
       begin
         Result := adMilitary;
-        exit;
+        Exit;
       end;
     end;
@@ -491 +491 @@
         SetNewModelFeature(mcWeapons, 0);
         SetNewModelFeature(mcDefense, 3);
-        exit;
+        Exit;
       end;
     end;
@@ -506 +506 @@
       OptimizeDevModel(1 shl mcDefense+1 shl mcSeaTrans+1 shl mcTurbines
         +1 shl mcAirDef);
-      MakeModelInfo(me,0,RO.DevModel,mi);
+      MakeModelInfo(Me,0,RO.DevModel,mi);
       if IsBetterModel(mi) then
-        begin result:=adMilitary; exit end;
+        begin Result:=adMilitary; Exit end;
       end;
 
@@ -519 +519 @@
       OptimizeDevModel(1 shl mcOffense+1 shl mcDefense
         +1 shl mcLongRange+1 shl mcAirDef+1 shl mcRadar);
-      MakeModelInfo(me,0,RO.DevModel,mi);
+      MakeModelInfo(Me,0,RO.DevModel,mi);
       if IsBetterModel(mi) then
-        begin result:=adMilitary; exit end;
+        begin Result:=adMilitary; Exit end;
       end
     end;
@@ -545 +545 @@
         begin
           ok := True;
-          break;
+          Break;
         end;
       if not ok then
@@ -588 +588 @@
         begin // 2 of 3 required
           Count := 0;
-          for i := 0 to 2 do
-            if RO.Tech[AdvPreq[ad, i]] >= tsApplicable then
+          for I := 0 to 2 do
+            if RO.Tech[AdvPreq[ad, I]] >= tsApplicable then
               Inc(Count);
           if Count >= 2 then
           begin
             Result := ad;
-            exit;
+            Exit;
           end;
         end
@@ -602 +602 @@
         begin
           Result := ad;
-          exit;
+          Exit;
         end;
       end;
@@ -618 +618 @@
     begin // go for future techs
       Result := -1;
-      i := 0;
+      I := 0;
       for ad := nAdv - 4 to nAdv - 1 do
         if (RO.Tech[ad] < MaxFutureTech) and (RO.Tech[AdvPreq[ad, 0]] >=
           tsApplicable) then
         begin
-          Inc(i);
-          if random(i) = 0 then
+          Inc(I);
+          if random(I) = 0 then
             Result := ad;
         end;
-      assert((Result < 0) or AdvanceResearchable(Result));
-      exit;
-    end;
-
-  assert(NewResearch >= 0);
-  fillchar(Entry, sizeof(Entry), False);
+      Assert((Result < 0) or AdvanceResearchable(Result));
+      Exit;
+    end;
+
+  Assert(NewResearch >= 0);
+  FillChar(Entry, SizeOf(Entry), False);
   MarkEntry(NewResearch);
   Result := -1;
@@ -638 +638 @@
     if Entry[ad] and ((Result < 0) or (Advancedness[ad] > Advancedness[Result])) then
       Result := ad;
-  assert(Result >= 0);
+  Assert(Result >= 0);
 end;
 
-function TAI.ChooseStealAdvance: integer;
+function TAI.ChooseStealAdvance: Integer;
 var
-  ad: integer;
+  ad: Integer;
 begin
   Result := -1;
@@ -659 +659 @@
   twpAllowFarmland = $0001;
 
-procedure TAI.TileWorkPlan(Loc, cix: integer; var Value, NextJob, TotalWork: integer);
+procedure TAI.TileWorkPlan(Loc, cix: Integer; var Value, NextJob, TotalWork: Integer);
 var
-  OldTile, TerrType: cardinal;
+  OldTile, TerrType: Cardinal;
   TileInfo: TTileInfo;
 begin
@@ -669 +669 @@
   begin
     Value := 3 * 8 - 1;
-    exit;
+    Exit;
   end; // better than any tile with 2 food
 
@@ -690 +690 @@
       Map[Loc] := Map[Loc] and not fTerrain or fGrass;
       TerrType := fGrass;
-      Map[Loc] := Map[Loc] or cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
+      Map[Loc] := Map[Loc] or Cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
     end
     else if IsResearched(adExplosives) and
@@ -701 +701 @@
       Map[Loc] := Map[Loc] and not fTerrain or fGrass;
       TerrType := fGrass;
-      Map[Loc] := Map[Loc] or cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
+      Map[Loc] := Map[Loc] or Cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
     end;
     if (Terrain[TerrType].MineEff > 0) and (RO.Government <> gDespotism) then
@@ -764 +764 @@
     end;
   end;
-  Server(sGetTileInfo, me, Loc, TileInfo);
+  Server(sGetTileInfo, Me, Loc, TileInfo);
   Value := TileInfo.Food * 8 + TileInfo.Prod * 2 + TileInfo.Trade;
   Map[Loc] := OldTile;
@@ -772 +772 @@
 procedure TAI.ProcessSettlers;
 var
-  i, uix, cix, ecix, dtr, Loc, RadiusLoc, Special, Food, Prod, Trade,
+  I, uix, cix, ecix, dtr, Loc, RadiusLoc, Special, Food, Prod, Trade,
   CityFood, Happy, TestScore, BestNearCityScore, BestUnusedValue,
-  BestUnusedLoc, Value, NextJob, TotalWork, V21, part, Loc1: integer;
-  Tile: cardinal;
-  FoodOk, Started: boolean;
+  BestUnusedLoc, Value, NextJob, TotalWork, V21, part, Loc1: Integer;
+  Tile: Cardinal;
+  FoodOk, Started: Boolean;
   Radius: TVicinity21Loc;
   CityAreaInfo: TCityAreaInfo;
-  TileFood, ResourceScore, CityScore: array[0..lxmax * lymax - 1] of integer;
-
-  procedure AddJob(Loc, Job, Score: integer);
+  TileFood, ResourceScore, CityScore: array[0..lxmax * lymax - 1] of Integer;
+
+  procedure AddJob(Loc, Job, Score: Integer);
   // set Score=1 for low-priority jobs
   begin
@@ -789 +789 @@
   end;
 
-  procedure ReserveCityRadius(Loc: integer);
+  procedure ReserveCityRadius(Loc: Integer);
   var
-    V21, RadiusLoc: integer;
+    V21, RadiusLoc: Integer;
     Radius: TVicinity21Loc;
   begin
@@ -808 +808 @@
   procedure ScoreRoadConnections;
   var
-    V8, nFragments, Loc, Loc1, History, RoadScore, a, b, FullyDeveloped,
-    ConnectMask: integer;
-    BridgeOk: boolean;
+    V8, nFragments, Loc, Loc1, History, RoadScore, A, B, FullyDeveloped,
+    ConnectMask: Integer;
+    BridgeOk: Boolean;
     Adjacent: TVicinity8Loc;
   begin
@@ -821 +821 @@
       if ((1 shl (Map[Loc] and fTerrain)) and (1 shl fOcean or 1 shl
         fShore or 1 shl fDesert or 1 shl fArctic or 1 shl fUNKNOWN) = 0) and
-        (RO.Territory[Loc] = me) and (Map[Loc] and FullyDeveloped = 0) and
+        (RO.Territory[Loc] = Me) and (Map[Loc] and FullyDeveloped = 0) and
         (BridgeOk or (Map[Loc] and fRiver = 0)) then
       begin
@@ -835 +835 @@
           Loc1 := Adjacent[V8 and 7];
           History := History shl 1;
-          if (Loc1 >= 0) and (RO.Territory[Loc1] = me) and
+          if (Loc1 >= 0) and (RO.Territory[Loc1] = Me) and
             (Map[Loc1] and ConnectMask <> 0) then
           begin
@@ -851 +851 @@
                   else if History and 4 <> 0 then
                   begin
-                    V8_to_ab((V8 - 1) and 7, a, b);
-                    ab_to_Loc(Loc, a shl 1, b shl 1, Loc1);
+                    V8_to_ab((V8 - 1) and 7, A, B);
+                    ab_to_Loc(Loc, A shl 1, B shl 1, Loc1);
                     if (Loc1 >= 0) and (Map[Loc1] and ConnectMask <> 0) then
                       Dec(nFragments);
@@ -876 +876 @@
 
 begin
-  fillchar(SettlerSurplus, sizeof(SettlerSurplus), 0);
+  FillChar(SettlerSurplus, SizeOf(SettlerSurplus), 0);
   JobAssignment_Initialize;
 
   if (Data.BehaviorFlags and bBarbarina = 0) or (RO.nCity < 3) then
   begin
-    fillchar(TileFood, sizeof(TileFood), 0);
-    fillchar(ResourceScore, sizeof(ResourceScore), 0);
+    FillChar(TileFood, SizeOf(TileFood), 0);
+    FillChar(ResourceScore, SizeOf(ResourceScore), 0);
     for Loc := 0 to MapSize - 1 do
       if Map[Loc] and fTerrain <> fUNKNOWN then
@@ -923 +923 @@
 
     // rate possible new cities
-    fillchar(CityScore, MapSize * sizeof(integer), 0);
+    FillChar(CityScore, MapSize * SizeOf(Integer), 0);
     for Loc := 0 to MapSize - 1 do
     begin
@@ -930 +930 @@
         ((RO.Government <> gDespotism) or (Map[Loc] and fSpecial = fSpecial1)) or
         (Map[Loc] and (fTerrain or fSpecial) = fPrairie or fSpecial1));
-      if FoodOk and ((RO.Territory[Loc] < 0) or (RO.Territory[Loc] = me)) then
+      if FoodOk and ((RO.Territory[Loc] < 0) or (RO.Territory[Loc] = Me)) then
       begin
         TestScore := 0;
@@ -950 +950 @@
         if CityFood >= MinCityFood then // city is worth founding
         begin
-          TestScore := (72 + 2 * TestScore) shl 8 + ((loc xor me) * 4567) mod 251;
+          TestScore := (72 + 2 * TestScore) shl 8 + ((loc xor Me) * 4567) mod 251;
           // some unexactness, random but always the same for this tile
           if TestScore > BestNearCityScore then
@@ -988 +988 @@
               if not (Map[RadiusLoc] and fTerrain in [fDesert, fArctic]) then
               begin
-                assert(RadiusLoc >= 0);
+                Assert(RadiusLoc >= 0);
                 TileWorkPlan(RadiusLoc, cix, Value, NextJob, TotalWork);
                 if (NextJob = jRoad) and (Built[imPalace] +
@@ -1000 +1000 @@
             begin // tile could be exploited
               RadiusLoc := Radius[V21];
-              assert(RadiusLoc >= 0);
+              Assert(RadiusLoc >= 0);
               if not (Map[RadiusLoc] and fTerrain in [fDesert, fArctic]) then
               begin
@@ -1024 +1024 @@
   if Data.BehaviorFlags and bBarbarina = 0 then // low priority jobs
     for Loc := 0 to MapSize - 1 do
-      if RO.Territory[Loc] = me then
+      if RO.Territory[Loc] = Me then
       begin
         Tile := Map[Loc];
@@ -1048 +1048 @@
   begin
     for part := 0 to nShipPart - 1 do
-      for i := 0 to ColonyShipPlan[part].nLocFoundCity - 1 do
-      begin
-        Loc := ColonyShipPlan[part].LocFoundCity[i];
+      for I := 0 to ColonyShipPlan[part].nLocFoundCity - 1 do
+      begin
+        Loc := ColonyShipPlan[part].LocFoundCity[I];
         Started := False;
         for uix := 0 to RO.nUn - 1 do
@@ -1056 +1056 @@
           begin
             Started := True;
-            break;
+            Break;
           end;
         if not Started then
@@ -1119 +1119 @@
             begin // settlers could be added to this city
               Happy := BasicHappy;
-              for i := 0 to nWonder - 1 do
-                if Built[i] > 0 then
+              for I := 0 to nWonder - 1 do
+                if Built[I] > 0 then
                   Inc(Happy);
               if Built[imTemple] > 0 then
@@ -1127 +1127 @@
               begin
                 Inc(Happy, 2);
-                if RO.Wonder[woBach].EffectiveOwner = me then
+                if RO.Wonder[woBach].EffectiveOwner = Me then
                   Inc(Happy, 1);
               end;
@@ -1150 +1150 @@
 procedure TAI.DoTurn;
 var
-  emix, i, p1, TaxSum, ScienceSum, NewTaxRate: integer;
-  AllHateMe: boolean;
+  emix, I, p1, TaxSum, ScienceSum, NewTaxRate: Integer;
+  AllHateMe: Boolean;
 {$IFDEF PERF}
   PF, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9: int64;
@@ -1157 +1157 @@
 begin
 {$IFDEF DEBUG}
-  fillchar(DebugMap, sizeof(DebugMap), 0);
+  FillChar(DebugMap, SizeOf(DebugMap), 0);
 {$ENDIF}
 
@@ -1169 +1169 @@
   WarNations := PresenceUnknown;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] < trPeace) then
+    if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] < trPeace) then
       Inc(WarNations, 1 shl p1);
   BombardingNations := 0;
@@ -1185 +1185 @@
     CheckGender;
 
-  if G.Difficulty[me] < MaxDiff then // not on beginner level
+  if G.Difficulty[Me] < MaxDiff then // not on beginner level
   begin
     if (Data.LastResearchTech = adHorsebackRiding) and (RO.ResearchTech < 0) and
       (random(6) = 0) and (HavePort or (ContinentPresence[0] and not
-      (1 shl me or PresenceUnknown) <> 0)) then
+      (1 shl Me or PresenceUnknown) <> 0)) then
     begin
       Data.BehaviorFlags := Data.BehaviorFlags or bBarbarina_Hide;
@@ -1206 +1206 @@
           begin
             AllHateMe := False;
-            break;
+            Break;
           end;
       if AllHateMe then
@@ -1302 +1302 @@
   else
   begin
-    if (RO.TaxRate = 0) or (RO.Money < (TotalPopulation[me] - 4) * 2) then
+    if (RO.TaxRate = 0) or (RO.Money < (TotalPopulation[Me] - 4) * 2) then
       NewTaxRate := RO.TaxRate // don't check decreasing tax
     else
@@ -1309 +1309 @@
     begin
       SumCities(NewTaxRate, TaxSum, ScienceSum);
-      if RO.Money + TaxSum >= (TotalPopulation[me] - 4) then
-        break; // enough
+      if RO.Money + TaxSum >= (TotalPopulation[Me] - 4) then
+        Break; // enough
       Inc(NewTaxRate, 10);
     end;
@@ -1324 +1324 @@
     // research completed
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and
+      if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and
         (RO.EnemyReport[p1].TurnOfCivilReport + TechReportOutdated > RO.Turn) and
         (RO.EnemyReport[p1].Tech[Data.LastResearchTech] < tsSeen) then
       begin // latest researched advance might be of interest to this nation
-        for i := 0 to nRequestedTechs - 1 do
-          if (Data.RequestedTechs[i] >= 0) and
-            (Data.RequestedTechs[i] shr 8 and $F = p1) then
-            Data.RequestedTechs[i] := -1;
+        for I := 0 to nRequestedTechs - 1 do
+          if (Data.RequestedTechs[I] >= 0) and
+            (Data.RequestedTechs[I] shr 8 and $F = p1) then
+            Data.RequestedTechs[I] := -1;
       end;
   if RO.ResearchTech = adMilitary then
@@ -1337 +1337 @@
   else
     Data.LastResearchTech := RO.ResearchTech;
-  for i := 0 to nRequestedTechs - 1 do
-    if (Data.RequestedTechs[i] >= 0) and
-      (RO.Tech[Data.RequestedTechs[i] and $FF] >= tsSeen) then
-      Data.RequestedTechs[i] := -1;
+  for I := 0 to nRequestedTechs - 1 do
+    if (Data.RequestedTechs[I] >= 0) and
+      (RO.Tech[Data.RequestedTechs[I] and $FF] >= tsSeen) then
+      Data.RequestedTechs[I] := -1;
 
   // prepare negotiation
@@ -1348 +1348 @@
 {$IFDEF DEBUG}
 (*for p1:=0 to nPl-1 do
-  if (p1<>me) and (1 shl p1 and RO.Alive<>0) and (RO.Treaty[p1]>=trPeace)
+  if (p1<>Me) and (1 shl p1 and RO.Alive<>0) and (RO.Treaty[p1]>=trPeace)
     and (RO.EnemyReport[p1].TurnOfCivilReport>=0) then
     TraceAdvanceValues(p1);*)
@@ -1363 +1363 @@
 
 {$IFDEF DEBUG}
-procedure TAI.TraceAdvanceValues(Nation: integer);
+procedure TAI.TraceAdvanceValues(Nation: Integer);
 var
-  ad: integer;
+  ad: Integer;
 begin
   for ad := 0 to nAdv - 1 do
@@ -1379 +1379 @@
 procedure TAI.CheckGender;
 var
-  p1, NewGender: integer;
+  p1, NewGender: Integer;
 begin
   NewGender := -1;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and
+    if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and
       (RO.Treaty[p1] >= trFriendlyContact) then
-      if PlayerHash[me] > PlayerHash[p1] then
+      if PlayerHash[Me] > PlayerHash[p1] then
       begin
         if NewGender = bMale then
         begin
           NewGender := -2;
-          break;
+          Break;
         end; // ambiguous, don't change gender
         NewGender := bFemale;
@@ -1399 +1399 @@
         begin
           NewGender := -2;
-          break;
+          Break;
         end; // ambiguous, don't change gender
         NewGender := bMale;
@@ -1412 +1412 @@
 procedure TAI.SetAdvanceValues;
 
-  procedure RateResearchAdv(ad, Time: integer);
+  procedure RateResearchAdv(ad, Time: Integer);
   var
-    Value: integer;
+    Value: Integer;
   begin
     if Time = 0 then
@@ -1424 +1424 @@
   end;
 
-  procedure SetPreqValues(ad, Value: integer);
+  procedure SetPreqValues(ad, Value: Integer);
   begin
     if (RO.Tech[ad] < tsSeen) and (ad <> RO.ResearchTech) then
@@ -1447 +1447 @@
   end;
 
-  procedure RateImpPreq(iix, Value: integer);
+  procedure RateImpPreq(iix, Value: Integer);
   begin
     if (Value > 0) and (Imp[iix].Preq >= 0) then
@@ -1454 +1454 @@
 
 var
-  emix, cix, adMissing, iad, ad, Count, i, Time, d, CurrentCost,
-  CurrentStrength, MaxSize, MaxTrade: integer;
-  PreView, Emergency, Bombarded: boolean;
+  emix, cix, adMissing, iad, ad, Count, I, Time, D, CurrentCost,
+  CurrentStrength, MaxSize, MaxTrade: Integer;
+  PreView, Emergency, Bombarded: Boolean;
 begin
   if AdvanceValuesSet then
-    exit;
+    Exit;
   AdvanceValuesSet := True;
 
-  fillchar(AdvanceValue, sizeof(AdvanceValue), 0);
+  FillChar(AdvanceValue, SizeOf(AdvanceValue), 0);
 
   // rate techs to ensure research progress
@@ -1482 +1482 @@
       begin // 2 of 3 required
         Count := 0;
-        for i := 0 to 2 do
-          if (AdvPreq[ad, i] = RO.ResearchTech) or
-            (RO.Tech[AdvPreq[ad, i]] >= tsSeen) then
+        for I := 0 to 2 do
+          if (AdvPreq[ad, I] = RO.ResearchTech) or
+            (RO.Tech[AdvPreq[ad, I]] >= tsSeen) then
             Inc(Count);
         if Count >= 2 then
@@ -1492 +1492 @@
           if ad <> adMassProduction then // don't score third preq for MP
           begin
-            for i := 0 to 2 do
-              if (AdvPreq[ad, i] <> RO.ResearchTech) and
-                (RO.Tech[AdvPreq[ad, i]] < tsSeen) then
-                RateResearchAdv(AdvPreq[ad, i], Time);
+            for I := 0 to 2 do
+              if (AdvPreq[ad, I] <> RO.ResearchTech) and
+                (RO.Tech[AdvPreq[ad, I]] < tsSeen) then
+                RateResearchAdv(AdvPreq[ad, I], Time);
           end;
           Inc(Time, 2 - Count);
@@ -1503 +1503 @@
       begin
         Count := 0;
-        for i := 0 to 1 do
-          if (AdvPreq[ad, i] <> preNone) and (AdvPreq[ad, i] <> RO.ResearchTech) and
-            (RO.Tech[AdvPreq[ad, i]] < tsSeen) then
+        for I := 0 to 1 do
+          if (AdvPreq[ad, I] <> preNone) and (AdvPreq[ad, I] <> RO.ResearchTech) and
+            (RO.Tech[AdvPreq[ad, I]] < tsSeen) then
           begin
-            RateResearchAdv(AdvPreq[ad, i], Time);
+            RateResearchAdv(AdvPreq[ad, I], Time);
             Inc(Count);
           end;
@@ -1536 +1536 @@
 
   // rate military techs
-  for d := 0 to nDomains - 1 do
+  for D := 0 to nDomains - 1 do
   begin
     CurrentCost := 0;
     CurrentStrength := 0;
     for PreView := True downto False do
-      for i := 0 to nUpgrade - 1 do
-        with Upgrade[d, i] do
+      for I := 0 to nUpgrade - 1 do
+        with Upgrade[D, I] do
           if (Preq >= 0) and not (Preq in FutureTech) then
             if ((Ro.ResearchTech = Preq) or (RO.Tech[Preq] >= tsSeen)) = PreView then
@@ -1553 +1553 @@
               else
               begin // rate
-                if (i > 0) and (Trans > 0) then
+                if (I > 0) and (Trans > 0) then
                   Inc(AdvanceValue[Preq], $400);
                 if Cost <= CurrentCost then
-                  Inc(AdvanceValue[Preq], (4 - d) * Strength * $400 div
-                    (CurrentStrength + Upgrade[d, 0].Strength))
+                  Inc(AdvanceValue[Preq], (4 - D) * Strength * $400 div
+                    (CurrentStrength + Upgrade[D, 0].Strength))
                 else
-                  Inc(AdvanceValue[Preq], (4 - d) * Strength * $200 div
-                    (CurrentStrength + Upgrade[d, 0].Strength));
+                  Inc(AdvanceValue[Preq], (4 - D) * Strength * $200 div
+                    (CurrentStrength + Upgrade[D, 0].Strength));
               end;
   end;
@@ -1640 +1640 @@
 procedure TAI.AnalyzeMap;
 var
-  cix, Loc, Loc1, V8, f1, p1: integer;
+  cix, Loc, Loc1, V8, f1, p1: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -1646 +1646 @@
 
   // collect nation presence information for continents and oceans
-  fillchar(ContinentPresence, sizeof(ContinentPresence), 0);
-  fillchar(OceanPresence, sizeof(OceanPresence), 0);
+  FillChar(ContinentPresence, SizeOf(ContinentPresence), 0);
+  FillChar(OceanPresence, SizeOf(OceanPresence), 0);
   for Loc := 0 to MapSize - 1 do
   begin
@@ -1699 +1699 @@
   end;
 
-  fillchar(TotalPopulation, sizeof(TotalPopulation), 0);
-  fillchar(ContinentPopulation, sizeof(ContinentPopulation), 0);
-  fillchar(DistrictPopulation, 4 * nDistrict, 0);
+  FillChar(TotalPopulation, SizeOf(TotalPopulation), 0);
+  FillChar(ContinentPopulation, SizeOf(ContinentPopulation), 0);
+  FillChar(DistrictPopulation, 4 * nDistrict, 0);
 
   // count population
@@ -1716 +1716 @@
       if Loc >= 0 then
       begin
-        Inc(TotalPopulation[me], Size);
-        assert(District[Loc] >= 0);
+        Inc(TotalPopulation[Me], Size);
+        Assert(District[Loc] >= 0);
         if District[Loc] < maxCOD then
           Inc(DistrictPopulation[District[Loc]], Size);
@@ -1725 +1725 @@
 procedure TAI.CollectModelCatStat;
 var
-  i, uix, Cat, mix, Quality: integer;
+  I, uix, Cat, mix, Quality: Integer;
 begin
   // categorize models
@@ -1771 +1771 @@
         if (Loc >= 0) and (mix = mixCruiser) and (Map[Loc] and fTerrain < fGrass) then
         begin
-          i := Formation[Loc];
-          if (i >= 0) and (i < maxCOD) then
-            OceanWithShip := OceanWithShip or (1 shl i);
+          I := Formation[Loc];
+          if (I >= 0) and (I < maxCOD) then
+            OceanWithShip := OceanWithShip or (1 shl I);
         end;
 end;
@@ -1780 +1780 @@
 const
   PatrolDestination = lxmax * lymax;
-  FirstSurplusLoop: array[mctGroundDefender..mctGroundAttacker] of integer = (2, 1);
+  FirstSurplusLoop: array[mctGroundDefender..mctGroundAttacker] of Integer = (2, 1);
 var
-  Cat, i, mix, cix, uix, Loop, nModelOrder: integer;
+  Cat, I, mix, cix, uix, Loop, nModelOrder: Integer;
   Adjacent: TVicinity8Loc;
-  LocNeed: array[0..lxmax * lymax - 1] of shortint;
-  Destination: array[0..nUmax - 1] of integer;
-  DistrictNeed, DistrictNeed0: array[0..maxCOD - 1] of integer;
-  ModelOrder: array[0..nMmax - 1] of integer;
-  complete, Fortified: boolean;
-
-  function IsBombarded(cix: integer): boolean;
+  LocNeed: array[0..lxmax * lymax - 1] of ShortInt;
+  Destination: array[0..nUmax - 1] of Integer;
+  DistrictNeed, DistrictNeed0: array[0..maxCOD - 1] of Integer;
+  ModelOrder: array[0..nMmax - 1] of Integer;
+  complete, Fortified: Boolean;
+
+  function IsBombarded(cix: Integer): Boolean;
   var
-    Loc1, V8: integer;
+    Loc1, V8: Integer;
     Adjacent: TVicinity8Loc;
   begin
@@ -1809 +1809 @@
           begin
             Result := True;
-            exit;
+            Exit;
           end;
         end;
@@ -1815 +1815 @@
   end;
 
-  procedure TryUtilize(uix: integer);
+  procedure TryUtilize(uix: Integer);
   var
-    cix, ProdCost, UtilizeCost: integer;
+    cix, ProdCost, UtilizeCost: Integer;
   begin
     if (MyUnit[uix].Health = 100) and (Map[MyUnit[uix].Loc] and
@@ -1829 +1829 @@
           UtilizeCost := MyModel[MyUnit[uix].mix].Cost;
           if Prod < (ProdCost - UtilizeCost * 2 div 3) *
-            BuildCostMod[G.Difficulty[me]] div 12 then
+            BuildCostMod[G.Difficulty[Me]] div 12 then
             Unit_Disband(uix);
         end;
@@ -1835 +1835 @@
   end;
 
-  procedure FindDestination(uix: integer);
+  procedure FindDestination(uix: Integer);
   var
-    MoveStyle, V8, Loc1, Time, NextLoc, NextTime, RecoverTurns: integer;
-    Reached: array[0..lxmax * lymax - 1] of boolean;
-  begin
-    fillchar(Reached, MapSize, False);
+    MoveStyle, V8, Loc1, Time, NextLoc, NextTime, RecoverTurns: Integer;
+    Reached: array[0..lxmax * lymax - 1] of Boolean;
+  begin
+    FillChar(Reached, MapSize, False);
     Pile.Create(MapSize);
     with MyUnit[uix] do
@@ -1854 +1854 @@
         if (District[Loc1] >= 0) and (District[Loc1] < maxCOD) then
         begin
-          assert(DistrictNeed[District[Loc1]] > 0);
+          Assert(DistrictNeed[District[Loc1]] > 0);
           Dec(DistrictNeed[District[Loc1]]);
         end;
         Destination[uix] := Loc1;
-        break;
+        Break;
       end;
       Reached[Loc1] := True;
@@ -1865 +1865 @@
       begin
         NextLoc := Adjacent[V8];
-        if (NextLoc >= 0) and not Reached[NextLoc] and (RO.Territory[NextLoc] = me) then
+        if (NextLoc >= 0) and not Reached[NextLoc] and (RO.Territory[NextLoc] = Me) then
           case CheckStep(MoveStyle, Time, V8 and 1, NextTime, RecoverTurns,
               Map[Loc1], Map[NextLoc], False) of
@@ -1873 +1873 @@
               Reached[NextLoc] := True; // don't check moving there again
             csCheckTerritory:
-              assert(False);
+              Assert(False);
           end;
       end;
@@ -1887 +1887 @@
           Unit_Disband(uix);
 
-  fillchar(UnitLack, sizeof(UnitLack), 0);
-  fillchar(Destination, 4 * RO.nUn, $FF);
-  for i := 0 to maxCOD - 1 do
-    if uixPatrol[i] >= 0 then
-      Destination[uixPatrol[i]] := PatrolDestination;
+  FillChar(UnitLack, SizeOf(UnitLack), 0);
+  FillChar(Destination, 4 * RO.nUn, $FF);
+  for I := 0 to maxCOD - 1 do
+    if uixPatrol[I] >= 0 then
+      Destination[uixPatrol[I]] := PatrolDestination;
   for uix := 0 to RO.nUn - 1 do
     if (MyUnit[uix].mix = mixMilitia) or (MyUnit[uix].mix = mixCruiser) then
@@ -1903 +1903 @@
       if ModelCat[mix] = Cat then
       begin
-        i := nModelOrder;
-        while (i > 0) and (ModelQuality[mix] < ModelQuality[ModelOrder[i - 1]]) do
-        begin
-          ModelOrder[i] := ModelOrder[i - 1];
-          Dec(i);
-        end;
-        ModelOrder[i] := mix;
+        I := nModelOrder;
+        while (I > 0) and (ModelQuality[mix] < ModelQuality[ModelOrder[I - 1]]) do
+        begin
+          ModelOrder[I] := ModelOrder[I - 1];
+          Dec(I);
+        end;
+        ModelOrder[I] := mix;
         Inc(nModelOrder);
       end;
@@ -1922 +1922 @@
               TryUtilize(uix);
 
-      fillchar(LocNeed, MapSize, 0);
-      fillchar(DistrictNeed, sizeof(DistrictNeed), 0);
+      FillChar(LocNeed, MapSize, 0);
+      FillChar(DistrictNeed, SizeOf(DistrictNeed), 0);
 
       for cix := 0 to RO.nCity - 1 do
@@ -1946 +1946 @@
         for uix := 0 to RO.nUn - 1 do
           with MyUnit[uix] do
-            if (Loc >= 0) and (Job = jCity) and (RO.Territory[Loc] = me) then
+            if (Loc >= 0) and (Job = jCity) and (RO.Territory[Loc] = Me) then
             begin
               LocNeed[Loc] := 1;
@@ -1954 +1954 @@
 
       complete := Loop >= FirstSurplusLoop[Cat];
-      for i := nModelOrder - 1 downto 0 do
+      for I := nModelOrder - 1 downto 0 do
       begin
         for Fortified := True downto False do
           for uix := 0 to RO.nUn - 1 do
             with MyUnit[uix] do
-              if (mix = ModelOrder[i]) and (Loc >= 0) and
+              if (mix = ModelOrder[I]) and (Loc >= 0) and
                 (Destination[uix] < 0) and (Master < 0) and
                 ((Flags and unFortified <> 0) = Fortified) and (LocNeed[Loc] > 0) then
@@ -1972 +1972 @@
         for uix := 0 to RO.nUn - 1 do
           with MyUnit[uix] do
-            if (mix = ModelOrder[i]) and (Loc >= 0) and (Destination[uix] < 0) and
+            if (mix = ModelOrder[I]) and (Loc >= 0) and (Destination[uix] < 0) and
               (Master < 0) then
               if (District[Loc] >= 0) and (District[Loc] < maxCOD) and
@@ -1989 +1989 @@
   // distribute obsolete settlers
   repeat
-    fillchar(LocNeed, MapSize, 0);
-    fillchar(DistrictNeed, sizeof(DistrictNeed), 0);
+    FillChar(LocNeed, MapSize, 0);
+    FillChar(DistrictNeed, SizeOf(DistrictNeed), 0);
 
     for cix := 0 to RO.nCity - 1 do
@@ -2040 +2040 @@
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
-      if (Loc >= 0) and (RO.Territory[Loc] = me) and (District[Loc] >= 0) and
+      if (Loc >= 0) and (RO.Territory[Loc] = Me) and (District[Loc] >= 0) and
         (District[Loc] < maxCOD) and (ModelQuality[mix] > 0) then
         case ModelCat[mix] of
@@ -2048 +2048 @@
 end;
 
-procedure TAI.CheckAttack(uix: integer);
+procedure TAI.CheckAttack(uix: Integer);
 var
   AttackScore, BestCount, AttackLoc, TestLoc, NextLoc, TestTime, V8,
   TestScore, euix, MyDamage, EnemyDamage, OldLoc, AttackForecast,
-  MoveResult, AttackResult, MoveStyle, NextTime, RecoverTurns: integer;
-  Tile: cardinal;
-  Exhausted: boolean;
+  MoveResult, AttackResult, MoveStyle, NextTime, RecoverTurns: Integer;
+  Tile: Cardinal;
+  Exhausted: Boolean;
   Adjacent: TVicinity8Loc;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 
 begin
@@ -2065 +2065 @@
       AttackScore := -999999;
       AttackLoc := -1;
-      fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       Pile.Create(MapSize);
       Pile.Put(Loc, $800 - Movement);
@@ -2077 +2077 @@
         if ((Tile and fUnit) <> 0) and ((Tile and fOwned) = 0) then
         begin // enemy unit
-          assert(TestTime < $1000);
+          Assert(TestTime < $1000);
           Unit_FindEnemyDefender(TestLoc, euix);
           if RO.Treaty[RO.EnemyUn[euix].Owner] < trPeace then
@@ -2168 +2168 @@
 end;
 
-procedure TAI.Patrol(uix: integer);
+procedure TAI.Patrol(uix: Integer);
 const
   DistanceScore = 4;
 var
   PatrolScore, BestCount, PatrolLoc, TestLoc, NextLoc, TestTime, V8,
-  TestScore, OldLoc, MoveResult, MoveStyle, NextTime, RecoverTurns: integer;
-  Tile: cardinal;
-  Exhausted, CaptureOnly: boolean;
+  TestScore, OldLoc, MoveResult, MoveStyle, NextTime, RecoverTurns: Integer;
+  Tile: Cardinal;
+  Exhausted, CaptureOnly: Boolean;
   Adjacent: TVicinity8Loc;
-  AdjacentUnknown: array[0..lxmax * lymax - 1] of shortint;
+  AdjacentUnknown: array[0..lxmax * lymax - 1] of ShortInt;
 
 begin
@@ -2196 +2196 @@
           // assume a score of 50 is the best achievable
           or CaptureOnly and (TestTime >= $1000) then
-          break;
+          Break;
 
         TestScore := 0;
@@ -2276 +2276 @@
 const
   nAttackCatOrder = 3;
-  AttackCatOrder: array[0..nAttackCatOrder - 1] of integer =
+  AttackCatOrder: array[0..nAttackCatOrder - 1] of Integer =
     (mctGroundAttacker, mctCruiser, mctGroundDefender);
 var
-  iCat, uix, uix1: integer;
-  IsPatrolUnit, Fortified: boolean;
+  iCat, uix, uix1: Integer;
+  IsPatrolUnit, Fortified: Boolean;
 begin
   for uix := 0 to RO.nUn - 1 do
@@ -2299 +2299 @@
               CheckAttack(uix);
 
-  fillchar(uixPatrol, sizeof(uixPatrol), $FF);
+  FillChar(uixPatrol, SizeOf(uixPatrol), $FF);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix], MyModel[mix] do
@@ -2333 +2333 @@
 end;
 
-function TAI.HavePort: boolean;
+function TAI.HavePort: Boolean;
 var
-  V8, cix, AdjacentLoc, f: integer;
+  V8, cix, AdjacentLoc, F: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -2349 +2349 @@
           if (AdjacentLoc >= 0) and ((Map[AdjacentLoc] and fTerrain) < fGrass) then
           begin
-            f := Formation[AdjacentLoc];
-            if (f >= 0) and (f < maxCOD) and (OceanPresence[f] and
-              not (1 shl me) <> 0) then
+            F := Formation[AdjacentLoc];
+            if (F >= 0) and (F < maxCOD) and (OceanPresence[F] and
+              not (1 shl Me) <> 0) then
               Result := True;
           end;
@@ -2361 +2361 @@
 var
   uix, cix, iix, dtr, V8, V21, NewImprovement, AdjacentLoc, MaxSettlers,
-  maxcount, cixMilAcademy: integer;
-  TerrType: cardinal;
+  maxcount, cixMilAcademy: Integer;
+  TerrType: Cardinal;
   IsPort, IsNavalBase, NeedCruiser, CheckProd, Destructed, ProduceSettlers,
-  ProduceMil: boolean;
+  ProduceMil: Boolean;
   Adjacent: TVicinity8Loc;
   Radius: TVicinity21Loc;
   Report: TCityReport;
-  HomeCount, CityProdRep: array[0..nCmax - 1] of integer;
-  MilProdCity: array[0..nCmax - 1] of boolean;
-
-  procedure TryBuild(Improvement: integer);
+  HomeCount, CityProdRep: array[0..nCmax - 1] of Integer;
+  MilProdCity: array[0..nCmax - 1] of Boolean;
+
+  procedure TryBuild(Improvement: Integer);
   begin
     if (NewImprovement = imTrGoods) // not already improvement of higher priority found
@@ -2381 +2381 @@
   end;
 
-  procedure TryDestruct(Improvement: integer);
+  procedure TryDestruct(Improvement: Integer);
   begin
     if Destructed or (MyCity[cix].Built[Improvement] = 0) then
-      exit;
+      Exit;
     if City_CurrentImprovementProject(cix) >= 0 then
       City_RebuildImprovement(cix, Improvement)
@@ -2392 +2392 @@
       and (Imp[CurrentImprovementProject].Kind in [ikCommon,ikNatGlobal,ikNatLocal])
       and ((Imp[CurrentImprovementProject].Cost*3-Imp[Improvement].Cost*2)
-      *BuildCostMod[G.Difficulty[me]]>MyCity[cix].Prod*(12*3)) then}
+      *BuildCostMod[G.Difficulty[Me]]>MyCity[cix].Prod*(12*3)) then}
     Destructed := True;
   end;
 
-  function ChooseBuildModel(Cat: integer): integer;
+  function ChooseBuildModel(Cat: Integer): Integer;
   var
-    Count, mix: integer;
+    Count, mix: Integer;
   begin
     Count := 0;
@@ -2409 +2409 @@
           Result := mix;
       end;
-    assert(Count > 0);
+    Assert(Count > 0);
   end;
 
@@ -2415 +2415 @@
   // find military production cities
   var
-    cix, Total, d, Threshold, NewThreshold, Share, SharePlus, cixWorst: integer;
-  begin
-    fillchar(MilProdCity, RO.nCity, 0);
+    cix, Total, D, Threshold, NewThreshold, Share, SharePlus, cixWorst: Integer;
+  begin
+    FillChar(MilProdCity, RO.nCity, 0);
     GetCityProdPotential;
-    for d := 0 to maxCOD - 1 do
+    for D := 0 to maxCOD - 1 do
     begin
       Total := 0;
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) then
+          if (Loc >= 0) and (District[Loc] = D) then
             Total := Total + CityResult[cix];
       if Total = 0 then
@@ -2433 +2433 @@
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) and
+          if (Loc >= 0) and (District[Loc] = D) and
             (Built[imBarracks] + Built[imMilAcademy] > 0) then
           begin
@@ -2448 +2448 @@
         for cix := 0 to RO.nCity - 1 do
           with MyCity[cix] do
-            if (Loc >= 0) and (District[Loc] = d) and
+            if (Loc >= 0) and (District[Loc] = D) and
               (Built[imBarracks] + Built[imMilAcademy] = 0) and
               (Built[imObservatory] = 0) and (CityResult[cix] < Threshold) and
@@ -2465 +2465 @@
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) and
+          if (Loc >= 0) and (District[Loc] = D) and
             (Built[imBarracks] + Built[imMilAcademy] = 0) and
             (CityResult[cix] >= Threshold) then
@@ -2471 +2471 @@
 {    if (cixWorst>=0)
       and (Share-CityResult[cixWorst]*2>=Total*MilProdShare div 100) then
-      MilProdCity[cixWorst]:=false;}
+      MilProdCity[cixWorst]:=False;}
     end;
 
@@ -2478 +2478 @@
     if cixStateImp[imPalace] >= 0 then
     begin
-      d := District[MyCity[cixStateImp[imPalace]].Loc];
-      if (d >= 0) and (d < maxCOD) then
+      D := District[MyCity[cixStateImp[imPalace]].Loc];
+      if (D >= 0) and (D < maxCOD) then
       begin
         cixMilAcademy := -1;
         for cix := 0 to RO.nCity - 1 do
           with MyCity[cix] do
-            if (Loc >= 0) and (District[Loc] = d) and
+            if (Loc >= 0) and (District[Loc] = D) and
               (Built[imObservatory] + Built[imPalace] = 0) and
               ((cixMilAcademy < 0) or (CityResult[cix] > CityResult[cixMilAcademy])) then
@@ -2500 +2500 @@
   procedure ChangeHomeCities;
   var
-    uix, NewHome, HomeSupport, NewHomeSupport, SingleSupport: integer;
+    uix, NewHome, HomeSupport, NewHomeSupport, SingleSupport: Integer;
   begin
     if RO.Government in [gAnarchy, gFundamentalism] then
-      exit;
+      Exit;
     for uix := 0 to RO.nUn - 1 do
       with MyUnit[uix] do
@@ -2551 +2551 @@
 
 begin
-  fillchar(HomeCount, 4 * RO.nCity, 0);
+  FillChar(HomeCount, 4 * RO.nCity, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -2744 +2744 @@
                     begin
                       TryBuild(imHarbor);
-                      break;
+                      Break;
                     end;
                   end;
@@ -2762 +2762 @@
               TryBuild(imRecycling);
             if (Report.Trade - Report.Corruption >= 11) and
-              (RO.Money < TotalPopulation[me] * 2) then
+              (RO.Money < TotalPopulation[Me] * 2) then
               TryBuild(imBank);
             if (RO.NatBuilt[imStockEx] = 0) and
@@ -2799 +2799 @@
 
           // rebuild imps no longer needed
-          if (RO.TaxRate = 0) and (RO.Money >= TotalPopulation[me] * 4) then
+          if (RO.TaxRate = 0) and (RO.Money >= TotalPopulation[Me] * 4) then
             TryDestruct(imBank)
           else if Report.Happy * 2 >= Size + 6 then
@@ -2825 +2825 @@
 end;
 
-function TAI.ChooseGovernment: integer;
+function TAI.ChooseGovernment: Integer;
 begin
   if Data.BehaviorFlags and bBarbarina <> 0 then
@@ -2846 +2846 @@
 //-------------------------------
 
-function TAI.MostWanted(Nation, adGiveAway: integer): integer;
+function TAI.MostWanted(Nation, adGiveAway: Integer): Integer;
 var
-  ad: integer;
+  ad: Integer;
 begin
   Result := -1;
@@ -2876 +2876 @@
 end;
 
-procedure TAI.FindBestTrade(Nation: integer; var adWanted, adGiveAway: integer);
+procedure TAI.FindBestTrade(Nation: Integer; var adWanted, adGiveAway: Integer);
 var
-  i, ad, ead, adTestGiveAway: integer;
+  I, ad, ead, adTestGiveAway: Integer;
 begin
   adWanted := -1;
@@ -2888 +2888 @@
     begin
       adTestGiveAway := -1;
-      for i := 0 to nRequestedTechs - 1 do
-        if (Data.RequestedTechs[i] >= 0) and
-          (Data.RequestedTechs[i] and $FFFF = Nation shl 8 + ead) then
+      for I := 0 to nRequestedTechs - 1 do
+        if (Data.RequestedTechs[I] >= 0) and
+          (Data.RequestedTechs[I] and $FFFF = Nation shl 8 + ead) then
           adTestGiveAway := -2; // already requested before
       if adTestGiveAway = -1 then
@@ -2913 +2913 @@
 end;
 
-function TAI.WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
+function TAI.WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
 var
-  p1, Count, adWanted, adGiveAway: integer;
+  p1, Count, adWanted, adGiveAway: Integer;
 begin
   if Data.BehaviorFlags and bBarbarina = bBarbarina then
   begin
     Result := Barbarina_WantNegotiation(Nation, NegoTime);
-    exit;
+    Exit;
   end;
 
@@ -2928 +2928 @@
     begin
       Result := False;
-      exit;
+      Exit;
     end;
     Count := 0;
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] >= trPeace) then
+      if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] >= trPeace) then
         Inc(Count);
     if Count >= 3 then // enough peace made
     begin
       Result := False;
-      exit;
+      Exit;
     end;
   end;
@@ -2978 +2978 @@
 procedure TAI.DoNegotiation;
 var
-  i, adWanted, adGiveAway, adToGet, Slot: integer;
-  BuildFreeOffer: boolean;
+  I, adWanted, adGiveAway, adToGet, Slot: Integer;
+  BuildFreeOffer: Boolean;
 begin
   if MyLastAction = scDipOffer then
@@ -3010 +3010 @@
   begin
     Barbarina_DoNegotiation;
-    exit;
+    Exit;
   end;
 
@@ -3016 +3016 @@
   begin
     Barbarina_DoCheckNegotiation;
-    exit;
+    Exit;
   end;
 
@@ -3031 +3031 @@
       (OppoOffer.nDeliver + OppoOffer.nCost = 1) and
       (OppoOffer.Price[0] and opMask = opTreaty) and
-      (integer(OppoOffer.Price[0] - opTreaty) > RO.Treaty[Opponent]) and
+      (Integer(OppoOffer.Price[0] - opTreaty) > RO.Treaty[Opponent]) and
       ((OppoOffer.Price[0] - opTreaty < trAlliance) or
       (RO.Tech[adScience] >= tsSeen)) then
       MyAction := scDipAccept // accept all treaties
     else if (RO.Treaty[Opponent] >= trPeace) and (OppoOffer.nDeliver = 1) and
-      (OppoOffer.Price[0] and $FFFF0000 = opCivilReport + cardinal(Opponent) shl 16) and
+      (OppoOffer.Price[0] and $FFFF0000 = opCivilReport + Cardinal(Opponent) shl 16) and
       (OppoOffer.nCost = 1) and (OppoOffer.Price[1] and $FFFF0000 =
-      opCivilReport + cardinal(me) shl 16) then
+      opCivilReport + Cardinal(Me) shl 16) then
       MyAction := scDipAccept // accept exchange of civil reports
     else if (OppoOffer.nDeliver = 1) and (OppoOffer.nCost = 1) and
@@ -3068 +3068 @@
         adWanted := MostWanted(Opponent, OppoOffer.Price[1] - opTech);
         if (OppoOffer.Price[0] and opMask = opTech) and
-          (cardinal(adWanted) = OppoOffer.Price[0] - opTech) then
+          (Cardinal(adWanted) = OppoOffer.Price[0] - opTech) then
           MyAction := scDipAccept // opponent's offer is already perfect
         else if adWanted >= 0 then
@@ -3124 +3124 @@
         MyOffer.Price[1] := opTech + adWanted;
         MyAction := scDipOffer;
-        for i := 0 to nRequestedTechs - 1 do
-          if Data.RequestedTechs[i] < 0 then
+        for I := 0 to nRequestedTechs - 1 do
+          if Data.RequestedTechs[I] < 0 then
           begin
-            Slot := i;
-            break;
+            Slot := I;
+            Break;
           end
-          else if (i = 0) or (Data.RequestedTechs[i] shr 16 <
+          else if (I = 0) or (Data.RequestedTechs[I] shr 16 <
             Data.RequestedTechs[Slot] shr 16) then // find most outdated entry
-            Slot := i;
+            Slot := I;
         Data.RequestedTechs[Slot] := RO.Turn shl 16 + Opponent shl 8 + adWanted;
       end;
@@ -3141 +3141 @@
 procedure SetLeaveOutValue;
 
-  procedure Process(ad: integer);
+  procedure Process(ad: Integer);
   var
-    i: integer;
+    I: Integer;
   begin
     if LeaveOutValue[ad] < 0 then
     begin
       LeaveOutValue[ad] := 0;
-      for i := 0 to 1 do
-        if AdvPreq[ad, i] >= 0 then
-        begin
-          Process(AdvPreq[ad, i]);
-          if AdvPreq[ad, i] in LeaveOutTechs then
-            Inc(LeaveOutValue[ad], LeaveOutValue[AdvPreq[ad, i]] + 1);
+      for I := 0 to 1 do
+        if AdvPreq[ad, I] >= 0 then
+        begin
+          Process(AdvPreq[ad, I]);
+          if AdvPreq[ad, I] in LeaveOutTechs then
+            Inc(LeaveOutValue[ad], LeaveOutValue[AdvPreq[ad, I]] + 1);
         end;
     end;
@@ -3159 +3159 @@
 
 var
-  ad: integer;
+  ad: Integer;
 begin
   FillChar(LeaveOutValue, SizeOf(LeaveOutValue), $FF);
@@ -3168 +3168 @@
 
 initialization
-  RWDataSize := sizeof(TPersistentData);
+  RWDataSize := SizeOf(TPersistentData);
   SetLeaveOutValue;
 

trunk/AI/StdAI/Barbarina.pas

@@ -25 +25 @@
 type
   TColonyShipPlan = array[0..nShipPart - 1] of record
-    cixProducing: integer;
-    LocResource: array[0..maxModern - 1] of integer;
-    nLocResource: integer;
-    LocFoundCity: array[0..maxModern - 1] of integer;
-    nLocFoundCity: integer;
+    cixProducing: Integer;
+    LocResource: array[0..maxModern - 1] of Integer;
+    nLocResource: Integer;
+    LocFoundCity: array[0..maxModern - 1] of Integer;
+    nLocFoundCity: Integer;
   end;
 
   TBarbarina = class(TToolAI)
-    constructor Create(Nation: integer); override;
+    constructor Create(Nation: Integer); override;
 
   protected
     ColonyShipPlan: TColonyShipPlan;
-    function Barbarina_GoHidden: boolean; // whether we should prepare for barbarina mode
-    function Barbarina_Go: boolean; // whether we should switch to barbarina mode now
+    function Barbarina_GoHidden: Boolean; // whether we should prepare for barbarina mode
+    function Barbarina_Go: Boolean; // whether we should switch to barbarina mode now
     procedure Barbarina_DoTurn;
     procedure Barbarina_SetCityProduction;
-    function Barbarina_ChooseResearchAdvance: integer;
-    function Barbarina_WantCheckNegotiation(Nation: integer): boolean;
+    function Barbarina_ChooseResearchAdvance: Integer;
+    function Barbarina_WantCheckNegotiation(Nation: Integer): Boolean;
     procedure Barbarina_DoCheckNegotiation;
-    function Barbarina_WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
+    function Barbarina_WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
     procedure Barbarina_DoNegotiation;
     procedure MakeColonyShipPlan;
 
   private
-    TurnOfMapAnalysis, Neighbours: integer;
-    ContinentPresence: array[0..maxCOD - 1] of integer;
-    OceanPresence: array[0..maxCOD - 1] of integer;
-    ContinentSize: array[0..maxCOD - 1] of integer;
-    OceanSize: array[0..maxCOD - 1] of integer;
-    mixBest: array[0..nModelCategory - 1] of integer;
+    TurnOfMapAnalysis, Neighbours: Integer;
+    ContinentPresence: array[0..maxCOD - 1] of Integer;
+    OceanPresence: array[0..maxCOD - 1] of Integer;
+    ContinentSize: array[0..maxCOD - 1] of Integer;
+    OceanSize: array[0..maxCOD - 1] of Integer;
+    mixBest: array[0..nModelCategory - 1] of Integer;
     NegoCause: (CancelTreaty);
-    function IsModelAvailable(rmix: integer): boolean;
+    function IsModelAvailable(rmix: Integer): Boolean;
     procedure FindBestModels;
     procedure AnalyzeMap;
-    procedure RateAttack(uix: integer);
-    function DoAttack(uix, AttackLoc: integer): boolean;
-    function ProcessMove(uix: integer): boolean;
+    procedure RateAttack(uix: Integer);
+    function DoAttack(uix, AttackLoc: Integer): Boolean;
+    function ProcessMove(uix: Integer): Boolean;
     procedure AttackAndPatrol;
   end;
@@ -73 +73 @@
 type
   TResearchModel = record
-    Category, Domain, Weight, adStop, FutMStrength: integer;
-    Upgrades: cardinal;
-    Cap: array [0..nFeature - 1] of integer;
+    Category, Domain, Weight, adStop, FutMStrength: Integer;
+    Upgrades: Cardinal;
+    Cap: array [0..nFeature - 1] of Integer;
   end;
 
@@ -93 +93 @@
 
   nResearchOrder = 40;
-  ResearchOrder: array[0..nResearchOrder - 1] of integer =
+  ResearchOrder: array[0..nResearchOrder - 1] of Integer =
     (adBronzeWorking, -adMapMaking, adChivalry, adMonotheism, adIronWorking,
     adGunPowder, adTheology, adConstruction, adCodeOfLaws, -adEngineering,
@@ -171 +171 @@
 
 var
-  Moved: array[0..numax - 1] of boolean;
-  UnitPresence: array[0..lxmax * lymax - 1] of byte;
+  Moved: array[0..numax - 1] of Boolean;
+  UnitPresence: array[0..lxmax * lymax - 1] of Byte;
   euixMap: array[0..lxmax * lymax - 1] of smallint;
   uixAttack: array[0..neumax - 1] of smallint;
-  AttackScore: array[0..neumax - 1] of integer;
-
-constructor TBarbarina.Create(Nation: integer);
+  AttackScore: array[0..neumax - 1] of Integer;
+
+constructor TBarbarina.Create(Nation: Integer);
 begin
   inherited;
@@ -184 +184 @@
 
 // whether one of the existing models matches a specific research model
-function TBarbarina.IsModelAvailable(rmix: integer): boolean;
+function TBarbarina.IsModelAvailable(rmix: Integer): Boolean;
 var
-  i, mix, MStrength: integer;
+  I, mix, MStrength: Integer;
 begin
   Result := False;
@@ -199 +199 @@
         Result := MStrength < (MyModel[mix].MStrength * 3) div 2;
         // for future techs: don't count model available if 50% stronger possible
-        for i := 0 to nFeature - 1 do
-          if MyModel[mix].Cap[i] < Cap[i] then
+        for I := 0 to nFeature - 1 do
+          if MyModel[mix].Cap[I] < Cap[I] then
           begin
             Result := False;
-            break;
+            Break;
           end;
         if Result then
-          break;
+          Break;
       end;
   end;
 end;
 
-function TBarbarina.Barbarina_GoHidden: boolean;
+function TBarbarina.Barbarina_GoHidden: Boolean;
 var
-  V21, Loc1, cix: integer;
+  V21, Loc1, cix: Integer;
   Radius: TVicinity21Loc;
 begin
@@ -238 +238 @@
 end;
 
-function TBarbarina.Barbarina_Go: boolean;
+function TBarbarina.Barbarina_Go: Boolean;
 begin
   if IsResearched(adMassProduction) then
@@ -249 +249 @@
     Result := (RO.nCity >= 3) and IsResearched(adMapMaking) and
       IsModelAvailable(EntryModel_Base);
-    exit;
+    Exit;
   end;
   Result := Result and ((RO.nUn >= RO.nCity * 3) or
-    (RO.Wonder[woZeus].EffectiveOwner = me));
+    (RO.Wonder[woZeus].EffectiveOwner = Me));
 end;
 
 procedure TBarbarina.AnalyzeMap;
 var
-  Loc, Loc1, V8, f1, p1, cix: integer;
+  Loc, Loc1, V8, f1, p1, cix: Integer;
   Adjacent: TVicinity8Loc;
 begin
   if TurnOfMapAnalysis = RO.Turn then
-    exit;
+    Exit;
 
   // inherited;
 
   // collect nation presence information for continents and oceans
-  fillchar(ContinentPresence, sizeof(ContinentPresence), 0);
-  fillchar(OceanPresence, sizeof(OceanPresence), 0);
-  fillchar(ContinentSize, sizeof(ContinentSize), 0);
-  fillchar(OceanSize, sizeof(OceanSize), 0);
+  FillChar(ContinentPresence, SizeOf(ContinentPresence), 0);
+  FillChar(OceanPresence, SizeOf(OceanPresence), 0);
+  FillChar(ContinentSize, SizeOf(ContinentSize), 0);
+  FillChar(OceanSize, SizeOf(OceanSize), 0);
   for Loc := 0 to MapSize - 1 do
   begin
@@ -339 +339 @@
 procedure TBarbarina.FindBestModels;
 var
-  i, mix, rmix, cat: integer;
+  I, mix, rmix, cat: Integer;
 begin
-  for i := 0 to nModelCategory - 1 do
-    mixBest[i] := -1;
+  for I := 0 to nModelCategory - 1 do
+    mixBest[I] := -1;
   for rmix := nResearchModel - 1 downto 0 do
     with ResearchModel[rmix] do
@@ -351 +351 @@
           begin
             mixBest[Category] := mix;
-            for i := 0 to nFeature - 1 do
-              if MyModel[mix].Cap[i] < Cap[i] then
+            for I := 0 to nFeature - 1 do
+              if MyModel[mix].Cap[I] < Cap[I] then
               begin
                 mixBest[Category] := -1;
-                break;
+                Break;
               end;
             if mixBest[Category] >= 0 then
-              break;
+              Break;
           end;
   for mix := 3 to RO.nModel - 1 do
@@ -387 +387 @@
       begin
         mixBest[ctSeaTrans] := mix;
-        break;
+        Break;
       end;
 end;
@@ -406 +406 @@
 
 // find one unit to destroy each known enemy unit, result in uixAttack
-procedure TBarbarina.RateAttack(uix: integer);
+procedure TBarbarina.RateAttack(uix: Integer);
 var
   MoveStyle, TestLoc, TestTime, NextLoc, NextTime, V8, RemHealth,
-  RecoverTurns, Score, BestScore, euixBest, uixOld: integer;
-  NextTile: cardinal;
+  RecoverTurns, Score, BestScore, euixBest, uixOld: Integer;
+  NextTile: Cardinal;
   Adjacent: TVicinity8Loc;
   Defense: ^TUnitInfo;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   with MyUnit[uix] do
@@ -419 +419 @@
     begin
       BestScore := 0;
-      fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       MoveStyle := GetMyMoveStyle(mix, Health);
       Pile.Create(MapSize);
@@ -494 +494 @@
 end;
 
-function TBarbarina.DoAttack(uix, AttackLoc: integer): boolean;
+function TBarbarina.DoAttack(uix, AttackLoc: Integer): Boolean;
   // AttackLoc=maNextCity means bombard only
 var
   MoveResult, Kind, Temp, MoveStyle, TestLoc, TestTime, NextLoc,
-  NextTime, V8, RecoverTurns, ecix: integer;
-  NextTile: cardinal;
-  AttackPositionReached, IsBombardment: boolean;
+  NextTime, V8, RecoverTurns, ecix: Integer;
+  NextTile: Cardinal;
+  AttackPositionReached, IsBombardment: Boolean;
   Adjacent: TVicinity8Loc;
-  PreLoc: array[0..lxmax * lymax - 1] of word;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  PreLoc: array[0..lxmax * lymax - 1] of Word;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   Result := False;
@@ -516 +516 @@
     else
       Kind := 0;
-    fillchar(Reached, MapSize, False);
+    FillChar(Reached, MapSize, False);
     AttackPositionReached := False;
     MoveStyle := GetMyMoveStyle(mix, Health);
@@ -524 +524 @@
     begin
       if (TestTime >= $800) or (AttackLoc = maNextCity) and (TestTime > $800 - 100) then
-        break;
+        Break;
       Reached[TestLoc] := True;
       V8_to_Loc(TestLoc, Adjacent);
@@ -537 +537 @@
           begin
             City_FindEnemyCity(NextLoc, ecix);
-            assert(ecix >= 0);
+            Assert(ecix >= 0);
             with RO.EnemyCity[ecix] do
               if (Size > 2) and (Flags and ciCoastalFort = 0) then
@@ -547 +547 @@
           begin
             AttackPositionReached := True;
-            break;
+            Break;
           end
           else if not Reached[NextLoc] then
@@ -572 +572 @@
       begin
         PreLoc[NextLoc] := TestLoc;
-        break;
+        Break;
       end;
     end;
     Pile.Free;
     if not AttackPositionReached then
-      exit;
+      Exit;
 
     TestLoc := AttackLoc;
@@ -601 +601 @@
     begin
       City_FindEnemyCity(AttackLoc, ecix);
-      assert(ecix >= 0);
+      Assert(ecix >= 0);
       while (Movement >= 100) and (RO.EnemyCity[ecix].Size > 2) do
         Unit_Step(uix, AttackLoc);
@@ -611 +611 @@
 end;
 
-function TBarbarina.ProcessMove(uix: integer): boolean;
+function TBarbarina.ProcessMove(uix: Integer): Boolean;
   // return true if no new enemy spotted
 const
@@ -618 +618 @@
   PatrolScore, BestCount, PatrolLoc, TestLoc, NextLoc, TestTime, V8,
   TestScore, MoveResult, MoveStyle, NextTime, TerrOwner, Kind, Temp,
-  RecoverTurns, MaxScore: integer;
-  Tile, NextTile: cardinal;
-  CaptureOnly, PeaceBorder, done, NextToEnemyCity: boolean;
+  RecoverTurns, MaxScore: Integer;
+  Tile, NextTile: Cardinal;
+  CaptureOnly, PeaceBorder, done, NextToEnemyCity: Boolean;
   Adjacent: TVicinity8Loc;
-  AdjacentUnknown: array[0..lxmax * lymax - 1] of shortint;
-  PreLoc: array[0..lxmax * lymax - 1] of word;
-  MoreTurn: array[0..lxmax * lymax - 1] of byte;
+  AdjacentUnknown: array[0..lxmax * lymax - 1] of ShortInt;
+  PreLoc: array[0..lxmax * lymax - 1] of Word;
+  MoreTurn: array[0..lxmax * lymax - 1] of Byte;
 
 begin
@@ -637 +637 @@
         if Map[Loc] and fCity = 0 then
           Unit_MoveEx(uix, maNextCity);
-        exit;
+        Exit;
       end;
 
@@ -666 +666 @@
           // assume a score of $400 is the best achievable
           or CaptureOnly and (TestTime >= $1000) then
-          break;
+          Break;
 
         TestScore := 0;
         Tile := Map[TestLoc];
-        assert(Tile and (fUnit or fOwned) <> fUnit);
+        Assert(Tile and (fUnit or fOwned) <> fUnit);
         TerrOwner := RO.Territory[TestLoc];
         AdjacentUnknown[TestLoc] := 0;
@@ -743 +743 @@
               TestScore := $400 - 14
             else if AdjacentUnknown[TestLoc] > 0 then
-              if PeaceBorder or (TerrOwner >= 0) and (TerrOwner <> me) and
+              if PeaceBorder or (TerrOwner >= 0) and (TerrOwner <> Me) and
                 (RO.Treaty[TerrOwner] < trPeace) then
                 TestScore := $400 - 32 + AdjacentUnknown[TestLoc]
@@ -790 +790 @@
         end;
         if PatrolLoc = Loc then
-          exit;
+          Exit;
         TestLoc := PatrolLoc;
         NextLoc := PreLoc[TestLoc];
@@ -814 +814 @@
             Result := MoveResult and rEnemySpotted = 0;
             done := True;
-            break;
-          end;
-          assert(Loc = NextLoc);
+            Break;
+          end;
+          Assert(Loc = NextLoc);
         end;
         if Loc >= 0 then
@@ -839 +839 @@
   procedure SetCityDefenders;
   var
-    uix, cix, V8, Loc1, Best, uixBest, det: integer;
+    uix, cix, V8, Loc1, Best, uixBest, det: Integer;
     Adjacent: TVicinity8Loc;
-    IsPort: boolean;
+    IsPort: Boolean;
   begin
     for cix := 0 to RO.nCity - 1 do
@@ -887 +887 @@
   procedure ProcessSeaTransport;
   var
-    i, f, uix, Loc1, a, b: integer;
-    ready, go: boolean;
+    I, F, uix, Loc1, A, B: Integer;
+    ready, go: Boolean;
     TransportPlan: TGroupTransportPlan;
   begin
     go := False;
-    for f := 0 to maxCOD - 1 do
-      if (f < nContinent) and (ContinentPresence[f] and not
-        (1 shl me or PresenceUnknown) <> 0) then
+    for F := 0 to maxCOD - 1 do
+      if (F < nContinent) and (ContinentPresence[F] and not
+        (1 shl Me or PresenceUnknown) <> 0) then
         go := True; // any enemy island known?
     if not go then
-      exit;
+      Exit;
 
     SeaTransport_BeginInitialize;
@@ -907 +907 @@
             (MyModel[mix].Attack > 0) and (Map[Loc] and fTerrain >= fGrass) then
           begin
-            f := Formation[Loc];
-            if (f >= 0) and (f < maxCOD) and (ContinentPresence[f] and
-              not (1 shl me) = 0) then
+            F := Formation[Loc];
+            if (F >= 0) and (F < maxCOD) and (ContinentPresence[F] and
+              not (1 shl Me) = 0) then
             begin
               go := True;
@@ -932 +932 @@
         if Map[Loc1] and fTerrain >= fGrass then
         begin
-          f := Formation[Loc1];
-          if (f >= 0) and (f < maxCOD) and (ContinentPresence[f] and
-            not (1 shl me or PresenceUnknown) <> 0) then
+          F := Formation[Loc1];
+          if (F >= 0) and (F < maxCOD) and (ContinentPresence[F] and
+            not (1 shl Me or PresenceUnknown) <> 0) then
             SeaTransport_AddDestination(Loc1);
         end;
@@ -948 +948 @@
       end;
       if ready then
-        for i := 0 to TransportPlan.nLoad - 1 do
+        for I := 0 to TransportPlan.nLoad - 1 do
         begin
           Loc_to_ab(TransportPlan.LoadLoc,
-            MyUnit[TransportPlan.uixLoad[i]].Loc, a, b);
-          ready := ready and (abs(a) <= 1) and (abs(b) <= 1);
+            MyUnit[TransportPlan.uixLoad[I]].Loc, A, B);
+          ready := ready and (abs(A) <= 1) and (abs(B) <= 1);
         end;
       if ready then
       begin
-        for i := 0 to TransportPlan.nLoad - 1 do
-        begin
-          Unit_Step(TransportPlan.uixLoad[i], TransportPlan.LoadLoc);
-          Moved[TransportPlan.uixLoad[i]] := True;
+        for I := 0 to TransportPlan.nLoad - 1 do
+        begin
+          Unit_Step(TransportPlan.uixLoad[I], TransportPlan.LoadLoc);
+          Moved[TransportPlan.uixLoad[I]] := True;
         end;
       end
       else
       begin
-        for i := 0 to TransportPlan.nLoad - 1 do
-        begin
-          Unit_MoveEx(TransportPlan.uixLoad[i], TransportPlan.LoadLoc, mxAdjacent);
-          Moved[TransportPlan.uixLoad[i]] := True;
+        for I := 0 to TransportPlan.nLoad - 1 do
+        begin
+          Unit_MoveEx(TransportPlan.uixLoad[I], TransportPlan.LoadLoc, mxAdjacent);
+          Moved[TransportPlan.uixLoad[I]] := True;
         end;
       end;
@@ -973 +973 @@
   end;
 
-  procedure ProcessUnload(uix: integer);
-
-    procedure Unload(Kind, ToLoc: integer);
+  procedure ProcessUnload(uix: Integer);
+
+    procedure Unload(Kind, ToLoc: Integer);
     var
-      uix1: integer;
+      uix1: Integer;
     begin
       for uix1 := 0 to RO.nUn - 1 do
@@ -987 +987 @@
             Unit_Step(uix1, ToLoc);
             UnitPresence[ToLoc] := UnitPresence[ToLoc] or Kind;
-            break;
+            Break;
           end;
     end;
@@ -993 +993 @@
   var
     uix1, MoveStyle, TestLoc, TestTime, NextLoc, NextTime, V8,
-    RecoverTurns, nSlow, nFast, SlowUnloadLoc, FastUnloadLoc, EndLoc, f: integer;
-    NextTile: cardinal;
+    RecoverTurns, nSlow, nFast, SlowUnloadLoc, FastUnloadLoc, EndLoc, F: Integer;
+    NextTile: Cardinal;
     Adjacent: TVicinity8Loc;
-    Reached: array[0..lxmax * lymax - 1] of boolean;
+    Reached: array[0..lxmax * lymax - 1] of Boolean;
   begin
     // inventory
@@ -1017 +1017 @@
         FastUnloadLoc := -1;
         EndLoc := -1;
-        fillchar(Reached, MapSize, False);
+        FillChar(Reached, MapSize, False);
         Pile.Create(MapSize);
         Pile.Put(Loc, $800 - Movement);
@@ -1034 +1034 @@
               else if NextTile and fTerrain >= fGrass then
               begin
-                f := Formation[NextLoc];
-                if (f >= 0) and (f < maxCOD) and
-                  (ContinentPresence[f] and not (1 shl me or PresenceUnknown) <> 0) and
+                F := Formation[NextLoc];
+                if (F >= 0) and (F < maxCOD) and
+                  (ContinentPresence[F] and not (1 shl Me or PresenceUnknown) <> 0) and
                   (NextTile and (fUnit or fOwned) <> fUnit) then
                 begin
@@ -1074 +1074 @@
 
         if EndLoc < 0 then
-          exit;
+          Exit;
         if Loc <> EndLoc then
           Unit_MoveEx(uix, EndLoc);
         if Loc <> EndLoc then
-          exit;
+          Exit;
         if SlowUnloadLoc >= 0 then
         begin
@@ -1092 +1092 @@
         begin
           Moved[uix] := False;
-          exit;
+          Exit;
         end
       until False;
@@ -1099 +1099 @@
 
 var
-  uix, euix, Kind, euixBest, AttackLoc: integer;
-  OldTile: cardinal;
-  BackToStart, FirstLoop: boolean;
+  uix, euix, Kind, euixBest, AttackLoc: Integer;
+  OldTile: Cardinal;
+  BackToStart, FirstLoop: Boolean;
 begin
-  fillchar(UnitPresence, MapSize, 0);
+  FillChar(UnitPresence, MapSize, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -1116 +1116 @@
       end;
 
-  fillchar(Moved, RO.nUn, False);
+  FillChar(Moved, RO.nUn, False);
   for uix := 0 to RO.nUn - 1 do
     if (MyUnit[uix].Master >= 0) or (MyUnit[uix].TroopLoad > 0) then
@@ -1128 +1128 @@
       if RO.nEnemyUn > 0 then
       begin
-        fillchar(euixMap, MapSize * 2, $FF);
-        fillchar(AttackScore, RO.nEnemyUn * 4, 0);
+        FillChar(euixMap, MapSize * 2, $FF);
+        FillChar(AttackScore, RO.nEnemyUn * 4, 0);
         for euix := 0 to RO.nEnemyUn - 1 do
           with RO.EnemyUn[euix] do
@@ -1140 +1140 @@
       end;
       if not BackToStart then
-        break;
+        Break;
 
       for uix := 0 to RO.nUn - 1 do
@@ -1155 +1155 @@
             euixBest := euix;
         if euixBest < 0 then
-          break;
+          Break;
         uix := uixAttack[euixBest];
         AttackLoc := RO.EnemyUn[euixBest].Loc;
@@ -1202 +1202 @@
             begin
               BackToStart := True;
-              break;
+              Break;
             end
   until not BackToStart;
@@ -1214 +1214 @@
     1 shl woMagellan + 1 shl woEiffel + 1 shl woLiberty + 1 shl woShinkansen;
 
-  function LowPriority(cix: integer): boolean;
+  function LowPriority(cix: Integer): Boolean;
   var
-    part, cixHighPriority, TestDistance: integer;
+    part, cixHighPriority, TestDistance: Integer;
   begin
     Result := False;
@@ -1228 +1228 @@
         begin
           Result := True;
-          exit;
+          Exit;
         end;
       end;
@@ -1234 +1234 @@
   end;
 
-  function ChooseWonderToBuild(WonderAvailable: integer; AllowCoastal: boolean): integer;
+  function ChooseWonderToBuild(WonderAvailable: Integer; AllowCoastal: Boolean): Integer;
   var
-    Count, iix: integer;
+    Count, iix: Integer;
   begin
     if (WonderAvailable and PrimeWonder > 0) and (AllowCoastal or
@@ -1267 +1267 @@
       begin
         Result := iix;
-        exit;
+        Exit;
       end;
     end;
@@ -1273 +1273 @@
 
 var
-  i, iix, cix, mix, uix, mixProduce, mixShip, V8, V21, Loc1, TotalPop,
-  AlonePop, f, f1, nTownGuard, ShipPart, ProduceShipPart, TestDistance,
-  part, WonderAvailable, WonderInWork, cixNewCapital, Center, Score, BestScore: integer;
-  mixCount: array[0..nmmax - 1] of integer;
+  I, iix, cix, mix, uix, mixProduce, mixShip, V8, V21, Loc1, TotalPop,
+  AlonePop, F, f1, nTownGuard, ShipPart, ProduceShipPart, TestDistance,
+  part, WonderAvailable, WonderInWork, cixNewCapital, Center, Score, BestScore: Integer;
+  mixCount: array[0..nmmax - 1] of Integer;
   //RareLoc: array[0..5] of integer;
   Adjacent: TVicinity8Loc;
   IsCoastal, IsPort, IsUnitProjectObsolete, HasSettler, SpezializeShipProduction,
   AlgaeAvailable, ProjectComplete, DoLowPriority, WillProduceColonyShip,
-  ImportantCity: boolean;
+  ImportantCity: Boolean;
   Radius: TVicinity21Loc;
   Report: TCityReportNew;
@@ -1289 +1289 @@
   FindBestModels;
 
-  fillchar(mixCount, RO.nModel * 4, 0);
+  FillChar(mixCount, RO.nModel * 4, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -1317 +1317 @@
       begin
         Inc(TotalPop, Size);
-        f := Formation[Loc];
-        if (f < 0) or (f >= maxCOD) or (ContinentPresence[f] = 1 shl me) then
+        F := Formation[Loc];
+        if (F < 0) or (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me) then
           Inc(AlonePop, Size);
       end;
@@ -1358 +1358 @@
               if (f1 >= 0) and (f1 < maxCOD) and
                 ((OceanSize[f1] >= 8) or (OceanPresence[f1] and not
-                (1 shl me) <> 0)) then
+                (1 shl Me) <> 0)) then
               begin // prefer non-coastal cities
                 Dec(Score, 18);
-                break;
+                Break;
               end;
             end;
@@ -1390 +1390 @@
           (LowPriority(cix) = DoLowPriority) then
         begin
-          f := Formation[Loc];
+          F := Formation[Loc];
           IsCoastal := False;
           IsPort := False;
@@ -1402 +1402 @@
               f1 := Formation[Loc1];
               if (f1 >= 0) and (f1 < maxCOD) and (OceanSize[f1] >= 8) and
-                (OceanPresence[f1] and not (1 shl me) <> 0) then
+                (OceanPresence[f1] and not (1 shl Me) <> 0) then
               begin
                 IsPort := True;
-                break;
+                Break;
               end;
             end;
@@ -1412 +1412 @@
             (RO.Model[City_CurrentUnitProject(cix)].Kind <> mkSettler) then
           begin
-            i := nModelCategory - 1;
-            while (i >= 0) and (City_CurrentUnitProject(cix) <> mixBest[i]) do
-              Dec(i);
-            IsUnitProjectObsolete := i < 0;
+            I := nModelCategory - 1;
+            while (I >= 0) and (City_CurrentUnitProject(cix) <> mixBest[I]) do
+              Dec(I);
+            IsUnitProjectObsolete := I < 0;
           end
           else
@@ -1581 +1581 @@
               City_StartImprovement(cix,imMissileBat)}
                 else if IsPort and (not SpezializeShipProduction or
-                  (f < 0) or (f >= maxCOD) or (ContinentPresence[f] = 1 shl me)) and
+                  (F < 0) or (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me)) and
                   (Built[imDockyard] = 0) and City_Improvable(cix, imDockyard) then
                   City_StartImprovement(cix, imDockyard)
                 else if IsPort and (mixShip >= 0) and
-                  (not SpezializeShipProduction or (f < 0) or
-                  (f >= maxCOD) or (ContinentPresence[f] = 1 shl me)) then
+                  (not SpezializeShipProduction or (F < 0) or
+                  (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me)) then
                   City_StartUnitProduction(cix, mixShip)
                 else if (Built[imBarracks] + Built[imMilAcademy] = 0) and
@@ -1600 +1600 @@
           if (City_CurrentImprovementProject(cix) = imCourt) and
             (Built[imTownHall] > 0) and (prod >= imp[imCourt].cost *
-            BuildCostMod[G.Difficulty[me]] div 12 -
-            (imp[imTownHall].cost * BuildCostMod[G.Difficulty[me]] div 12) *
+            BuildCostMod[G.Difficulty[Me]] div 12 -
+            (imp[imTownHall].cost * BuildCostMod[G.Difficulty[Me]] div 12) *
             2 div 3) then
             City_RebuildImprovement(cix, imTownHall)
@@ -1614 +1614 @@
                 if City_RebuildImprovement(cix, iix) < rExecuted then
                   City_SellImprovement(cix, iix);
-                break;
+                Break;
               end;
         end;
 end;
 
-function TBarbarina.Barbarina_ChooseResearchAdvance: integer;
+function TBarbarina.Barbarina_ChooseResearchAdvance: Integer;
 var
-  nPreq, rmix, rmixChosen, i, MaxWeight, MaxDefense, ChosenPreq: integer;
-  NeedSeaUnits, ready: boolean;
+  nPreq, rmix, rmixChosen, I, MaxWeight, MaxDefense, ChosenPreq: Integer;
+  NeedSeaUnits, ready: Boolean;
   ModelExists: set of 0..nModelCategory - 1;
-  known: array[0..nAdv - 1] of integer;
-
-  procedure ChoosePreq(ad: integer);
+  known: array[0..nAdv - 1] of Integer;
+
+  procedure ChoosePreq(ad: Integer);
   var
-    i: integer;
-    PreqOk: boolean;
+    I: Integer;
+    PreqOk: Boolean;
   begin
-    assert(RO.Tech[ad] < tsApplicable);
+    Assert(RO.Tech[ad] < tsApplicable);
     if known[ad] = 0 then
     begin
@@ -1637 +1637 @@
       PreqOk := True;
       if not (ad in [adScience, adMassProduction]) and (RO.Tech[ad] < tsSeen) then
-        for i := 0 to 1 do
-          if (AdvPreq[ad, i] >= 0) and (RO.Tech[AdvPreq[ad, i]] < tsApplicable) then
+        for I := 0 to 1 do
+          if (AdvPreq[ad, I] >= 0) and (RO.Tech[AdvPreq[ad, I]] < tsApplicable) then
           begin
             PreqOk := False;
-            ChoosePreq(AdvPreq[ad, i]);
+            ChoosePreq(AdvPreq[ad, I]);
           end;
       if PreqOk then
@@ -1697 +1697 @@
         ready := (MaxWeight >= Weight) and (MaxDefense >= Cap[mcDefense]);
         if ready then
-          for i := 0 to nFeature - 1 do
-            if (Cap[i] > 0) and (Feature[i].Preq <> preNone) and
-              ((Feature[i].Preq < 0) or not IsResearched(Feature[i].Preq)) then
+          for I := 0 to nFeature - 1 do
+            if (Cap[I] > 0) and (Feature[I].Preq <> preNone) and
+              ((Feature[I].Preq < 0) or not IsResearched(Feature[I].Preq)) then
               ready := False;
         if ready then
         begin
-          for i := 0 to nUpgrade - 1 do
-            if (Upgrades and (1 shl i) <> 0) and not
-              IsResearched(Upgrade[Domain, i].Preq) then
+          for I := 0 to nUpgrade - 1 do
+            if (Upgrades and (1 shl I) <> 0) and not
+              IsResearched(Upgrade[Domain, I].Preq) then
               ready := False;
         end;
         if ready then
         begin
-          include(ModelExists, Category);
+          Include(ModelExists, Category);
           if not IsModelAvailable(rmix) then
             rmixChosen := rmix;
@@ -1719 +1719 @@
     begin
       PrepareNewModel(Domain);
-      for i := 0 to nFeature - 1 do
-        if (i < 2) or (Cap[i] > 0) then
-          SetNewModelFeature(i, Cap[i]);
-      if RO.Wonder[woSun].EffectiveOwner = me then
+      for I := 0 to nFeature - 1 do
+        if (I < 2) or (Cap[I] > 0) then
+          SetNewModelFeature(I, Cap[I]);
+      if RO.Wonder[woSun].EffectiveOwner = Me then
       begin
         //if Cap[mcWeapons]>=2*Cap[mcArmor] then
@@ -1730 +1730 @@
       end;
       Result := adMilitary;
-      exit;
+      Exit;
     end;
 
   NeedSeaUnits := True;
-  i := 0;
-  while (i < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[i] < 0) or
-      IsResearched(abs(ResearchOrder[i]))) do
-    Inc(i);
-  if i >= nResearchOrder then // list done, continue with future tech
+  I := 0;
+  while (I < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[I] < 0) or
+      IsResearched(abs(ResearchOrder[I]))) do
+    Inc(I);
+  if I >= nResearchOrder then // list done, continue with future tech
   begin
     if random(2) = 1 then
@@ -1750 +1750 @@
     nPreq := 0;
     ChosenPreq := -1;
-    ChoosePreq(abs(ResearchOrder[i]));
-    assert(nPreq > 0);
+    ChoosePreq(abs(ResearchOrder[I]));
+    Assert(nPreq > 0);
     Result := ChosenPreq;
   end;
 end;
 
-function TBarbarina.Barbarina_WantCheckNegotiation(Nation: integer): boolean;
+function TBarbarina.Barbarina_WantCheckNegotiation(Nation: Integer): Boolean;
 begin
   if (RO.Tech[adTheRepublic] < tsSeen) and (RO.Tech[adTheology] >= tsApplicable) and
@@ -1769 +1769 @@
 begin
   if RO.Tech[adTheRepublic] >= tsSeen then
-    exit; // default reaction
+    Exit; // default reaction
   if MyLastAction = scContact then
   begin
@@ -1797 +1797 @@
 end;
 
-function TBarbarina.Barbarina_WantNegotiation(Nation: integer;
-  NegoTime: TNegoTime): boolean;
+function TBarbarina.Barbarina_WantNegotiation(Nation: Integer;
+  NegoTime: TNegoTime): Boolean;
 var
-  uix, TestLoc, V8: integer;
+  uix, TestLoc, V8: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -1812 +1812 @@
       if RO.Turn >= RO.LastCancelTreaty[Nation] + CancelTreatyTurns then
       begin
-        if (RO.Turn and 3 = (Nation + $F - me) and 3) and
+        if (RO.Turn and 3 = (Nation + $F - Me) and 3) and
           (RO.Treaty[Nation] > trPeace) then
         begin
@@ -1838 +1838 @@
                     NegoCause := CancelTreaty;
                     Result := True;
-                    exit;
+                    Exit;
                   end;
                 end;
@@ -1858 +1858 @@
 procedure TBarbarina.MakeColonyShipPlan;
 var
-  i, V21, V21C, CityLoc, Loc1, part, cix, BestValue, TestValue, FoodCount,
-  ProdCount, ProdExtra, Score, BestScore: integer;
-  Tile: cardinal;
-  ok, check: boolean;
+  I, V21, V21C, CityLoc, Loc1, part, cix, BestValue, TestValue, FoodCount,
+  ProdCount, ProdExtra, Score, BestScore: Integer;
+  Tile: Cardinal;
+  ok, check: Boolean;
   Radius, RadiusC: TVicinity21Loc;
 begin
@@ -1887 +1887 @@
               begin
                 part := (Tile and fModern) shr 25 - 1;
-                if RO.Ship[me].Parts[part] < ShipNeed[part] then
+                if RO.Ship[Me].Parts[part] < ShipNeed[part] then
                   // not enough of this kind already
                 begin
@@ -1893 +1893 @@
                   if ColonyShipPlan[part].cixProducing >= 0 then
                   begin // another city is already assigned to this ship part, choose one of the two
-                    TestValue := (ID and $FFF) shl 4 + ((ID shr 12) + 15 - me) and $F;
+                    TestValue := (ID and $FFF) shl 4 + ((ID shr 12) + 15 - Me) and $F;
                     BestValue :=
                       (MyCity[ColonyShipPlan[part].cixProducing].ID and $FFF) shl
                       4 + ((MyCity[ColonyShipPlan[part].cixProducing].ID shr 12) +
-                      15 - me) and $F;
+                      15 - Me) and $F;
                     if TestValue <= BestValue then
                       ok := False;
@@ -1912 +1912 @@
     check := False;
     for part := 0 to nShipPart - 1 do
-      if (RO.Ship[me].Parts[part] < ShipNeed[part]) // not enough of this kind already
+      if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
         and (ColonyShipPlan[part].cixProducing < 0) then // no city to produce
         check := True;
@@ -1931 +1931 @@
       end;
       for part := 0 to nShipPart - 1 do
-        if (RO.Ship[me].Parts[part] < ShipNeed[part]) // not enough of this kind already
+        if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
           and (ColonyShipPlan[part].cixProducing < 0) // no city to produce
           and (ColonyShipPlan[part].nLocResource > 0) then // resource is known
         begin
-          for i := 0 to ColonyShipPlan[part].nLocResource - 1 do
+          for I := 0 to ColonyShipPlan[part].nLocResource - 1 do
           begin
             BestScore := 0;
-            V21_to_Loc(ColonyShipPlan[part].LocResource[i], Radius);
+            V21_to_Loc(ColonyShipPlan[part].LocResource[I], Radius);
             for V21 := 1 to 26 do
             begin // check all potential cities in range
@@ -1984 +1984 @@
                       Dec(ProdCount, 5 - FoodCount);
                     Score := ProdCount * 4 + ProdExtra * 8 + FoodCount;
-                    Score := Score shl 8 + ((CityLoc xor me) * 4567) mod 251;
+                    Score := Score shl 8 + ((CityLoc xor Me) * 4567) mod 251;
                     // some unexactness, random but always the same for this tile
                   end;

trunk/AI/StdAI/CustomAI.pas

@@ -13 +13 @@
   TCustomAI = class
   public
-    procedure Process(Command: integer; var Data);
+    procedure Process(Command: Integer; var Data);
 
     // overridables
-    constructor Create(Nation: integer); virtual;
+    constructor Create(Nation: Integer); virtual;
     destructor Destroy; override;
     procedure SetDataDefaults; virtual;
     procedure SetDataRandom; virtual;
     procedure OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
-      ToLoc, EndHealth, EndHealthDef: integer); virtual;
-    procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: integer); virtual;
+      ToLoc, EndHealth, EndHealthDef: Integer); virtual;
+    procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer); virtual;
     procedure OnAfterEnemyAttack; virtual;
     procedure OnAfterEnemyCapture; virtual;
 
   protected
-    me: integer; // index of the controlled nation
+    Me: Integer; // index of the controlled nation
     RO: ^TPlayerContext;
     Map: ^TTileList;
@@ -34 +34 @@
     MyModel: ^TModelList;
 
-    cixStateImp: array[imPalace..imSpacePort] of integer;
+    cixStateImp: array[imPalace..imSpacePort] of Integer;
 
     // negotiation
-    Opponent: integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
-    MyAction, MyLastAction, OppoAction: integer;
+    Opponent: Integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
+    MyAction, MyLastAction, OppoAction: Integer;
     MyOffer, MyLastOffer, OppoOffer: TOffer;
 
@@ -44 +44 @@
     procedure DoTurn; virtual;
     procedure DoNegotiation; virtual;
-    function ChooseResearchAdvance: integer; virtual;
-    function ChooseStealAdvance: integer; virtual;
-    function ChooseGovernment: integer; virtual;
-    function WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean; virtual;
-    function OnNegoRejected_CancelTreaty: boolean; virtual;
+    function ChooseResearchAdvance: Integer; virtual;
+    function ChooseStealAdvance: Integer; virtual;
+    function ChooseGovernment: Integer; virtual;
+    function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; virtual;
+    function OnNegoRejected_CancelTreaty: Boolean; virtual;
 
     // general functions
-    function IsResearched(Advance: integer): boolean;
-    function ResearchCost: integer;
-    function ChangeAttitude(Nation, Attitude: integer): integer;
-    function Revolution: integer;
-    function ChangeRates(Tax, Lux: integer): integer;
-    function PrepareNewModel(Domain: integer): integer;
-    function SetNewModelFeature(F, Count: integer): integer;
-    function AdvanceResearchable(Advance: integer): boolean;
-    function AdvanceStealable(Advance: integer): boolean;
-    function GetJobProgress(Loc: integer; var JobProgress: TJobProgressData): boolean;
-    function DebugMessage(Level: integer; Text: string): boolean;
-    function SetDebugMap(var DebugMap): boolean;
+    function IsResearched(Advance: Integer): Boolean;
+    function ResearchCost: Integer;
+    function ChangeAttitude(Nation, Attitude: Integer): Integer;
+    function Revolution: Integer;
+    function ChangeRates(Tax, Lux: Integer): Integer;
+    function PrepareNewModel(Domain: Integer): Integer;
+    function SetNewModelFeature(F, Count: Integer): Integer;
+    function AdvanceResearchable(Advance: Integer): Boolean;
+    function AdvanceStealable(Advance: Integer): Boolean;
+    function GetJobProgress(Loc: Integer; var JobProgress: TJobProgressData): Boolean;
+    function DebugMessage(Level: Integer; Text: string): Boolean;
+    function SetDebugMap(var DebugMap): Boolean;
 
     // unit functions
-    procedure Unit_FindMyDefender(Loc: integer; var uix: integer);
-    procedure Unit_FindEnemyDefender(Loc: integer; var euix: integer);
-    function Unit_Move(uix, ToLoc: integer): integer;
-    function Unit_Step(uix, ToLoc: integer): integer;
-    function Unit_Attack(uix, ToLoc: integer): integer;
-    function Unit_DoMission(uix, MissionType, ToLoc: integer): integer;
-    function Unit_MoveForecast(uix, ToLoc: integer;
-      var RemainingMovement: integer): boolean;
-    function Unit_AttackForecast(uix, ToLoc, AttackMovement: integer;
-      var RemainingHealth: integer): boolean;
-    function Unit_DefenseForecast(euix, ToLoc: integer;
-      var RemainingHealth: integer): boolean;
-    function Unit_Disband(uix: integer): integer;
-    function Unit_StartJob(uix, NewJob: integer): integer;
-    function Unit_SetHomeHere(uix: integer): integer;
-    function Unit_Load(uix: integer): integer;
-    function Unit_Unload(uix: integer): integer;
-    function Unit_SelectTransport(uix: integer): integer;
-    function Unit_AddToCity(uix: integer): integer;
+    procedure Unit_FindMyDefender(Loc: Integer; var uix: Integer);
+    procedure Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
+    function Unit_Move(uix, ToLoc: Integer): Integer;
+    function Unit_Step(uix, ToLoc: Integer): Integer;
+    function Unit_Attack(uix, ToLoc: Integer): Integer;
+    function Unit_DoMission(uix, MissionType, ToLoc: Integer): Integer;
+    function Unit_MoveForecast(uix, ToLoc: Integer;
+      var RemainingMovement: Integer): Boolean;
+    function Unit_AttackForecast(uix, ToLoc, AttackMovement: Integer;
+      var RemainingHealth: Integer): Boolean;
+    function Unit_DefenseForecast(euix, ToLoc: Integer;
+      var RemainingHealth: Integer): Boolean;
+    function Unit_Disband(uix: Integer): Integer;
+    function Unit_StartJob(uix, NewJob: Integer): Integer;
+    function Unit_SetHomeHere(uix: Integer): Integer;
+    function Unit_Load(uix: Integer): Integer;
+    function Unit_Unload(uix: Integer): Integer;
+    function Unit_SelectTransport(uix: Integer): Integer;
+    function Unit_AddToCity(uix: Integer): Integer;
 
     // city functions
-    procedure City_FindMyCity(Loc: integer; var cix: integer);
-    procedure City_FindEnemyCity(Loc: integer; var ecix: integer);
-    function City_HasProject(cix: integer): boolean;
-    function City_CurrentImprovementProject(cix: integer): integer;
-    function City_CurrentUnitProject(cix: integer): integer;
-    function City_GetTileInfo(cix, TileLoc: integer; var TileInfo: TTileInfo): integer;
-    function City_GetReport(cix: integer; var Report: TCityReport): integer;
-    function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: integer;
-      var Report: TCityReport): integer;
-    function City_GetReportNew(cix: integer; var Report: TCityReportNew): integer;
-    function City_GetHypoReportNew(cix, HypoTiles, HypoTaxRate, HypoLuxuryRate: integer;
-      var Report: TCityReportNew): integer;
-    function City_GetAreaInfo(cix: integer; var AreaInfo: TCityAreaInfo): integer;
-    function City_StartUnitProduction(cix, mix: integer): integer;
-    function City_StartEmigration(cix, mix: integer;
-      AllowDisbandCity, AsConscripts: boolean): integer;
-    function City_StartImprovement(cix, iix: integer): integer;
-    function City_Improvable(cix, iix: integer): boolean;
-    function City_StopProduction(cix: integer): integer;
-    function City_BuyProject(cix: integer): integer;
-    function City_SellImprovement(cix, iix: integer): integer;
-    function City_RebuildImprovement(cix, iix: integer): integer;
-    function City_SetTiles(cix, NewTiles: integer): integer;
-    procedure City_OptimizeTiles(cix: integer; ResourceWeights: cardinal = rwMaxGrowth);
+    procedure City_FindMyCity(Loc: Integer; var cix: Integer);
+    procedure City_FindEnemyCity(Loc: Integer; var ecix: Integer);
+    function City_HasProject(cix: Integer): Boolean;
+    function City_CurrentImprovementProject(cix: Integer): Integer;
+    function City_CurrentUnitProject(cix: Integer): Integer;
+    function City_GetTileInfo(cix, TileLoc: Integer; var TileInfo: TTileInfo): Integer;
+    function City_GetReport(cix: Integer; var Report: TCityReport): Integer;
+    function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer;
+      var Report: TCityReport): Integer;
+    function City_GetReportNew(cix: Integer; var Report: TCityReportNew): Integer;
+    function City_GetHypoReportNew(cix, HypoTiles, HypoTaxRate, HypoLuxuryRate: Integer;
+      var Report: TCityReportNew): Integer;
+    function City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
+    function City_StartUnitProduction(cix, mix: Integer): Integer;
+    function City_StartEmigration(cix, mix: Integer;
+      AllowDisbandCity, AsConscripts: Boolean): Integer;
+    function City_StartImprovement(cix, iix: Integer): Integer;
+    function City_Improvable(cix, iix: Integer): Boolean;
+    function City_StopProduction(cix: Integer): Integer;
+    function City_BuyProject(cix: Integer): Integer;
+    function City_SellImprovement(cix, iix: Integer): Integer;
+    function City_RebuildImprovement(cix, iix: Integer): Integer;
+    function City_SetTiles(cix, NewTiles: Integer): Integer;
+    procedure City_OptimizeTiles(cix: Integer; ResourceWeights: Cardinal = rwMaxGrowth);
 
     // negotiation
-    function Nego_CheckMyAction: integer;
+    function Nego_CheckMyAction: Integer;
 
   private
-    HaveTurned: boolean;
+    HaveTurned: Boolean;
     UnwantedNego: set of 0..nPl - 1;
     Contacted: set of 0..nPl - 1;
@@ -125 +125 @@
   Server: TServerCall;
   G: TNewGameData;
-  RWDataSize, MapSize: integer;
-  decompose24: cardinal;
-  nodata: pointer;
+  RWDataSize, MapSize: Integer;
+  decompose24: Cardinal;
+  nodata: Pointer;
 
 const
@@ -139 +139 @@
 
 type
-  TVicinity8Loc = array[0..7] of integer;
-  TVicinity21Loc = array[0..27] of integer;
+  TVicinity8Loc = array[0..7] of Integer;
+  TVicinity21Loc = array[0..27] of Integer;
 
 
 procedure Init(NewGameData: TNewGameData);
 
-procedure ab_to_Loc(Loc0, a, b: integer; var Loc: integer);
-procedure Loc_to_ab(Loc0, Loc: integer; var a, b: integer);
-procedure ab_to_V8(a, b: integer; var V8: integer);
-procedure V8_to_ab(V8: integer; var a, b: integer);
-procedure ab_to_V21(a, b: integer; var V21: integer);
-procedure V21_to_ab(V21: integer; var a, b: integer);
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
-function Distance(Loc0, Loc1: integer): integer;
+procedure ab_to_Loc(Loc0, A, B: Integer; var Loc: Integer);
+procedure Loc_to_ab(Loc0, Loc: Integer; var A, B: Integer);
+procedure ab_to_V8(A, B: Integer; var V8: Integer);
+procedure V8_to_ab(V8: Integer; var A, B: Integer);
+procedure ab_to_V21(A, B: Integer; var V21: Integer);
+procedure V21_to_ab(V21: Integer; var A, B: Integer);
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
+function Distance(Loc0, Loc1: Integer): Integer;
 
 
@@ -159 +159 @@
 
 const
-  ab_v8: array[-4..4] of integer = (5, 6, 7, 4, -1, 0, 3, 2, 1);
-  v8_a: array[0..7] of integer = (1, 1, 0, -1, -1, -1, 0, 1);
-  v8_b: array[0..7] of integer = (0, 1, 1, 1, 0, -1, -1, -1);
-
-
-procedure ab_to_Loc(Loc0, a, b: integer; var Loc: integer);
+  ab_v8: array[-4..4] of Integer = (5, 6, 7, 4, -1, 0, 3, 2, 1);
+  v8_a: array[0..7] of Integer = (1, 1, 0, -1, -1, -1, 0, 1);
+  v8_b: array[0..7] of Integer = (0, 1, 1, 1, 0, -1, -1, -1);
+
+
+procedure ab_to_Loc(Loc0, A, B: Integer; var Loc: Integer);
 {relative location from Loc0}
 var
-  y0: integer;
-begin
-  assert((Loc0 >= 0) and (Loc0 < MapSize) and (a - b + G.lx >= 0));
-  y0 := cardinal(Loc0) * decompose24 shr 24;
-  Loc := (Loc0 + (a - b + y0 and 1 + G.lx + G.lx) shr 1) mod G.lx + G.lx * (y0 + a + b);
+  y0: Integer;
+begin
+  Assert((Loc0 >= 0) and (Loc0 < MapSize) and (A - B + G.lx >= 0));
+  y0 := Cardinal(Loc0) * decompose24 shr 24;
+  Loc := (Loc0 + (A - B + y0 and 1 + G.lx + G.lx) shr 1) mod G.lx + G.lx * (y0 + A + B);
   if Loc >= MapSize then
     Loc := -$1000;
 end;
 
-procedure Loc_to_ab(Loc0, Loc: integer; var a, b: integer);
+procedure Loc_to_ab(Loc0, Loc: Integer; var A, B: Integer);
 {$IFDEF FPC}// freepascal
 var
-  dx, dy: integer;
+  dx, dy: Integer;
 begin
   dx := ((Loc mod G.lx * 2 + Loc div G.lx and 1) - (Loc0 mod G.lx * 2 + Loc0 div
     G.lx and 1) + 3 * G.lx) mod (2 * G.lx) - G.lx;
   dy := Loc div G.lx - Loc0 div G.lx;
-  a := (dx + dy) div 2;
-  b := (dy - dx) div 2;
+  A := (dx + dy) div 2;
+  B := (dy - dx) div 2;
 end;
 
@@ -195 +195 @@
 // calculate
 push ecx
-div byte ptr [G]
+div Byte ptr [G]
 xor ebx,ebx
 mov bl,ah  // ebx:=Loc0 mod G.lx
@@ -201 +201 @@
 and ecx,$000000FF // ecx:=Loc0 div G.lx
 mov eax,edx
-div byte ptr [G]
+div Byte ptr [G]
 xor edx,edx
 mov dl,ah // edx:=Loc mod G.lx
@@ -218 +218 @@
 mov edx,dword ptr [G]
 cmp eax,edx
-jl @a
+jl @A
   sub eax,edx
   sub eax,edx
   jmp @ok
-@a:
+@A:
 neg edx
 cmp eax,edx
@@ -235 +235 @@
 add eax,ebx
 sar edx,1 // edx:=b
-mov ebx,[b]
+mov ebx,[B]
 mov [ebx],edx
 sar eax,1 // eax:=a
-mov [a],eax
+mov [A],eax
 
 pop ebx
@@ -244 +244 @@
 {$ENDIF}
 
-procedure ab_to_V8(a, b: integer; var V8: integer);
-begin
-  assert((abs(a) <= 1) and (abs(b) <= 1) and ((a <> 0) or (b <> 0)));
-  V8 := ab_v8[2 * b + b + a];
-end;
-
-procedure V8_to_ab(V8: integer; var a, b: integer);
-begin
-  a := v8_a[V8];
-  b := V8_b[V8];
-end;
-
-procedure ab_to_V21(a, b: integer; var V21: integer);
-begin
-  V21 := (a + b + 3) shl 2 + (a - b + 3) shr 1;
-end;
-
-procedure V21_to_ab(V21: integer; var a, b: integer);
-var
-  dx, dy: integer;
+procedure ab_to_V8(A, B: Integer; var V8: Integer);
+begin
+  Assert((abs(A) <= 1) and (abs(B) <= 1) and ((A <> 0) or (B <> 0)));
+  V8 := ab_v8[2 * B + B + A];
+end;
+
+procedure V8_to_ab(V8: Integer; var A, B: Integer);
+begin
+  A := v8_a[V8];
+  B := V8_b[V8];
+end;
+
+procedure ab_to_V21(A, B: Integer; var V21: Integer);
+begin
+  V21 := (A + B + 3) shl 2 + (A - B + 3) shr 1;
+end;
+
+procedure V21_to_ab(V21: Integer; var A, B: Integer);
+var
+  dx, dy: Integer;
 begin
   dy := V21 shr 2 - 3;
   dx := V21 and 3 shl 1 - 3 + (dy + 3) and 1;
-  a := (dx + dy) div 2;
-  b := (dy - dx) div 2;
-end;
-
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-var
-  x0, y0, lx: integer;
+  A := (dx + dy) div 2;
+  B := (dy - dx) div 2;
+end;
+
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+var
+  x0, y0, lx: Integer;
 begin
   lx := G.lx;
-  y0 := cardinal(Loc0) * decompose24 shr 24;
+  y0 := Cardinal(Loc0) * decompose24 shr 24;
   x0 := Loc0 - y0 * lx; // Loc0 mod lx;
   VicinityLoc[1] := Loc0 + lx * 2;
@@ -323 +323 @@
 end;
 
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
-var
-  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: integer;
-  dst: ^integer;
-begin
-  y0 := cardinal(Loc0) * decompose24 shr 24;
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
+var
+  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
+  dst: ^Integer;
+begin
+  y0 := Cardinal(Loc0) * decompose24 shr 24;
   xComp0 := Loc0 - y0 * G.lx - 1; // Loc0 mod G.lx -1
   xCompSwitch := xComp0 - 1 + y0 and 1;
@@ -368 +368 @@
 end;
 
-function Distance(Loc0, Loc1: integer): integer;
-var
-  a, b, dx, dy: integer;
-begin
-  Loc_to_ab(Loc0, Loc1, a, b);
-  dx := abs(a - b);
-  dy := abs(a + b);
+function Distance(Loc0, Loc1: Integer): Integer;
+var
+  A, B, dx, dy: Integer;
+begin
+  Loc_to_ab(Loc0, Loc1, A, B);
+  dx := abs(A - B);
+  dy := abs(A + B);
   Result := dx + dy + abs(dx - dy) shr 1;
 end;
@@ -381 +381 @@
 procedure Init(NewGameData: TNewGameData);
 {$IFDEF DEBUG}var
-  Loc: integer;
+  Loc: Integer;
 {$ENDIF}
 begin
@@ -389 +389 @@
 {$IFDEF DEBUG}
   for Loc := 0 to MapSize - 1 do
-    assert(cardinal(Loc) * decompose24 shr 24 = cardinal(Loc div G.lx));
+    Assert(Cardinal(Loc) * decompose24 shr 24 = Cardinal(Loc div G.lx));
 {$ENDIF}
 end;
 
 
-constructor TCustomAI.Create(Nation: integer);
+constructor TCustomAI.Create(Nation: Integer);
 begin
   inherited Create;
-  me := Nation;
-  RO := pointer(G.RO[Nation]);
-  Map := pointer(RO.Map);
-  MyUnit := pointer(RO.Un);
-  MyCity := pointer(RO.City);
-  MyModel := pointer(RO.Model);
+  Me := Nation;
+  RO := Pointer(G.RO[Nation]);
+  Map := Pointer(RO.Map);
+  MyUnit := Pointer(RO.Un);
+  MyCity := Pointer(RO.City);
+  MyModel := Pointer(RO.Model);
   Opponent := -1;
 end;
@@ -408 +408 @@
 destructor TCustomAI.Destroy;
 begin
-  Server(sSetDebugMap, me, 0, nodata^);
-end;
-
-
-procedure TCustomAI.Process(Command: integer; var Data);
-var
-  Nation, NewResearch, NewGov, Count, ad, cix, iix: integer;
+  Server(sSetDebugMap, Me, 0, nodata^);
+end;
+
+
+procedure TCustomAI.Process(Command: Integer; var Data);
+var
+  Nation, NewResearch, NewGov, Count, ad, cix, iix: Integer;
   NegoTime: TNegoTime;
 begin
@@ -420 +420 @@
     cTurn, cContinue:
     begin
-      if RO.Alive and (1 shl me) = 0 then
+      if RO.Alive and (1 shl Me) = 0 then
       begin // I'm dead, huhu
-        Server(sTurn, me, 0, nodata^);
-        exit;
+        Server(sTurn, Me, 0, nodata^);
+        Exit;
       end;
       if Command = cTurn then
       begin
-        fillchar(cixStateImp, sizeof(cixStateImp), $FF);
+        FillChar(cixStateImp, SizeOf(cixStateImp), $FF);
         for cix := 0 to RO.nCity - 1 do
           if MyCity[cix].Loc >= 0 then
@@ -437 +437 @@
           NewGov := ChooseGovernment;
           if NewGov > gAnarchy then
-            Server(sSetGovernment, me, NewGov, nodata^);
+            Server(sSetGovernment, Me, NewGov, nodata^);
         end;
         HaveTurned := False;
@@ -446 +446 @@
         if OnNegoRejected_CancelTreaty then
           if RO.Treaty[Opponent] >= trPeace then
-            if Server(sCancelTreaty, me, 0, nodata^) < rExecuted then
-              assert(False);
+            if Server(sCancelTreaty, Me, 0, nodata^) < rExecuted then
+              Assert(False);
       end
       else
@@ -459 +459 @@
         if RO.Government <> gAnarchy then
           for Nation := 0 to nPl - 1 do
-            if (Nation <> me) and (1 shl Nation and RO.Alive <> 0) and
+            if (Nation <> Me) and (1 shl Nation and RO.Alive <> 0) and
               (RO.Treaty[Nation] >= trNone) and not (Nation in Contacted) and not
               (Nation in UnwantedNego) and
-              (Server(scContact - sExecute + Nation shl 4, me, 0, nodata^) >= rExecuted) then
+              (Server(scContact - sExecute + Nation shl 4, Me, 0, nodata^) >= rExecuted) then
               if WantNegotiation(Nation, NegoTime) then
               begin
-                if Server(scContact + Nation shl 4, me, 0, nodata^) >= rExecuted then
+                if Server(scContact + Nation shl 4, Me, 0, nodata^) >= rExecuted then
                 begin
-                  include(Contacted, Nation);
+                  Include(Contacted, Nation);
                   Opponent := Nation;
                   MyAction := scContact;
-                  exit;
+                  Exit;
                 end;
               end
               else
-                include(UnwantedNego, Nation);
+                Include(UnwantedNego, Nation);
         if NegoTime = BeginOfTurn then
         begin
@@ -483 +483 @@
         end
         else
-          break;
+          Break;
       until False;
       if RO.Happened and phTech <> 0 then
@@ -499 +499 @@
             end;
         end;
-        Server(sSetResearch, me, NewResearch, nodata^);
+        Server(sSetResearch, Me, NewResearch, nodata^);
       end;
-      if Server(sTurn, me, 0, nodata^) < rExecuted then
-        assert(False);
+      if Server(sTurn, Me, 0, nodata^) < rExecuted then
+        Assert(False);
     end;
     scContact:
-      if WantNegotiation(integer(Data), EnemyCalled) then
+      if WantNegotiation(Integer(Data), EnemyCalled) then
       begin
-        if Server(scDipStart, me, 0, nodata^) < rExecuted then
-          assert(False);
-        Opponent := integer(Data);
+        if Server(scDipStart, Me, 0, nodata^) < rExecuted then
+          Assert(False);
+        Opponent := Integer(Data);
         MyAction := scDipStart;
       end
       else
       begin
-        if Server(scReject, me, 0, nodata^) < rExecuted then
-          assert(False);
+        if Server(scReject, Me, 0, nodata^) < rExecuted then
+          Assert(False);
       end;
     scDipStart, scDipNotice, scDipAccept, scDipCancelTreaty, scDipOffer, scDipBreak:
@@ -538 +538 @@
       end;
       DoNegotiation;
-      assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
+      Assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
         (MyAction = scDipCancelTreaty) or (MyAction = scDipOffer) or (MyAction = scDipBreak));
       if MyAction = scDipOffer then
-        Server(MyAction, me, 0, MyOffer)
+        Server(MyAction, Me, 0, MyOffer)
       else
-        Server(MyAction, me, 0, nodata^);
+        Server(MyAction, Me, 0, nodata^);
     end;
     cShowEndContact:
@@ -568 +568 @@
 
 procedure TCustomAI.OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
-  ToLoc, EndHealth, EndHealthDef: integer);
-begin
-end;
-
-procedure TCustomAI.OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: integer);
+  ToLoc, EndHealth, EndHealthDef: Integer);
+begin
+end;
+
+procedure TCustomAI.OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer);
 begin
 end;
@@ -584 +584 @@
 end;
 
-function TCustomAI.ChooseResearchAdvance: integer;
+function TCustomAI.ChooseResearchAdvance: Integer;
 begin
   Result := -1;
 end;
 
-function TCustomAI.ChooseStealAdvance: integer;
+function TCustomAI.ChooseStealAdvance: Integer;
 begin
   Result := -1;
 end;
 
-function TCustomAI.ChooseGovernment: integer;
+function TCustomAI.ChooseGovernment: Integer;
 begin
   Result := gDespotism;
 end;
 
-function TCustomAI.WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
+function TCustomAI.WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
 begin
   Result := False;
 end;
 
-function TCustomAI.OnNegoRejected_CancelTreaty: boolean;
+function TCustomAI.OnNegoRejected_CancelTreaty: Boolean;
 begin
   Result := False;
@@ -613 +613 @@
 procedure TCustomAI.StealAdvance;
 var
-  Steal, ad, Count: integer;
+  Steal, ad, Count: Integer;
 begin
   Steal := ChooseStealAdvance;
@@ -628 +628 @@
   end;
   if Steal >= 0 then
-    Server(sStealTech, me, Steal, nodata^);
+    Server(sStealTech, Me, Steal, nodata^);
   RO.Happened := RO.Happened and not phStealTech;
 end;
 
-function TCustomAI.IsResearched(Advance: integer): boolean;
+function TCustomAI.IsResearched(Advance: Integer): Boolean;
 begin
   Result := (Advance = preNone) or (Advance <> preNA) and (RO.Tech[Advance] >= tsApplicable);
 end;
 
-function TCustomAI.ResearchCost: integer;
-begin
-  Server(sGetTechCost, me, 0, Result);
-end;
-
-function TCustomAI.ChangeAttitude(Nation, Attitude: integer): integer;
-begin
-  Result := Server(sSetAttitude + Nation shl 4, me, Attitude, nodata^);
-end;
-
-function TCustomAI.Revolution: integer;
-begin
-  Result := Server(sRevolution, me, 0, nodata^);
-end;
-
-function TCustomAI.ChangeRates(Tax, Lux: integer): integer;
-begin
-  Result := Server(sSetRates, me, Tax div 10 and $f + Lux div 10 and $f shl 4, nodata^);
-end;
-
-function TCustomAI.PrepareNewModel(Domain: integer): integer;
-begin
-  Result := Server(sCreateDevModel, me, Domain, nodata^);
-end;
-
-function TCustomAI.SetNewModelFeature(F, Count: integer): integer;
-begin
-  Result := Server(sSetDevModelCap + Count shl 4, me, F, nodata^);
-end;
-
-function TCustomAI.AdvanceResearchable(Advance: integer): boolean;
-begin
-  Result := Server(sSetResearch - sExecute, me, Advance, nodata^) >= rExecuted;
-end;
-
-function TCustomAI.AdvanceStealable(Advance: integer): boolean;
-begin
-  Result := Server(sStealTech - sExecute, me, Advance, nodata^) >= rExecuted;
-end;
-
-function TCustomAI.GetJobProgress(Loc: integer;
-  var JobProgress: TJobProgressData): boolean;
-begin
-  Result := Server(sGetJobProgress, me, Loc, JobProgress) >= rExecuted;
-end;
-
-function TCustomAI.DebugMessage(Level: integer; Text: string): boolean;
-begin
-  Text := copy('P' + char(48 + me) + ' ' + Text, 1, 254);
-  Server(sMessage, me, Level, PChar(Text)^);
+function TCustomAI.ResearchCost: Integer;
+begin
+  Server(sGetTechCost, Me, 0, Result);
+end;
+
+function TCustomAI.ChangeAttitude(Nation, Attitude: Integer): Integer;
+begin
+  Result := Server(sSetAttitude + Nation shl 4, Me, Attitude, nodata^);
+end;
+
+function TCustomAI.Revolution: Integer;
+begin
+  Result := Server(sRevolution, Me, 0, nodata^);
+end;
+
+function TCustomAI.ChangeRates(Tax, Lux: Integer): Integer;
+begin
+  Result := Server(sSetRates, Me, Tax div 10 and $F + Lux div 10 and $F shl 4, nodata^);
+end;
+
+function TCustomAI.PrepareNewModel(Domain: Integer): Integer;
+begin
+  Result := Server(sCreateDevModel, Me, Domain, nodata^);
+end;
+
+function TCustomAI.SetNewModelFeature(F, Count: Integer): Integer;
+begin
+  Result := Server(sSetDevModelCap + Count shl 4, Me, F, nodata^);
+end;
+
+function TCustomAI.AdvanceResearchable(Advance: Integer): Boolean;
+begin
+  Result := Server(sSetResearch - sExecute, Me, Advance, nodata^) >= rExecuted;
+end;
+
+function TCustomAI.AdvanceStealable(Advance: Integer): Boolean;
+begin
+  Result := Server(sStealTech - sExecute, Me, Advance, nodata^) >= rExecuted;
+end;
+
+function TCustomAI.GetJobProgress(Loc: Integer;
+  var JobProgress: TJobProgressData): Boolean;
+begin
+  Result := Server(sGetJobProgress, Me, Loc, JobProgress) >= rExecuted;
+end;
+
+function TCustomAI.DebugMessage(Level: Integer; Text: string): Boolean;
+begin
+  Text := Copy('P' + char(48 + Me) + ' ' + Text, 1, 254);
+  Server(sMessage, Me, Level, PChar(Text)^);
 
   Result := True;
@@ -693 +693 @@
 end;
 
-function TCustomAI.SetDebugMap(var DebugMap): boolean;
-begin
-  Server(sSetDebugMap, me, 0, DebugMap);
+function TCustomAI.SetDebugMap(var DebugMap): Boolean;
+begin
+  Server(sSetDebugMap, Me, 0, DebugMap);
 
   Result := True;
@@ -702 +702 @@
 end;
 
-procedure TCustomAI.Unit_FindMyDefender(Loc: integer; var uix: integer);
-begin
-  if Server(sGetDefender, me, Loc, uix) < rExecuted then
+procedure TCustomAI.Unit_FindMyDefender(Loc: Integer; var uix: Integer);
+begin
+  if Server(sGetDefender, Me, Loc, uix) < rExecuted then
     uix := -1;
 end;
 
-procedure TCustomAI.Unit_FindEnemyDefender(Loc: integer; var euix: integer);
+procedure TCustomAI.Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
 begin
   euix := RO.nEnemyUn - 1;
@@ -715 +715 @@
 end;
 
-function TCustomAI.Unit_Move(uix, ToLoc: integer): integer;
-var
-  Step: integer;
-  DestinationReached: boolean;
+function TCustomAI.Unit_Move(uix, ToLoc: Integer): Integer;
+var
+  Step: Integer;
+  DestinationReached: Boolean;
   Advice: TMoveAdviceData;
 begin
-  assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
 {Loc_to_ab(MyUnit[uix].Loc,ToLoc,a,b);
-assert((a<>0) or (b<>0));
-if (a>=-1) and (a<=1) and (b>=-1) and (b<=1) then
+Assert((A<>0) or (B<>0));
+if (A>=-1) and (A<=1) and (B>=-1) and (B<=1) then
   begin // move to adjacent tile
-  !!!problem: if move is invalid, return codes are not consistent with other branch (eNoWay)
+  !!!problem: if Move is invalid, return codes are not consistent with other branch (eNoWay)
   Advice.nStep:=1;
-  Advice.dx[0]:=a-b;
-  Advice.dy[0]:=a+b;
+  Advice.dx[0]:=A-B;
+  Advice.dy[0]:=A+B;
   Advice.MoreTurns:=0;
   Advice.MaxHostile_MovementLeft:=MyUnit[uix].Movement;
-  result:=eOK;
+  Result:=eOK;
   end
 else}
@@ -739 +739 @@
     Advice.MoreTurns := 9999;
     Advice.MaxHostile_MovementLeft := 100;
-    Result := Server(sGetMoveAdvice, me, uix, Advice);
+    Result := Server(sGetMoveAdvice, Me, uix, Advice);
   end;
   if Result = eOk then
@@ -755 +755 @@
         begin
           DestinationReached := True;
-          break;
+          Break;
         end // stop next to destination
         else if Step = Advice.nStep then
@@ -761 +761 @@
 
       if (Step = Advice.nStep) or (Result <> eOK) and (Result <> eLoaded) then
-        break;
+        Break;
 
       Result := Server(sMoveUnit + (Advice.dx[Step] and 7) shl 4 +
-        (Advice.dy[Step] and 7) shl 7, me, uix, nodata^);
+        (Advice.dy[Step] and 7) shl 7, Me, uix, nodata^);
       Inc(Step);
       if RO.Happened and phStealTech <> 0 then
@@ -779 +779 @@
 end;
 
-function TCustomAI.Unit_Step(uix, ToLoc: integer): integer;
-var
-  a, b: integer;
-begin
-  Loc_to_ab(MyUnit[uix].Loc, ToLoc, a, b);
-  assert(((a <> 0) or (b <> 0)) and (a >= -1) and (a <= 1) and (b >= -1) and (b <= 1));
-  Result := Server(sMoveUnit + ((a - b) and 7) shl 4 + ((a + b) and 7) shl 7, me, uix, nodata^);
+function TCustomAI.Unit_Step(uix, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+  Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
+  Result := Server(sMoveUnit + ((A - B) and 7) shl 4 + ((A + B) and 7) shl 7, Me, uix, nodata^);
   if RO.Happened and phStealTech <> 0 then
     StealAdvance;
 end;
 
-function TCustomAI.Unit_Attack(uix, ToLoc: integer): integer;
-var
-  a, b: integer;
-begin
-  assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+function TCustomAI.Unit_Attack(uix, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
     and ((Map[ToLoc] and (fUnit or fOwned) = fUnit) // is an attack
     or (Map[ToLoc] and (fCity or fOwned) = fCity) and
     (MyModel[MyUnit[uix].mix].Domain <> dGround))); // is a bombardment
-  Loc_to_ab(MyUnit[uix].Loc, ToLoc, a, b);
-  assert(((a <> 0) or (b <> 0)) and (a >= -1) and (a <= 1) and (b >= -1) and (b <= 1));
+  Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+  Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
   // attack to adjacent tile
-  Result := Server(sMoveUnit + (a - b) and 7 shl 4 + (a + b) and 7 shl 7, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_DoMission(uix, MissionType, ToLoc: integer): integer;
-var
-  a, b: integer;
-begin
-  Result := Server(sSetSpyMission + MissionType shl 4, me, 0, nodata^);
+  Result := Server(sMoveUnit + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_DoMission(uix, MissionType, ToLoc: Integer): Integer;
+var
+  A, B: Integer;
+begin
+  Result := Server(sSetSpyMission + MissionType shl 4, Me, 0, nodata^);
   if Result >= rExecuted then
   begin
-    assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+    Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
       and (MyModel[MyUnit[uix].mix].Kind = mkDiplomat)); // is a commando
-    Loc_to_ab(MyUnit[uix].Loc, ToLoc, a, b);
-    assert(((a <> 0) or (b <> 0)) and (a >= -1) and (a <= 1) and (b >= -1) and (b <= 1));
+    Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+    Assert(((A <> 0) or (B <> 0)) and (A >= -1) and (A <= 1) and (B >= -1) and (B <= 1));
     // city must be adjacent
-    Result := Server(sMoveUnit - sExecute + (a - b) and 7 shl 4 + (a + b) and 7 shl 7, me, uix, nodata^);
+    Result := Server(sMoveUnit - sExecute + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^);
     if Result = eMissionDone then
-      Result := Server(sMoveUnit + (a - b) and 7 shl 4 + (a + b) and 7 shl 7, me, uix, nodata^)
+      Result := Server(sMoveUnit + (A - B) and 7 shl 4 + (A + B) and 7 shl 7, Me, uix, nodata^)
     else if (Result <> eNoTime_Move) and (Result <> eTreaty) and (Result <> eNoTurn) then
       Result := eInvalid; // not a special commando mission!
@@ -824 +824 @@
 end;
 
-function TCustomAI.Unit_MoveForecast(uix, ToLoc: integer;
-  var RemainingMovement: integer): boolean;
+function TCustomAI.Unit_MoveForecast(uix, ToLoc: Integer;
+  var RemainingMovement: Integer): Boolean;
 var
   Advice: TMoveAdviceData;
 begin
-  assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0)); // is a unit
   Advice.ToLoc := ToLoc;
   Advice.MoreTurns := 0;
   Advice.MaxHostile_MovementLeft := 100;
-  if Server(sGetMoveAdvice, me, uix, Advice) = eOk then
+  if Server(sGetMoveAdvice, Me, uix, Advice) = eOk then
   begin
     RemainingMovement := Advice.MaxHostile_MovementLeft;
@@ -846 +846 @@
 
 // negative RemainingHealth is remaining helth of defender if lost
-function TCustomAI.Unit_AttackForecast(uix, ToLoc, AttackMovement: integer;
-  var RemainingHealth: integer): boolean;
+function TCustomAI.Unit_AttackForecast(uix, ToLoc, AttackMovement: Integer;
+  var RemainingHealth: Integer): Boolean;
 var
   BattleForecast: TBattleForecast;
 begin
-  assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
+  Assert((uix >= 0) and (uix < RO.nUn) and (MyUnit[uix].Loc >= 0) // is a unit
     and (Map[ToLoc] and (fUnit or fOwned) = fUnit)); // is an attack
   RemainingHealth := -$100;
@@ -858 +858 @@
     with MyUnit[uix] do
     begin
-      BattleForecast.pAtt := me;
+      BattleForecast.pAtt := Me;
       BattleForecast.mixAtt := mix;
       BattleForecast.HealthAtt := Health;
@@ -864 +864 @@
       BattleForecast.FlagsAtt := Flags;
       BattleForecast.Movement := AttackMovement;
-      if Server(sGetBattleForecast, me, ToLoc, BattleForecast) >= rExecuted then
+      if Server(sGetBattleForecast, Me, ToLoc, BattleForecast) >= rExecuted then
       begin
         if BattleForecast.EndHealthAtt > 0 then
@@ -875 +875 @@
 end;
 
-function TCustomAI.Unit_DefenseForecast(euix, ToLoc: integer;
-  var RemainingHealth: integer): boolean;
+function TCustomAI.Unit_DefenseForecast(euix, ToLoc: Integer;
+  var RemainingHealth: Integer): Boolean;
 var
   BattleForecast: TBattleForecast;
 begin
-  assert((euix >= 0) and (euix < RO.nEnemyUn) and (RO.EnemyUn[euix].Loc >= 0) // is an enemy unit
+  Assert((euix >= 0) and (euix < RO.nEnemyUn) and (RO.EnemyUn[euix].Loc >= 0) // is an enemy unit
     and (Map[ToLoc] and (fUnit or fOwned) = (fUnit or fOwned))); // is an attack
   RemainingHealth := $100;
@@ -892 +892 @@
     BattleForecast.FlagsAtt := Flags;
     BattleForecast.Movement := 100;
-    if Server(sGetBattleForecast, me, ToLoc, BattleForecast) >= rExecuted then
+    if Server(sGetBattleForecast, Me, ToLoc, BattleForecast) >= rExecuted then
     begin
       if BattleForecast.EndHealthDef > 0 then
@@ -903 +903 @@
 end;
 
-function TCustomAI.Unit_Disband(uix: integer): integer;
-begin
-  Result := Server(sRemoveUnit, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_StartJob(uix, NewJob: integer): integer;
-begin
-  Result := Server(sStartJob + NewJob shl 4, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_SetHomeHere(uix: integer): integer;
-begin
-  Result := Server(sSetUnitHome, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_Load(uix: integer): integer;
-begin
-  Result := Server(sLoadUnit, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_Unload(uix: integer): integer;
-begin
-  Result := Server(sUnloadUnit, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_AddToCity(uix: integer): integer;
-begin
-  Result := Server(sAddToCity, me, uix, nodata^);
-end;
-
-function TCustomAI.Unit_SelectTransport(uix: integer): integer;
-begin
-  Result := Server(sSelectTransport, me, uix, nodata^);
-end;
-
-
-procedure TCustomAI.City_FindMyCity(Loc: integer; var cix: integer);
+function TCustomAI.Unit_Disband(uix: Integer): Integer;
+begin
+  Result := Server(sRemoveUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_StartJob(uix, NewJob: Integer): Integer;
+begin
+  Result := Server(sStartJob + NewJob shl 4, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_SetHomeHere(uix: Integer): Integer;
+begin
+  Result := Server(sSetUnitHome, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_Load(uix: Integer): Integer;
+begin
+  Result := Server(sLoadUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_Unload(uix: Integer): Integer;
+begin
+  Result := Server(sUnloadUnit, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_AddToCity(uix: Integer): Integer;
+begin
+  Result := Server(sAddToCity, Me, uix, nodata^);
+end;
+
+function TCustomAI.Unit_SelectTransport(uix: Integer): Integer;
+begin
+  Result := Server(sSelectTransport, Me, uix, nodata^);
+end;
+
+
+procedure TCustomAI.City_FindMyCity(Loc: Integer; var cix: Integer);
 begin
   if Map[Loc] and (fCity or fOwned) <> fCity or fOwned then
@@ -951 +951 @@
 end;
 
-procedure TCustomAI.City_FindEnemyCity(Loc: integer; var ecix: integer);
+procedure TCustomAI.City_FindEnemyCity(Loc: Integer; var ecix: Integer);
 begin
   if Map[Loc] and (fCity or fOwned) <> fCity then
@@ -963 +963 @@
 end;
 
-function TCustomAI.City_HasProject(cix: integer): boolean;
+function TCustomAI.City_HasProject(cix: Integer): Boolean;
 begin
   Result := MyCity[cix].Project and (cpImp + cpIndex) <> cpImp + imTrGoods;
 end;
 
-function TCustomAI.City_CurrentImprovementProject(cix: integer): integer;
+function TCustomAI.City_CurrentImprovementProject(cix: Integer): Integer;
 begin
   if MyCity[cix].Project and cpImp = 0 then
@@ -980 +980 @@
 end;
 
-function TCustomAI.City_CurrentUnitProject(cix: integer): integer;
+function TCustomAI.City_CurrentUnitProject(cix: Integer): Integer;
 begin
   if MyCity[cix].Project and cpImp <> 0 then
@@ -988 +988 @@
 end;
 
-function TCustomAI.City_GetTileInfo(cix, TileLoc: integer;
-  var TileInfo: TTileInfo): integer;
+function TCustomAI.City_GetTileInfo(cix, TileLoc: Integer;
+  var TileInfo: TTileInfo): Integer;
 begin
   TileInfo.ExplCity := cix;
-  Result := Server(sGetHypoCityTileInfo, me, TileLoc, TileInfo);
-end;
-
-function TCustomAI.City_GetReport(cix: integer; var Report: TCityReport): integer;
+  Result := Server(sGetHypoCityTileInfo, Me, TileLoc, TileInfo);
+end;
+
+function TCustomAI.City_GetReport(cix: Integer; var Report: TCityReport): Integer;
 begin
   Report.HypoTiles := -1;
   Report.HypoTax := -1;
   Report.HypoLux := -1;
-  Result := Server(sGetCityReport, me, cix, Report);
-end;
-
-function TCustomAI.City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: integer;
-  var Report: TCityReport): integer;
+  Result := Server(sGetCityReport, Me, cix, Report);
+end;
+
+function TCustomAI.City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer;
+  var Report: TCityReport): Integer;
 begin
   Report.HypoTiles := HypoTiles;
   Report.HypoTax := HypoTax;
   Report.HypoLux := HypoLux;
-  Result := Server(sGetCityReport, me, cix, Report);
-end;
-
-function TCustomAI.City_GetReportNew(cix: integer; var Report: TCityReportNew): integer;
+  Result := Server(sGetCityReport, Me, cix, Report);
+end;
+
+function TCustomAI.City_GetReportNew(cix: Integer; var Report: TCityReportNew): Integer;
 begin
   Report.HypoTiles := -1;
   Report.HypoTaxRate := -1;
   Report.HypoLuxuryRate := -1;
-  Result := Server(sGetCityReportNew, me, cix, Report);
+  Result := Server(sGetCityReportNew, Me, cix, Report);
 end;
 
 function TCustomAI.City_GetHypoReportNew(cix, HypoTiles, HypoTaxRate,
-  HypoLuxuryRate: integer; var Report: TCityReportNew): integer;
+  HypoLuxuryRate: Integer; var Report: TCityReportNew): Integer;
 begin
   Report.HypoTiles := HypoTiles;
   Report.HypoTaxRate := HypoTaxRate;
   Report.HypoLuxuryRate := HypoLuxuryRate;
-  Result := Server(sGetCityReportNew, me, cix, Report);
-end;
-
-function TCustomAI.City_GetAreaInfo(cix: integer; var AreaInfo: TCityAreaInfo): integer;
-begin
-  Result := Server(sGetCityAreaInfo, me, cix, AreaInfo);
-end;
-
-function TCustomAI.City_StartUnitProduction(cix, mix: integer): integer;
+  Result := Server(sGetCityReportNew, Me, cix, Report);
+end;
+
+function TCustomAI.City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
+begin
+  Result := Server(sGetCityAreaInfo, Me, cix, AreaInfo);
+end;
+
+function TCustomAI.City_StartUnitProduction(cix, mix: Integer): Integer;
 begin
   if (MyCity[cix].Project and (cpImp + cpIndex) <> mix) then
     // not already producing that
-    Result := Server(sSetCityProject, me, cix, mix);
-end;
-
-function TCustomAI.City_StartEmigration(cix, mix: integer;
-  AllowDisbandCity, AsConscripts: boolean): integer;
-var
-  NewProject: integer;
+    Result := Server(sSetCityProject, Me, cix, mix);
+end;
+
+function TCustomAI.City_StartEmigration(cix, mix: Integer;
+  AllowDisbandCity, AsConscripts: Boolean): Integer;
+var
+  NewProject: Integer;
 begin
   NewProject := mix;
@@ -1051 +1051 @@
   if AsConscripts then
     NewProject := NewProject or cpConscripts;
-  Result := Server(sSetCityProject, me, cix, NewProject);
-end;
-
-function TCustomAI.City_StartImprovement(cix, iix: integer): integer;
-var
-  NewProject: integer;
+  Result := Server(sSetCityProject, Me, cix, NewProject);
+end;
+
+function TCustomAI.City_StartImprovement(cix, iix: Integer): Integer;
+var
+  NewProject: Integer;
 begin
   NewProject := iix + cpImp;
   if (MyCity[cix].Project and (cpImp + cpIndex) <> NewProject) then
     // not already producing that
-    Result := Server(sSetCityProject, me, cix, NewProject);
-end;
-
-function TCustomAI.City_Improvable(cix, iix: integer): boolean;
-var
-  NewProject: integer;
+    Result := Server(sSetCityProject, Me, cix, NewProject);
+end;
+
+function TCustomAI.City_Improvable(cix, iix: Integer): Boolean;
+var
+  NewProject: Integer;
 begin
   NewProject := iix + cpImp;
-  Result := Server(sSetCityProject - sExecute, me, cix, NewProject) >= rExecuted;
-end;
-
-function TCustomAI.City_StopProduction(cix: integer): integer;
-var
-  NewProject: integer;
+  Result := Server(sSetCityProject - sExecute, Me, cix, NewProject) >= rExecuted;
+end;
+
+function TCustomAI.City_StopProduction(cix: Integer): Integer;
+var
+  NewProject: Integer;
 begin
   NewProject := imTrGoods + cpImp;
-  Result := Server(sSetCityProject, me, cix, NewProject);
-end;
-
-function TCustomAI.City_BuyProject(cix: integer): integer;
-begin
-  Result := Server(sBuyCityProject, me, cix, nodata^);
-end;
-
-function TCustomAI.City_SellImprovement(cix, iix: integer): integer;
-begin
-  Result := Server(sSellCityImprovement, me, cix, iix);
-end;
-
-function TCustomAI.City_RebuildImprovement(cix, iix: integer): integer;
-begin
-  Result := Server(sRebuildCityImprovement, me, cix, iix);
-end;
-
-function TCustomAI.City_SetTiles(cix, NewTiles: integer): integer;
-begin
-  Result := Server(sSetCityTiles, me, cix, NewTiles);
-end;
-
-procedure TCustomAI.City_OptimizeTiles(cix: integer; ResourceWeights: cardinal);
+  Result := Server(sSetCityProject, Me, cix, NewProject);
+end;
+
+function TCustomAI.City_BuyProject(cix: Integer): Integer;
+begin
+  Result := Server(sBuyCityProject, Me, cix, nodata^);
+end;
+
+function TCustomAI.City_SellImprovement(cix, iix: Integer): Integer;
+begin
+  Result := Server(sSellCityImprovement, Me, cix, iix);
+end;
+
+function TCustomAI.City_RebuildImprovement(cix, iix: Integer): Integer;
+begin
+  Result := Server(sRebuildCityImprovement, Me, cix, iix);
+end;
+
+function TCustomAI.City_SetTiles(cix, NewTiles: Integer): Integer;
+begin
+  Result := Server(sSetCityTiles, Me, cix, NewTiles);
+end;
+
+procedure TCustomAI.City_OptimizeTiles(cix: Integer; ResourceWeights: Cardinal);
 var
   Advice: TCityTileAdviceData;
 begin
   Advice.ResourceWeights := ResourceWeights;
-  Server(sGetCityTileAdvice, me, cix, Advice);
+  Server(sGetCityTileAdvice, Me, cix, Advice);
   City_SetTiles(cix, Advice.Tiles);
 end;
@@ -1111 +1111 @@
 
 // negotiation
-function TCustomAI.Nego_CheckMyAction: integer;
-begin
-  assert(Opponent >= 0); // only allowed in negotiation mode
-  assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
+function TCustomAI.Nego_CheckMyAction: Integer;
+begin
+  Assert(Opponent >= 0); // only allowed in negotiation mode
+  Assert((MyAction = scDipNotice) or (MyAction = scDipAccept) or
     (MyAction = scDipCancelTreaty) or (MyAction = scDipOffer) or (MyAction = scDipBreak));
   if MyAction = scDipOffer then
-    Result := Server(MyAction - sExecute, me, 0, MyOffer)
+    Result := Server(MyAction - sExecute, Me, 0, MyOffer)
   else
-    Result := Server(MyAction - sExecute, me, 0, nodata^);
+    Result := Server(MyAction - sExecute, Me, 0, nodata^);
 end;
 
 
 initialization
-  nodata := pointer(0);
+  nodata := Pointer(0);
   RWDataSize := 0;
 

trunk/AI/StdAI/CustomAI_Reload.pas

@@ -13 +13 @@
 TCustomAI=class
 public
-  procedure Process(Command: integer; var Data);
+  procedure Process(Command: Integer; var Data);
 
   // overridables
-  constructor Create(Nation: integer); virtual;
+  constructor Create(Nation: Integer); virtual;
   destructor Destroy; override;
   procedure SetDataDefaults; virtual;
   procedure SetDataRandom; virtual;
   procedure OnBeforeEnemyAttack(UnitInfo: TUnitInfo;
-    ToLoc, EndHealth, EndHealthDef: integer); virtual;
-  procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: integer); virtual;
+    ToLoc, EndHealth, EndHealthDef: Integer); virtual;
+  procedure OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer); virtual;
   procedure OnAfterEnemyAttack; virtual;
   procedure OnAfterEnemyCapture; virtual;
 
 protected
-  me: integer; // index of the controlled nation
+  Me: Integer; // index of the controlled nation
   RO: ^TPlayerContext;
   Map: ^TTileList;
@@ -34 +34 @@
   MyModel: ^TModelList;
 
-  cixStateImp: array[imPalace..imSpacePort] of integer;
+  cixStateImp: array[imPalace..imSpacePort] of Integer;
 
   // negotiation
-  Opponent: integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
-  MyAction, MyLastAction, OppoAction: integer;
+  Opponent: Integer; // nation i'm in negotiation with, -1 indicates no-negotiation mode
+  MyAction, MyLastAction, OppoAction: Integer;
   MyOffer, MyLastOffer, OppoOffer: TOffer;
 
@@ -44 +44 @@
   procedure DoTurn; virtual;
   procedure DoNegotiation; virtual;
-  function ChooseResearchAdvance: integer; virtual;
-  function ChooseStealAdvance: integer; virtual;
-  function ChooseGovernment: integer; virtual;
-  function WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean; virtual;
-  function OnNegoRejected_CancelTreaty: boolean; virtual;
+  function ChooseResearchAdvance: Integer; virtual;
+  function ChooseStealAdvance: Integer; virtual;
+  function ChooseGovernment: Integer; virtual;
+  function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; virtual;
+  function OnNegoRejected_CancelTreaty: Boolean; virtual;
 
   // general functions
-  function IsResearched(Advance: integer): boolean;
-  function ResearchCost: integer;
-  function ChangeAttitude(Nation, Attitude: integer): integer;
-  function Revolution: integer;
-  function ChangeRates(Tax,Lux: integer): integer;
-  function PrepareNewModel(Domain: integer): integer;
-  function SetNewModelFeature(F, Count: integer): integer;
-  function AdvanceResearchable(Advance: integer): boolean;
-  function AdvanceStealable(Advance: integer): boolean;
-  function DebugMessage(Level: integer; Text: string): boolean;
-  function SetDebugMap(var DebugMap): boolean;
+  function IsResearched(Advance: Integer): Boolean;
+  function ResearchCost: Integer;
+  function ChangeAttitude(Nation, Attitude: Integer): Integer;
+  function Revolution: Integer;
+  function ChangeRates(Tax,Lux: Integer): Integer;
+  function PrepareNewModel(Domain: Integer): Integer;
+  function SetNewModelFeature(F, Count: Integer): Integer;
+  function AdvanceResearchable(Advance: Integer): Boolean;
+  function AdvanceStealable(Advance: Integer): Boolean;
+  function DebugMessage(Level: Integer; Text: string): Boolean;
+  function SetDebugMap(var DebugMap): Boolean;
 
   // unit functions
-  procedure Unit_FindMyDefender(Loc: integer; var uix: integer);
-  procedure Unit_FindEnemyDefender(Loc: integer; var euix: integer);
-  function Unit_Move(uix,ToLoc: integer): integer;
-  function Unit_Step(uix,ToLoc: integer): integer;
-  function Unit_Attack(uix,ToLoc: integer): integer;
-  function Unit_DoMission(uix,MissionType,ToLoc: integer): integer;
-  function Unit_MoveForecast(uix,ToLoc: integer; var RemainingMovement: integer): boolean;
-  function Unit_AttackForecast(uix,ToLoc,AttackMovement: integer; var RemainingHealth: integer): boolean;
-  function Unit_DefenseForecast(euix,ToLoc: integer; var RemainingHealth: integer): boolean;
-  function Unit_Disband(uix: integer): integer;
-  function Unit_StartJob(uix,NewJob: integer): integer;
-  function Unit_SetHomeHere(uix: integer): integer;
-  function Unit_Load(uix: integer): integer;
-  function Unit_Unload(uix: integer): integer;
-  function Unit_AddToCity(uix: integer): integer;
+  procedure Unit_FindMyDefender(Loc: Integer; var uix: Integer);
+  procedure Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
+  function Unit_Move(uix,ToLoc: Integer): Integer;
+  function Unit_Step(uix,ToLoc: Integer): Integer;
+  function Unit_Attack(uix,ToLoc: Integer): Integer;
+  function Unit_DoMission(uix,MissionType,ToLoc: Integer): Integer;
+  function Unit_MoveForecast(uix,ToLoc: Integer; var RemainingMovement: Integer): Boolean;
+  function Unit_AttackForecast(uix,ToLoc,AttackMovement: Integer; var RemainingHealth: Integer): Boolean;
+  function Unit_DefenseForecast(euix,ToLoc: Integer; var RemainingHealth: Integer): Boolean;
+  function Unit_Disband(uix: Integer): Integer;
+  function Unit_StartJob(uix,NewJob: Integer): Integer;
+  function Unit_SetHomeHere(uix: Integer): Integer;
+  function Unit_Load(uix: Integer): Integer;
+  function Unit_Unload(uix: Integer): Integer;
+  function Unit_AddToCity(uix: Integer): Integer;
 
   // city functions
-  procedure City_FindMyCity(Loc: integer; var cix: integer);
-  procedure City_FindEnemyCity(Loc: integer; var ecix: integer);
-  function City_HasProject(cix: integer): boolean;
-  function City_CurrentImprovementProject(cix: integer): integer;
-  function City_CurrentUnitProject(cix: integer): integer;
-  function City_GetTileInfo(cix,TileLoc: integer; var TileInfo: TTileInfo): integer;
-  function City_GetReport(cix: integer; var Report: TCityReport): integer;
-  function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: integer; var Report: TCityReport): integer;
-  function City_GetAreaInfo(cix: integer; var AreaInfo: TCityAreaInfo): integer;
-  function City_StartUnitProduction(cix,mix: integer): integer;
-  function City_StartEmigration(cix,mix: integer; AllowDisbandCity, AsConscripts: boolean): integer;
-  function City_StartImprovement(cix,iix: integer): integer;
-  function City_Improvable(cix,iix: integer): boolean;
-  function City_StopProduction(cix: integer): integer;
-  function City_BuyProject(cix: integer): integer;
-  function City_SellImprovement(cix,iix: integer): integer;
-  function City_RebuildImprovement(cix,iix: integer): integer;
-  function City_SetTiles(cix,NewTiles: integer): integer;
+  procedure City_FindMyCity(Loc: Integer; var cix: Integer);
+  procedure City_FindEnemyCity(Loc: Integer; var ecix: Integer);
+  function City_HasProject(cix: Integer): Boolean;
+  function City_CurrentImprovementProject(cix: Integer): Integer;
+  function City_CurrentUnitProject(cix: Integer): Integer;
+  function City_GetTileInfo(cix,TileLoc: Integer; var TileInfo: TTileInfo): Integer;
+  function City_GetReport(cix: Integer; var Report: TCityReport): Integer;
+  function City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer; var Report: TCityReport): Integer;
+  function City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
+  function City_StartUnitProduction(cix,mix: Integer): Integer;
+  function City_StartEmigration(cix,mix: Integer; AllowDisbandCity, AsConscripts: Boolean): Integer;
+  function City_StartImprovement(cix,iix: Integer): Integer;
+  function City_Improvable(cix,iix: Integer): Boolean;
+  function City_StopProduction(cix: Integer): Integer;
+  function City_BuyProject(cix: Integer): Integer;
+  function City_SellImprovement(cix,iix: Integer): Integer;
+  function City_RebuildImprovement(cix,iix: Integer): Integer;
+  function City_SetTiles(cix,NewTiles: Integer): Integer;
 
   // negotiation
-  function Nego_CheckMyAction: integer;
+  function Nego_CheckMyAction: Integer;
 
 private
-  HaveTurned: boolean;
+  HaveTurned: Boolean;
   UnwantedNego: set of 0..nPl-1;
   Contacted: set of 0..nPl-1;
@@ -114 +114 @@
 Server: TServerCall;
 G: TNewGameData;
-RWDataSize, MapSize: integer;
-decompose24: cardinal;
-nodata: pointer;
+RWDataSize, MapSize: Integer;
+decompose24: Cardinal;
+nodata: Pointer;
 
 const
@@ -126 +126 @@
 
 type
-TVicinity8Loc=array[0..7] of integer;
-TVicinity21Loc=array[0..27] of integer;
+TVicinity8Loc=array[0..7] of Integer;
+TVicinity21Loc=array[0..27] of Integer;
 
 
 procedure Init(NewGameData: TNewGameData);
 
-procedure ab_to_Loc(Loc0,a,b: integer; var Loc: integer);
-procedure Loc_to_ab(Loc0,Loc: integer; var a,b: integer);
-procedure ab_to_V8(a,b: integer; var V8: integer);
-procedure V8_to_ab(V8: integer; var a,b: integer);
-procedure ab_to_V21(a,b: integer; var V21: integer);
-procedure V21_to_ab(V21: integer; var a,b: integer);
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
+procedure ab_to_Loc(Loc0,A,B: Integer; var Loc: Integer);
+procedure Loc_to_ab(Loc0,Loc: Integer; var A,B: Integer);
+procedure ab_to_V8(A,B: Integer; var V8: Integer);
+procedure V8_to_ab(V8: Integer; var A,B: Integer);
+procedure ab_to_V21(A,B: Integer; var V21: Integer);
+procedure V21_to_ab(V21: Integer; var A,B: Integer);
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
 
 
@@ -145 +145 @@
 
 const
-ab_v8: array[-4..4] of integer = (5,6,7,4,-1,0,3,2,1);
-v8_a: array[0..7] of integer = (1,1,0,-1,-1,-1,0,1);
-v8_b: array[0..7] of integer = (0,1,1,1,0,-1,-1,-1);
-
-
-procedure ab_to_Loc(Loc0,a,b: integer; var Loc: integer);
+ab_v8: array[-4..4] of Integer = (5,6,7,4,-1,0,3,2,1);
+v8_a: array[0..7] of Integer = (1,1,0,-1,-1,-1,0,1);
+v8_b: array[0..7] of Integer = (0,1,1,1,0,-1,-1,-1);
+
+
+procedure ab_to_Loc(Loc0,A,B: Integer; var Loc: Integer);
 {relative location from Loc0}
 var
-y0: integer;
-begin
-assert((Loc0>=0) and (Loc0<MapSize) and (a-b+G.lx>=0));
-y0:=cardinal(Loc0)*decompose24 shr 24;
-Loc:=(Loc0+(a-b+y0 and 1+G.lx+G.lx) shr 1) mod G.lx +G.lx*(y0+a+b);
+y0: Integer;
+begin
+Assert((Loc0>=0) and (Loc0<MapSize) and (A-B+G.lx>=0));
+y0:=Cardinal(Loc0)*decompose24 shr 24;
+Loc:=(Loc0+(A-B+y0 and 1+G.lx+G.lx) shr 1) mod G.lx +G.lx*(y0+A+B);
 if Loc>=MapSize then Loc:=-$1000
 end;
 
-procedure Loc_to_ab(Loc0,Loc: integer; var a,b: integer);
+procedure Loc_to_ab(Loc0,Loc: Integer; var A,B: Integer);
 {$IFDEF FPC} // freepascal
 var
-dx,dy: integer;
+dx,dy: Integer;
 begin
 dx:=((Loc mod G.lx *2 +Loc div G.lx and 1)
   -(Loc0 mod G.lx *2 +Loc0 div G.lx and 1)+3*G.lx) mod (2*G.lx) -G.lx;
 dy:=Loc div G.lx-Loc0 div G.lx;
-a:=(dx+dy) div 2;
-b:=(dy-dx) div 2;
+A:=(dx+dy) div 2;
+B:=(dy-dx) div 2;
 end;
 {$ELSE} // delphi
@@ -179 +179 @@
 // calculate
 push ecx
-div byte ptr [G]
+div Byte ptr [G]
 xor ebx,ebx
 mov bl,ah  // ebx:=Loc0 mod G.lx
@@ -185 +185 @@
 and ecx,$000000FF // ecx:=Loc0 div G.lx
 mov eax,edx
-div byte ptr [G]
+div Byte ptr [G]
 xor edx,edx
 mov dl,ah // edx:=Loc mod G.lx
@@ -202 +202 @@
 mov edx,dword ptr [G]
 cmp eax,edx
-jl @a
+jl @A
   sub eax,edx
   sub eax,edx
   jmp @ok
-@a:
+@A:
 neg edx
 cmp eax,edx
@@ -219 +219 @@
 add eax,ebx
 sar edx,1 // edx:=b
-mov ebx,[b]
+mov ebx,[B]
 mov [ebx],edx
 sar eax,1 // eax:=a
-mov [a],eax
+mov [A],eax
 
 pop ebx
@@ -228 +228 @@
 {$ENDIF}
 
-procedure ab_to_V8(a,b: integer; var V8: integer);
-begin
-assert((abs(a)<=1) and (abs(b)<=1) and ((a<>0) or (b<>0)));
-V8:=ab_v8[2*b+b+a];
-end;
-
-procedure V8_to_ab(V8: integer; var a,b: integer);
-begin
-a:=v8_a[V8]; b:=V8_b[V8];
-end;
-
-procedure ab_to_V21(a,b: integer; var V21: integer);
-begin
-V21:=(a+b+3) shl 2+(a-b+3) shr 1;
-end;
-
-procedure V21_to_ab(V21: integer; var a,b: integer);
-var
-dx,dy: integer;
+procedure ab_to_V8(A,B: Integer; var V8: Integer);
+begin
+Assert((abs(A)<=1) and (abs(B)<=1) and ((A<>0) or (B<>0)));
+V8:=ab_v8[2*B+B+A];
+end;
+
+procedure V8_to_ab(V8: Integer; var A,B: Integer);
+begin
+A:=v8_a[V8]; B:=V8_b[V8];
+end;
+
+procedure ab_to_V21(A,B: Integer; var V21: Integer);
+begin
+V21:=(A+B+3) shl 2+(A-B+3) shr 1;
+end;
+
+procedure V21_to_ab(V21: Integer; var A,B: Integer);
+var
+dx,dy: Integer;
 begin
 dy:=V21 shr 2-3;
 dx:=V21 and 3 shl 1 -3 + (dy+3) and 1;
-a:=(dx+dy) div 2;
-b:=(dy-dx) div 2;
-end;
-
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-var
-x0,y0,lx: integer;
+A:=(dx+dy) div 2;
+B:=(dy-dx) div 2;
+end;
+
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+var
+x0,y0,lx: Integer;
 begin
 lx:=G.lx;
-y0:=cardinal(Loc0)*decompose24 shr 24;
+y0:=Cardinal(Loc0)*decompose24 shr 24;
 x0:=Loc0-y0*lx; // Loc0 mod lx;
 VicinityLoc[1]:=Loc0+lx*2;
@@ -265 +265 @@
 VicinityLoc[5]:=Loc0-lx*2;
 VicinityLoc[7]:=Loc0+1;
-inc(Loc0,y0 and 1);
+Inc(Loc0,y0 and 1);
 VicinityLoc[0]:=Loc0+lx;
 VicinityLoc[2]:=Loc0+lx-1;
@@ -276 +276 @@
   if x0=0 then
     begin
-    inc(VicinityLoc[3],lx);
+    Inc(VicinityLoc[3],lx);
     if y0 and 1=0 then
       begin
-      inc(VicinityLoc[2],lx);
-      inc(VicinityLoc[4],lx);
+      Inc(VicinityLoc[2],lx);
+      Inc(VicinityLoc[4],lx);
       end
     end
@@ -286 +286 @@
 else
   begin
-  dec(VicinityLoc[7],lx);
+  Dec(VicinityLoc[7],lx);
   if y0 and 1=1 then
     begin
-    dec(VicinityLoc[0],lx);
-    dec(VicinityLoc[6],lx);
+    Dec(VicinityLoc[0],lx);
+    Dec(VicinityLoc[6],lx);
     end
   end;
@@ -306 +306 @@
 end;
 
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
-var
-dx,dy,bit,y0,xComp,yComp,xComp0,xCompSwitch: integer;
-dst: ^integer;
-begin
-y0:=cardinal(Loc0)*decompose24 shr 24;
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
+var
+dx,dy,bit,y0,xComp,yComp,xComp0,xCompSwitch: Integer;
+dst: ^Integer;
+begin
+y0:=Cardinal(Loc0)*decompose24 shr 24;
 xComp0:=Loc0-y0*G.lx-1; // Loc0 mod G.lx -1
 xCompSwitch:=xComp0-1+y0 and 1;
-if xComp0<0 then inc(xComp0,G.lx);
-if xCompSwitch<0 then inc(xCompSwitch,G.lx);
+if xComp0<0 then Inc(xComp0,G.lx);
+if xCompSwitch<0 then Inc(xCompSwitch,G.lx);
 xCompSwitch:=xCompSwitch xor xComp0;
 yComp:=G.lx*(y0-3);
@@ -329 +329 @@
       if bit and $67F7F76<>0 then dst^:=xComp+yComp
       else dst^:=-1;
-      inc(xComp);
-      if xComp>=G.lx then dec(xComp, G.lx);
-      inc(dst);
+      Inc(xComp);
+      if xComp>=G.lx then Dec(xComp, G.lx);
+      Inc(dst);
       bit:=bit shl 1;
       end;
-    inc(yComp,G.lx);
+    Inc(yComp,G.lx);
     end
   else
     begin
     for dx:=0 to 3 do
-      begin dst^:=-$1000; inc(dst); end;
+      begin dst^:=-$1000; Inc(dst); end;
     end
 end;
@@ -345 +345 @@
 
 procedure Init(NewGameData: TNewGameData);
-{$IFDEF DEBUG}var Loc: integer;{$ENDIF}
+{$IFDEF DEBUG}var Loc: Integer;{$ENDIF}
 begin
 G:=NewGameData;
 MapSize:=G.lx*G.ly;
 decompose24:=(1 shl 24-1) div G.lx +1;
-{$IFDEF DEBUG}for Loc:=0 to MapSize-1 do assert(cardinal(Loc)*decompose24 shr 24=cardinal(Loc div G.lx));{$ENDIF}
-end;
-
-
-constructor TCustomAI.Create(Nation: integer);
+{$IFDEF DEBUG}for Loc:=0 to MapSize-1 do Assert(Cardinal(Loc)*decompose24 shr 24=Cardinal(Loc div G.lx));{$ENDIF}
+end;
+
+
+constructor TCustomAI.Create(Nation: Integer);
 begin
 inherited Create;
-me:=Nation;
-RO:=pointer(G.RO[Nation]);
-Map:=pointer(RO.Map);
-MyUnit:=pointer(RO.Un);
-MyCity:=pointer(RO.City);
-MyModel:=pointer(RO.Model);
+Me:=Nation;
+RO:=Pointer(G.RO[Nation]);
+Map:=Pointer(RO.Map);
+MyUnit:=Pointer(RO.Un);
+MyCity:=Pointer(RO.City);
+MyModel:=Pointer(RO.Model);
 Opponent:=-1;
 end;
@@ -368 +368 @@
 destructor TCustomAI.Destroy;
 begin
-Server(sSetDebugMap,me,0,nodata^);
-end;
-
-
-procedure TCustomAI.Process(Command: integer; var Data);
-var
-Nation,NewResearch,NewGov,count,ad,cix,iix: integer;
+Server(sSetDebugMap,Me,0,nodata^);
+end;
+
+
+procedure TCustomAI.Process(Command: Integer; var Data);
+var
+Nation,NewResearch,NewGov,count,ad,cix,iix: Integer;
 NegoTime: TNegoTime;
 begin
@@ -380 +380 @@
   cTurn, cContinue:
     begin
-    if RO.Alive and (1 shl me)=0 then
+    if RO.Alive and (1 shl Me)=0 then
       begin // I'm dead, huhu
-      Server(sTurn,me,0,nodata^);
-      exit
+      Server(sTurn,Me,0,nodata^);
+      Exit
       end;
     if Command=cTurn then
       begin
-      fillchar(cixStateImp, sizeof(cixStateImp), $FF);
+      FillChar(cixStateImp, SizeOf(cixStateImp), $FF);
       for cix:=0 to RO.nCity-1 do if MyCity[cix].Loc>=0 then
         for iix:=imPalace to imSpacePort do
@@ -396 +396 @@
         NewGov:=ChooseGovernment;
         if NewGov>gAnarchy then
-          Server(sSetGovernment,me,NewGov,nodata^);
+          Server(sSetGovernment,Me,NewGov,nodata^);
         end;
-      HaveTurned:=false;
+      HaveTurned:=False;
       Contacted:=[];
       end;
@@ -405 +405 @@
       if OnNegoRejected_CancelTreaty then
         if RO.Treaty[Opponent]>=trPeace then
-          if Server(sCancelTreaty,me,0,nodata^)<rExecuted then
-            assert(false)
+          if Server(sCancelTreaty,Me,0,nodata^)<rExecuted then
+            Assert(False)
       end
     else UnwantedNego:=[];
@@ -415 +415 @@
       if RO.Government<>gAnarchy then
         for Nation:=0 to nPl-1 do
-           if (Nation<>me) and (1 shl Nation and RO.Alive<>0)
+           if (Nation<>Me) and (1 shl Nation and RO.Alive<>0)
              and (RO.Treaty[Nation]>=trNone)
              and not (Nation in Contacted) and not (Nation in UnwantedNego)
-             and (Server(scContact-sExecute + Nation shl 4, me, 0, nodata^)>=rExecuted) then
+             and (Server(scContact-sExecute + Nation shl 4, Me, 0, nodata^)>=rExecuted) then
              if WantNegotiation(Nation, NegoTime) then
                begin
-               if Server(scContact + Nation shl 4, me, 0, nodata^)>=rExecuted then
+               if Server(scContact + Nation shl 4, Me, 0, nodata^)>=rExecuted then
                  begin
-                 include(Contacted, Nation);
+                 Include(Contacted, Nation);
                  Opponent:=Nation;
                  MyAction:=scContact;
-                 exit;
+                 Exit;
                  end;
                end
-             else include(UnwantedNego,Nation);
+             else Include(UnwantedNego,Nation);
       if NegoTime=BeginOfTurn then
         begin
         DoTurn;
-        HaveTurned:=true;
+        HaveTurned:=True;
         Contacted:=[];
         UnwantedNego:=[];
         end
-      else break;
-    until false;
+      else Break;
+    until False;
     if RO.Happened and phTech<>0 then
       begin
@@ -446 +446 @@
         count:=0;
         for ad:=0 to nAdv-1 do if AdvanceResearchable(ad) then
-          begin inc(count); if random(count)=0 then NewResearch:=ad end
+          begin Inc(count); if random(count)=0 then NewResearch:=ad end
         end;
-      Server(sSetResearch,me,NewResearch,nodata^)
+      Server(sSetResearch,Me,NewResearch,nodata^)
       end;
-    if (me=1) and (RO.Turn=800) then
+    if (Me=1) and (RO.Turn=800) then
       begin
       count:=0;
-      Server(sReload,me,0,count)
+      Server(sReload,Me,0,count)
       end
     else if (RO.Turn>10) and (random(1000)=0) then
       begin
       count:=RO.Turn-10;
-      Server(sReload,me,0,count)
+      Server(sReload,Me,0,count)
       end
-    else if Server(sTurn,me,0,nodata^)<rExecuted then
-      assert(false);
+    else if Server(sTurn,Me,0,nodata^)<rExecuted then
+      Assert(False);
     end;
   scContact:
-    if WantNegotiation(integer(Data), EnemyCalled) then
+    if WantNegotiation(Integer(Data), EnemyCalled) then
       begin
-      if Server(scDipStart, me, 0, nodata^)<rExecuted then
-        assert(false);
-      Opponent:=integer(Data);
+      if Server(scDipStart, Me, 0, nodata^)<rExecuted then
+        Assert(False);
+      Opponent:=Integer(Data);
       MyAction:=scDipStart;
       end
     else
       begin
-      if Server(scReject, me, 0, nodata^)<rExecuted then
-        assert(false);
+      if Server(scReject, Me, 0, nodata^)<rExecuted then
+        Assert(False);
       end;
   scDipStart, scDipNotice, scDipAccept, scDipCancelTreaty, scDipOffer, scDipBreak:
@@ -486 +486 @@
     else begin MyAction:=scDipOffer; MyOffer.nDeliver:=0; MyOffer.nCost:=0; end;
     DoNegotiation;
-    assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
+    Assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
       or (MyAction=scDipCancelTreaty) or (MyAction=scDipOffer)
       or (MyAction=scDipBreak));
-    if MyAction=scDipOffer then Server(MyAction, me, 0, MyOffer)
-    else Server(MyAction, me, 0, nodata^);
+    if MyAction=scDipOffer then Server(MyAction, Me, 0, MyOffer)
+    else Server(MyAction, Me, 0, nodata^);
     end;
   cShowEndContact:
@@ -515 +515 @@
 
 procedure TCustomAI.OnBeforeEnemyAttack(UnitInfo: TUnitInfo; ToLoc, EndHealth,
-  EndHealthDef: integer);
-begin
-end;
-
-procedure TCustomAI.OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: integer);
+  EndHealthDef: Integer);
+begin
+end;
+
+procedure TCustomAI.OnBeforeEnemyCapture(UnitInfo: TUnitInfo; ToLoc: Integer);
 begin
 end;
@@ -531 +531 @@
 end;
 
-function TCustomAI.ChooseResearchAdvance: integer;
-begin
-result:=-1
-end;
-
-function TCustomAI.ChooseStealAdvance: integer;
-begin
-result:=-1
-end;
-
-function TCustomAI.ChooseGovernment: integer;
-begin
-result:=gDespotism
-end;
-
-function TCustomAI.WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
-begin
-result:=false;
-end;
-
-function TCustomAI.OnNegoRejected_CancelTreaty: boolean;
-begin
-result:=false;
+function TCustomAI.ChooseResearchAdvance: Integer;
+begin
+Result:=-1
+end;
+
+function TCustomAI.ChooseStealAdvance: Integer;
+begin
+Result:=-1
+end;
+
+function TCustomAI.ChooseGovernment: Integer;
+begin
+Result:=gDespotism
+end;
+
+function TCustomAI.WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
+begin
+Result:=False;
+end;
+
+function TCustomAI.OnNegoRejected_CancelTreaty: Boolean;
+begin
+Result:=False;
 end;
 {$HINTS ON}
@@ -559 +559 @@
 procedure TCustomAI.StealAdvance;
 var
-Steal, ad, count: integer;
+Steal, ad, count: Integer;
 begin
 Steal:=ChooseStealAdvance;
@@ -566 +566 @@
   count:=0;
   for ad:=0 to nAdv-1 do if AdvanceStealable(ad) then
-    begin inc(count); if random(count)=0 then Steal:=ad end
+    begin Inc(count); if random(count)=0 then Steal:=ad end
   end;
-if Steal>=0 then Server(sStealTech,me,Steal,nodata^);
+if Steal>=0 then Server(sStealTech,Me,Steal,nodata^);
 RO.Happened:=RO.Happened and not phStealTech
 end;
 
-function TCustomAI.IsResearched(Advance: integer): boolean;
-begin
-result:= RO.Tech[Advance]>=tsApplicable
-end;
-
-function TCustomAI.ResearchCost: integer;
-begin
-Server(sGetTechCost,me,0,result)
-end;
-
-function TCustomAI.ChangeAttitude(Nation, Attitude: integer): integer;
-begin
-result:=Server(sSetAttitude+Nation shl 4,me,Attitude,nodata^)
-end;
-
-function TCustomAI.Revolution: integer;
-begin
-result:=Server(sRevolution,me,0,nodata^);
-end;
-
-function TCustomAI.ChangeRates(Tax,Lux: integer): integer;
-begin
-result:=Server(sSetRates,me,Tax div 10 and $f+Lux div 10 and $f shl 4,nodata^)
-end;
-
-function TCustomAI.PrepareNewModel(Domain: integer): integer;
-begin
-result:=Server(sCreateDevModel,me,Domain,nodata^);
-end;
-
-function TCustomAI.SetNewModelFeature(F, Count: integer): integer;
-begin
-result:=Server(sSetDevModelCap+Count shl 4,me,F,nodata^)
-end;
-
-function TCustomAI.AdvanceResearchable(Advance: integer): boolean;
-begin
-result:= Server(sSetResearch-sExecute,me,Advance,nodata^)>=rExecuted;
-end;
-
-function TCustomAI.AdvanceStealable(Advance: integer): boolean;
-begin
-result:= Server(sStealTech-sExecute,me,Advance,nodata^)>=rExecuted;
-end;
-
-function TCustomAI.DebugMessage(Level: integer; Text: string): boolean;
-begin
-Text:=copy('P'+char(48+me)+' '+Text,1,254);
-Server(sMessage,me,Level,pchar(Text)^);
-
-result:=true;
+function TCustomAI.IsResearched(Advance: Integer): Boolean;
+begin
+Result:= RO.Tech[Advance]>=tsApplicable
+end;
+
+function TCustomAI.ResearchCost: Integer;
+begin
+Server(sGetTechCost,Me,0,Result)
+end;
+
+function TCustomAI.ChangeAttitude(Nation, Attitude: Integer): Integer;
+begin
+Result:=Server(sSetAttitude+Nation shl 4,Me,Attitude,nodata^)
+end;
+
+function TCustomAI.Revolution: Integer;
+begin
+Result:=Server(sRevolution,Me,0,nodata^);
+end;
+
+function TCustomAI.ChangeRates(Tax,Lux: Integer): Integer;
+begin
+Result:=Server(sSetRates,Me,Tax div 10 and $F+Lux div 10 and $F shl 4,nodata^)
+end;
+
+function TCustomAI.PrepareNewModel(Domain: Integer): Integer;
+begin
+Result:=Server(sCreateDevModel,Me,Domain,nodata^);
+end;
+
+function TCustomAI.SetNewModelFeature(F, Count: Integer): Integer;
+begin
+Result:=Server(sSetDevModelCap+Count shl 4,Me,F,nodata^)
+end;
+
+function TCustomAI.AdvanceResearchable(Advance: Integer): Boolean;
+begin
+Result:= Server(sSetResearch-sExecute,Me,Advance,nodata^)>=rExecuted;
+end;
+
+function TCustomAI.AdvanceStealable(Advance: Integer): Boolean;
+begin
+Result:= Server(sStealTech-sExecute,Me,Advance,nodata^)>=rExecuted;
+end;
+
+function TCustomAI.DebugMessage(Level: Integer; Text: string): Boolean;
+begin
+Text:=Copy('P'+char(48+Me)+' '+Text,1,254);
+Server(sMessage,Me,Level,PChar(Text)^);
+
+Result:=True;
   // always returns true so that it can be used like
   // "assert(DebugMessage(...));" -> not compiled in release build
 end;
 
-function TCustomAI.SetDebugMap(var DebugMap): boolean;
-begin
-Server(sSetDebugMap, me, 0, DebugMap);
-
-result:=true;
+function TCustomAI.SetDebugMap(var DebugMap): Boolean;
+begin
+Server(sSetDebugMap, Me, 0, DebugMap);
+
+Result:=True;
   // always returns true so that it can be used like
   // "assert(SetDebugMap(...));" -> not compiled in release build
 end;
 
-procedure TCustomAI.Unit_FindMyDefender(Loc: integer; var uix: integer);
-begin
-if Server(sGetDefender,me,Loc,uix)<rExecuted then uix:=-1
-end;
-
-procedure TCustomAI.Unit_FindEnemyDefender(Loc: integer; var euix: integer);
+procedure TCustomAI.Unit_FindMyDefender(Loc: Integer; var uix: Integer);
+begin
+if Server(sGetDefender,Me,Loc,uix)<rExecuted then uix:=-1
+end;
+
+procedure TCustomAI.Unit_FindEnemyDefender(Loc: Integer; var euix: Integer);
 begin
 euix:=RO.nEnemyUn-1;
 while (euix>=0) and (RO.EnemyUn[euix].Loc<>Loc) do
-  dec(euix);
-end;
-
-function TCustomAI.Unit_Move(uix,ToLoc: integer): integer;
-var
-Step: integer;
-DestinationReached: boolean;
+  Dec(euix);
+end;
+
+function TCustomAI.Unit_Move(uix,ToLoc: Integer): Integer;
+var
+Step: Integer;
+DestinationReached: Boolean;
 Advice: TMoveAdviceData;
 begin
-assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
+Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
 {Loc_to_ab(MyUnit[uix].Loc,ToLoc,a,b);
-assert((a<>0) or (b<>0));
-if (a>=-1) and (a<=1) and (b>=-1) and (b<=1) then
+Assert((A<>0) or (B<>0));
+if (A>=-1) and (A<=1) and (B>=-1) and (B<=1) then
   begin // move to adjacent tile
-  !!!problem: if move is invalid, return codes are not consistent with other branch (eNoWay)
+  !!!problem: if Move is invalid, return codes are not consistent with other branch (eNoWay)
   Advice.nStep:=1;
-  Advice.dx[0]:=a-b;
-  Advice.dy[0]:=a+b;
+  Advice.dx[0]:=A-B;
+  Advice.dy[0]:=A+B;
   Advice.MoreTurns:=0;
   Advice.MaxHostile_MovementLeft:=MyUnit[uix].Movement;
-  result:=eOK;
+  Result:=eOK;
   end
 else}
@@ -672 +672 @@
   Advice.MoreTurns:=9999;
   Advice.MaxHostile_MovementLeft:=100;
-  result:=Server(sGetMoveAdvice,me,uix,Advice);
+  Result:=Server(sGetMoveAdvice,Me,uix,Advice);
   end;
-if result=eOk then
+if Result=eOk then
   begin
-  DestinationReached:=false;
+  DestinationReached:=False;
   Step:=0;
   repeat
-    if result and (rExecuted or rUnitRemoved)=rExecuted then // check if destination reached
+    if Result and (rExecuted or rUnitRemoved)=rExecuted then // check if destination reached
       if (ToLoc>=0) and (Advice.MoreTurns=0) and (Step=Advice.nStep-1)
         and ((Map[ToLoc] and (fUnit or fOwned)=fUnit) // attack
@@ -685 +685 @@
           and ((MyModel[MyUnit[uix].mix].Domain<>dGround) // bombardment
             or (MyModel[MyUnit[uix].mix].Flags and mdCivil<>0))) then // can't capture
-        begin DestinationReached:=true; break end // stop next to destination
+        begin DestinationReached:=True; Break end // stop next to destination
       else if Step=Advice.nStep then
-        DestinationReached:=true; // normal move -- stop at destination
-
-    if (Step=Advice.nStep) or (result<>eOK) and (result<>eLoaded) then
-      break;
-
-    result:=Server(sMoveUnit+(Advice.dx[Step] and 7) shl 4 +(Advice.dy[Step] and 7) shl 7,
-      me,uix,nodata^);
-    inc(Step);
+        DestinationReached:=True; // normal move -- stop at destination
+
+    if (Step=Advice.nStep) or (Result<>eOK) and (Result<>eLoaded) then
+      Break;
+
+    Result:=Server(sMoveUnit+(Advice.dx[Step] and 7) shl 4 +(Advice.dy[Step] and 7) shl 7,
+      Me,uix,nodata^);
+    Inc(Step);
     if RO.Happened and phStealTech<>0 then StealAdvance;
-  until false;
+  until False;
   if DestinationReached then
     if Advice.nStep=25 then
-      result:=Unit_Move(uix,ToLoc) // Shinkansen
+      Result:=Unit_Move(uix,ToLoc) // Shinkansen
     else if Advice.MoreTurns=0 then
-      result:=result or rLocationReached
-    else result:=result or rMoreTurns;
-  end
-end;
-
-function TCustomAI.Unit_Step(uix,ToLoc: integer): integer;
-var
-a,b: integer;
-begin
-Loc_to_ab(MyUnit[uix].Loc, ToLoc, a, b);
-assert(((a<>0) or (b<>0)) and (a>=-1) and (a<=1) and (b>=-1) and (b<=1));
-result:=Server(sMoveUnit+((a-b) and 7) shl 4 +((a+b) and 7) shl 7, me, uix, nodata^);
+      Result:=Result or rLocationReached
+    else Result:=Result or rMoreTurns;
+  end
+end;
+
+function TCustomAI.Unit_Step(uix,ToLoc: Integer): Integer;
+var
+A,B: Integer;
+begin
+Loc_to_ab(MyUnit[uix].Loc, ToLoc, A, B);
+Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1));
+Result:=Server(sMoveUnit+((A-B) and 7) shl 4 +((A+B) and 7) shl 7, Me, uix, nodata^);
 if RO.Happened and phStealTech<>0 then StealAdvance;
 end;
 
-function TCustomAI.Unit_Attack(uix,ToLoc: integer): integer;
-var
-a,b: integer;
-begin
-assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
+function TCustomAI.Unit_Attack(uix,ToLoc: Integer): Integer;
+var
+A,B: Integer;
+begin
+Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
   and ((Map[ToLoc] and (fUnit or fOwned)=fUnit) // is an attack
   or (Map[ToLoc] and (fCity or fOwned)=fCity)
   and (MyModel[MyUnit[uix].mix].Domain<>dGround))); // is a bombardment
-Loc_to_ab(MyUnit[uix].Loc,ToLoc,a,b);
-assert(((a<>0) or (b<>0)) and (a>=-1) and (a<=1) and (b>=-1) and (b<=1)); // attack to adjacent tile
-result:=Server(sMoveUnit+(a-b) and 7 shl 4 +(a+b) and 7 shl 7,me,uix,nodata^);
-end;
-
-function TCustomAI.Unit_DoMission(uix,MissionType,ToLoc: integer): integer;
-var
-a,b: integer;
-begin
-result:=Server(sSetSpyMission + MissionType shl 4,me,0,nodata^);
-if result>=rExecuted then
+Loc_to_ab(MyUnit[uix].Loc,ToLoc,A,B);
+Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1)); // attack to adjacent tile
+Result:=Server(sMoveUnit+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^);
+end;
+
+function TCustomAI.Unit_DoMission(uix,MissionType,ToLoc: Integer): Integer;
+var
+A,B: Integer;
+begin
+Result:=Server(sSetSpyMission + MissionType shl 4,Me,0,nodata^);
+if Result>=rExecuted then
   begin
-  assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
+  Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
     and (MyModel[MyUnit[uix].mix].Kind=mkDiplomat)); // is a commando
-  Loc_to_ab(MyUnit[uix].Loc,ToLoc,a,b);
-  assert(((a<>0) or (b<>0)) and (a>=-1) and (a<=1) and (b>=-1) and (b<=1)); // city must be adjacent
-  result:=Server(sMoveUnit-sExecute+(a-b) and 7 shl 4 +(a+b) and 7 shl 7,me,uix,nodata^);
-  if result=eMissionDone then
-    result:=Server(sMoveUnit+(a-b) and 7 shl 4 +(a+b) and 7 shl 7,me,uix,nodata^)
-  else if (result<>eNoTime_Move) and (result<>eTreaty) and (result<>eNoTurn) then
-    result:=eInvalid // not a special commando mission!
-  end
-end;
-
-function TCustomAI.Unit_MoveForecast(uix,ToLoc: integer;
-  var RemainingMovement: integer): boolean;
+  Loc_to_ab(MyUnit[uix].Loc,ToLoc,A,B);
+  Assert(((A<>0) or (B<>0)) and (A>=-1) and (A<=1) and (B>=-1) and (B<=1)); // city must be adjacent
+  Result:=Server(sMoveUnit-sExecute+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^);
+  if Result=eMissionDone then
+    Result:=Server(sMoveUnit+(A-B) and 7 shl 4 +(A+B) and 7 shl 7,Me,uix,nodata^)
+  else if (Result<>eNoTime_Move) and (Result<>eTreaty) and (Result<>eNoTurn) then
+    Result:=eInvalid // not a special commando mission!
+  end
+end;
+
+function TCustomAI.Unit_MoveForecast(uix,ToLoc: Integer;
+  var RemainingMovement: Integer): Boolean;
 var
 Advice: TMoveAdviceData;
 begin
-assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
+Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0)); // is a unit
 Advice.ToLoc:=ToLoc;
 Advice.MoreTurns:=0;
 Advice.MaxHostile_MovementLeft:=100;
-if Server(sGetMoveAdvice,me,uix,Advice)=eOk then
+if Server(sGetMoveAdvice,Me,uix,Advice)=eOk then
   begin
   RemainingMovement:=Advice.MaxHostile_MovementLeft;
-  result:=true
+  Result:=True
   end
 else
   begin
   RemainingMovement:=-1;
-  result:=false
-  end
-end;
-
-function TCustomAI.Unit_AttackForecast(uix,ToLoc,AttackMovement: integer;
-  var RemainingHealth: integer): boolean;
+  Result:=False
+  end
+end;
+
+function TCustomAI.Unit_AttackForecast(uix,ToLoc,AttackMovement: Integer;
+  var RemainingHealth: Integer): Boolean;
 var
 BattleForecast: TBattleForecast;
 begin
-assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
+Assert((uix>=0) and (uix<RO.nUn) and (MyUnit[uix].Loc>=0) // is a unit
   and (Map[ToLoc] and (fUnit or fOwned)=fUnit)); // is an attack
 RemainingHealth:=-$100;
-result:=false;
+Result:=False;
 if AttackMovement>=0 then with MyUnit[uix] do
   begin
-  BattleForecast.pAtt:=me;
+  BattleForecast.pAtt:=Me;
   BattleForecast.mixAtt:=mix;
   BattleForecast.HealthAtt:=Health;
@@ -786 +786 @@
   BattleForecast.FlagsAtt:=Flags;
   BattleForecast.Movement:=AttackMovement;
-  if Server(sGetBattleForecast,me,ToLoc,BattleForecast)>=rExecuted then
+  if Server(sGetBattleForecast,Me,ToLoc,BattleForecast)>=rExecuted then
     begin
     if BattleForecast.EndHealthAtt>0 then
       RemainingHealth:=BattleForecast.EndHealthAtt
     else RemainingHealth:=-BattleForecast.EndHealthDef;
-    result:=true
+    Result:=True
     end
   end
 end;
 
-function TCustomAI.Unit_DefenseForecast(euix,ToLoc: integer;
-  var RemainingHealth: integer): boolean;
+function TCustomAI.Unit_DefenseForecast(euix,ToLoc: Integer;
+  var RemainingHealth: Integer): Boolean;
 var
 BattleForecast: TBattleForecast;
 begin
-assert((euix>=0) and (euix<RO.nEnemyUn) and (RO.EnemyUn[euix].Loc>=0) // is an enemy unit
+Assert((euix>=0) and (euix<RO.nEnemyUn) and (RO.EnemyUn[euix].Loc>=0) // is an enemy unit
   and (Map[ToLoc] and (fUnit or fOwned)=(fUnit or fOwned))); // is an attack
 RemainingHealth:=$100;
-result:=false;
+Result:=False;
 with RO.EnemyUn[euix] do
   begin
@@ -813 +813 @@
   BattleForecast.FlagsAtt:=Flags;
   BattleForecast.Movement:=100;
-  if Server(sGetBattleForecast,me,ToLoc,BattleForecast)>=rExecuted then
+  if Server(sGetBattleForecast,Me,ToLoc,BattleForecast)>=rExecuted then
     begin
     if BattleForecast.EndHealthDef>0 then
       RemainingHealth:=BattleForecast.EndHealthDef
     else RemainingHealth:=-BattleForecast.EndHealthAtt;
-    result:=true
+    Result:=True
     end
   end
 end;
 
-function TCustomAI.Unit_Disband(uix: integer): integer;
-begin
-result:=Server(sRemoveUnit,me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_StartJob(uix,NewJob: integer): integer;
-begin
-result:=Server(sStartJob+NewJob shl 4,me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_SetHomeHere(uix: integer): integer;
-begin
-result:=Server(sSetUnitHome,me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_Load(uix: integer): integer;
-begin
-result:=Server(sLoadUnit,me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_Unload(uix: integer): integer;
-begin
-result:=Server(sUnloadUnit,me,uix,nodata^)
-end;
-
-function TCustomAI.Unit_AddToCity(uix: integer): integer;
-begin
-result:=Server(sAddToCity,me,uix,nodata^)
-end;
-
-
-procedure TCustomAI.City_FindMyCity(Loc: integer; var cix: integer);
+function TCustomAI.Unit_Disband(uix: Integer): Integer;
+begin
+Result:=Server(sRemoveUnit,Me,uix,nodata^)
+end;
+
+function TCustomAI.Unit_StartJob(uix,NewJob: Integer): Integer;
+begin
+Result:=Server(sStartJob+NewJob shl 4,Me,uix,nodata^)
+end;
+
+function TCustomAI.Unit_SetHomeHere(uix: Integer): Integer;
+begin
+Result:=Server(sSetUnitHome,Me,uix,nodata^)
+end;
+
+function TCustomAI.Unit_Load(uix: Integer): Integer;
+begin
+Result:=Server(sLoadUnit,Me,uix,nodata^)
+end;
+
+function TCustomAI.Unit_Unload(uix: Integer): Integer;
+begin
+Result:=Server(sUnloadUnit,Me,uix,nodata^)
+end;
+
+function TCustomAI.Unit_AddToCity(uix: Integer): Integer;
+begin
+Result:=Server(sAddToCity,Me,uix,nodata^)
+end;
+
+
+procedure TCustomAI.City_FindMyCity(Loc: Integer; var cix: Integer);
 begin
 if Map[Loc] and (fCity or fOwned)<>fCity or fOwned then
@@ -862 +862 @@
   cix:=RO.nCity-1;
   while (cix>=0) and (MyCity[cix].Loc<>Loc) do
-    dec(cix);
-  end
-end;
-
-procedure TCustomAI.City_FindEnemyCity(Loc: integer; var ecix: integer);
+    Dec(cix);
+  end
+end;
+
+procedure TCustomAI.City_FindEnemyCity(Loc: Integer; var ecix: Integer);
 begin
 if Map[Loc] and (fCity or fOwned)<>fCity then
@@ -874 +874 @@
   ecix:=RO.nEnemyCity-1;
   while (ecix>=0) and (RO.EnemyCity[ecix].Loc<>Loc) do
-    dec(ecix);
-  end
-end;
-
-function TCustomAI.City_HasProject(cix: integer): boolean;
-begin
-result:= MyCity[cix].Project and (cpImp+cpIndex)<>cpImp+imTrGoods
-end;
-
-function TCustomAI.City_CurrentImprovementProject(cix: integer): integer;
-begin
-if MyCity[cix].Project and cpImp=0 then result:=-1
+    Dec(ecix);
+  end
+end;
+
+function TCustomAI.City_HasProject(cix: Integer): Boolean;
+begin
+Result:= MyCity[cix].Project and (cpImp+cpIndex)<>cpImp+imTrGoods
+end;
+
+function TCustomAI.City_CurrentImprovementProject(cix: Integer): Integer;
+begin
+if MyCity[cix].Project and cpImp=0 then Result:=-1
 else
   begin
-  result:=MyCity[cix].Project and cpIndex;
-  if result=imTrGoods then result:=-1
-  end
-end;
-
-function TCustomAI.City_CurrentUnitProject(cix: integer): integer;
-begin
-if MyCity[cix].Project and cpImp<>0 then result:=-1
-else result:=MyCity[cix].Project and cpIndex;
-end;
-
-function TCustomAI.City_GetTileInfo(cix,TileLoc: integer; var TileInfo: TTileInfo): integer;
+  Result:=MyCity[cix].Project and cpIndex;
+  if Result=imTrGoods then Result:=-1
+  end
+end;
+
+function TCustomAI.City_CurrentUnitProject(cix: Integer): Integer;
+begin
+if MyCity[cix].Project and cpImp<>0 then Result:=-1
+else Result:=MyCity[cix].Project and cpIndex;
+end;
+
+function TCustomAI.City_GetTileInfo(cix,TileLoc: Integer; var TileInfo: TTileInfo): Integer;
 begin
 TileInfo.ExplCity:=cix;
-result:=Server(sGetHypoCityTileInfo,me,TileLoc,TileInfo)
-end;
-
-function TCustomAI.City_GetReport(cix: integer; var Report: TCityReport): integer;
+Result:=Server(sGetHypoCityTileInfo,Me,TileLoc,TileInfo)
+end;
+
+function TCustomAI.City_GetReport(cix: Integer; var Report: TCityReport): Integer;
 begin
 Report.HypoTiles:=-1;
 Report.HypoTax:=-1;
 Report.HypoLux:=-1;
-result:=Server(sGetCityReport,me,cix,Report)
-end;
-
-function TCustomAI.City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: integer;
-  var Report: TCityReport): integer;
+Result:=Server(sGetCityReport,Me,cix,Report)
+end;
+
+function TCustomAI.City_GetHypoReport(cix, HypoTiles, HypoTax, HypoLux: Integer;
+  var Report: TCityReport): Integer;
 begin
 Report.HypoTiles:=HypoTiles;
 Report.HypoTax:=HypoTax;
 Report.HypoLux:=HypoLux;
-result:=Server(sGetCityReport,me,cix,Report)
-end;
-
-function TCustomAI.City_GetAreaInfo(cix: integer; var AreaInfo: TCityAreaInfo): integer;
-begin
-result:=Server(sGetCityAreaInfo,me,cix,AreaInfo)
-end;
-
-function TCustomAI.City_StartUnitProduction(cix,mix: integer): integer;
-begin
-result:=Server(sSetCityProject,me,cix,mix)
-end;
-
-function TCustomAI.City_StartEmigration(cix,mix: integer;
-  AllowDisbandCity, AsConscripts: boolean): integer;
-var
-NewProject: integer;
+Result:=Server(sGetCityReport,Me,cix,Report)
+end;
+
+function TCustomAI.City_GetAreaInfo(cix: Integer; var AreaInfo: TCityAreaInfo): Integer;
+begin
+Result:=Server(sGetCityAreaInfo,Me,cix,AreaInfo)
+end;
+
+function TCustomAI.City_StartUnitProduction(cix,mix: Integer): Integer;
+begin
+Result:=Server(sSetCityProject,Me,cix,mix)
+end;
+
+function TCustomAI.City_StartEmigration(cix,mix: Integer;
+  AllowDisbandCity, AsConscripts: Boolean): Integer;
+var
+NewProject: Integer;
 begin
 NewProject:=mix;
 if AllowDisbandCity then NewProject:=NewProject or cpDisbandCity;
 if AsConscripts then NewProject:=NewProject or cpConscripts;
-result:=Server(sSetCityProject,me,cix,NewProject)
-end;
-
-function TCustomAI.City_StartImprovement(cix,iix: integer): integer;
-var
-NewProject: integer;
+Result:=Server(sSetCityProject,Me,cix,NewProject)
+end;
+
+function TCustomAI.City_StartImprovement(cix,iix: Integer): Integer;
+var
+NewProject: Integer;
 begin
 NewProject:=iix+cpImp;
-result:=Server(sSetCityProject,me,cix,NewProject)
-end;
-
-function TCustomAI.City_Improvable(cix,iix: integer): boolean;
-var
-NewProject: integer;
+Result:=Server(sSetCityProject,Me,cix,NewProject)
+end;
+
+function TCustomAI.City_Improvable(cix,iix: Integer): Boolean;
+var
+NewProject: Integer;
 begin
 NewProject:=iix+cpImp;
-result:= Server(sSetCityProject-sExecute,me,cix,NewProject)>=rExecuted;
-end;
-
-function TCustomAI.City_StopProduction(cix: integer): integer;
-var
-NewProject: integer;
+Result:= Server(sSetCityProject-sExecute,Me,cix,NewProject)>=rExecuted;
+end;
+
+function TCustomAI.City_StopProduction(cix: Integer): Integer;
+var
+NewProject: Integer;
 begin
 NewProject:=imTrGoods+cpImp;
-result:=Server(sSetCityProject,me,cix,NewProject)
-end;
-
-function TCustomAI.City_BuyProject(cix: integer): integer;
-begin
-result:=Server(sBuyCityProject,me,cix,nodata^)
-end;
-
-function TCustomAI.City_SellImprovement(cix,iix: integer): integer;
-begin
-result:=Server(sSellCityImprovement,me,cix,iix)
-end;
-
-function TCustomAI.City_RebuildImprovement(cix,iix: integer): integer;
-begin
-result:=Server(sRebuildCityImprovement,me,cix,iix)
-end;
-
-function TCustomAI.City_SetTiles(cix,NewTiles: integer): integer;
-begin
-result:=Server(sSetCityTiles,me,cix,NewTiles)
+Result:=Server(sSetCityProject,Me,cix,NewProject)
+end;
+
+function TCustomAI.City_BuyProject(cix: Integer): Integer;
+begin
+Result:=Server(sBuyCityProject,Me,cix,nodata^)
+end;
+
+function TCustomAI.City_SellImprovement(cix,iix: Integer): Integer;
+begin
+Result:=Server(sSellCityImprovement,Me,cix,iix)
+end;
+
+function TCustomAI.City_RebuildImprovement(cix,iix: Integer): Integer;
+begin
+Result:=Server(sRebuildCityImprovement,Me,cix,iix)
+end;
+
+function TCustomAI.City_SetTiles(cix,NewTiles: Integer): Integer;
+begin
+Result:=Server(sSetCityTiles,Me,cix,NewTiles)
 end;
 
 
 // negotiation
-function TCustomAI.Nego_CheckMyAction: integer;
-begin
-assert(Opponent>=0); // only allowed in negotiation mode
-assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
+function TCustomAI.Nego_CheckMyAction: Integer;
+begin
+Assert(Opponent>=0); // only allowed in negotiation mode
+Assert((MyAction=scDipNotice) or (MyAction=scDipAccept)
   or (MyAction=scDipCancelTreaty) or (MyAction=scDipOffer)
   or (MyAction=scDipBreak));
-if MyAction=scDipOffer then result:=Server(MyAction-sExecute, me, 0, MyOffer)
-else result:=Server(MyAction-sExecute, me, 0, nodata^);
+if MyAction=scDipOffer then Result:=Server(MyAction-sExecute, Me, 0, MyOffer)
+else Result:=Server(MyAction-sExecute, Me, 0, nodata^);
 end;
 
 
 initialization
-nodata:=pointer(0);
+nodata:=Pointer(0);
 RWDataSize:=0;
 

trunk/AI/StdAI/Pile.pas

@@ -8 +8 @@
 interface
 
-procedure Create(Size: integer);
+procedure Create(Size: Integer);
 procedure Free;
 procedure Empty;
-function Put(Item, Value: integer): boolean;
-function TestPut(Item, Value: integer): boolean;
-function Get(var Item, Value: integer): boolean;
+function Put(Item, Value: Integer): Boolean;
+function TestPut(Item, Value: Integer): Boolean;
+function Get(var Item, Value: Integer): Boolean;
 
 
@@ -23 +23 @@
 type
   TheapItem = record
-    Item: integer;
-    Value: integer;
+    Item: Integer;
+    Value: Integer;
   end;
 
 var
   bh: array[0..MaxSize - 1] of TheapItem;
-  Ix: array[0..MaxSize - 1] of integer;
-  n, CurrentSize: integer;
-{$IFDEF DEBUG}InUse: boolean;{$ENDIF}
+  Ix: array[0..MaxSize - 1] of Integer;
+  N, CurrentSize: Integer;
+{$IFDEF DEBUG}InUse: Boolean;{$ENDIF}
 
 
-procedure Create(Size: integer);
+procedure Create(Size: Integer);
 begin
   {$IFDEF DEBUG}
-  assert(not InUse, 'Pile is a single instance class, ' +
+  Assert(not InUse, 'Pile is a single instance class, ' +
     'no multiple usage possible. Always call Pile.Free after use.');
 {$ENDIF}
-  assert(Size <= MaxSize);
-  if (n <> 0) or (Size > CurrentSize) then
+  Assert(Size <= MaxSize);
+  if (N <> 0) or (Size > CurrentSize) then
   begin
-    FillChar(Ix, Size * sizeOf(integer), 255);
-    n := 0;
+    FillChar(Ix, Size * sizeOf(Integer), 255);
+    N := 0;
   end;
   CurrentSize := Size;
@@ -55 +55 @@
 begin
         {$IFDEF DEBUG}
-  assert(InUse);
+  Assert(InUse);
   InUse := False;
 {$ENDIF}
@@ -62 +62 @@
 procedure Empty;
 begin
-  if n <> 0 then
+  if N <> 0 then
   begin
-    FillChar(Ix, CurrentSize * sizeOf(integer), 255);
-    n := 0;
+    FillChar(Ix, CurrentSize * sizeOf(Integer), 255);
+    N := 0;
   end;
 end;
 
 //Parent(i) = (i-1)/2.
-function Put(Item, Value: integer): boolean; //O(lg(n))
+function Put(Item, Value: Integer): Boolean; //O(lg(n))
 var
-  i, j: integer;
+  I, J: Integer;
 begin
-  assert(Item < CurrentSize);
-  i := Ix[Item];
-  if i >= 0 then
+  Assert(Item < CurrentSize);
+  I := Ix[Item];
+  if I >= 0 then
   begin
-    if bh[i].Value <= Value then
+    if bh[I].Value <= Value then
     begin
       Result := False;
-      exit;
+      Exit;
     end;
   end
   else
   begin
-    i := n;
-    Inc(n);
+    I := N;
+    Inc(N);
   end;
 
-  while i > 0 do
+  while I > 0 do
   begin
-    j := (i - 1) shr 1;  //Parent(i) = (i-1)/2
-    if Value >= bh[j].Value then
-      break;
-    bh[i] := bh[j];
-    Ix[bh[i].Item] := i;
-    i := j;
+    J := (I - 1) shr 1;  //Parent(i) = (i-1)/2
+    if Value >= bh[J].Value then
+      Break;
+    bh[I] := bh[J];
+    Ix[bh[I].Item] := I;
+    I := J;
   end;
   //  Insert the new Item at the insertion point found.
-  bh[i].Value := Value;
-  bh[i].Item := Item;
-  Ix[bh[i].Item] := i;
+  bh[I].Value := Value;
+  bh[I].Item := Item;
+  Ix[bh[I].Item] := I;
   Result := True;
 end;
 
-function TestPut(Item, Value: integer): boolean;
+function TestPut(Item, Value: Integer): Boolean;
 var
-  i: integer;
+  I: Integer;
 begin
-  assert(Item < CurrentSize);
-  i := Ix[Item];
-  Result := (i < 0) or (bh[i].Value > Value);
+  Assert(Item < CurrentSize);
+  I := Ix[Item];
+  Result := (I < 0) or (bh[I].Value > Value);
 end;
 
 //Left(i) = 2*i+1.
 //Right(i) = 2*i+2 => Left(i)+1
-function Get(var Item, Value: integer): boolean; //O(lg(n))
+function Get(var Item, Value: Integer): Boolean; //O(lg(n))
 var
-  i, j: integer;
-  last: TheapItem;
+  I, J: Integer;
+  Last: TheapItem;
 begin
-  if n = 0 then
+  if N = 0 then
   begin
     Result := False;
-    exit;
+    Exit;
   end;
 
@@ -133 +133 @@
   Ix[Item] := -1;
 
-  Dec(n);
-  if n > 0 then
+  Dec(N);
+  if N > 0 then
   begin
-    last := bh[n];
-    i := 0;
-    j := 1;
-    while j < n do
+    Last := bh[N];
+    I := 0;
+    J := 1;
+    while J < N do
     begin
       //  Right(i) = Left(i)+1
-      if (j < n - 1) and (bh[j].Value > bh[j + 1].Value) then
-        Inc(j);
-      if last.Value <= bh[j].Value then
-        break;
+      if (J < N - 1) and (bh[J].Value > bh[J + 1].Value) then
+        Inc(J);
+      if Last.Value <= bh[J].Value then
+        Break;
 
-      bh[i] := bh[j];
-      Ix[bh[i].Item] := i;
-      i := j;
-      j := j shl 1 + 1;  //Left(j) = 2*j+1
+      bh[I] := bh[J];
+      Ix[bh[I].Item] := I;
+      I := J;
+      J := J shl 1 + 1;  //Left(j) = 2*j+1
     end;
 
     // Insert the root in the correct place in the heap.
-    bh[i] := last;
-    Ix[last.Item] := i;
+    bh[I] := Last;
+    Ix[Last.Item] := I;
   end;
   Result := True;
@@ -161 +161 @@
 
 initialization
-  n := 0;
+  N := 0;
   CurrentSize := 0;
         {$IFDEF DEBUG}

trunk/AI/StdAI/Protocol.pas

@@ -916 +916 @@
   Cost: Integer;
   Maint: Integer;
-  Expiration: integer;
+  Expiration: Integer;
 end
 = ((Kind: ikWonder; Preq: adMathematics; Cost: 400; Maint: 0;
@@ -1120 +1120 @@
   Strength: Integer;
   Trans: Integer;
-  Cost: integer;
+  Cost: Integer;
 end
 = (((Preq: adWarriorCode; Strength: 4; Trans: 0; Cost: 3),
@@ -1510 +1510 @@
   TGetCityData = record
     Owner: Integer;
-    c: TCity;
+    C: TCity;
   end;
 
@@ -1591 +1591 @@
   TCreateUnitData = record
     Loc: Integer;
-    p: Integer;
+    P: Integer;
     mix: Integer;
   end;
@@ -1600 +1600 @@
   TOwnerList = array [0 .. INFIN] of ShortInt;
   TByteList = array [0 .. INFIN] of Byte;
-  TIntList = array [0 .. INFIN] of integer;
+  TIntList = array [0 .. INFIN] of Integer;
   TCityList = array [0 .. INFIN] of TCity;
   TUnList = array [0 .. INFIN] of TUn;
@@ -1761 +1761 @@
     0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
 
-  SpecialModelPreq: array [0 .. nSpecialModel - 1] of integer = (preNone,
+  SpecialModelPreq: array [0 .. nSpecialModel - 1] of Integer = (preNone,
     adExplosives, preNone, preNone, (* adWri, *) adIntelligence, adTrade,
     (* adTheCorporation,adHorsebackRiding,adAutomobile,adNavigation,
@@ -1770 +1770 @@
   DelphiRandSeed: Integer;
 
-procedure MakeUnitInfo(p: Integer; const u: TUn; var ui: TUnitInfo);
-procedure MakeModelInfo(p, mix: Integer; const m: TModel; var mi: TModelInfo);
+procedure MakeUnitInfo(P: Integer; const U: TUn; var ui: TUnitInfo);
+procedure MakeModelInfo(P, mix: Integer; const M: TModel; var mi: TModelInfo);
 function IsSameModel(const mi1, mi2: TModelInfo): Boolean;
 function SpecialTile(Loc, TerrType, lx: Integer): Integer;
@@ -1781 +1781 @@
 implementation
 
-procedure MakeUnitInfo(p: Integer; const u: TUn; var ui: TUnitInfo);
+procedure MakeUnitInfo(P: Integer; const U: TUn; var ui: TUnitInfo);
 begin
-  ui.Owner := p;
-  ui.Loc := u.Loc;
-  ui.Health := u.Health;
-  ui.Fuel := u.Fuel;
-  ui.Job := u.Job;
-  ui.Exp := u.Exp;
-  ui.Load := u.TroopLoad + u.AirLoad;
-  ui.mix := u.mix;
-  ui.Flags := u.Flags;
+  ui.Owner := P;
+  ui.Loc := U.Loc;
+  ui.Health := U.Health;
+  ui.Fuel := U.Fuel;
+  ui.Job := U.Job;
+  ui.Exp := U.Exp;
+  ui.Load := U.TroopLoad + U.AirLoad;
+  ui.mix := U.mix;
+  ui.Flags := U.Flags;
 end;
 
-procedure MakeModelInfo(p, mix: Integer; const m: TModel; var mi: TModelInfo);
+procedure MakeModelInfo(P, mix: Integer; const M: TModel; var mi: TModelInfo);
 var
-  i: Integer;
+  I: Integer;
 begin
-  mi.Owner := p;
+  mi.Owner := P;
   mi.mix := mix;
-  mi.ID := m.ID;
-  mi.Domain := m.Domain;
-  if m.Kind = mkEnemyDeveloped then
+  mi.ID := M.ID;
+  mi.Domain := M.Domain;
+  if M.Kind = mkEnemyDeveloped then
     mi.Kind := mkSelfDeveloped // important for IsSameModel()
   else
-    mi.Kind := m.Kind;
-  mi.Attack := m.Attack;
-  mi.Defense := m.Defense;
-  mi.Speed := m.Speed;
-  mi.Cost := m.Cost;
+    mi.Kind := M.Kind;
+  mi.Attack := M.Attack;
+  mi.Defense := M.Defense;
+  mi.Speed := M.Speed;
+  mi.Cost := M.Cost;
   if mi.Domain = dAir then
   begin
-    mi.TTrans := m.Cap[mcAirTrans] * m.MTrans;
-    mi.ATrans_Fuel := m.Cap[mcFuel];
+    mi.TTrans := M.Cap[mcAirTrans] * M.MTrans;
+    mi.ATrans_Fuel := M.Cap[mcFuel];
   end
   else
   begin
-    mi.TTrans := m.Cap[mcSeaTrans] * m.MTrans;
-    mi.ATrans_Fuel := m.Cap[mcCarrier] * m.MTrans;
-  end;
-  mi.Bombs := m.Cap[mcBombs] * m.MStrength * 2;
+    mi.TTrans := M.Cap[mcSeaTrans] * M.MTrans;
+    mi.ATrans_Fuel := M.Cap[mcCarrier] * M.MTrans;
+  end;
+  mi.Bombs := M.Cap[mcBombs] * M.MStrength * 2;
   mi.Cap := 0;
-  for i := mcFirstNonCap to nFeature - 1 do
-    if m.Cap[i] > 0 then
-      mi.Cap := mi.Cap or (1 shl (i - mcFirstNonCap));
+  for I := mcFirstNonCap to nFeature - 1 do
+    if M.Cap[I] > 0 then
+      mi.Cap := mi.Cap or (1 shl (I - mcFirstNonCap));
   mi.MaxUpgrade := 0;
-  for i := 1 to nUpgrade - 1 do
-    if m.Upgrades and (1 shl i) <> 0 then
-      mi.MaxUpgrade := i;
-  mi.Weight := m.Weight;
+  for I := 1 to nUpgrade - 1 do
+    if M.Upgrades and (1 shl I) <> 0 then
+      mi.MaxUpgrade := I;
+  mi.Weight := M.Weight;
   mi.Lost := 0;
 end;
@@ -1841 +1841 @@
   Compare1 := @mi1;
   Compare2 := @mi2;
-  result := (Compare1[1] and $FFFF0000 = Compare2[1] and $FFFF0000) and
+  Result := (Compare1[1] and $FFFF0000 = Compare2[1] and $FFFF0000) and
     (Compare1[2] = Compare2[2]) and (Compare1[3] = Compare2[3]) and
     (Compare1[4] = Compare2[4]) and (Compare1[5] = Compare2[5])
@@ -1848 +1848 @@
 function SpecialTile(Loc, TerrType, lx: Integer): Integer;
 var
-  x, y, qx, qy, a: Integer;
+  X, Y, qx, qy, A: Integer;
 begin
   if TerrType = fOcean then
-    result := 0
+    Result := 0
   else
   begin
-    y := Loc div lx;
-    x := Loc - y * lx;
+    Y := Loc div lx;
+    X := Loc - Y * lx;
     if TerrType = fGrass then { formula for productive grassland }
-      if Odd((lymax + x - y shr 1) shr 1 + x + (y + 1) shr 1) then
-        result := 1
+      if Odd((lymax + X - Y shr 1) shr 1 + X + (Y + 1) shr 1) then
+        Result := 1
       else
-        result := 0
+        Result := 0
     else { formula for special resources }
     begin
-      a := 4 * x - y + 9980;
-      qx := a div 10;
-      if (qx * 10 = a) and (qx and 3 <> 0) then
+      A := 4 * X - Y + 9980;
+      qx := A div 10;
+      if (qx * 10 = A) and (qx and 3 <> 0) then
       begin
-        qy := (y + x) div 5;
+        qy := (Y + X) div 5;
         if qy and 3 <> qx shr 2 and 1 * 2 then
           if (TerrType = fArctic) or (TerrType = fSwamp) then
-            result := 1
+            Result := 1
           else if TerrType = fShore then
           begin
             if (qx + qy) and 1 = 0 then
               if qx and 3 = 2 then
-                result := 2
+                Result := 2
               else
-                result := 1
+                Result := 1
             else
-              result := 0
+              Result := 0
           end
           else
-            result := (qx + qy) and 1 + 1
+            Result := (qx + qy) and 1 + 1
         else
-          result := 0;
+          Result := 0;
       end
       else
-        result := 0;
+        Result := 0;
     end
   end;

trunk/AI/StdAI/StdAI.lpr

@@ -12 +12 @@
 var
   AIList: array[0..nPl - 1] of TCustomAI;
-  Defender: integer;
+  Defender: Integer;
 
 
-  procedure Client(Command, Player: integer; var Data); stdcall;
+  procedure Client(Command, Player: Integer; var Data); stdcall;
   var
-    p, y0, ToLoc: integer;
+    P, y0, ToLoc: Integer;
     UnitInfo: TUnitInfo;
   begin
@@ -32 +32 @@
 {$ENDIF}
         CustomAI.Init(TNewGameData(Data));
-        for p := nPl - 1 downto 0 do
-          if G.RO[p] <> nil then
+        for P := nPl - 1 downto 0 do
+          if G.RO[P] <> nil then
           begin
-            AIList[p] := TAI.Create(p);
-            AIList[p].SetDataDefaults;
+            AIList[P] := TAI.Create(P);
+            AIList[P].SetDataDefaults;
           end
           else
-            AIList[p] := nil;
+            AIList[P] := nil;
         Defender := -1;
       end;
       cGetReady:
-        for p := nPl - 1 downto 0 do
-          if AIList[p] <> nil then
-            AIList[p].SetDataRandom;
+        for P := nPl - 1 downto 0 do
+          if AIList[P] <> nil then
+            AIList[P].SetDataRandom;
       cBreakGame:
-        for p := 0 to nPl - 1 do
-          if AIList[p] <> nil then
-            AIList[p].Free;
+        for P := 0 to nPl - 1 do
+          if AIList[P] <> nil then
+            AIList[P].Free;
 
       cTurn, cContinue, scContact..scDipBreak, cShowEndContact:

trunk/AI/StdAI/ToolAI.pas

@@ -11 +11 @@
 type
   TGroupTransportPlan = record
-    LoadLoc, uixTransport, nLoad, TurnsEmpty, TurnsLoaded: integer;
-    uixLoad: array[0..15] of integer;
+    LoadLoc, uixTransport, nLoad, TurnsEmpty, TurnsLoaded: Integer;
+    uixLoad: array[0..15] of Integer;
   end;
 
@@ -18 +18 @@
   TToolAI = class(TCustomAI)
   protected
-  {$IFDEF DEBUG}DebugMap: array[0..lxmax * lymax - 1] of integer;{$ENDIF}
-
-    function CenterOfEmpire: integer;
+  {$IFDEF DEBUG}DebugMap: array[0..lxmax * lymax - 1] of Integer;{$ENDIF}
+
+    function CenterOfEmpire: Integer;
     // tile that is in the middle of all own cities
 
-    function CityTaxBalance(cix: integer; const CityReport: TCityReport): integer;
+    function CityTaxBalance(cix: Integer; const CityReport: TCityReport): Integer;
     // calculates exact difference of income and maintenance cost for a single city
     // positive result = income higher than maintenance
@@ -29 +29 @@
     // respects production and food converted to gold
     // CityReport must have been prepared before
-    procedure SumCities(TaxRate: integer; var TaxSum, ScienceSum: integer);
+    procedure SumCities(TaxRate: Integer; var TaxSum, ScienceSum: Integer);
     // calculates exact total tax and science income
     // tax is reduced by maintenance (so might be negative)
@@ -46 +46 @@
     procedure JobAssignment_Initialize;
     // initialization, must be called first of the JobAssignment functions
-    procedure JobAssignment_AddJob(Loc, Job, Score: integer);
+    procedure JobAssignment_AddJob(Loc, Job, Score: Integer);
     // add job for settlers with certain score
     // jobs include founding cities!
-    procedure JobAssignment_AddUnit(uix: integer);
+    procedure JobAssignment_AddUnit(uix: Integer);
     // add a settler unit to do jobs
     procedure JobAssignment_Go;
@@ -57 +57 @@
     // starting a job one turn earlier counts the same as 4 points of score
     // function does not cancel jobs that are already started
-    function JobAssignment_GotJob(uix: integer): boolean;
+    function JobAssignment_GotJob(uix: Integer): Boolean;
     // can be called after JobAssignment_Go to find out whether
     // a certain settler has been assigned a job to
@@ -64 +64 @@
     // calculates formations and districts
 
-    function CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: integer;
-      var TimeAfterStep, RecoverTurns: integer; FromTile, ToTile: integer;
-      IsCapture: boolean): integer;
+    function CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: Integer;
+      var TimeAfterStep, RecoverTurns: Integer; FromTile, ToTile: Integer;
+      IsCapture: Boolean): Integer;
     // forecast single unit move between adjacent tiles
     // format of TimeBeforeStep and TimeAfterStep: $1000*number of turns + $800-MP left
@@ -74 +74 @@
     // CrossCorner=1 for long moves that cross the tile corner, =0 for short ones that don't
 
-    function GetMyMoveStyle(mix, Health: integer): integer;
-
-    function Unit_MoveEx(uix, ToLoc: integer; Options: integer = 0): integer;
+    function GetMyMoveStyle(mix, Health: Integer): Integer;
+
+    function Unit_MoveEx(uix, ToLoc: Integer; Options: Integer = 0): Integer;
 
     procedure SeaTransport_BeginInitialize;
@@ -90 +90 @@
     // - all transports have same capacity
     // - no transport is damaged
-    procedure SeaTransport_AddLoad(uix: integer);
-    procedure SeaTransport_AddTransport(uix: integer);
-    procedure SeaTransport_AddDestination(Loc: integer);
-    function SeaTransport_MakeGroupPlan(var TransportPlan: TGroupTransportPlan): boolean;
+    procedure SeaTransport_AddLoad(uix: Integer);
+    procedure SeaTransport_AddTransport(uix: Integer);
+    procedure SeaTransport_AddDestination(Loc: Integer);
+    function SeaTransport_MakeGroupPlan(var TransportPlan: TGroupTransportPlan): Boolean;
     // make plan for group of units to transport from a single loading location by a single transport
     // the plan optimizes:
@@ -103 +103 @@
     // function returns false if no more transports are possible
 
-    function CurrentMStrength(Domain: integer): integer;
+    function CurrentMStrength(Domain: Integer): Integer;
   end;
 
@@ -132 +132 @@
 
 var
-  nContinent, nOcean, nDistrict: integer;
-  Formation: array[0..lxmax * lymax - 1] of integer;
+  nContinent, nOcean, nDistrict: Integer;
+  Formation: array[0..lxmax * lymax - 1] of Integer;
   // water: ocean index, land: continent index, sorted by size
   // territory unpassable due to peace treaty divides a continent
-  District: array[0..lxmax * lymax - 1] of integer;
+  District: array[0..lxmax * lymax - 1] of Integer;
   // index of coherent own territory, sorted by size
-  CityResult: array[0..nCmax - 1] of integer;
-
-  Advancedness: array[0..nAdv - 1] of integer;
+  CityResult: array[0..nCmax - 1] of Integer;
+
+  Advancedness: array[0..nAdv - 1] of Integer;
 // total number of prerequisites for each advance
 
@@ -149 +149 @@
 
 type
-  pinteger = ^integer;
+  pinteger = ^Integer;
 
 var
   // for JobAssignment
-  MaxScore: integer;
-  TileJob, TileJobScore: array[0..lxmax * lymax - 1] of byte;
-  JobLocOfSettler: array[0..nUmax - 1] of integer; // ToAssign = find job
+  MaxScore: Integer;
+  TileJob, TileJobScore: array[0..lxmax * lymax - 1] of Byte;
+  JobLocOfSettler: array[0..nUmax - 1] of Integer; // ToAssign = find job
 
   // for Transport
-  TransportMoveStyle, TransportCapacity, nTransportLoad: integer;
-  InitComplete, HaveDestinations: boolean;
-  uixTransportLoad, TransportAvailable: array[0..nUmax - 1] of integer;
-  TurnsAfterLoad: array[0..lxmax * lymax - 1] of shortint;
-
-procedure ReplaceD(Start, Stop: pinteger; Raider, Twix: integer);
+  TransportMoveStyle, TransportCapacity, nTransportLoad: Integer;
+  InitComplete, HaveDestinations: Boolean;
+  uixTransportLoad, TransportAvailable: array[0..nUmax - 1] of Integer;
+  TurnsAfterLoad: array[0..lxmax * lymax - 1] of ShortInt;
+
+procedure ReplaceD(Start, Stop: pinteger; Raider, Twix: Integer);
 begin
   while Start <> Stop do
@@ -173 +173 @@
 end;
 
-function NextZero(Start, Stop: pinteger; Mask: cardinal): pinteger;
+function NextZero(Start, Stop: pinteger; Mask: Cardinal): pinteger;
 begin
   while (Start <> Stop) and (Start^ and Mask <> 0) do
@@ -180 +180 @@
 end;
 
-function TToolAI.CenterOfEmpire: integer;
-var
-  cix, Loc, x, y, sy, n: integer;
-  a, su, sv: double;
-begin
-  n := 0;
+function TToolAI.CenterOfEmpire: Integer;
+var
+  cix, Loc, X, Y, sy, N: Integer;
+  A, su, sv: Double;
+begin
+  N := 0;
   sy := 0;
   su := 0;
@@ -194 +194 @@
     if Loc >= 0 then
     begin
-      y := Loc div G.lx;
-      x := Loc - y * G.lx;
-      Inc(sy, y);
-      a := 2 * pi * x / G.lx;
-      su := su + cos(a);
-      sv := sv + sin(a);
-      Inc(n);
-    end;
-  end;
-  a := arctan2(sv, su);
-  x := round(G.lx * a / (2 * pi));
-  while x >= G.lx do
-    Dec(x, G.lx);
-  while x < 0 do
-    Inc(x, G.lx);
-  Result := ((2 * sy + n) div (2 * n)) * G.lx + x;
-end;
-
-function TToolAI.CityTaxBalance(cix: integer; const CityReport: TCityReport): integer;
-var
-  i: integer;
+      Y := Loc div G.lx;
+      X := Loc - Y * G.lx;
+      Inc(sy, Y);
+      A := 2 * pi * X / G.lx;
+      su := su + cos(A);
+      sv := sv + sin(A);
+      Inc(N);
+    end;
+  end;
+  A := arctan2(sv, su);
+  X := round(G.lx * A / (2 * pi));
+  while X >= G.lx do
+    Dec(X, G.lx);
+  while X < 0 do
+    Inc(X, G.lx);
+  Result := ((2 * sy + N) div (2 * N)) * G.lx + X;
+end;
+
+function TToolAI.CityTaxBalance(cix: Integer; const CityReport: TCityReport): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
@@ -229 +229 @@
       Inc(Result, CityReport.FoodRep - CityReport.Eaten);
   end;
-  for i := nWonder to nImp - 1 do
-    if MyCity[cix].Built[i] > 0 then
-      Dec(Result, Imp[i].Maint);
-end;
-
-procedure TToolAI.SumCities(TaxRate: integer; var TaxSum, ScienceSum: integer);
-var
-  cix, p1: integer;
+  for I := nWonder to nImp - 1 do
+    if MyCity[cix].Built[I] > 0 then
+      Dec(Result, Imp[I].Maint);
+end;
+
+procedure TToolAI.SumCities(TaxRate: Integer; var TaxSum, ScienceSum: Integer);
+var
+  cix, p1: Integer;
   CityReport: TCityReport;
 begin
@@ -242 +242 @@
   ScienceSum := 0;
   if RO.Government = gAnarchy then
-    exit;
+    Exit;
   for p1 := 0 to nPl - 1 do
     if RO.Tribute[p1] <= RO.TributePaid[p1] then
@@ -268 +268 @@
 procedure TToolAI.OptimizeCityTiles;
 var
-  cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RO.nCity - 1 do
@@ -278 +278 @@
 procedure TToolAI.GetCityProdPotential;
 var
-  cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
@@ -286 +286 @@
       begin
         Advice.ResourceWeights := rwMaxProd;
-        Server(sGetCityTileAdvice, me, cix, Advice);
+        Server(sGetCityTileAdvice, Me, cix, Advice);
         CityResult[cix] := Advice.CityReport.ProdRep; // considers factory, but shouldn't
       end;
@@ -293 +293 @@
 procedure TToolAI.GetCityTradePotential;
 var
-  cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
@@ -301 +301 @@
       begin
         Advice.ResourceWeights := rwMaxScience;
-        Server(sGetCityTileAdvice, me, cix, Advice);
+        Server(sGetCityTileAdvice, Me, cix, Advice);
         CityResult[cix] := Advice.CityReport.Trade;
       end;
@@ -314 +314 @@
 procedure TToolAI.JobAssignment_Initialize;
 begin
-  fillchar(JobLocOfSettler, RO.nUn * sizeof(integer), $FF); // -1
-  fillchar(TileJob, MapSize, jNone);
-  fillchar(TileJobScore, MapSize, 0);
+  FillChar(JobLocOfSettler, RO.nUn * SizeOf(Integer), $FF); // -1
+  FillChar(TileJob, MapSize, jNone);
+  FillChar(TileJobScore, MapSize, 0);
   MaxScore := 0;
 end;
 
-procedure TToolAI.JobAssignment_AddJob(Loc, Job, Score: integer);
+procedure TToolAI.JobAssignment_AddJob(Loc, Job, Score: Integer);
 begin
   if Score > 255 then
@@ -333 +333 @@
 end;
 
-procedure TToolAI.JobAssignment_AddUnit(uix: integer);
-begin
-  assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
+procedure TToolAI.JobAssignment_AddUnit(uix: Integer);
+begin
+  Assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
   JobLocOfSettler[uix] := ToAssign;
 end;
 
-function TToolAI.JobAssignment_GotJob(uix: integer): boolean;
+function TToolAI.JobAssignment_GotJob(uix: Integer): Boolean;
 begin
   Result := JobLocOfSettler[uix] >= 0;
@@ -347 +347 @@
 const
   DistanceScore = 4;
-  StepSizeByTerrain: array[0..11] of integer =
+  StepSizeByTerrain: array[0..11] of Integer =
     (0, 0, 1, 2, 1, 1, 0, 1, 0, 1, 1, 2);
   //Oc-Sh-Gr-De-Pr-Tu-Ar-Sw-XX-Fo-Hi-Mo
 var
   uix, BestScore, BestCount, BestLoc, BestJob, BestDistance, TestLoc,
-  NextLoc, TestDistance, V8, TestScore, StepSize, MoveResult: integer;
-  UnitsToAssign: boolean;
+  NextLoc, TestDistance, V8, TestScore, StepSize, MoveResult: Integer;
+  UnitsToAssign: Boolean;
   Adjacent: TVicinity8Loc;
   SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of smallint;
   // DistToLoc is only defined where SettlerOfJobLoc>=0
-  TileChecked: array[0..lxmax * lymax - 1] of boolean;
-begin
-  fillchar(SettlerOfJobLoc, MapSize * 2, $FF); // -1
+  TileChecked: array[0..lxmax * lymax - 1] of Boolean;
+begin
+  FillChar(SettlerOfJobLoc, MapSize * 2, $FF); // -1
 
   // keep up jobs that are already started
@@ -380 +380 @@
         BestJob := jNone;
         BestScore := -999999;
-        FillChar(TileChecked, MapSize * sizeof(boolean), False);
+        FillChar(TileChecked, MapSize * SizeOf(Boolean), False);
         Pile.Create(MapSize);
         Pile.Put(MyUnit[uix].Loc, 0); // start search for new job at current location
@@ -399 +399 @@
                   and (Map[NextLoc] and (fUnit or fOwned) <> fUnit) // no foreign unit
                   and ((RO.Territory[NextLoc] < 0) or
-                  (RO.Territory[NextLoc] = me)) // no foreign territory
+                  (RO.Territory[NextLoc] = Me)) // no foreign territory
                   and (Map[TestLoc] and Map[NextLoc] and fInEnemyZoC = 0) then
                   // move not prevented by ZoC
@@ -414 +414 @@
             ((SettlerOfJobLoc[TestLoc] < 0) or (DistToLoc[TestLoc] > TestDistance)) then
           begin
-            TestScore := integer(TileJobScore[TestLoc]) - DistanceScore * TestDistance;
+            TestScore := Integer(TileJobScore[TestLoc]) - DistanceScore * TestDistance;
             if TestScore > BestScore then
               BestCount := 0;
@@ -469 +469 @@
 procedure TToolAI.AnalyzeMap;
 var
-  i, j, Loc, Loc1, V8, Count, Kind, MostIndex: integer;
+  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;
 begin
-  fillchar(District, MapSize * 4, $FF);
+  FillChar(District, MapSize * 4, $FF);
   for Loc := 0 to MapSize - 1 do
     if Map[Loc] and fTerrain = fUNKNOWN then
@@ -500 +500 @@
               Formation[Loc], Formation[Loc1]);
       end;
-      if (RO.Territory[Loc] = me) and (Map[Loc] and fTerrain >= fGrass) then
+      if (RO.Territory[Loc] = Me) and (Map[Loc] and fTerrain >= fGrass) then
       begin
         District[Loc] := Loc;
@@ -545 +545 @@
         Inc(Count);
       end;
-    for i := 0 to Count - 2 do
-    begin
-      MostIndex := i;
-      for j := i + 1 to Count - 1 do
-        if IndexOfID[IDOfIndex[j]] > IndexOfID[IDOfIndex[MostIndex]] then
-          MostIndex := j;
-      if MostIndex <> i then
-      begin
-        j := IDOfIndex[i];
-        IDOfIndex[i] := IDOfIndex[MostIndex];
-        IDOfIndex[MostIndex] := j;
-      end;
-    end;
-    for i := 0 to Count - 1 do
-      IndexOfID[IDOfIndex[i]] := i;
+    for I := 0 to Count - 2 do
+    begin
+      MostIndex := I;
+      for J := I + 1 to Count - 1 do
+        if IndexOfID[IDOfIndex[J]] > IndexOfID[IDOfIndex[MostIndex]] then
+          MostIndex := J;
+      if MostIndex <> I then
+      begin
+        J := IDOfIndex[I];
+        IDOfIndex[I] := IDOfIndex[MostIndex];
+        IDOfIndex[MostIndex] := J;
+      end;
+    end;
+    for I := 0 to Count - 1 do
+      IndexOfID[IDOfIndex[I]] := I;
 
     case Kind of
@@ -605 +605 @@
 // other:  |   Basic   | 0| Speed  |              X X X             | MaxTerrType  |
 
-function TToolAI.GetMyMoveStyle(mix, Health: integer): integer;
+function TToolAI.GetMyMoveStyle(mix, Health: Integer): Integer;
 begin
   with MyModel[mix] do
@@ -614 +614 @@
       begin
         Inc(Result, (50 + (Speed - 150) * 13 shr 7) shl 8); //HeavyCost
-        if RO.Wonder[woShinkansen].EffectiveOwner <> me then
+        if RO.Wonder[woShinkansen].EffectiveOwner <> Me then
           Inc(Result, Speed * (4 * 1311) shr 17); // RailCost
-        if (RO.Wonder[woGardens].EffectiveOwner <> me) or
+        if (RO.Wonder[woGardens].EffectiveOwner <> Me) or
           (Kind = mkSettler) and (Speed >= 200) then
           Inc(Result, msHostile);
@@ -631 +631 @@
       begin
         Result := Speed;
-        if RO.Wonder[woMagellan].EffectiveOwner = me then
+        if RO.Wonder[woMagellan].EffectiveOwner = Me then
           Inc(Result, 200);
         if Health < 100 then
@@ -646 +646 @@
 end;
 
-function TToolAI.CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: integer;
-  var TimeAfterStep, RecoverTurns: integer; FromTile, ToTile: integer;
-  IsCapture: boolean): integer;
-var
-  MoveCost, RecoverCost: integer;
+function TToolAI.CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: Integer;
+  var TimeAfterStep, RecoverTurns: Integer; FromTile, ToTile: Integer;
+  IsCapture: Boolean): Integer;
+var
+  MoveCost, RecoverCost: Integer;
 begin
   //IsCapture:=true;
-  assert(((FromTile and fTerrain <= fMountains) or (FromTile and
+  Assert(((FromTile and fTerrain <= fMountains) or (FromTile and
     fTerrain = fUNKNOWN)) and ((ToTile and fTerrain <= fMountains) or
     (ToTile and fTerrain = fUNKNOWN)));
@@ -701 +701 @@
                 if ToTile and fPeace <> 0 then
                   Result := csCheckTerritory;
-                exit;
+                Exit;
               end;
             end;
@@ -820 +820 @@
           begin
             Result := csForbiddenTile;
-            exit;
+            Exit;
           end;
         end
@@ -869 +869 @@
               // must wait for next turn
               Result := csOk;
-              exit;
+              Exit;
             end;
           end;
@@ -894 +894 @@
 -------- Pathfinding Reference Implementation --------
 var
-MoveStyle,V8,Loc,Time,NextLoc,NextTime,RecoverTurns: integer;
+MoveStyle,V8,Loc,Time,NextLoc,NextTime,RecoverTurns: Integer;
 Adjacent: TVicinity8Loc;
-Reached: array[0..lxmax*lymax-1] of boolean;
-begin
-fillchar(Reached, MapSize, false);
+Reached: array[0..lxmax*lymax-1] of Boolean;
+begin
+FillChar(Reached, MapSize, False);
 MoveStyle:=GetMyMoveStyle(MyUnit[uix].mix, MyUnit[uix].Health);
 Pile.Create(MapSize);
@@ -906 +906 @@
   // todo: check exit condition, e.g. whether destination reached
 
-  Reached[Loc]:=true;
+  Reached[Loc]:=True;
   V8_to_Loc(Loc, Adjacent);
   for V8:=0 to 7 do
@@ -916 +916 @@
           Pile.Put(NextLoc, NextTime+RecoverTurns*$1000);
         csForbiddenTile:
-          Reached[NextLoc]:=true; // don't check moving there again
+          Reached[NextLoc]:=True; // don't check moving there again
         csCheckTerritory:
           if RO.Territory[NextLoc]=RO.Territory[Loc] then
@@ -927 +927 @@
 *)
 
-function TToolAI.Unit_MoveEx(uix, ToLoc: integer; Options: integer): integer;
+function TToolAI.Unit_MoveEx(uix, ToLoc: Integer; Options: Integer): Integer;
 var
   Loc, NextLoc, Temp, FromLoc, EndLoc, Time, V8, MoveResult, RecoverTurns,
-  NextTime, MoveStyle: integer;
+  NextTime, MoveStyle: Integer;
   Adjacent: TVicinity8Loc;
-  PreLoc: array[0..lxmax * lymax - 1] of integer;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  PreLoc: array[0..lxmax * lymax - 1] of Integer;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   Result := eOk;
   FromLoc := MyUnit[uix].Loc;
   if FromLoc = ToLoc then
-    exit;
+    Exit;
 
   FillChar(Reached, MapSize, False);
@@ -1003 +1003 @@
       begin
         Result := MoveResult;
-        break;
+        Break;
       end;
     end;
@@ -1016 +1016 @@
 procedure TToolAI.SeaTransport_BeginInitialize;
 begin
-  fillchar(TransportAvailable, RO.nUn * sizeof(integer), $FF); // -1
+  FillChar(TransportAvailable, RO.nUn * SizeOf(Integer), $FF); // -1
   InitComplete := False;
   HaveDestinations := False;
@@ -1025 +1025 @@
 end;
 
-procedure TToolAI.SeaTransport_AddLoad(uix: integer);
-var
-  i: integer;
-begin
-  assert(not InitComplete); // call order violation!
+procedure TToolAI.SeaTransport_AddLoad(uix: Integer);
+var
+  I: Integer;
+begin
+  Assert(not InitComplete); // call order violation!
   if Map[MyUnit[uix].Loc] and fTerrain < fGrass then
-    exit;
-  for i := 0 to nTransportLoad - 1 do
-    if uix = uixTransportLoad[i] then
-      exit;
+    Exit;
+  for I := 0 to nTransportLoad - 1 do
+    if uix = uixTransportLoad[I] then
+      Exit;
   uixTransportLoad[nTransportLoad] := uix;
   Inc(nTransportLoad);
 end;
 
-procedure TToolAI.SeaTransport_AddTransport(uix: integer);
-var
-  MoveStyle: integer;
-begin
-  assert(not InitComplete); // call order violation!
-  assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
+procedure TToolAI.SeaTransport_AddTransport(uix: Integer);
+var
+  MoveStyle: Integer;
+begin
+  Assert(not InitComplete); // call order violation!
+  Assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
   TransportAvailable[uix] := 1;
   with MyModel[MyUnit[uix].mix] do
@@ -1058 +1058 @@
 end;
 
-procedure TToolAI.SeaTransport_AddDestination(Loc: integer);
-begin
-  assert(not InitComplete); // call order violation!
+procedure TToolAI.SeaTransport_AddDestination(Loc: Integer);
+begin
+  Assert(not InitComplete); // call order violation!
   Pile.Put(Loc, $800);
   HaveDestinations := True;
@@ -1067 +1067 @@
 procedure TToolAI.SeaTransport_EndInitialize;
 var
-  Loc0, Time0, V8, Loc1, ArriveTime, RecoverTurns: integer;
+  Loc0, Time0, V8, Loc1, ArriveTime, RecoverTurns: Integer;
   Adjacent: TVicinity8Loc;
 begin
-  assert(not InitComplete); // call order violation!
+  Assert(not InitComplete); // call order violation!
   InitComplete := True;
   if HaveDestinations then
   begin // calculate TurnsAfterLoad from destination locs
-    fillchar(TurnsAfterLoad, MapSize, $FF); // -1
+    FillChar(TurnsAfterLoad, MapSize, $FF); // -1
     while Pile.Get(Loc0, Time0) do
     begin // search backward
@@ -1100 +1100 @@
 
 function TToolAI.SeaTransport_MakeGroupPlan(
-  var TransportPlan: TGroupTransportPlan): boolean;
-var
-  V8, i, j, iPicked, uix, Loc0, Time0, Loc1, RecoverTurns, MoveStyle,
+  var TransportPlan: TGroupTransportPlan): Boolean;
+var
+  V8, I, J, iPicked, uix, Loc0, Time0, Loc1, RecoverTurns, MoveStyle,
   TurnsLoaded, TurnCount, tuix, tuix1, ArriveTime, TotalDelay,
   BestTotalDelay, GroupCount, BestGroupCount, BestLoadLoc, FullMovementLoc,
-  nSelectedLoad, f, OriginContinent, a, b: integer;
-  CompleteFlag, NotReachedFlag, ContinueUnit: cardinal;
-  IsComplete, ok, IsFirstLoc: boolean;
+  nSelectedLoad, F, OriginContinent, A, B: Integer;
+  CompleteFlag, NotReachedFlag, ContinueUnit: Cardinal;
+  IsComplete, ok, IsFirstLoc: Boolean;
   StartLocPtr, ArrivedEnd: pinteger;
   Adjacent: TVicinity8Loc;
-  uixSelectedLoad: array[0..15] of integer;
-  tuixSelectedLoad: array[0..15] of integer;
-  Arrived: array[0..lxmax * lymax] of cardinal;
+  uixSelectedLoad: array[0..15] of Integer;
+  tuixSelectedLoad: array[0..15] of Integer;
+  Arrived: array[0..lxmax * lymax] of Cardinal;
   ResponsibleTransport: array[0..lxmax * lymax - 1] of smallint;
-  TurnsBeforeLoad: array[0..lxmax * lymax - 1] of shortint;
-  GroupComplete: array[0..lxmax * lymax - 1] of boolean;
-begin
-  assert(InitComplete); // call order violation!
+  TurnsBeforeLoad: array[0..lxmax * lymax - 1] of ShortInt;
+  GroupComplete: array[0..lxmax * lymax - 1] of Boolean;
+begin
+  Assert(InitComplete); // call order violation!
 
   if HaveDestinations and (nTransportLoad > 0) then
@@ -1128 +1128 @@
         for tuix := 0 to nTransportLoad - 1 do
         begin
-          Loc_to_ab(MyUnit[uix].Loc, MyUnit[uixTransportLoad[tuix]].Loc, a, b);
-          if (abs(a) <= 1) and (abs(b) <= 1) then
+          Loc_to_ab(MyUnit[uix].Loc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
+          if (abs(A) <= 1) and (abs(B) <= 1) then
           begin
-            assert((a <> 0) or (b <> 0));
+            Assert((A <> 0) or (B <> 0));
             Inc(GroupCount);
           end;
@@ -1145 +1145 @@
           for tuix := nTransportLoad - 1 downto 0 do
           begin
-            Loc_to_ab(TransportPlan.LoadLoc, MyUnit[uixTransportLoad[tuix]].Loc, a, b);
-            if (abs(a) <= 1) and (abs(b) <= 1) then
+            Loc_to_ab(TransportPlan.LoadLoc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
+            if (abs(A) <= 1) and (abs(B) <= 1) then
             begin
               TransportPlan.uixLoad[TransportPlan.nLoad] := uixTransportLoad[tuix];
@@ -1153 +1153 @@
               Inc(TransportPlan.nLoad);
               if TransportPlan.nLoad = TransportCapacity then
-                break;
+                Break;
             end;
           end;
           Result := True;
-          exit;
+          Exit;
         end;
       end;
@@ -1165 +1165 @@
   begin
     // select units from same continent
-    fillchar(Arrived, 4 * nContinent, 0); // misuse Arrived as counter
+    FillChar(Arrived, 4 * nContinent, 0); // misuse Arrived as counter
     for tuix := 0 to nTransportLoad - 1 do
     begin
-      assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
-      f := Formation[MyUnit[uixTransportLoad[tuix]].Loc];
-      if f >= 0 then
-        Inc(Arrived[f]);
+      Assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
+      F := Formation[MyUnit[uixTransportLoad[tuix]].Loc];
+      if F >= 0 then
+        Inc(Arrived[F]);
     end;
     OriginContinent := 0;
-    for f := 1 to nContinent - 1 do
-      if Arrived[f] > Arrived[OriginContinent] then
-        OriginContinent := f;
+    for F := 1 to nContinent - 1 do
+      if Arrived[F] > Arrived[OriginContinent] then
+        OriginContinent := F;
     nSelectedLoad := 0;
     for tuix := 0 to nTransportLoad - 1 do
@@ -1185 +1185 @@
         Inc(nSelectedLoad);
         if nSelectedLoad = 16 then
-          break;
+          Break;
       end;
 
     Pile.Create(MapSize);
-    fillchar(ResponsibleTransport, MapSize * 2, $FF); // -1
-    fillchar(TurnsBeforeLoad, MapSize, $FF); // -1
+    FillChar(ResponsibleTransport, MapSize * 2, $FF); // -1
+    FillChar(TurnsBeforeLoad, MapSize, $FF); // -1
     ok := False;
     for uix := 0 to RO.nUn - 1 do
@@ -1203 +1203 @@
       Result := False;
       Pile.Free;
-      exit;
+      Exit;
     end;
     while Pile.Get(Loc0, Time0) do
@@ -1224 +1224 @@
     end;
 
-    fillchar(Arrived, MapSize * 4, $55); // set NotReachedFlag for all tiles
-    fillchar(GroupComplete, MapSize, False);
+    FillChar(Arrived, MapSize * 4, $55); // set NotReachedFlag for all tiles
+    FillChar(GroupComplete, MapSize, False);
     BestLoadLoc := -1;
 
@@ -1232 +1232 @@
     begin
       uix := uixSelectedLoad[tuix];
-      if MyUnit[uix].Movement = integer(MyModel[MyUnit[uix].mix].Speed) then
+      if MyUnit[uix].Movement = Integer(MyModel[MyUnit[uix].mix].Speed) then
       begin
         NotReachedFlag := 1 shl (2 * tuix);
@@ -1246 +1246 @@
             if (TurnsBeforeLoad[Loc1] >= 0) and (TurnsAfterLoad[Loc1] >= 0) then
             begin
-              i := 1;
+              I := 1;
               GroupCount := 0;
               for tuix1 := 0 to nSelectedLoad - 1 do
               begin
-                if Arrived[loc1] and i = 0 then
+                if Arrived[loc1] and I = 0 then
                   Inc(GroupCount);
-                i := i shl 2;
+                I := I shl 2;
               end;
-              assert(GroupCount <= TransportCapacity);
+              Assert(GroupCount <= TransportCapacity);
               if (GroupCount = TransportCapacity) or (GroupCount = nSelectedLoad) then
                 GroupComplete[loc1] := True;
@@ -1292 +1292 @@
           begin
             Pile.Put(MyUnit[uix].Loc, $1800 - MyUnit[uix].Movement);
-            if MyUnit[uix].Movement = integer(MyModel[MyUnit[uix].mix].Speed) then
+            if MyUnit[uix].Movement = Integer(MyModel[MyUnit[uix].mix].Speed) then
               FullMovementLoc := MyUnit[uix].Loc;
             // surrounding tiles can be loaded immediately
@@ -1308 +1308 @@
             if StartLocPtr <> ArrivedEnd then
             begin
-              Loc0 := (integer(StartLocPtr) - integer(@Arrived)) shr 2;
+              Loc0 := (Integer(StartLocPtr) - Integer(@Arrived)) shr 2;
               Inc(StartLocPtr);
               Time0 := $800;
@@ -1316 +1316 @@
               if IsFirstLoc then
                 ContinueUnit := ContinueUnit and not (1 shl tuix);
-              break;
+              Break;
             end;
             IsFirstLoc := False;
@@ -1323 +1323 @@
             if not GroupComplete[Loc0] and (Map[Loc0] and fTerrain <> fMountains) then
             begin // check whether group complete -- no mountains because complete flag might be faked there
-              i := 1;
+              I := 1;
               GroupCount := 0;
               for tuix1 := 0 to nSelectedLoad - 1 do
               begin
-                if Arrived[Loc0] and i = 0 then
+                if Arrived[Loc0] and I = 0 then
                   Inc(GroupCount);
-                i := i shl 2;
+                I := I shl 2;
               end;
-              assert(GroupCount <= TransportCapacity);
+              Assert(GroupCount <= TransportCapacity);
               if (GroupCount = TransportCapacity) or (GroupCount = nSelectedLoad) then
                 GroupComplete[Loc0] := True;
@@ -1353 +1353 @@
                 if (TurnsBeforeLoad[Loc1] >= 0) and (TurnsAfterLoad[Loc1] >= 0) then
                 begin
-                  i := 1;
+                  I := 1;
                   GroupCount := 0;
                   for tuix1 := 0 to nSelectedLoad - 1 do
                   begin
-                    if Arrived[loc1] and i = 0 then
+                    if Arrived[loc1] and I = 0 then
                       Inc(GroupCount);
-                    i := i shl 2;
+                    I := I shl 2;
                   end;
-                  assert(GroupCount <= TransportCapacity);
+                  Assert(GroupCount <= TransportCapacity);
                   if (GroupCount = TransportCapacity) or
                     (GroupCount = nSelectedLoad) then
@@ -1436 +1436 @@
         if 1 shl (2 * tuix) and Arrived[BestLoadLoc] = 0 then
         begin
-          assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
+          Assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
           TransportPlan.uixLoad[TransportPlan.nLoad] := uixSelectedLoad[tuix];
           uixTransportLoad[tuixSelectedLoad[tuix]] :=
@@ -1444 +1444 @@
         end;
       Result := True;
-      exit;
+      Exit;
     end;
 
@@ -1451 +1451 @@
     for tuix := nSelectedLoad - 1 downto 0 do
     begin
-      assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
+      Assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
       uixTransportLoad[tuixSelectedLoad[tuix]] :=
         uixTransportLoad[nTransportLoad - 1];
@@ -1464 +1464 @@
 // Misc
 
-function TToolAI.CurrentMStrength(Domain: integer): integer;
-var
-  i: integer;
+function TToolAI.CurrentMStrength(Domain: Integer): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
-  for i := 0 to nUpgrade - 1 do
-    with upgrade[Domain, i] do
+  for I := 0 to nUpgrade - 1 do
+    with upgrade[Domain, I] do
       if (Preq = preNone) or (Preq >= 0) and
         ((RO.Tech[Preq] >= tsApplicable) or (Preq in FutureTech) and
@@ -1486 +1486 @@
 procedure SetAdvancedness;
 var
-  ad, j, Reduction, AgeThreshold: integer;
-  known: array[0..nAdv - 1] of integer;
-
-  procedure MarkPreqs(ad: integer);
+  ad, J, Reduction, AgeThreshold: Integer;
+  known: array[0..nAdv - 1] of Integer;
+
+  procedure MarkPreqs(ad: Integer);
   var
-    i: integer;
+    I: Integer;
   begin
     if known[ad] = 0 then
     begin
       known[ad] := 1;
-      for i := 0 to 2 do
-        if AdvPreq[ad, i] >= 0 then
-          MarkPreqs(AdvPreq[ad, i]);
+      for I := 0 to 2 do
+        if AdvPreq[ad, I] >= 0 then
+          MarkPreqs(AdvPreq[ad, I]);
     end;
   end;
@@ -1508 +1508 @@
     FillChar(known, SizeOf(known), 0);
     MarkPreqs(ad);
-    for j := 0 to nAdv - 1 do
-      if known[j] > 0 then
+    for J := 0 to nAdv - 1 do
+      if known[J] > 0 then
         Inc(Advancedness[ad]);
   end;