Changeset 447

Timestamp:

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

Author:

chronos

Message:

• Modified: Use first capital letter in identifiers.

Location:

trunk

Files:

• AI/StdAI/AI.pas (modified) (133 diffs)
• AI/StdAI/Barbarina.pas (modified) (74 diffs)
• AI/StdAI/CustomAI.pas (modified) (47 diffs)
• AI/StdAI/CustomAI_Reload.pas (modified) (34 diffs)
• AI/StdAI/Pile.pas (modified) (6 diffs)
• AI/StdAI/Protocol.pas (modified) (10 diffs)
• AI/StdAI/StdAI.lpr (modified) (2 diffs)
• AI/StdAI/ToolAI.pas (modified) (67 diffs)
• CityProcessing.pas (modified) (83 diffs)
• CmdList.pas (modified) (16 diffs)
• Database.pas (modified) (182 diffs)
• Direct.pas (modified) (10 diffs)
• GameServer.pas (modified) (231 diffs)
• Global.pas (modified) (1 diff)
• IPQ.pas (modified) (6 diffs)
• Inp.pas (modified) (2 diffs)
• LocalPlayer/Battle.pas (modified) (7 diffs)
• LocalPlayer/CityScreen.pas (modified) (66 diffs)
• LocalPlayer/CityType.pas (modified) (11 diffs)
• LocalPlayer/ClientTools.pas (modified) (40 diffs)
• LocalPlayer/Diagram.pas (modified) (15 diffs)
• LocalPlayer/Diplomacy.pas (modified) (9 diffs)
• LocalPlayer/Draft.pas (modified) (12 diffs)
• LocalPlayer/Enhance.pas (modified) (13 diffs)
• LocalPlayer/Help.pas (modified) (71 diffs)
• LocalPlayer/IsoEngine.pas (modified) (68 diffs)
• LocalPlayer/LocalPlayer.pas (modified) (3 diffs)
• LocalPlayer/MessgEx.pas (modified) (19 diffs)
• LocalPlayer/NatStat.pas (modified) (25 diffs)
• LocalPlayer/Nego.pas (modified) (35 diffs)
• LocalPlayer/PVSB.pas (modified) (5 diffs)
• LocalPlayer/Rates.pas (modified) (8 diffs)
• LocalPlayer/Select.pas (modified) (87 diffs)
• LocalPlayer/TechTree.pas (modified) (8 diffs)
• LocalPlayer/Term.pas (modified) (370 diffs)
• LocalPlayer/Tribes.pas (modified) (17 diffs)
• LocalPlayer/UKeyBindings.pas (modified) (1 diff)
• LocalPlayer/UnitStat.pas (modified) (34 diffs)
• LocalPlayer/Wonders.pas (modified) (5 diffs)
• Log.pas (modified) (5 diffs)
• Messg.pas (modified) (2 diffs)
• Network/UNetworkClient.pas (modified) (1 diff)
• Network/UNetworkCommon.pas (modified) (1 diff)
• Network/UNetworkServer.pas (modified) (4 diffs)
• NoTerm.pas (modified) (18 diffs)
• Packages/CevoComponents/AsyncProcess2.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (11 diffs)
• Packages/CevoComponents/ButtonB.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonBase.pas (modified) (7 diffs)
• Packages/CevoComponents/ButtonC.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonN.pas (modified) (7 diffs)
• Packages/CevoComponents/CevoComponents.pas (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)
• Packages/CevoComponents/DrawDlg.pas (modified) (1 diff)
• Packages/CevoComponents/EOTButton.pas (modified) (4 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (44 diffs)
• Packages/CevoComponents/Sound.pas (modified) (1 diff)
• Packages/CevoComponents/StringTables.pas (modified) (6 diffs)
• Packages/CevoComponents/UGraphicSet.pas (modified) (1 diff)
• Packages/CevoComponents/UTexture.pas (modified) (1 diff)
• Packages/Common/Common.pas (modified) (1 diff)
• Packages/Common/StopWatch.pas (modified) (3 diffs)
• Packages/Common/UAboutDialog.pas (modified) (1 diff)
• Packages/Common/UCommon.pas (modified) (5 diffs)
• Packages/Common/UFindFile.pas (modified) (7 diffs)
• Packages/Common/UFormAbout.pas (modified) (1 diff)
• Packages/Common/UGeometric.pas (modified) (2 diffs)
• Packages/Common/UJobProgressView.pas (modified) (1 diff)
• Packages/Common/UMetaCanvas.pas (modified) (3 diffs)
• Packages/Common/UPrefixMultiplier.pas (modified) (2 diffs)
• Packages/Common/UResetableThread.pas (modified) (1 diff)
• Packages/Common/UScaleDPI.pas (modified) (1 diff)
• Packages/Common/UStringTable.pas (modified) (1 diff)
• Packages/Common/UTheme.pas (modified) (1 diff)
• Packages/Common/UTranslator.pas (modified) (9 diffs)
• Platform.pas (modified) (1 diff)
• Protocol.pas (modified) (10 diffs)
• Settings.pas (modified) (1 diff)
• Start.pas (modified) (66 diffs)
• UBrain.pas (modified) (1 diff)
• UMiniMap.pas (modified) (1 diff)
• UnitProcessing.pas (modified) (64 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;

trunk/CityProcessing.pas

@@ -8 +8 @@
 
 // Reporting
-procedure GetCityAreaInfo(p, Loc: integer; var CityAreaInfo: TCityAreaInfo);
-function CanCityGrow(p, cix: integer): boolean;
-function GetCityReport(p, cix: integer; var CityReport: TCityReport): integer;
-function GetCityReportNew(p, cix: integer;
-  var CityReportNew: TCityReportNew): integer;
+procedure GetCityAreaInfo(P, Loc: Integer; var CityAreaInfo: TCityAreaInfo);
+function CanCityGrow(P, cix: Integer): Boolean;
+function GetCityReport(P, cix: Integer; var CityReport: TCityReport): Integer;
+function GetCityReportNew(P, cix: Integer;
+  var CityReportNew: TCityReportNew): Integer;
 
 // Internal Tile Picking
-function AddBestCityTile(p, cix: integer): boolean;
-procedure CityGrowth(p, cix: integer);
-procedure CityShrink(p, cix: integer);
-procedure Pollute(p, cix: integer);
+function AddBestCityTile(P, cix: Integer): Boolean;
+procedure CityGrowth(P, cix: Integer);
+procedure CityShrink(P, cix: Integer);
+procedure Pollute(P, cix: Integer);
 
 // Turn Processing
-procedure PayCityMaintenance(p, cix: integer);
-procedure CollectCityResources(p, cix: integer);
-function CityTurn(p, cix: integer): boolean;
+procedure PayCityMaintenance(P, cix: Integer);
+procedure CollectCityResources(P, cix: Integer);
+function CityTurn(P, cix: Integer): Boolean;
 
 // Tile Access
-function SetCityTiles(p, cix, NewTiles: integer;
-  TestOnly: boolean = false): integer;
-procedure GetCityTileAdvice(p, cix: integer; var Advice: TCityTileAdviceData);
+function SetCityTiles(P, cix, NewTiles: Integer;
+  TestOnly: Boolean = False): Integer;
+procedure GetCityTileAdvice(P, cix: Integer; var Advice: TCityTileAdviceData);
 
 // Start/End Game
@@ -67 +67 @@
 
 var
-  MaxDist: integer;
+  MaxDist: Integer;
 
 {
@@ -73 +73 @@
   ____________________________________________________________________
 }
-procedure GetCityAreaInfo(p, Loc: integer; var CityAreaInfo: TCityAreaInfo);
-var
-  V21, Loc1, p1: integer;
+procedure GetCityAreaInfo(P, Loc: Integer; var CityAreaInfo: TCityAreaInfo);
+var
+  V21, Loc1, p1: Integer;
   Radius: TVicinity21Loc;
 begin
-{$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
+{$IFOPT O-}Assert(1 shl P and InvalidTreatyMap = 0); {$ENDIF}
   with CityAreaInfo do
   begin
@@ -90 +90 @@
       begin
         p1 := RealMap[Loc1] shr 27;
-        if (p1 < nPl) and (p1 <> p) and (RW[p].Treaty[p1] >= trPeace) then
+        if (p1 < nPl) and (p1 <> P) and (RW[P].Treaty[p1] >= trPeace) then
           Available[V21] := faTreaty
-        else if (ZoCMap[Loc1] > 0) and (Occupant[Loc1] <> p) and
-          (RW[p].Treaty[Occupant[Loc1]] < trAlliance) then
+        else if (ZoCMap[Loc1] > 0) and (Occupant[Loc1] <> P) and
+          (RW[P].Treaty[Occupant[Loc1]] < trAlliance) then
           Available[V21] := faSiege
         else if (UsedByCity[Loc1] <> -1) and (UsedByCity[Loc1] <> Loc) then
@@ -104 +104 @@
 end;
 
-function CanCityGrow(p, cix: integer): boolean;
-begin
-  with RW[p].City[cix] do
-    result := (Size < MaxCitySize) and
+function CanCityGrow(P, cix: Integer): Boolean;
+begin
+  with RW[P].City[cix] do
+    Result := (Size < MaxCitySize) and
       ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
       (Size < NeedSewerSize) or (Built[imSewer] = 1));
 end;
 
-procedure DetermineCityProdProcessing(p, cix: integer;
+procedure DetermineCityProdProcessing(P, cix: Integer;
   var ProdProcessing: TProdProcessing);
 begin
-  with RW[p].City[cix], ProdProcessing do
+  with RW[P].City[cix], ProdProcessing do
   begin
     ProdBonus := 0;
     PollBonus := 0;
     if Built[imFactory] = 1 then
-      inc(ProdBonus);
+      Inc(ProdBonus);
     if Built[imMfgPlant] = 1 then
-      inc(ProdBonus);
+      Inc(ProdBonus);
     if (Built[imPower] = 1) or (Built[imHydro] = 1) or (Built[imNuclear] = 1) or
-      (GWonder[woHoover].EffectiveOwner = p) then
+      (GWonder[woHoover].EffectiveOwner = P) then
       ProdBonus := ProdBonus * 2;
     if Built[imFactory] = 1 then
-      inc(PollBonus);
+      Inc(PollBonus);
     if Built[imMfgPlant] = 1 then
-      inc(PollBonus);
+      Inc(PollBonus);
     if (Built[imFactory] + Built[imMfgPlant] > 0) then
-      if (Built[imHydro] > 0) or (GWonder[woHoover].EffectiveOwner = p) then
-        dec(PollBonus)
+      if (Built[imHydro] > 0) or (GWonder[woHoover].EffectiveOwner = P) then
+        Dec(PollBonus)
       else if (Built[imNuclear] = 0) and (Built[imPower] = 1) then
-        inc(PollBonus);
-    if (RW[p].Government <= gDespotism) or (Built[imRecycling] = 1) then
+        Inc(PollBonus);
+    if (RW[P].Government <= gDespotism) or (Built[imRecycling] = 1) then
       PollBonus := -2; // no pollution
     PollThreshold := Size;
     FutProdBonus := 0;
-    if RW[p].Tech[futProductionTechnology] > 0 then
+    if RW[P].Tech[futProductionTechnology] > 0 then
     begin // future tech benefits
       if Built[imFactory] = 1 then
-        inc(FutProdBonus, FactoryFutureBonus * RW[p].Tech
+        Inc(FutProdBonus, FactoryFutureBonus * RW[P].Tech
           [futProductionTechnology]);
       if Built[imMfgPlant] = 1 then
-        inc(FutProdBonus, MfgPlantFutureBonus * RW[p].Tech
+        Inc(FutProdBonus, MfgPlantFutureBonus * RW[P].Tech
           [futProductionTechnology]);
     end;
@@ -151 +151 @@
 end;
 
-procedure BoostProd(BaseProd: integer; ProdProcessing: TProdProcessing;
-  var Prod, Poll: integer);
+procedure BoostProd(BaseProd: Integer; ProdProcessing: TProdProcessing;
+  var Prod, Poll: Integer);
 begin
   Poll := BaseProd * (2 + ProdProcessing.PollBonus) shr 1;
@@ -158 +158 @@
     Poll := 0
   else
-    dec(Poll, ProdProcessing.PollThreshold);
+    Dec(Poll, ProdProcessing.PollThreshold);
   if ProdProcessing.FutProdBonus > 0 then
     Prod := BaseProd * (100 + ProdProcessing.ProdBonus * 50 +
@@ -166 +166 @@
 end;
 
-procedure DetermineCityTradeProcessing(p, cix, HappinessBeforeLux: integer;
+procedure DetermineCityTradeProcessing(P, cix, HappinessBeforeLux: Integer;
   var TradeProcessing: TTradeProcessing);
 var
-  i, Dist: integer;
-begin
-  with RW[p].City[cix], TradeProcessing do
+  I, Dist: Integer;
+begin
+  with RW[P].City[cix], TradeProcessing do
   begin
     TaxBonus := 0;
     ScienceBonus := 0;
     if Built[imMarket] = 1 then
-      inc(TaxBonus, 2);
+      Inc(TaxBonus, 2);
     if Built[imBank] = 1 then
     begin
-      inc(TaxBonus, 3);
-      if RW[p].NatBuilt[imStockEx] = 1 then
-        inc(TaxBonus, 3);
+      Inc(TaxBonus, 3);
+      if RW[P].NatBuilt[imStockEx] = 1 then
+        Inc(TaxBonus, 3);
     end;
     LuxBonus := TaxBonus;
     if Built[imLibrary] = 1 then
-      inc(ScienceBonus, 2);
+      Inc(ScienceBonus, 2);
     if Built[imUniversity] = 1 then
-      inc(ScienceBonus, 3);
+      Inc(ScienceBonus, 3);
     if Built[imResLab] = 1 then
-      inc(ScienceBonus, 3);
+      Inc(ScienceBonus, 3);
     ScienceDoubling := 0;
     if Built[imNatObs] > 0 then
-      inc(ScienceDoubling);
-    if RW[p].Government = gFundamentalism then
-      dec(ScienceDoubling)
-    else if (GWonder[woNewton].EffectiveOwner = p) and
-      (RW[p].Government = gMonarchy) then
-      inc(ScienceDoubling);
-    FlexibleLuxury := ((ServerVersion[p] >= $0100F1) and
-      (GWonder[woLiberty].EffectiveOwner = p) or (ServerVersion[p] < $0100F1)
-      and (GWonder[woMich].EffectiveOwner = p)) and
-      (RW[p].Government <> gAnarchy);
+      Inc(ScienceDoubling);
+    if RW[P].Government = gFundamentalism then
+      Dec(ScienceDoubling)
+    else if (GWonder[woNewton].EffectiveOwner = P) and
+      (RW[P].Government = gMonarchy) then
+      Inc(ScienceDoubling);
+    FlexibleLuxury := ((ServerVersion[P] >= $0100F1) and
+      (GWonder[woLiberty].EffectiveOwner = P) or (ServerVersion[P] < $0100F1)
+      and (GWonder[woMich].EffectiveOwner = P)) and
+      (RW[P].Government <> gAnarchy);
     FutResBonus := 0;
-    if RW[p].Tech[futResearchTechnology] > 0 then
+    if RW[P].Tech[futResearchTechnology] > 0 then
     begin // future tech benefits
       if Built[imUniversity] = 1 then
-        inc(FutResBonus, UniversityFutureBonus * RW[p].Tech
+        Inc(FutResBonus, UniversityFutureBonus * RW[P].Tech
           [futResearchTechnology]);
       if Built[imResLab] = 1 then
-        inc(FutResBonus, ResLabFutureBonus * RW[p].Tech[futResearchTechnology]);
-    end;
-    if (RW[p].NatBuilt[imPalace] > 0) or (ServerVersion[p] < $010000) then
+        Inc(FutResBonus, ResLabFutureBonus * RW[P].Tech[futResearchTechnology]);
+    end;
+    if (RW[P].NatBuilt[imPalace] > 0) or (ServerVersion[P] < $010000) then
     begin // calculate corruption
       Dist := MaxDist;
-      for i := 0 to RW[p].nCity - 1 do
-        if (RW[p].City[i].Loc >= 0) and (RW[p].City[i].Built[imPalace] = 1) then
-          Dist := Distance(Loc, RW[p].City[i].Loc);
-      if (Dist = 0) or (CorrLevel[RW[p].Government] = 0) then
+      for I := 0 to RW[P].nCity - 1 do
+        if (RW[P].City[I].Loc >= 0) and (RW[P].City[I].Built[imPalace] = 1) then
+          Dist := Distance(Loc, RW[P].City[I].Loc);
+      if (Dist = 0) or (CorrLevel[RW[P].Government] = 0) then
         RelCorr := 0.0
       else
       begin
         RelCorr := Dist / MaxDist;
-        if CorrLevel[RW[p].Government] > 1 then
-          RelCorr := Exp(ln(RelCorr) / CorrLevel[RW[p].Government]);
+        if CorrLevel[RW[P].Government] > 1 then
+          RelCorr := Exp(ln(RelCorr) / CorrLevel[RW[P].Government]);
         if Built[imCourt] = 1 then
           RelCorr := RelCorr / 2;
@@ -237 +237 @@
 end;
 
-procedure SplitTrade(Trade, TaxRate, LuxRate, Working: integer;
+procedure SplitTrade(Trade, TaxRate, LuxRate, Working: Integer;
   TradeProcessing: TTradeProcessing; var Corruption, Tax, Lux,
-  Science: integer);
-var
-  plus: integer;
+  Science: Integer);
+var
+  plus: Integer;
 begin
   Corruption := Trunc(Trade * TradeProcessing.RelCorr);
@@ -276 +276 @@
 end;
 
-function GetProjectCost(p, cix: integer): integer;
-var
-  i: integer;
-begin
-  with RW[p].City[cix] do
+function GetProjectCost(P, cix: Integer): Integer;
+var
+  I: Integer;
+begin
+  with RW[P].City[cix] do
   begin
     if Project and cpImp = 0 then
     begin
-      result := RW[p].Model[Project and cpIndex].Cost; { unit project }
+      Result := RW[P].Model[Project and cpIndex].Cost; { unit project }
       if Project and cpConscripts <> 0 then
       begin
-        i := RW[p].Model[Project and cpIndex].MCost;
-        result := result - 3 * i;
-        if result <= 0 then
-          result := i;
+        I := RW[P].Model[Project and cpIndex].MCost;
+        Result := Result - 3 * I;
+        if Result <= 0 then
+          Result := I;
       end
-      else if RW[p].Model[Project and cpIndex].Cap[mcLine] > 0 then
+      else if RW[P].Model[Project and cpIndex].Cap[mcLine] > 0 then
         if Project0 and (not cpAuto or cpRepeat) = Project and not cpAuto or cpRepeat
         then
-          result := result shr 1
+          Result := Result shr 1
         else
-          result := result * 2;
+          Result := Result * 2;
     end
     else
     begin { improvement project }
-      result := Imp[Project and cpIndex].Cost;
-      if (Project and cpIndex < nWonder) and (GWonder[woColossus].EffectiveOwner = p)
+      Result := Imp[Project and cpIndex].Cost;
+      if (Project and cpIndex < nWonder) and (GWonder[woColossus].EffectiveOwner = P)
       then
-        result := result * ColossusEffect div 100;
-    end;
-    result := result * BuildCostMod[Difficulty[p]] div 12;
-  end;
-end;
-
-function GetSmallCityReport(p, cix: integer; var CityReport: TCityReport;
-  PCityReportEx: PCityReportEx = nil): integer;
-var
-  i, uix, V21, Loc1, ForcedSupport, BaseHappiness, Control: integer;
+        Result := Result * ColossusEffect div 100;
+    end;
+    Result := Result * BuildCostMod[Difficulty[P]] div 12;
+  end;
+end;
+
+function GetSmallCityReport(P, cix: Integer; var CityReport: TCityReport;
+  PCityReportEx: PCityReportEx = nil): Integer;
+var
+  I, uix, V21, Loc1, ForcedSupport, BaseHappiness, Control: Integer;
   ProdProcessing: TProdProcessing;
   TradeProcessing: TTradeProcessing;
   Radius: TVicinity21Loc;
   UnitReport: TUnitReport;
-  RareOK: array [0 .. 3] of integer;
+  RareOK: array [0 .. 3] of Integer;
   TileInfo: TTileInfo;
 begin
-  with RW[p].City[cix], CityReport do
+  with RW[P].City[cix], CityReport do
   begin
     if HypoTiles <= 0 then
       HypoTiles := Tiles;
     if HypoTax < 0 then
-      HypoTax := RW[p].TaxRate;
+      HypoTax := RW[P].TaxRate;
     if HypoLux < 0 then
-      HypoLux := RW[p].LuxRate;
-
-    if (Flags and chCaptured <> 0) or (RW[p].Government = gAnarchy) then
+      HypoLux := RW[P].LuxRate;
+
+    if (Flags and chCaptured <> 0) or (RW[P].Government = gAnarchy) then
     begin
       Working := 0;
       for V21 := 1 to 26 do
         if HypoTiles and (1 shl V21) <> 0 then
-          inc(Working); // for backward compatibility
-
-      if RW[p].Government = gFundamentalism then
+          Inc(Working); // for backward compatibility
+
+      if RW[P].Government = gFundamentalism then
       begin
         Happy := Size;
@@ -380 +380 @@
           BaseHappiness := Size;
       end;
-      for i := 0 to nWonder - 1 do
-        if Built[i] = 1 then
+      for I := 0 to nWonder - 1 do
+        if Built[I] = 1 then
         begin
-          inc(Happy);
-          inc(BaseHappiness, 2);
+          Inc(Happy);
+          Inc(BaseHappiness, 2);
         end;
       if Built[imTemple] = 1 then
       begin
-        inc(Happy);
-        inc(BaseHappiness, 2);
+        Inc(Happy);
+        Inc(BaseHappiness, 2);
       end;
       if Built[imCathedral] = 1 then
       begin
-        inc(Happy, 2);
-        inc(BaseHappiness, 4);
-        if GWonder[woBach].EffectiveOwner = p then
+        Inc(Happy, 2);
+        Inc(BaseHappiness, 4);
+        if GWonder[woBach].EffectiveOwner = P then
         begin
-          inc(Happy);
-          inc(BaseHappiness, 2);
+          Inc(Happy);
+          Inc(BaseHappiness, 2);
         end;
       end;
       if Built[imTheater] > 0 then
       begin
-        inc(Happy, 2);
-        inc(BaseHappiness, 4);
+        Inc(Happy, 2);
+        Inc(BaseHappiness, 4);
       end;
 
       // calculate unit support
-{$IFOPT O-}assert(InvalidTreatyMap = 0); {$ENDIF}
+{$IFOPT O-}Assert(InvalidTreatyMap = 0); {$ENDIF}
       Support := 0;
       ForcedSupport := 0;
       Eaten := Size * 2;
       Deployed := 0;
-      for uix := 0 to RW[p].nUn - 1 do
-        with RW[p].Un[uix] do
+      for uix := 0 to RW[P].nUn - 1 do
+        with RW[P].Un[uix] do
           if (Loc >= 0) and (Home = cix) then
           begin
-            GetUnitReport(p, uix, UnitReport);
-            inc(Eaten, UnitReport.FoodSupport);
+            GetUnitReport(P, uix, UnitReport);
+            Inc(Eaten, UnitReport.FoodSupport);
             if UnitReport.ReportFlags and urfAlwaysSupport <> 0 then
-              inc(ForcedSupport, UnitReport.ProdSupport)
+              Inc(ForcedSupport, UnitReport.ProdSupport)
             else
-              inc(Support, UnitReport.ProdSupport);
+              Inc(Support, UnitReport.ProdSupport);
             if UnitReport.ReportFlags and urfDeployed <> 0 then
-              inc(Deployed);
+              Inc(Deployed);
           end;
       if Deployed >= Happy then
         Happy := 0
       else
-        dec(Happy, Deployed);
-      dec(Support, Size * SupportFree[RW[p].Government] shr 1);
+        Dec(Happy, Deployed);
+      Dec(Support, Size * SupportFree[RW[P].Government] shr 1);
       if Support < 0 then
         Support := 0;
-      inc(Support, ForcedSupport);
+      Inc(Support, ForcedSupport);
 
       { control }
-      case RW[p].Government of
+      case RW[P].Government of
         gDespotism:
-          for uix := 0 to RW[p].nUn - 1 do
-            if (RW[p].Un[uix].Loc = Loc) and
-              (RW[p].Model[RW[p].Un[uix].mix].Kind = mkSpecial_TownGuard) then
+          for uix := 0 to RW[P].nUn - 1 do
+            if (RW[P].Un[uix].Loc = Loc) and
+              (RW[P].Model[RW[P].Un[uix].mix].Kind = mkSpecial_TownGuard) then
             begin
-              inc(Happy);
-              inc(Control, 2);
+              Inc(Happy);
+              Inc(Control, 2);
             end;
         gFundamentalism:
@@ -454 +454 @@
 
       // collect processing parameters
-      DetermineCityProdProcessing(p, cix, ProdProcessing);
-      DetermineCityTradeProcessing(p, cix, BaseHappiness + Control - 2 *
+      DetermineCityProdProcessing(P, cix, ProdProcessing);
+      DetermineCityTradeProcessing(P, cix, BaseHappiness + Control - 2 *
         Deployed, TradeProcessing);
 
@@ -472 +472 @@
           // HypoTiles go beyond map border!
           begin
-            result := eInvalid;
-            exit;
+            Result := eInvalid;
+            Exit;
           end;
-          GetTileInfo(p, cix, Loc1, TileInfo);
-          inc(FoodRep, TileInfo.Food);
-          inc(ProdRep, TileInfo.Prod);
-          inc(Trade, TileInfo.Trade);
+          GetTileInfo(P, cix, Loc1, TileInfo);
+          Inc(FoodRep, TileInfo.Food);
+          Inc(ProdRep, TileInfo.Prod);
+          Inc(Trade, TileInfo.Trade);
           if (RealMap[Loc1] and fModern <> 0) and
-            (RW[p].Tech[adMassProduction] >= tsApplicable) then
-            inc(RareOK[RealMap[Loc1] shr 25 and 3]);
-          inc(Working);
+            (RW[P].Tech[adMassProduction] >= tsApplicable) then
+            Inc(RareOK[RealMap[Loc1] shr 25 and 3]);
+          Inc(Working);
         end;
       if Built[imAlgae] = 1 then
-        inc(FoodRep, 12);
+        Inc(FoodRep, 12);
 
       if PCityReportEx <> nil then
@@ -510 +510 @@
     end;
   end;
-  result := eOk;
-end;
-
-function GetCityReport(p, cix: integer; var CityReport: TCityReport): integer;
-begin
-  result := GetSmallCityReport(p, cix, CityReport);
-  CityReport.Storage := StorageSize[Difficulty[p]];
-  CityReport.ProdCost := GetProjectCost(p, cix);
-end;
-
-function GetCityReportNew(p, cix: integer;
-  var CityReportNew: TCityReportNew): integer;
+  Result := eOk;
+end;
+
+function GetCityReport(P, cix: Integer; var CityReport: TCityReport): Integer;
+begin
+  Result := GetSmallCityReport(P, cix, CityReport);
+  CityReport.Storage := StorageSize[Difficulty[P]];
+  CityReport.ProdCost := GetProjectCost(P, cix);
+end;
+
+function GetCityReportNew(P, cix: Integer;
+  var CityReportNew: TCityReportNew): Integer;
 var
   CityReport: TCityReport;
@@ -531 +531 @@
     CityReport.HypoTax := HypoTaxRate;
     CityReport.HypoLux := HypoLuxuryRate;
-    result := GetSmallCityReport(p, cix, CityReport, @CityReportEx);
-    FoodSupport := CityReport.Eaten - 2 * RW[p].City[cix].Size;
+    Result := GetSmallCityReport(P, cix, CityReport, @CityReportEx);
+    FoodSupport := CityReport.Eaten - 2 * RW[P].City[cix].Size;
     MaterialSupport := CityReport.Support;
-    ProjectCost := GetProjectCost(p, cix);
-    Storage := StorageSize[Difficulty[p]];
+    ProjectCost := GetProjectCost(P, cix);
+    Storage := StorageSize[Difficulty[P]];
     Deployed := CityReport.Deployed;
     Morale := CityReportEx.BaseHappiness;
     CollectedControl := CityReportEx.BaseControl +
-      (RW[p].City[cix].Size - CityReport.Working) * 2;
+      (RW[P].City[cix].Size - CityReport.Working) * 2;
     CollectedFood := CityReport.FoodRep;
     CollectedMaterial := CityReportEx.Material;
@@ -551 +551 @@
     Luxury := CityReport.Lux;
     FoodSurplus := CityReport.FoodRep - CityReport.Eaten;
-    HappinessBalance := Morale + Luxury + CollectedControl - RW[p].City[cix]
+    HappinessBalance := Morale + Luxury + CollectedControl - RW[P].City[cix]
       .Size - 2 * Deployed;
   end;
@@ -560 +560 @@
   ____________________________________________________________________
 }
-procedure NextBest(p, cix: integer; var SelectedLoc, SelectedV21: integer);
+procedure NextBest(P, cix: Integer; var SelectedLoc, SelectedV21: Integer);
 { best tile unused but available by city cix }
 var
-  Resources, Most, Loc1, p1, V21: integer;
+  Resources, Most, Loc1, p1, V21: Integer;
   TileInfo: TTileInfo;
   Radius: TVicinity21Loc;
 begin
-{$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
+{$IFOPT O-}Assert(1 shl P and InvalidTreatyMap = 0); {$ENDIF}
   Most := 0;
   SelectedLoc := -1;
   SelectedV21 := -1;
-  with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
     V21_to_Loc(Loc, Radius);
@@ -580 +580 @@
       begin
         p1 := RealMap[Loc1] shr 27;
-        if ((p1 = nPl) or (p1 = p) or (RW[p].Treaty[p1] < trPeace)) and
-          ((ZoCMap[Loc1] = 0) or (Occupant[Loc1] = p) or
-          (RW[p].Treaty[Occupant[Loc1]] = trAlliance)) then
+        if ((p1 = nPl) or (p1 = P) or (RW[P].Treaty[p1] < trPeace)) and
+          ((ZoCMap[Loc1] = 0) or (Occupant[Loc1] = P) or
+          (RW[P].Treaty[Occupant[Loc1]] = trAlliance)) then
         begin
-          GetTileInfo(p, cix, Loc1, TileInfo);
+          GetTileInfo(P, cix, Loc1, TileInfo);
           Resources := TileInfo.Food shl 16 + TileInfo.Prod shl 8 +
             TileInfo.Trade;
@@ -600 +600 @@
 end;
 
-procedure NextWorst(p, cix: integer; var SelectedLoc, SelectedV21: integer);
+procedure NextWorst(P, cix: Integer; var SelectedLoc, SelectedV21: Integer);
 { worst tile used by city cix }
 var
-  Resources, Least, Loc1, V21: integer;
+  Resources, Least, Loc1, V21: Integer;
   Radius: TVicinity21Loc;
   TileInfo: TTileInfo;
@@ -610 +610 @@
   SelectedLoc := -1;
   SelectedV21 := -1;
-  with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
     V21_to_Loc(Loc, Radius);
@@ -619 +619 @@
         if (Loc1 >= 0) and (Loc1 < MapSize) and (1 shl V21 and Tiles <> 0) then
         begin
-          GetTileInfo(p, cix, Loc1, TileInfo);
+          GetTileInfo(P, cix, Loc1, TileInfo);
           Resources := TileInfo.Food shl 16 + TileInfo.Prod shl 8 +
             TileInfo.Trade;
@@ -634 +634 @@
 end;
 
-function NextPoll(p, cix: integer): integer;
-var
-  Resources, Best, dx, dy, Loc1, Dist, BestDist, V21, pTerr: integer;
+function NextPoll(P, cix: Integer): Integer;
+var
+  Resources, Best, dx, dy, Loc1, Dist, BestDist, V21, pTerr: Integer;
   Radius: TVicinity21Loc;
   TileInfo: TTileInfo;
 begin
   BestDist := MaxInt;
-{$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
+{$IFOPT O-}Assert(1 shl P and InvalidTreatyMap = 0); {$ENDIF}
   Best := 0;
-  result := -1;
-  with RW[p].City[cix] do
+  Result := -1;
+  with RW[P].City[cix] do
   begin
     V21_to_Loc(Loc, Radius);
@@ -656 +656 @@
         begin
           pTerr := RealMap[Loc1] shr 27;
-          if (pTerr = nPl) or (pTerr = p) or (RW[p].Treaty[pTerr] < trPeace)
+          if (pTerr = nPl) or (pTerr = P) or (RW[P].Treaty[pTerr] < trPeace)
           then
           begin
-            GetTileInfo(p, cix, Loc1, TileInfo);
+            GetTileInfo(P, cix, Loc1, TileInfo);
             Resources := TileInfo.Prod shl 16 + TileInfo.Trade shl 8 +
               TileInfo.Food;
@@ -669 +669 @@
             then
             begin
-              result := Loc1;
+              Result := Loc1;
               Best := Resources;
               BestDist := Dist;
@@ -679 +679 @@
 end;
 
-function AddBestCityTile(p, cix: integer): boolean;
-var
-  TileLoc, V21: integer;
-begin
-  NextBest(p, cix, TileLoc, V21);
-  result := TileLoc >= 0;
-  if result then
-    with RW[p].City[cix] do
-    begin
-      assert(1 shl V21 and Tiles = 0);
+function AddBestCityTile(P, cix: Integer): Boolean;
+var
+  TileLoc, V21: Integer;
+begin
+  NextBest(P, cix, TileLoc, V21);
+  Result := TileLoc >= 0;
+  if Result then
+    with RW[P].City[cix] do
+    begin
+      Assert(1 shl V21 and Tiles = 0);
       Tiles := Tiles or (1 shl V21);
       UsedByCity[TileLoc] := Loc;
@@ -694 +694 @@
 end;
 
-procedure CityGrowth(p, cix: integer);
-var
-  TileLoc, V21: integer;
+procedure CityGrowth(P, cix: Integer);
+var
+  TileLoc, V21: Integer;
   AltCityReport: TCityReport;
 begin
-  with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
-    inc(Size);
-    NextBest(p, cix, TileLoc, V21);
+    Inc(Size);
+    NextBest(P, cix, TileLoc, V21);
     if TileLoc >= 0 then
     begin { test whether exploitation of tile would lead to disorder }
@@ -708 +708 @@
       AltCityReport.HypoTax := -1;
       AltCityReport.HypoLux := -1;
-      GetSmallCityReport(p, cix, AltCityReport);
+      GetSmallCityReport(P, cix, AltCityReport);
       if AltCityReport.Working - AltCityReport.Happy <= Size shr 1 then
       // !!! change to new style disorder
       begin { no disorder -- exploit tile }
-        assert(1 shl V21 and Tiles = 0);
+        Assert(1 shl V21 and Tiles = 0);
         Tiles := Tiles or (1 shl V21);
         UsedByCity[TileLoc] := Loc;
@@ -720 +720 @@
 end;
 
-procedure CityShrink(p, cix: integer);
-var
-  TileLoc, V21, Working: integer;
+procedure CityShrink(P, cix: Integer);
+var
+  TileLoc, V21, Working: Integer;
   AltCityReport: TCityReport;
 begin
-  with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
     Working := 0;
     for V21 := 1 to 26 do
       if Tiles and (1 shl V21) <> 0 then
-        inc(Working);
-    dec(Size);
-    if Food > StorageSize[Difficulty[p]] then
-      Food := StorageSize[Difficulty[p]];
-    NextWorst(p, cix, TileLoc, V21);
+        Inc(Working);
+    Dec(Size);
+    if Food > StorageSize[Difficulty[P]] then
+      Food := StorageSize[Difficulty[P]];
+    NextWorst(P, cix, TileLoc, V21);
     if Working > Size then
     begin { all citizens were working -- worst tile no longer exploited }
-      assert(1 shl V21 and Tiles <> 0);
+      Assert(1 shl V21 and Tiles <> 0);
       Tiles := Tiles and not(1 shl V21);
       UsedByCity[TileLoc] := -1;
@@ -746 +746 @@
       AltCityReport.HypoTax := -1;
       AltCityReport.HypoLux := -1;
-      GetSmallCityReport(p, cix, AltCityReport);
+      GetSmallCityReport(P, cix, AltCityReport);
       if AltCityReport.Working - AltCityReport.Happy > Size shr 1 then
       // !!! change to new style disorder
       begin { disorder -- don't exploit tile }
-        assert(1 shl V21 and Tiles <> 0);
+        Assert(1 shl V21 and Tiles <> 0);
         Tiles := Tiles and not(1 shl V21);
         UsedByCity[TileLoc] := -1;
@@ -758 +758 @@
 end;
 
-procedure Pollute(p, cix: integer);
-var
-  PollutionLoc: integer;
-begin
-  with RW[p].City[cix] do
+procedure Pollute(P, cix: Integer);
+var
+  PollutionLoc: Integer;
+begin
+  with RW[P].City[cix] do
   begin
     Pollution := Pollution - MaxPollution;
-    PollutionLoc := NextPoll(p, cix);
+    PollutionLoc := NextPoll(P, cix);
     if PollutionLoc >= 0 then
     begin
-      inc(Flags, chPollution);
+      Inc(Flags, chPollution);
       RealMap[PollutionLoc] := RealMap[PollutionLoc] or fPoll;
     end;
@@ -778 +778 @@
   ____________________________________________________________________
 }
-procedure PayCityMaintenance(p, cix: integer);
-var
-  i: integer;
-begin
-  with RW[p], City[cix] do
-    for i := nWonder to nImp - 1 do
-      if (Built[i] > 0) and (Project0 and (cpImp or cpIndex) <> (cpImp or i))
+procedure PayCityMaintenance(P, cix: Integer);
+var
+  I: Integer;
+begin
+  with RW[P], City[cix] do
+    for I := nWonder to nImp - 1 do
+      if (Built[I] > 0) and (Project0 and (cpImp or cpIndex) <> (cpImp or I))
       then // don't pay maintenance when just completed
       begin
-        dec(Money, Imp[i].Maint);
+        Dec(Money, Imp[I].Maint);
         if Money < 0 then
         begin { out of money - sell improvement }
-          inc(Money, Imp[i].Cost * BuildCostMod[Difficulty[p]] div 12);
-          Built[i] := 0;
-          if Imp[i].Kind <> ikCommon then
+          Inc(Money, Imp[I].Cost * BuildCostMod[Difficulty[P]] div 12);
+          Built[I] := 0;
+          if Imp[I].Kind <> ikCommon then
           begin
-            assert(i <> imSpacePort);
+            Assert(I <> imSpacePort);
             // never sell automatically! (solution: no maintenance)
-            NatBuilt[i] := 0;
-            if i = imGrWall then
-              GrWallContinent[p] := -1;
+            NatBuilt[I] := 0;
+            if I = imGrWall then
+              GrWallContinent[P] := -1;
           end;
-          inc(Flags, chImprovementLost);
-        end;
-      end;
-end;
-
-procedure CollectCityResources(p, cix: integer);
-var
-  CityStorage, CityProjectCost: integer;
+          Inc(Flags, chImprovementLost);
+        end;
+      end;
+end;
+
+procedure CollectCityResources(P, cix: Integer);
+var
+  CityStorage, CityProjectCost: Integer;
   CityReport: TCityReportNew;
-  Disorder: boolean;
-begin
-  with RW[p], City[cix], CityReport do
+  Disorder: Boolean;
+begin
+  with RW[P], City[cix], CityReport do
     if Flags and chCaptured <> 0 then
     begin
       Flags := Flags and not chDisorder;
-      dec(Flags, $10000);
+      Dec(Flags, $10000);
       if Flags and chCaptured = 0 then
         Flags := Flags or chAfterCapture;
@@ -826 +826 @@
       HypoTaxRate := -1;
       HypoLuxuryRate := -1;
-      GetCityReportNew(p, cix, CityReport);
-      CityStorage := StorageSize[Difficulty[p]];
-      CityProjectCost := GetProjectCost(p, cix);
+      GetCityReportNew(P, cix, CityReport);
+      CityStorage := StorageSize[Difficulty[P]];
+      CityProjectCost := GetProjectCost(P, cix);
 
       Disorder := (HappinessBalance < 0);
@@ -840 +840 @@
       if not Disorder and ((Government = gFuture) or (Size >= NeedAqueductSize)
         and (FoodSurplus < 2)) and (FoodSurplus > 0) then
-        inc(Money, FoodSurplus)
+        Inc(Money, FoodSurplus)
       else if not(Disorder and (FoodSurplus > 0)) then
       begin { calculate new food storage }
@@ -849 +849 @@
           (Project and (cpImp + cpIndex) <> cpImp + imAqueduct) and
           (Project and (cpImp + cpIndex) <> cpImp + imSewer) and
-          not CanCityGrow(p, cix) then
-          inc(Flags, chNoGrowthWarning);
+          not CanCityGrow(P, cix) then
+          Inc(Flags, chNoGrowthWarning);
       end;
 
       if Prod > CityProjectCost then
       begin
-        inc(Money, Prod - CityProjectCost);
+        Inc(Money, Prod - CityProjectCost);
         Prod := CityProjectCost;
       end;
@@ -862 +862 @@
       else if not Disorder and (Flags and chProductionSabotaged = 0) then
         if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-          inc(Money, Production)
+          Inc(Money, Production)
         else
-          inc(Prod, Production);
+          Inc(Prod, Production);
 
       if not Disorder then
       begin
         { sum research points and taxes }
-        inc(Research, Science);
-        inc(Money, Tax);
+        Inc(Research, Science);
+        Inc(Money, Tax);
         Pollution := Pollution + AddPollution;
       end;
@@ -876 +876 @@
 end;
 
-function CityTurn(p, cix: integer): boolean;
+function CityTurn(P, cix: Integer): Boolean;
 // return value: whether city keeps existing
 var
-  i, uix, cix2, p1, SizeMod, CityStorage, CityProjectCost, NewImp, Det,
-    TestDet: integer;
-  LackOfMaterial, CheckGrow, DoProd, IsActive: boolean;
-begin
-  with RW[p], City[cix] do
+  I, uix, cix2, p1, SizeMod, CityStorage, CityProjectCost, NewImp, Det,
+    TestDet: Integer;
+  LackOfMaterial, CheckGrow, DoProd, IsActive: Boolean;
+begin
+  with RW[P], City[cix] do
   begin
     SizeMod := 0;
-    CityStorage := StorageSize[Difficulty[p]];
-    CityProjectCost := GetProjectCost(p, cix);
+    CityStorage := StorageSize[Difficulty[P]];
+    CityProjectCost := GetProjectCost(P, cix);
 
     LackOfMaterial := Flags and chUnitLost <> 0;
@@ -897 +897 @@
     if CheckGrow and (GTestFlags and tfImmGrow <> 0) then { fast growth }
     begin
-      if CanCityGrow(p, cix) then
-        inc(SizeMod);
+      if CanCityGrow(P, cix) then
+        Inc(SizeMod);
     end
     else if CheckGrow and (Food >= CityStorage) then { normal growth }
     begin
-      if CanCityGrow(p, cix) then
+      if CanCityGrow(P, cix) then
       begin
         if Built[imGranary] = 1 then
-          dec(Food, CityStorage shr 1)
+          Dec(Food, CityStorage shr 1)
         else
-          dec(Food, CityStorage);
-        inc(SizeMod);
+          Dec(Food, CityStorage);
+        Inc(SizeMod);
       end;
     end
@@ -916 +916 @@
       // check if settlers or conscripts there to disband
       uix := -1;
-      for i := 0 to nUn - 1 do
-        if (Un[i].Loc >= 0) and (Un[i].Home = cix) and
-          ((Model[Un[i].mix].Kind = mkSettler)
+      for I := 0 to nUn - 1 do
+        if (Un[I].Loc >= 0) and (Un[I].Home = cix) and
+          ((Model[Un[I].mix].Kind = mkSettler)
           { and (GWonder[woFreeSettlers].EffectiveOwner<>p) }
-          or (Un[i].Flags and unConscripts <> 0)) and
-          ((uix = -1) or (Model[Un[i].mix].Cost < Model[Un[uix].mix].Cost) or
-          (Model[Un[i].mix].Cost = Model[Un[uix].mix].Cost) and
-          (Un[i].Exp < Un[uix].Exp)) then
-          uix := i;
+          or (Un[I].Flags and unConscripts <> 0)) and
+          ((uix = -1) or (Model[Un[I].mix].Cost < Model[Un[uix].mix].Cost) or
+          (Model[Un[I].mix].Cost = Model[Un[uix].mix].Cost) and
+          (Un[I].Exp < Un[uix].Exp)) then
+          uix := I;
 
       if uix >= 0 then
       begin
-        RemoveUnit_UpdateMap(p, uix);
-        inc(Flags, chUnitLost);
+        RemoveUnit_UpdateMap(P, uix);
+        Inc(Flags, chUnitLost);
       end
       else
       begin
-        dec(SizeMod);
-        inc(Flags, chPopDecrease);
+        Dec(SizeMod);
+        Inc(Flags, chPopDecrease);
       end
     end;
@@ -946 +946 @@
         uix := -1;
         Det := MaxInt;
-        for i := 0 to nUn - 1 do
-          if (Un[i].Loc >= 0) and (Un[i].Home = cix) then
-            with Model[Un[i].mix] do
+        for I := 0 to nUn - 1 do
+          if (Un[I].Loc >= 0) and (Un[I].Home = cix) then
+            with Model[Un[I].mix] do
             begin
               if Kind = mkSpecial_TownGuard then
-                TestDet := Un[i].Health + Un[i].Exp shl 8
+                TestDet := Un[I].Health + Un[I].Exp shl 8
                 // disband townguards first
               else
               begin
-                TestDet := Un[i].Health + Un[i].Exp shl 8 + Cost shl 16;
+                TestDet := Un[I].Health + Un[I].Exp shl 8 + Cost shl 16;
                 // value of unit
                 if Flags and mdDoubleSupport <> 0 then
@@ -963 +963 @@
               if TestDet < Det then
               begin
-                uix := i;
+                uix := I;
                 Det := TestDet;
               end;
@@ -969 +969 @@
         if uix >= 0 then
         begin
-          RemoveUnit_UpdateMap(p, uix);
-          inc(Flags, chUnitLost);
+          RemoveUnit_UpdateMap(P, uix);
+          Inc(Flags, chUnitLost);
         end;
       end;
@@ -984 +984 @@
       (GWonder[Project and cpIndex].CityID <> WonderNotBuiltYet) then
     begin
-      inc(Flags, chOldWonder);
-      DoProd := false;
+      Inc(Flags, chOldWonder);
+      DoProd := False;
     end;
 
@@ -995 +995 @@
       (Project and cpConscripts <> 0))) then
     begin
-      inc(Flags, chNoSettlerProd);
-      DoProd := false;
+      Inc(Flags, chNoSettlerProd);
+      DoProd := False;
     end;
 
     if DoProd then
     begin { project complete }
-      dec(Prod, CityProjectCost);
+      Dec(Prod, CityProjectCost);
       if Project and cpImp = 0 then { produce unit }
       begin
         if nUn < numax then
         begin
-          CreateUnit(p, Project and cpIndex);
+          CreateUnit(P, Project and cpIndex);
           Un[nUn - 1].Loc := Loc;
           with Un[nUn - 1] do
@@ -1020 +1020 @@
               Flags := Flags or unConscripts;
           end;
-          PlaceUnit(p, nUn - 1);
+          PlaceUnit(P, nUn - 1);
           UpdateUnitMap(Loc);
           if Model[Project and cpIndex].Kind = mkSettler then
-            dec(SizeMod, 2) { settler produced - city shrink }
+            Dec(SizeMod, 2) { settler produced - city shrink }
           else if (Model[Project and cpIndex].Kind = mkSlaves) or
             (Project and cpConscripts <> 0) then
-            dec(SizeMod); { slaves/conscripts produced - city shrink }
+            Dec(SizeMod); { slaves/conscripts produced - city shrink }
         end;
         Project0 := Project or cpRepeat or cpCompleted;
@@ -1032 +1032 @@
       else if Imp[Project and cpIndex].Kind = ikShipPart then
       begin { produce ship parts }
-        inc(GShip[p].Parts[Project and cpIndex - imShipComp]);
+        Inc(GShip[P].Parts[Project and cpIndex - imShipComp]);
         Project0 := Project or cpCompleted;
       end
@@ -1038 +1038 @@
       begin
         NewImp := Project and cpIndex;
-        inc(Money, Prod); { change rest to money }
+        Inc(Money, Prod); { change rest to money }
         Project0 := Project or cpCompleted;
         Project := cpImp + imTrGoods;
@@ -1045 +1045 @@
         if Imp[NewImp].Kind in [ikNatLocal, ikNatGlobal] then
         begin // nat. project
-          for i := 0 to nCity - 1 do
-            if (City[i].Loc >= 0) and (City[i].Built[NewImp] = 1) then
+          for I := 0 to nCity - 1 do
+            if (City[I].Loc >= 0) and (City[I].Built[NewImp] = 1) then
             begin { allowed only once }
-              inc(Money, Imp[NewImp].Cost * BuildCostMod[Difficulty[p]] div 12);
-              City[i].Built[NewImp] := 0;
+              Inc(Money, Imp[NewImp].Cost * BuildCostMod[Difficulty[P]] div 12);
+              City[I].Built[NewImp] := 0;
             end;
           NatBuilt[NewImp] := 1;
@@ -1056 +1056 @@
           case NewImp of
             imGrWall:
-              GrWallContinent[p] := Continent[Loc];
+              GrWallContinent[P] := Continent[Loc];
           end;
         end;
@@ -1063 +1063 @@
         begin // wonder
           GWonder[NewImp].CityID := ID;
-          GWonder[NewImp].EffectiveOwner := p;
+          GWonder[NewImp].EffectiveOwner := P;
           CheckExpiration(NewImp);
 
@@ -1070 +1070 @@
             woEiffel:
               begin // reactivate wonders
-                for i := 0 to nWonder - 1 do
-                  if Imp[i].Expiration >= 0 then
+                for I := 0 to nWonder - 1 do
+                  if Imp[I].Expiration >= 0 then
                     for cix2 := 0 to nCity - 1 do
-                      if (City[cix2].Loc >= 0) and (City[cix2].Built[i] = 1)
+                      if (City[cix2].Loc >= 0) and (City[cix2].Built[I] = 1)
                       then
-                        GWonder[i].EffectiveOwner := p;
+                        GWonder[I].EffectiveOwner := P;
               end;
             woLighthouse:
-              CheckSpecialModels(p, preLighthouse);
+              CheckSpecialModels(P, preLighthouse);
             woLeo:
               begin
-                inc(Research, TechBaseCost(nTech[p], Difficulty[p]) +
-                  TechBaseCost(nTech[p] + 2, Difficulty[p]));
-                CheckSpecialModels(p, preLeo);
+                Inc(Research, TechBaseCost(nTech[P], Difficulty[P]) +
+                  TechBaseCost(nTech[P] + 2, Difficulty[P]));
+                CheckSpecialModels(P, preLeo);
               end;
             woPyramids:
-              CheckSpecialModels(p, preBuilder);
+              CheckSpecialModels(P, preBuilder);
             woMir:
               begin
                 for p1 := 0 to nPl - 1 do
-                  if (p1 <> p) and (1 shl p1 and GAlive <> 0) then
+                  if (p1 <> P) and (1 shl p1 and GAlive <> 0) then
                   begin
-                    if RW[p].Treaty[p1] = trNoContact then
-                      IntroduceEnemy(p, p1);
-                    GiveCivilReport(p, p1);
-                    GiveMilReport(p, p1);
+                    if RW[P].Treaty[p1] = trNoContact then
+                      IntroduceEnemy(P, p1);
+                    GiveCivilReport(P, p1);
+                    GiveMilReport(P, p1);
                   end;
               end;
@@ -1101 +1101 @@
         end;
 
-        for i := 0 to nImpReplacement - 1 do // sell obsolete buildings
-          if (ImpReplacement[i].NewImp = NewImp) and
-            (Built[ImpReplacement[i].OldImp] > 0) then
+        for I := 0 to nImpReplacement - 1 do // sell obsolete buildings
+          if (ImpReplacement[I].NewImp = NewImp) and
+            (Built[ImpReplacement[I].OldImp] > 0) then
           begin
-            inc(RW[p].Money, Imp[ImpReplacement[i].OldImp].Cost * BuildCostMod
-              [Difficulty[p]] div 12);
-            Built[ImpReplacement[i].OldImp] := 0;
+            Inc(RW[P].Money, Imp[ImpReplacement[I].OldImp].Cost * BuildCostMod
+              [Difficulty[P]] div 12);
+            Built[ImpReplacement[I].OldImp] := 0;
           end;
 
         if NewImp in [imPower, imHydro, imNuclear] then
-          for i := 0 to nImp - 1 do
-            if (i <> NewImp) and (i in [imPower, imHydro, imNuclear]) and
-              (Built[i] > 0) then
+          for I := 0 to nImp - 1 do
+            if (I <> NewImp) and (I in [imPower, imHydro, imNuclear]) and
+              (Built[I] > 0) then
             begin // sell obsolete power plant
-              inc(RW[p].Money, Imp[i].Cost * BuildCostMod[Difficulty[p]
+              Inc(RW[P].Money, Imp[I].Cost * BuildCostMod[Difficulty[P]
                 ] div 12);
-              Built[i] := 0;
+              Built[I] := 0;
             end;
 
@@ -1123 +1123 @@
       end;
       Prod0 := Prod;
-      inc(Flags, chProduction);
+      Inc(Flags, chProduction);
     end
     else
@@ -1135 +1135 @@
     if SizeMod > 0 then
     begin
-      CityGrowth(p, cix);
-      inc(Flags, chPopIncrease);
-    end;
-    result := Size + SizeMod >= 2;
-    if result then
+      CityGrowth(P, cix);
+      Inc(Flags, chPopIncrease);
+    end;
+    Result := Size + SizeMod >= 2;
+    if Result then
       while SizeMod < 0 do
       begin
-        CityShrink(p, cix);
-        inc(SizeMod);
+        CityShrink(P, cix);
+        Inc(SizeMod);
       end;
   end;
@@ -1152 +1152 @@
   ____________________________________________________________________
 }
-function SetCityTiles(p, cix, NewTiles: integer;
-  TestOnly: boolean = false): integer;
-var
-  V21, Working, ChangeTiles, AddTiles, Loc1: integer;
+function SetCityTiles(P, cix, NewTiles: Integer;
+  TestOnly: Boolean = False): Integer;
+var
+  V21, Working, ChangeTiles, AddTiles, Loc1: Integer;
   CityAreaInfo: TCityAreaInfo;
   Radius: TVicinity21Loc;
 begin
-  with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
-    ChangeTiles := NewTiles xor integer(Tiles);
+    ChangeTiles := NewTiles xor Integer(Tiles);
     AddTiles := NewTiles and not Tiles;
     if Mode = moPlaying then
@@ -1167 +1167 @@
       if NewTiles and not $67F7F76 <> 0 then
       begin
-        result := eInvalid;
-        exit
+        Result := eInvalid;
+        Exit
       end; // invalid tile index included
       if NewTiles and (1 shl 13) = 0 then
       begin
-        result := eViolation;
-        exit
+        Result := eViolation;
+        Exit
       end; // city tile must be exploited
       if ChangeTiles = 0 then
       begin
-        result := eNotChanged;
-        exit
+        Result := eNotChanged;
+        Exit
       end;
       if AddTiles <> 0 then
       begin
         // check if new tiles possible
-        GetCityAreaInfo(p, Loc, CityAreaInfo);
+        GetCityAreaInfo(P, Loc, CityAreaInfo);
         for V21 := 1 to 26 do
           if AddTiles and (1 shl V21) <> 0 then
             if CityAreaInfo.Available[V21] <> faAvailable then
             begin
-              result := eTileNotAvailable;
-              exit;
+              Result := eTileNotAvailable;
+              Exit;
             end;
         // not more tiles than inhabitants
@@ -1195 +1195 @@
         for V21 := 1 to 26 do
           if NewTiles and (1 shl V21) <> 0 then
-            inc(Working);
+            Inc(Working);
         if Working > Size then
         begin
-          result := eNoWorkerAvailable;
-          exit;
-        end;
-      end;
-    end;
-    result := eOk;
+          Result := eNoWorkerAvailable;
+          Exit;
+        end;
+      end;
+    end;
+    Result := eOk;
     if not TestOnly then
     begin
@@ -1211 +1211 @@
         begin
           Loc1 := Radius[V21];
-          assert((Loc1 >= 0) and (Loc1 < MapSize));
+          Assert((Loc1 >= 0) and (Loc1 < MapSize));
           if NewTiles and (1 shl V21) <> 0 then
             UsedByCity[Loc1] := Loc // employ tile
           else if UsedByCity[Loc1] <> Loc then
-            assert(Mode < moPlaying)
+            Assert(Mode < moPlaying)
             // should only happen during loading, because of wrong sSetCityTiles command order
           else
@@ -1225 +1225 @@
 end;
 
-procedure GetCityTileAdvice(p, cix: integer; var Advice: TCityTileAdviceData);
+procedure GetCityTileAdvice(P, cix: Integer; var Advice: TCityTileAdviceData);
 const
   oFood = 0;
@@ -1240 +1240 @@
   end;
 var
-  i, V21, Loc1, nHierarchy, iH, iT, iH_Switch, MinWorking, MaxWorking,
+  I, V21, Loc1, nHierarchy, iH, iT, iH_Switch, MinWorking, MaxWorking,
     WantedProd, MinFood, MinProd, count, Take, MaxTake, AreaSize, FormulaCode,
     NeedRare, RareTiles, cix1, dx, dy, BestTiles, ProdBeforeBoost, TestTiles,
-    SubPlus, SuperPlus: integer;
-  SuperValue, BestSuperValue, SubValue, BestSubValue: integer;
-  Value, BestValue, ValuePlus: extended;
-  ValueFormula_Weight: array [oFood .. oScience] of extended;
-  ValueFormula_Multiply: array [oFood .. oScience] of boolean;
-  Output: array [oFood .. oScience] of integer;
+    SubPlus, SuperPlus: Integer;
+  SuperValue, BestSuperValue, SubValue, BestSubValue: Integer;
+  Value, BestValue, ValuePlus: Extended;
+  ValueFormula_Weight: array [oFood .. oScience] of Extended;
+  ValueFormula_Multiply: array [oFood .. oScience] of Boolean;
+  Output: array [oFood .. oScience] of Integer;
   TileInfo, BaseTileInfo: TTileInfo;
   Radius, Radius1: TVicinity21Loc;
@@ -1255 +1255 @@
   CityAreaInfo: TCityAreaInfo;
   Hierarchy: array [0 .. 20, 0 .. 31] of TTileData;
-  nTile, nSelection: array [0 .. 20] of integer;
-  SubCriterion: array [0 .. 27] of integer;
-  FoodWasted, FoodToTax, ProdToTax, RareOK, NeedStep2, IsBest: boolean;
-begin
-  if (RW[p].Government = gAnarchy) or (RW[p].City[cix].Flags and chCaptured <> 0)
+  nTile, nSelection: array [0 .. 20] of Integer;
+  SubCriterion: array [0 .. 27] of Integer;
+  FoodWasted, FoodToTax, ProdToTax, RareOK, NeedStep2, IsBest: Boolean;
+begin
+  if (RW[P].Government = gAnarchy) or (RW[P].City[cix].Flags and chCaptured <> 0)
   then
   begin
@@ -1265 +1265 @@
     Advice.Tiles := 1 shl CityOwnTile;
     Advice.CityReport.HypoTiles := 1 shl CityOwnTile;
-    exit;
-  end;
-
-  for i := oFood to oScience do
+    Exit;
+  end;
+
+  for I := oFood to oScience do
   begin // decode evaluation formula from weights parameter
-    FormulaCode := Advice.ResourceWeights shr (24 - 8 * i) and $FF;
-    ValueFormula_Multiply[i] := FormulaCode and $80 <> 0;
+    FormulaCode := Advice.ResourceWeights shr (24 - 8 * I) and $FF;
+    ValueFormula_Multiply[I] := FormulaCode and $80 <> 0;
     if FormulaCode and $40 <> 0 then
-      ValueFormula_Weight[i] := (FormulaCode and $0F) *
+      ValueFormula_Weight[I] := (FormulaCode and $0F) *
         (1 shl (FormulaCode and $30 shr 4)) / 16
     else
-      ValueFormula_Weight[i] := (FormulaCode and $0F) *
+      ValueFormula_Weight[I] := (FormulaCode and $0F) *
         (1 shl (FormulaCode and $30 shr 4));
   end;
@@ -1283 +1283 @@
   TestReport.HypoTax := -1;
   TestReport.HypoLux := -1;
-  GetSmallCityReport(p, cix, TestReport, @CityReportEx);
-  with RW[p].City[cix] do
+  GetSmallCityReport(P, cix, TestReport, @CityReportEx);
+  with RW[P].City[cix] do
   begin
     V21_to_Loc(Loc, Radius);
-    FoodToTax := RW[p].Government = gFuture;
+    FoodToTax := RW[P].Government = gFuture;
     ProdToTax := Project and (cpImp + cpIndex) = cpImp + imTrGoods;
-    FoodWasted := not FoodToTax and (Food = StorageSize[Difficulty[p]]) and
-      not CanCityGrow(p, cix);
+    FoodWasted := not FoodToTax and (Food = StorageSize[Difficulty[P]]) and
+      not CanCityGrow(P, cix);
 
     // sub criteria
@@ -1300 +1300 @@
           V21 xor $15;
     end;
-    for cix1 := 0 to RW[p].nCity - 1 do
+    for cix1 := 0 to RW[P].nCity - 1 do
       if cix1 <> cix then
       begin
-        Loc1 := RW[p].City[cix1].Loc;
+        Loc1 := RW[P].City[cix1].Loc;
         if Loc1 >= 0 then
         begin
@@ -1316 +1316 @@
               begin
                 dxdy(Loc, Loc1, dx, dy);
-                dec(SubCriterion[(dy + 3) shl 2 + (dx + 3) shr 1], 160);
+                Dec(SubCriterion[(dy + 3) shl 2 + (dx + 3) shr 1], 160);
               end;
             end;
@@ -1323 +1323 @@
       end;
 
-    GetCityAreaInfo(p, Loc, CityAreaInfo);
+    GetCityAreaInfo(P, Loc, CityAreaInfo);
     AreaSize := 0;
     for V21 := 1 to 26 do
       if CityAreaInfo.Available[V21] = faAvailable then
-        inc(AreaSize);
-
-    if RW[p].Government = gFundamentalism then
+        Inc(AreaSize);
+
+    if RW[P].Government = gFundamentalism then
     begin
       MinWorking := Size;
@@ -1339 +1339 @@
       if MinWorking > Size then
         MinWorking := Size;
-      if (RW[p].LuxRate = 0) and not CityReportEx.TradeProcessing.FlexibleLuxury
+      if (RW[P].LuxRate = 0) and not CityReportEx.TradeProcessing.FlexibleLuxury
       then
         MaxWorking := MinWorking
@@ -1376 +1376 @@
         Loc1 := Radius[V21];
         if (Loc1 >= 0) and (Loc1 < MapSize) and
-          (RealMap[Loc1] and fModern = cardinal(NeedRare)) then
+          (RealMap[Loc1] and fModern = Cardinal(NeedRare)) then
           RareTiles := RareTiles or (1 shl V21);
       end;
@@ -1388 +1388 @@
       begin
         Loc1 := Radius[V21];
-        assert((Loc1 >= 0) and (Loc1 < MapSize));
-        GetTileInfo(p, cix, Loc1, TileInfo);
+        Assert((Loc1 >= 0) and (Loc1 < MapSize));
+        GetTileInfo(P, cix, Loc1, TileInfo);
         if V21 = CityOwnTile then
           BaseTileInfo := TileInfo
@@ -1405 +1405 @@
               (TileInfo.Trade = Hierarchy[iH, iT].Trade) and
               (SubCriterion[V21] >= SubCriterion[Hierarchy[iH, iT].V21])) do
-              inc(iT);
+              Inc(iT);
             if (iT = nTile[iH]) // new worst tile in this hierarchy
               or ((TileInfo.Food >= Hierarchy[iH, iT].Food)
@@ -1411 +1411 @@
               and (TileInfo.Prod >= Hierarchy[iH, iT].Prod) and
               (TileInfo.Trade >= Hierarchy[iH, iT].Trade)) then
-              break; // insert position found!
-            inc(iH);
+              Break; // insert position found!
+            Inc(iH);
           end;
           if iH = nHierarchy then
           begin // need to start new hierarchy
             nTile[iH] := 0;
-            inc(nHierarchy);
+            Inc(nHierarchy);
             iT := 0;
           end;
-          move(Hierarchy[iH, iT], Hierarchy[iH, iT + 1],
+          Move(Hierarchy[iH, iT], Hierarchy[iH, iT + 1],
             (nTile[iH] - iT) * SizeOf(TTileData));
-          inc(nTile[iH]);
+          Inc(nTile[iH]);
           Hierarchy[iH, iT].V21 := V21;
           Hierarchy[iH, iT].Food := TileInfo.Food;
@@ -1438 +1438 @@
         begin
           Loc1 := Radius[V21];
-          assert((V21 <> CityOwnTile) and (Loc1 >= 0) and (Loc1 < MapSize));
-          GetTileInfo(p, cix, Loc1, TileInfo);
+          Assert((V21 <> CityOwnTile) and (Loc1 >= 0) and (Loc1 < MapSize));
+          GetTileInfo(P, cix, Loc1, TileInfo);
           if iH = nHierarchy then
           begin // need to start new hierarchy
             nTile[iH] := 0;
-            inc(nHierarchy);
+            Inc(nHierarchy);
             iT := 0;
           end
           else
             iT := nTile[iH];
-          inc(nTile[iH]);
+          Inc(nTile[iH]);
           Hierarchy[iH, iT].V21 := V21;
           Hierarchy[iH, iT].Food := TileInfo.Food; // = 0
@@ -1457 +1457 @@
     end;
     if Built[imAlgae] > 0 then
-      inc(BaseTileInfo.Food, 12);
+      Inc(BaseTileInfo.Food, 12);
 
     // step 2: summarize resources
     for iH := 0 to nHierarchy - 1 do
     begin
-      move(Hierarchy[iH, 0], Hierarchy[iH, 1], nTile[iH] * SizeOf(TTileData));
+      Move(Hierarchy[iH, 0], Hierarchy[iH, 1], nTile[iH] * SizeOf(TTileData));
       Hierarchy[iH, 0].Food := 0;
       Hierarchy[iH, 0].Prod := 0;
@@ -1470 +1470 @@
       for iT := 1 to nTile[iH] do
       begin
-        inc(Hierarchy[iH, iT].Food, Hierarchy[iH, iT - 1].Food);
-        inc(Hierarchy[iH, iT].Prod, Hierarchy[iH, iT - 1].Prod);
-        inc(Hierarchy[iH, iT].Trade, Hierarchy[iH, iT - 1].Trade);
-        inc(Hierarchy[iH, iT].SubValue, Hierarchy[iH, iT - 1].SubValue);
+        Inc(Hierarchy[iH, iT].Food, Hierarchy[iH, iT - 1].Food);
+        Inc(Hierarchy[iH, iT].Prod, Hierarchy[iH, iT - 1].Prod);
+        Inc(Hierarchy[iH, iT].Trade, Hierarchy[iH, iT - 1].Trade);
+        Inc(Hierarchy[iH, iT].SubValue, Hierarchy[iH, iT - 1].SubValue);
         Hierarchy[iH, iT].V21 := 1 shl Hierarchy[iH, iT].V21 +
           Hierarchy[iH, iT - 1].V21;
@@ -1501 +1501 @@
         (ProdBeforeBoost < WantedProd)) do
       begin
-        assert(nSelection[iH] = 0);
+        Assert(nSelection[iH] = 0);
         Take := MinWorking - TestReport.Working;
         if Take > nTile[iH] then
@@ -1514 +1514 @@
           while (Take < MaxTake) and
             (TestReport.FoodRep + Hierarchy[iH, Take].Food < MinFood) do
-            inc(Take);
+            Inc(Take);
           while (Take < MaxTake) and
             (ProdBeforeBoost + Hierarchy[iH, Take].Prod < MinProd) do
-            inc(Take);
+            Inc(Take);
         end;
         nSelection[iH] := Take;
-        inc(TestReport.Working, Take);
+        Inc(TestReport.Working, Take);
         with Hierarchy[iH, Take] do
         begin
-          inc(TestReport.FoodRep, Food);
-          inc(ProdBeforeBoost, Prod);
-          inc(TestReport.Trade, Trade);
-        end;
-        inc(iH);
-      end;
-
-      assert((TestReport.Working >= MinWorking) and
+          Inc(TestReport.FoodRep, Food);
+          Inc(ProdBeforeBoost, Prod);
+          Inc(TestReport.Trade, Trade);
+        end;
+        Inc(iH);
+      end;
+
+      Assert((TestReport.Working >= MinWorking) and
         (TestReport.Working <= MaxWorking));
       if (TestReport.FoodRep >= MinFood) and (ProdBeforeBoost >= MinProd) then
       begin
-        SplitTrade(TestReport.Trade, RW[p].TaxRate, RW[p].LuxRate,
+        SplitTrade(TestReport.Trade, RW[P].TaxRate, RW[P].LuxRate,
           TestReport.Working, CityReportEx.TradeProcessing,
           TestReport.Corruption, TestReport.Tax, TestReport.Lux,
@@ -1543 +1543 @@
           TestReport.Deployed >= Size then
         begin // city is not in disorder -- evaluate combination
-          inc(count);
+          Inc(count);
           if (MinProd < WantedProd) and (ProdBeforeBoost > MinProd) then
           begin // no combination reached wanted prod yet
@@ -1591 +1591 @@
               then
               begin
-                inc(Output[oTax], Output[oFood]);
+                Inc(Output[oTax], Output[oFood]);
                 Output[oFood] := 0;
               end;
@@ -1603 +1603 @@
               if NeedRare > 0 then
               begin
-                RareOK := false;
+                RareOK := False;
                 for iH := 0 to nHierarchy - 1 do
                   if Hierarchy[iH, nSelection[iH]].V21 and RareTiles <> 0 then
-                    RareOK := true;
+                    RareOK := True;
                 if not RareOK then
                   TestReport.ProdRep := TestReport.Support;
@@ -1613 +1613 @@
               if ProdToTax then
               begin
-                inc(Output[oTax], Output[oProd]);
+                Inc(Output[oTax], Output[oProd]);
                 Output[oProd] := 0;
               end;
             end;
 
-            NeedStep2 := false;
+            NeedStep2 := False;
             Value := 0;
-            for i := oFood to oScience do
-              if ValueFormula_Multiply[i] then
-                NeedStep2 := true
+            for I := oFood to oScience do
+              if ValueFormula_Multiply[I] then
+                NeedStep2 := True
               else
-                Value := Value + ValueFormula_Weight[i] * Output[i];
+                Value := Value + ValueFormula_Weight[I] * Output[I];
             if NeedStep2 then
             begin
               if Value > 0 then
                 Value := ln(Value) + 123;
-              for i := oFood to oScience do
-                if ValueFormula_Multiply[i] and (Output[i] > 0) then
-                  Value := Value + ValueFormula_Weight[i] *
-                    (ln(Output[i]) + 123);
+              for I := oFood to oScience do
+                if ValueFormula_Multiply[I] and (Output[I] > 0) then
+                  Value := Value + ValueFormula_Weight[I] *
+                    (ln(Output[I]) + 123);
             end;
 
@@ -1643 +1643 @@
               for iH := 0 to nHierarchy - 1 do
               begin
-                inc(TestTiles, Hierarchy[iH, nSelection[iH]].V21);
-                inc(SubValue, Hierarchy[iH, nSelection[iH]].SubValue);
+                Inc(TestTiles, Hierarchy[iH, nSelection[iH]].V21);
+                Inc(SubValue, Hierarchy[iH, nSelection[iH]].SubValue);
               end;
-              IsBest := true;
+              IsBest := True;
               if (SuperPlus = 0) and (ValuePlus = 0.0) then
               begin
                 SubPlus := SubValue - BestSubValue;
                 if SubPlus < 0 then
-                  IsBest := false
+                  IsBest := False
                 else if SubPlus = 0 then
                 begin
-                  assert(TestTiles <> BestTiles);
+                  Assert(TestTiles <> BestTiles);
                   IsBest := TestTiles > BestTiles
                 end
@@ -1679 +1679 @@
         with Hierarchy[iH_Switch, nSelection[iH_Switch]] do
         begin
-          dec(TestReport.FoodRep, Food);
-          dec(ProdBeforeBoost, Prod);
-          dec(TestReport.Trade, Trade);
-        end;
-        inc(nSelection[iH_Switch]);
-        inc(TestReport.Working);
+          Dec(TestReport.FoodRep, Food);
+          Dec(ProdBeforeBoost, Prod);
+          Dec(TestReport.Trade, Trade);
+        end;
+        Inc(nSelection[iH_Switch]);
+        Inc(TestReport.Working);
         if (nSelection[iH_Switch] <= nTile[iH_Switch]) and
           (TestReport.Working <= MaxWorking) then
@@ -1690 +1690 @@
           with Hierarchy[iH_Switch, nSelection[iH_Switch]] do
           begin
-            inc(TestReport.FoodRep, Food);
-            inc(ProdBeforeBoost, Prod);
-            inc(TestReport.Trade, Trade);
+            Inc(TestReport.FoodRep, Food);
+            Inc(ProdBeforeBoost, Prod);
+            Inc(TestReport.Trade, Trade);
           end;
-          break;
-        end;
-        dec(TestReport.Working, nSelection[iH_Switch]);
+          Break;
+        end;
+        Dec(TestReport.Working, nSelection[iH_Switch]);
         nSelection[iH_Switch] := 0;
-        inc(iH_Switch);
+        Inc(iH_Switch);
       until iH_Switch = nHierarchy;
     until iH_Switch = nHierarchy; // everything tested -- done
   end;
-  assert(BestSuperValue > 0); // advice should always be possible
+  Assert(BestSuperValue > 0); // advice should always be possible
   Advice.Tiles := BestTiles;
   Advice.CityReport.HypoTiles := BestTiles;
@@ -1713 +1713 @@
 procedure InitGame;
 var
-  p, i, mixTownGuard: integer;
+  P, I, mixTownGuard: Integer;
 begin
   MaxDist := Distance(0, MapSize - lx shr 1);
-  for p := 0 to nPl - 1 do
-    if (1 shl p and GAlive <> 0) then
-      with RW[p] do
+  for P := 0 to nPl - 1 do
+    if (1 shl P and GAlive <> 0) then
+      with RW[P] do
       begin // initialize capital
         mixTownGuard := 0;
         while Model[mixTownGuard].Kind <> mkSpecial_TownGuard do
-          inc(mixTownGuard);
+          Inc(mixTownGuard);
         with City[0] do
         begin
           Built[imPalace] := 1;
           Size := 4;
-          for i := 2 to Size do
-            AddBestCityTile(p, 0);
+          for I := 2 to Size do
+            AddBestCityTile(P, 0);
           Project := mixTownGuard;
         end;

trunk/CmdList.pas

@@ -10 +10 @@
   MaxDataSize = 1024;
   CommandDataElementSize = 4;
-  CommandDataElementCountMask = $f;
+  CommandDataElementCountMask = $F;
   CommandDataMaxSize = CommandDataElementSize * CommandDataElementCountMask;
 
@@ -27 +27 @@
     constructor Create;
     destructor Destroy; override;
-    procedure Get(var Command, Player, Subject: integer; var Data: pointer);
-    procedure GetDataChanges(Data: pointer; DataSize: integer);
-    procedure Put(Command, Player, Subject: integer; Data: pointer);
-    procedure PutDataChanges(Command, Player: integer;
-      OldData, NewData: pointer; DataSize: integer);
-    procedure LoadFromFile(const f: TFileStream);
-    procedure SaveToFile(const f: TFileStream);
-    procedure AppendToFile(const f: TFileStream; const OldState: TCmdListState);
+    procedure Get(var Command, Player, Subject: Integer; var Data: Pointer);
+    procedure GetDataChanges(Data: Pointer; DataSize: Integer);
+    procedure Put(Command, Player, Subject: Integer; Data: Pointer);
+    procedure PutDataChanges(Command, Player: Integer;
+      OldData, NewData: Pointer; DataSize: Integer);
+    procedure LoadFromFile(const F: TFileStream);
+    procedure SaveToFile(const F: TFileStream);
+    procedure AppendToFile(const F: TFileStream; const OldState: TCmdListState);
     procedure Cut;
-    function Progress: integer;
+    function Progress: Integer;
   private
-    LogAlloc: integer; { allocated size of LogData in bytes }
+    LogAlloc: Integer; { allocated size of LogData in bytes }
     LogData: ^TLogData;
     FState: TCmdListState;
-    procedure PutData(Data: pointer; Length: integer);
+    procedure PutData(Data: Pointer; Length: Integer);
     procedure CompleteMoveCode;
   public
@@ -92 +92 @@
 end;
 
-procedure TCmdList.Get(var Command, Player, Subject: integer; var Data: pointer);
+procedure TCmdList.Get(var Command, Player, Subject: Integer; var Data: Pointer);
 var
   DirCode: Cardinal;
@@ -127 +127 @@
   else
   begin
-    code := Cardinal((@LogData[FState.LoadPos])^);
-    if code and 3 = 0 then
+    Code := Cardinal((@LogData[FState.LoadPos])^);
+    if Code and 3 = 0 then
     begin // non-clientex command
-      Command := code shr 2 and $3FFF + sExecute;
-      Player := code shr 16 and $F;
-      Subject := code shr 20 and $FFF;
-      inc(FState.LoadPos, 4);
-    end
-    else if code and 7 = 2 then
+      Command := Code shr 2 and $3FFF + sExecute;
+      Player := Code shr 16 and $F;
+      Subject := Code shr 20 and $FFF;
+      Inc(FState.LoadPos, 4);
+    end
+    else if Code and 7 = 2 then
     begin // clientex command
-      Command := code shr 3 and $FFFF;
-      Player := code shr 19 and $F;
+      Command := Code shr 3 and $FFFF;
+      Player := Code shr 19 and $F;
       Subject := 0;
-      inc(FState.LoadPos, 3);
+      Inc(FState.LoadPos, 3);
     end
     else
     begin // move command shortcut
-      if (code and 1 = 1) and (code and (7 shl 4) <> 6 shl 4) then
+      if (Code and 1 = 1) and (Code and (7 shl 4) <> 6 shl 4) then
       begin
-        FState.LoadMoveCode := code and $FF;
-        inc(FState.LoadPos);
+        FState.LoadMoveCode := Code and $FF;
+        Inc(FState.LoadPos);
       end
       else
       begin
-        FState.LoadMoveCode := code and $FFFFFF;
-        inc(FState.LoadPos, 3);
+        FState.LoadMoveCode := Code and $FFFFFF;
+        Inc(FState.LoadPos, 3);
       end;
       Get(Command, Player, Subject, Data);
@@ -163 +163 @@
     begin
       Data := @LogData[FState.LoadPos];
-      inc(FState.LoadPos, Command and CommandDataElementCountMask * CommandDataElementSize);
-    end;
-  end;
-end;
-
-procedure TCmdList.GetDataChanges(Data: pointer; DataSize: integer);
+      Inc(FState.LoadPos, Command and CommandDataElementCountMask * CommandDataElementSize);
+    end;
+  end;
+end;
+
+procedure TCmdList.GetDataChanges(Data: Pointer; DataSize: Integer);
 var
-  b0, b1: integer;
+  b0, b1: Integer;
   Map0, Map1: Cardinal;
 begin
   Map0 := Cardinal((@LogData[FState.LoadPos])^);
-  inc(FState.LoadPos, 4);
+  Inc(FState.LoadPos, 4);
   b0 := 0;
   while Map0 > 0 do begin
     if Map0 and 1 <> 0 then begin
       Map1 := Cardinal((@LogData[FState.LoadPos])^);
-      inc(FState.LoadPos, 4);
+      Inc(FState.LoadPos, 4);
       for b1 := 0 to 31 do
         if 1 shl b1 and Map1 <> 0 then begin
           if b0 * 32 + b1 < DataSize then
             PData(Data)[b0 * 32 + b1] := Cardinal((@LogData[FState.LoadPos])^);
-          inc(FState.LoadPos, 4);
+          Inc(FState.LoadPos, 4);
         end;
     end;
-    inc(b0);
+    Inc(b0);
     Map0 := Map0 shr 1;
   end;
 end;
 
-procedure TCmdList.Put(Command, Player, Subject: integer; Data: pointer);
+procedure TCmdList.Put(Command, Player, Subject: Integer; Data: Pointer);
 var
-  DirCode, code: Cardinal;
+  DirCode, Code: Cardinal;
 begin
   if Command and $FC00 = sMoveUnit then
@@ -209 +209 @@
     end;
     if Subject = FState.LastMovingUnit then
-      code := 1 + DirCode shl 1
-    else
-      code := 6 + DirCode shl 3 + Cardinal(Subject) shl 6;
+      Code := 1 + DirCode shl 1
+    else
+      Code := 6 + DirCode shl 3 + Cardinal(Subject) shl 6;
     if FState.MoveCode = 0 then
-      FState.MoveCode := code
+      FState.MoveCode := Code
     else if FState.MoveCode and 1 = 1 then
     begin // FM + this
-      FState.MoveCode := FState.MoveCode + code shl 4;
-      if code and 1 = 1 then
+      FState.MoveCode := FState.MoveCode + Code shl 4;
+      if Code and 1 = 1 then
         PutData(@FState.MoveCode, 1) // FM + FM
       else
@@ -223 +223 @@
       FState.MoveCode := 0;
     end
-    else if code and 1 = 1 then
+    else if Code and 1 = 1 then
     begin // M + FM
-      FState.MoveCode := FState.MoveCode + code shl 18;
+      FState.MoveCode := FState.MoveCode + Code shl 18;
       PutData(@FState.MoveCode, 3);
       FState.MoveCode := 0;
@@ -232 +232 @@
     begin
       PutData(@FState.MoveCode, 3);
-      FState.MoveCode := code;
+      FState.MoveCode := Code;
     end;
     FState.LastMovingUnit := Subject;
@@ -241 +241 @@
     if Command >= cClientEx then
     begin
-      code := 2 + Command shl 3 + Player shl 19;
-      PutData(@code, 3);
-    end
-    else
-    begin
-      code := Cardinal(Command - sExecute) shl 2 + Cardinal(Player) shl 16 +
+      Code := 2 + Command shl 3 + Player shl 19;
+      PutData(@Code, 3);
+    end
+    else
+    begin
+      Code := Cardinal(Command - sExecute) shl 2 + Cardinal(Player) shl 16 +
         Cardinal(Subject) shl 20;
-      PutData(@code, 4);
+      PutData(@Code, 4);
     end;
   end;
@@ -255 +255 @@
 end;
 
-procedure TCmdList.PutDataChanges(Command, Player: integer;
-  OldData, NewData: pointer; DataSize: integer);
+procedure TCmdList.PutDataChanges(Command, Player: Integer;
+  OldData, NewData: Pointer; DataSize: Integer);
 var
-  MapPos, LogPos, b0, b1, RowEnd: integer;
-  Map0, Map1, code: Cardinal;
+  MapPos, LogPos, b0, b1, RowEnd: Integer;
+  Map0, Map1, Code: Cardinal;
 begin
   if DataSize <= 0 then
-    exit;
+    Exit;
   if DataSize > MaxDataSize then
     DataSize := MaxDataSize;
@@ -273 +273 @@
     if LogPos + 4 * 32 > LogAlloc then
     begin
-      inc(LogAlloc, LogGrow);
+      Inc(LogAlloc, LogGrow);
       ReallocMem(LogData, LogAlloc);
     end;
@@ -287 +287 @@
       begin
         Cardinal((@LogData[LogPos])^) := PData(NewData)[b1];
-        inc(LogPos, 4);
-        inc(Map1, $80000000);
+        Inc(LogPos, 4);
+        Inc(Map1, $80000000);
       end;
     end;
@@ -296 +296 @@
       Cardinal((@LogData[MapPos])^) := Map1;
       MapPos := LogPos;
-      inc(LogPos, 4);
-      inc(Map0, $80000000);
+      Inc(LogPos, 4);
+      Inc(Map0, $80000000);
     end;
   end;
   if Map0 = 0 then
-    exit; // no changes
+    Exit; // no changes
 
   Map0 := Map0 shr (31 - (DataSize - 1) div 32);
   Cardinal((@LogData[FState.nLog + 4])^) := Map0;
-  code := Cardinal(Command - sExecute) shl 2 + Cardinal(Player) shl 16;
-  Cardinal((@LogData[FState.nLog])^) := code;
+  Code := Cardinal(Command - sExecute) shl 2 + Cardinal(Player) shl 16;
+  Cardinal((@LogData[FState.nLog])^) := Code;
   FState.nLog := MapPos;
 end;
 
-procedure TCmdList.PutData(Data: pointer; Length: integer);
+procedure TCmdList.PutData(Data: Pointer; Length: Integer);
 begin
   if FState.nLog + Length > LogAlloc then
   begin
-    inc(LogAlloc, LogGrow);
+    Inc(LogAlloc, LogGrow);
     ReallocMem(LogData, LogAlloc);
   end;
-  move(Data^, LogData[FState.nLog], Length);
-  inc(FState.nLog, Length);
+  Move(Data^, LogData[FState.nLog], Length);
+  Inc(FState.nLog, Length);
 end;
 
@@ -333 +333 @@
 end;
 
-procedure TCmdList.LoadFromFile(const f: TFileStream);
-begin
-  f.read(FState.nLog, 4);
+procedure TCmdList.LoadFromFile(const F: TFileStream);
+begin
+  F.read(FState.nLog, 4);
   LogData := nil;
   LogAlloc := ((FState.nLog + 2) div LogGrow + 1) * LogGrow;
   ReallocMem(LogData, LogAlloc);
-  f.read(LogData^, FState.nLog);
+  F.read(LogData^, FState.nLog);
   FState.LoadPos := 0;
 end;
 
-procedure TCmdList.SaveToFile(const f: TFileStream);
+procedure TCmdList.SaveToFile(const F: TFileStream);
 begin
   CompleteMoveCode;
-  f.write(FState.nLog, 4);
-  f.write(LogData^, FState.nLog);
-end;
-
-procedure TCmdList.AppendToFile(const f: TFileStream;
+  F.write(FState.nLog, 4);
+  F.write(LogData^, FState.nLog);
+end;
+
+procedure TCmdList.AppendToFile(const F: TFileStream;
   const OldState: TCmdListState);
 begin
   CompleteMoveCode;
-  f.write(FState.nLog, 4);
-  f.Position := f.Position + OldState.nLog;
-  f.write(LogData[OldState.nLog], FState.nLog - OldState.nLog);
+  F.write(FState.nLog, 4);
+  F.Position := F.Position + OldState.nLog;
+  F.write(LogData[OldState.nLog], FState.nLog - OldState.nLog);
 end;
 
@@ -364 +364 @@
 end;
 
-function TCmdList.Progress: integer;
+function TCmdList.Progress: Integer;
 begin
   if (FState.LoadPos = FState.nLog) and (FState.LoadMoveCode = 0) then
-    result := 1000 // loading complete
+    Result := 1000 // loading complete
   else if FState.nLog > 1 shl 20 then
-    result := (FState.LoadPos shr 8) * 999 div (FState.nLog shr 8)
+    Result := (FState.LoadPos shr 8) * 999 div (FState.nLog shr 8)
   else
-    result := FState.LoadPos * 999 div FState.nLog;
+    Result := FState.LoadPos * 999 div FState.nLog;
 end;
 
@@ -379 +379 @@
   Byte3    Byte2    Byte1    Byte0
   ssssssss sssspppp cccccccc cccccc00
-  (c = Command-sExecute, p = Player, s = Subject)
+  (C = Command-sExecute, P = Player, S = Subject)
 
   ClientEx-Command:
   Byte2    Byte1    Byte0
   0ppppccc cccccccc ccccc010
-  (c = Command, p = Player)
+  (C = Command, P = Player)
 
   Single Move:
   Byte2    Byte1    Byte0
   000000ss ssssssss ssaaa110
-  (a = Direction, s = Subject)
+  (A = Direction, S = Subject)
 
   Move + Follow Move:
   Byte2    Byte1    Byte0
   00bbb1ss ssssssss ssaaa110
-  (a = Direction 1, s = Subject 1, b = Direction 2)
+  (A = Direction 1, S = Subject 1, B = Direction 2)
 
   Follow Move + Move:
   Byte2    Byte1    Byte0
   00ssssss ssssssbb b110aaa1
-  (a = Direction 1, b = Direction 2, s = Subject 2)
+  (A = Direction 1, B = Direction 2, S = Subject 2)
 
   Single Follow Move:
   Byte0
   0000aaa1
-  (a = Direction)
+  (A = Direction)
 
   Double Follow Move:
   Byte0
   bbb1aaa1
-  (a = Direction 1, b = Direction 2)
+  (A = Direction 1, B = Direction 2)
 }
 

trunk/Database.pas

@@ -26 +26 @@
 
   nStartUn = 1;
-  StartUn: array [0 .. nStartUn - 1] of integer = (0); // mix of start units
+  StartUn: array [0 .. nStartUn - 1] of Integer = (0); // mix of start units
 
   CityOwnTile = 13;
@@ -50 +50 @@
   Mode: TGameMode;
   GWonder: array [0 .. nWonder - 1] of TWonderInfo;
-  ServerVersion: array [0 .. nPl - 1] of integer;
-  ProcessClientData: array [0 .. nPl - 1] of boolean;
+  ServerVersion: array [0 .. nPl - 1] of Integer;
+  ProcessClientData: array [0 .. nPl - 1] of Boolean;
   CL: TCmdList;
 {$IFDEF TEXTLOG}CmdInfo: string;
@@ -58 +58 @@
   // map data
   RealMap: array [0 .. lxmax * lymax - 1] of Cardinal;
-  Continent: array [0 .. lxmax * lymax - 1] of integer;
+  Continent: array [0 .. lxmax * lymax - 1] of Integer;
   { continent id for each tile }
   Occupant: array [0 .. lxmax * lymax - 1] of ShortInt;
@@ -65 +65 @@
   ObserveLevel: array [0 .. lxmax * lymax - 1] of Cardinal;
   { Observe Level of player p in bits 2*p and 2*p+1 }
-  UsedByCity: array [0 .. lxmax * lymax - 1] of integer;
+  UsedByCity: array [0 .. lxmax * lymax - 1] of Integer;
   { location of exploiting city for
     each tile, =-1 if not exploited }
@@ -71 +71 @@
   // player data
   RW: array [0 .. nPl - 1] of TPlayerContext; { player data }
-  Difficulty: array [0 .. nPl - 1] of integer;
+  Difficulty: array [0 .. nPl - 1] of Integer;
   GShip: array [0 .. nPl - 1] of TShipInfo;
   ResourceMask: array [0 .. nPl - 1] of Cardinal;
-  Founded: array [0 .. nPl - 1] of integer; { number of cities founded }
-  TerritoryCount: array [0 .. nPl] of integer;
+  Founded: array [0 .. nPl - 1] of Integer; { number of cities founded }
+  TerritoryCount: array [0 .. nPl] of Integer;
   LastValidStat, Researched, Discovered, // number of tiles discovered
-  GrWallContinent: array [0 .. nPl - 1] of integer;
+  GrWallContinent: array [0 .. nPl - 1] of Integer;
   RWemix: array [0 .. nPl - 1, 0 .. nPl - 1, 0 .. nmmax - 1] of SmallInt;
   // [p1,p2,mix] -> index of p2's model mix in p1's enemy model list
   Destroyed: array [0 .. nPl - 1, 0 .. nPl - 1, 0 .. nmmax - 1] of SmallInt;
   // [p1,p2,mix] -> number of p2's units with model mix that p1 has destroyed
-  nTech: array [0 .. nPl - 1] of integer; { number of known techs }
+  nTech: array [0 .. nPl - 1] of Integer; { number of known techs }
   // NewContact: array[0..nPl-1,0..nPl-1] of boolean;
 
 type
-  TVicinity8Loc = array [0 .. 7] of integer;
-  TVicinity21Loc = array [0 .. 27] of integer;
-
-procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
-procedure IntServer(Command, Player, Subject: integer; var Data);
-procedure CompactLists(p: integer);
-procedure ClearTestFlags(ClearFlags: integer);
-procedure SetTestFlags(p, SetFlags: integer);
+  TVicinity8Loc = array [0 .. 7] of Integer;
+  TVicinity21Loc = array [0 .. 27] of Integer;
+
+procedure MaskD(var X: array of Cardinal; Count, Mask: Cardinal);
+procedure IntServer(Command, Player, Subject: Integer; var Data);
+procedure CompactLists(P: Integer);
+procedure ClearTestFlags(ClearFlags: Integer);
+procedure SetTestFlags(P, SetFlags: Integer);
 
 // Tech Related Functions
-function TechBaseCost(nTech, diff: integer): integer;
-function TechCost(p: integer): integer;
-procedure CalculateModel(var m: TModel);
-procedure CheckSpecialModels(p, pre: integer);
-procedure EnableDevModel(p: integer);
-procedure SeeTech(p, ad: integer);
-procedure DiscoverTech(p, ad: integer);
-procedure CheckExpiration(Wonder: integer);
+function TechBaseCost(nTech, diff: Integer): Integer;
+function TechCost(P: Integer): Integer;
+procedure CalculateModel(var M: TModel);
+procedure CheckSpecialModels(P, pre: Integer);
+procedure EnableDevModel(P: Integer);
+procedure SeeTech(P, ad: Integer);
+procedure DiscoverTech(P, ad: Integer);
+procedure CheckExpiration(Wonder: Integer);
 
 // Location Navigation
-function dLoc(Loc, dx, dy: integer): integer;
-procedure dxdy(Loc0, Loc1: integer; var dx, dy: integer);
-function Distance(Loc0, Loc1: integer): integer;
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
+function dLoc(Loc, dx, dy: Integer): Integer;
+procedure dxdy(Loc0, Loc1: Integer; var dx, dy: Integer);
+function Distance(Loc0, Loc1: Integer): Integer;
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
 
 // Game Initialization
 procedure InitRandomGame;
-procedure InitMapGame(Human: integer);
+procedure InitMapGame(Human: Integer);
 procedure ReleaseGame;
 
 // Map Editor
-function MapGeneratorAvailable: boolean;
+function MapGeneratorAvailable: Boolean;
 procedure CreateElevation;
-procedure CreateMap(preview: boolean);
+procedure CreateMap(preview: Boolean);
 procedure InitMapEditor;
 procedure ReleaseMapEditor;
-procedure EditTile(Loc, NewTile: integer);
+procedure EditTile(Loc, NewTile: Integer);
 
 // Map Revealing
-function GetTileInfo(p, cix, Loc: integer; var Info: TTileInfo): integer;
-procedure Strongest(Loc: integer; var uix, Strength, Bonus, Cnt: integer);
-function UnitSpeed(p, mix, Health: integer): integer;
-procedure GetUnitReport(p, uix: integer; var UnitReport: TUnitReport);
-procedure SearchCity(Loc: integer; var p, cix: integer);
-procedure TellAboutModel(p, taOwner, tamix: integer);
-function emixSafe(p, taOwner, tamix: integer): integer;
-function Discover9(Loc, p, Level: integer;
-  TellAllied, EnableContact: boolean): boolean;
-function Discover21(Loc, p, AdjacentLevel: integer;
-  TellAllied, EnableContact: boolean): boolean;
-procedure DiscoverAll(p, Level: integer);
-procedure DiscoverViewAreas(p: integer);
-function GetUnitStack(p, Loc: integer): integer;
-procedure UpdateUnitMap(Loc: integer; CityChange: boolean = false);
-procedure RecalcV8ZoC(p, Loc: integer);
-procedure RecalcMapZoC(p: integer);
-procedure RecalcPeaceMap(p: integer);
+function GetTileInfo(P, cix, Loc: Integer; var Info: TTileInfo): Integer;
+procedure Strongest(Loc: Integer; var uix, Strength, Bonus, Cnt: Integer);
+function UnitSpeed(P, mix, Health: Integer): Integer;
+procedure GetUnitReport(P, uix: Integer; var UnitReport: TUnitReport);
+procedure SearchCity(Loc: Integer; var P, cix: Integer);
+procedure TellAboutModel(P, taOwner, tamix: Integer);
+function emixSafe(P, taOwner, tamix: Integer): Integer;
+function Discover9(Loc, P, Level: Integer;
+  TellAllied, EnableContact: Boolean): Boolean;
+function Discover21(Loc, P, AdjacentLevel: Integer;
+  TellAllied, EnableContact: Boolean): Boolean;
+procedure DiscoverAll(P, Level: Integer);
+procedure DiscoverViewAreas(P: Integer);
+function GetUnitStack(P, Loc: Integer): Integer;
+procedure UpdateUnitMap(Loc: Integer; CityChange: Boolean = False);
+procedure RecalcV8ZoC(P, Loc: Integer);
+procedure RecalcMapZoC(P: Integer);
+procedure RecalcPeaceMap(P: Integer);
 
 // Territory Calculation
-procedure CheckBorders(OriginLoc: integer; PlayerLosingCity: integer = -1);
-procedure LogCheckBorders(p, cix: integer; PlayerLosingCity: integer = -1);
+procedure CheckBorders(OriginLoc: Integer; PlayerLosingCity: Integer = -1);
+procedure LogCheckBorders(P, cix: Integer; PlayerLosingCity: Integer = -1);
 
 // Map Processing
-procedure CreateUnit(p, mix: integer);
-procedure FreeUnit(p, uix: integer);
-procedure PlaceUnit(p, uix: integer);
-procedure RemoveUnit(p, uix: integer; Enemy: integer = -1);
-procedure RemoveUnit_UpdateMap(p, uix: integer);
-procedure RemoveAllUnits(p, Loc: integer; Enemy: integer = -1);
-procedure RemoveDomainUnits(d, p, Loc: integer);
-procedure FoundCity(p, FoundLoc: integer);
-procedure DestroyCity(p, cix: integer; SaveUnits: boolean);
-procedure ChangeCityOwner(pOld, cixOld, pNew: integer);
-procedure CompleteJob(p, Loc, Job: integer);
+procedure CreateUnit(P, mix: Integer);
+procedure FreeUnit(P, uix: Integer);
+procedure PlaceUnit(P, uix: Integer);
+procedure RemoveUnit(P, uix: Integer; Enemy: Integer = -1);
+procedure RemoveUnit_UpdateMap(P, uix: Integer);
+procedure RemoveAllUnits(P, Loc: Integer; Enemy: Integer = -1);
+procedure RemoveDomainUnits(D, P, Loc: Integer);
+procedure FoundCity(P, FoundLoc: Integer);
+procedure DestroyCity(P, cix: Integer; SaveUnits: Boolean);
+procedure ChangeCityOwner(pOld, cixOld, pNew: Integer);
+procedure CompleteJob(P, Loc, Job: Integer);
 
 // Diplomacy
-procedure IntroduceEnemy(p1, p2: integer);
-procedure GiveCivilReport(p, pAbout: integer);
-procedure GiveMilReport(p, pAbout: integer);
-procedure ShowPrice(pSender, pTarget, Price: integer);
-function PayPrice(pSender, pTarget, Price: integer; execute: boolean): boolean;
-procedure CancelTreaty(p, pWith: integer; DecreaseCredibility: boolean = true);
-function DoSpyMission(p, pCity, cix, Mission: integer): Cardinal;
+procedure IntroduceEnemy(p1, p2: Integer);
+procedure GiveCivilReport(P, pAbout: Integer);
+procedure GiveMilReport(P, pAbout: Integer);
+procedure ShowPrice(pSender, pTarget, Price: Integer);
+function PayPrice(pSender, pTarget, Price: Integer; execute: Boolean): Boolean;
+procedure CancelTreaty(P, pWith: Integer; DecreaseCredibility: Boolean = True);
+function DoSpyMission(P, pCity, cix, Mission: Integer): Cardinal;
 
 
@@ -180 +180 @@
 
 var
-  UnBuilt: array [0 .. nPl - 1] of integer; { number of units built }
-
-procedure MaskD(var x: array of Cardinal; Count, Mask: Cardinal);
+  UnBuilt: array [0 .. nPl - 1] of Integer; { number of units built }
+
+procedure MaskD(var X: array of Cardinal; Count, Mask: Cardinal);
 var
   I: Integer;
 begin
   for I := 0 to Count - 1 do
-    x[I] := x[I] and Mask;
-end;
-
-procedure CompactLists(p: integer);
-var
-  uix, uix1, cix: integer;
-{$IFOPT O-}V21: integer;
+    X[I] := X[I] and Mask;
+end;
+
+procedure CompactLists(P: Integer);
+var
+  uix, uix1, cix: Integer;
+{$IFOPT O-}V21: Integer;
   Radius: TVicinity21Loc; {$ENDIF}
 begin
-  with RW[p] do
+  with RW[P] do
   begin
     // compact unit list
@@ -203 +203 @@
       if Un[uix].Loc < 0 then
       begin
-        dec(nUn);
+        Dec(nUn);
         Un[uix] := Un[nUn]; { replace removed unit by last }
         if (Un[uix].TroopLoad > 0) or (Un[uix].AirLoad > 0) then
@@ -212 +212 @@
       end
       else
-        inc(uix);
+        Inc(uix);
 
     // compact city list
@@ -219 +219 @@
       if City[cix].Loc < 0 then
       begin
-        dec(nCity);
+        Dec(nCity);
         City[cix] := City[nCity]; { replace city by last }
         for uix1 := 0 to nUn - 1 do
@@ -227 +227 @@
       end
       else
-        inc(cix);
+        Inc(cix);
 
     // compact enemy city list
@@ -234 +234 @@
       if EnemyCity[cix].Loc < 0 then
       begin
-        dec(nEnemyCity);
+        Dec(nEnemyCity);
         EnemyCity[cix] := EnemyCity[nEnemyCity]; { replace city by last }
       end
       else
-        inc(cix);
+        Inc(cix);
 
 {$IFOPT O-}
@@ -247 +247 @@
         for V21 := 1 to 26 do
           if Tiles and (1 shl V21) <> 0 then
-            assert(UsedByCity[Radius[V21]] = Loc);
+            Assert(UsedByCity[Radius[V21]] = Loc);
       end;
 {$ENDIF}
@@ -257 +257 @@
   ____________________________________________________________________
 }
-function TechBaseCost(nTech, diff: integer): integer;
-var
-  c0: single;
+function TechBaseCost(nTech, diff: Integer): Integer;
+var
+  c0: Single;
 begin
   c0 := TechFormula_M[diff] * (nTech + 4) *
     exp((nTech + 4) / TechFormula_D[diff]);
   if c0 >= $10000000 then
-    result := $10000000
+    Result := $10000000
   else
-    result := trunc(c0);
-end;
-
-function TechCost(p: integer): integer;
-begin
-  with RW[p] do
-  begin
-    result := TechBaseCost(nTech[p], Difficulty[p]);
+    Result := trunc(c0);
+end;
+
+function TechCost(P: Integer): Integer;
+begin
+  with RW[P] do
+  begin
+    Result := TechBaseCost(nTech[P], Difficulty[P]);
     if ResearchTech >= 0 then
       if (ResearchTech = adMilitary) or (Tech[ResearchTech] = tsSeen) then
-        result := result shr 1
+        Result := Result shr 1
       else if ResearchTech in FutureTech then
         if Government = gFuture then
-          result := result * 2
+          Result := Result * 2
         else
-          result := result * 4;
-  end;
-end;
-
-procedure SetModelFlags(var m: TModel);
-begin
-  m.Flags := 0;
-  if (m.Domain = dGround) and (m.Kind <> mkDiplomat) then
-    m.Flags := m.Flags or mdZOC;
-  if (m.Kind = mkDiplomat) or (m.Attack + m.Cap[mcBombs] = 0) then
-    m.Flags := m.Flags or mdCivil;
-  if (m.Cap[mcOver] > 0) or (m.Domain = dSea) and (m.Weight >= 6) then
-    m.Flags := m.Flags or mdDoubleSupport;
-end;
-
-procedure CalculateModel(var m: TModel);
+          Result := Result * 4;
+  end;
+end;
+
+procedure SetModelFlags(var M: TModel);
+begin
+  M.Flags := 0;
+  if (M.Domain = dGround) and (M.Kind <> mkDiplomat) then
+    M.Flags := M.Flags or mdZOC;
+  if (M.Kind = mkDiplomat) or (M.Attack + M.Cap[mcBombs] = 0) then
+    M.Flags := M.Flags or mdCivil;
+  if (M.Cap[mcOver] > 0) or (M.Domain = dSea) and (M.Weight >= 6) then
+    M.Flags := M.Flags or mdDoubleSupport;
+end;
+
+procedure CalculateModel(var M: TModel);
 { calculate attack, defense, cost... of a model by features }
 var
-  i: integer;
-begin
-  with m do
+  I: Integer;
+begin
+  with M do
   begin
     Attack := (Cap[mcOffense] + Cap[mcOver]) * MStrength;
@@ -312 +312 @@
           Speed := 350 + 200 * Cap[mcNP] + 200 * Cap[mcTurbines];
           if Cap[mcNP] = 0 then
-            inc(Speed, 100 * Cap[mcSE]);
+            Inc(Speed, 100 * Cap[mcSE]);
         end;
       dAir:
@@ -318 +318 @@
     end;
     Cost := 0;
-    for i := 0 to nFeature - 1 do
-      if 1 shl Domain and Feature[i].Domains <> 0 then
-        inc(Cost, Cap[i] * Feature[i].Cost);
+    for I := 0 to nFeature - 1 do
+      if 1 shl Domain and Feature[I].Domains <> 0 then
+        Inc(Cost, Cap[I] * Feature[I].Cost);
     Cost := Cost * MCost;
     Weight := 0;
-    for i := 0 to nFeature - 1 do
-      if 1 shl Domain and Feature[i].Domains <> 0 then
-        if (Domain = dGround) and (i = mcDefense) then
-          inc(Weight, Cap[i] * 2)
+    for I := 0 to nFeature - 1 do
+      if 1 shl Domain and Feature[I].Domains <> 0 then
+        if (Domain = dGround) and (I = mcDefense) then
+          Inc(Weight, Cap[I] * 2)
         else
-          inc(Weight, Cap[i] * Feature[i].Weight);
-  end;
-  SetModelFlags(m);
-end;
-
-procedure CheckSpecialModels(p, pre: integer);
-var
-  i, mix1: integer;
-  HasAlready: boolean;
-begin
-  for i := 0 to nSpecialModel -
+          Inc(Weight, Cap[I] * Feature[I].Weight);
+  end;
+  SetModelFlags(M);
+end;
+
+procedure CheckSpecialModels(P, pre: Integer);
+var
+  I, mix1: Integer;
+  HasAlready: Boolean;
+begin
+  for I := 0 to nSpecialModel -
     1 do { check whether new special model available }
-    if (SpecialModelPreq[i] = pre) and (RW[p].nModel < nmmax) then
-    begin
-      HasAlready := false;
-      for mix1 := 0 to RW[p].nModel - 1 do
-        if (RW[p].Model[mix1].Kind = SpecialModel[i].Kind) and
-          (RW[p].Model[mix1].Attack = SpecialModel[i].Attack) and
-          (RW[p].Model[mix1].Speed = SpecialModel[i].Speed) then
-          HasAlready := true;
+    if (SpecialModelPreq[I] = pre) and (RW[P].nModel < nmmax) then
+    begin
+      HasAlready := False;
+      for mix1 := 0 to RW[P].nModel - 1 do
+        if (RW[P].Model[mix1].Kind = SpecialModel[I].Kind) and
+          (RW[P].Model[mix1].Attack = SpecialModel[I].Attack) and
+          (RW[P].Model[mix1].Speed = SpecialModel[I].Speed) then
+          HasAlready := True;
       if not HasAlready then
       begin
-        RW[p].Model[RW[p].nModel] := SpecialModel[i];
-        SetModelFlags(RW[p].Model[RW[p].nModel]);
-        with RW[p].Model[RW[p].nModel] do
+        RW[P].Model[RW[P].nModel] := SpecialModel[I];
+        SetModelFlags(RW[P].Model[RW[P].nModel]);
+        with RW[P].Model[RW[P].nModel] do
         begin
           Status := 0;
@@ -359 +359 @@
           Built := 0;
           Lost := 0;
-          ID := p shl 12 + RW[p].nModel;
-          if (Kind = mkSpecial_Boat) and (ServerVersion[p] < $000EF0) then
+          ID := P shl 12 + RW[P].nModel;
+          if (Kind = mkSpecial_Boat) and (ServerVersion[P] < $000EF0) then
             Speed := 350; // old longboat
         end;
-        inc(RW[p].nModel);
-      end;
-    end;
-end;
-
-procedure EnableDevModel(p: integer);
-begin
-  with RW[p] do
+        Inc(RW[P].nModel);
+      end;
+    end;
+end;
+
+procedure EnableDevModel(P: Integer);
+begin
+  with RW[P] do
     if nModel < nmmax then
     begin
@@ -381 +381 @@
         Built := 0;
         Lost := 0;
-        ID := p shl 12 + nModel;
-      end;
-      inc(nModel);
-      inc(Researched[p]);
-    end;
-end;
-
-procedure SeeTech(p, ad: integer);
-begin
-{$IFDEF TEXTLOG}CmdInfo := CmdInfo + Format(' P%d:A%d', [p, ad]); {$ENDIF}
-  RW[p].Tech[ad] := tsSeen;
+        ID := P shl 12 + nModel;
+      end;
+      Inc(nModel);
+      Inc(Researched[P]);
+    end;
+end;
+
+procedure SeeTech(P, ad: Integer);
+begin
+{$IFDEF TEXTLOG}CmdInfo := CmdInfo + Format(' P%d:A%d', [P, ad]); {$ENDIF}
+  RW[P].Tech[ad] := tsSeen;
   // inc(nTech[p]);
-  inc(Researched[p]);
+  Inc(Researched[P]);
 end;
 
 procedure FreeSlaves;
 var
-  p1, uix: integer;
+  p1, uix: Integer;
 begin
   for p1 := 0 to nPl - 1 do
@@ -407 +407 @@
 end;
 
-procedure DiscoverTech(p, ad: integer);
-
-  procedure TellAboutKeyTech(p, Source: integer);
+procedure DiscoverTech(P, ad: Integer);
+
+  procedure TellAboutKeyTech(P, Source: Integer);
   var
-    i, p1: integer;
-  begin
-    for i := 1 to 3 do
-      if ad = AgePreq[i] then
+    I, p1: Integer;
+  begin
+    for I := 1 to 3 do
+      if ad = AgePreq[I] then
         for p1 := 0 to nPl - 1 do
-          if (p1 <> p) and ((GAlive or GWatching) and (1 shl p1) <> 0) then
-            RW[p1].EnemyReport[p].Tech[ad] := Source;
-  end;
-
-var
-  i: integer;
+          if (p1 <> P) and ((GAlive or GWatching) and (1 shl p1) <> 0) then
+            RW[p1].EnemyReport[P].Tech[ad] := Source;
+  end;
+
+var
+  I: Integer;
 begin
   if ad in FutureTech then
   begin
-    if RW[p].Tech[ad] < tsApplicable then
-      RW[p].Tech[ad] := 1
+    if RW[P].Tech[ad] < tsApplicable then
+      RW[P].Tech[ad] := 1
     else
-      inc(RW[p].Tech[ad]);
+      Inc(RW[P].Tech[ad]);
     if ad <> futResearchTechnology then
-      inc(nTech[p], 2);
-    inc(Researched[p], 8);
-    exit;
-  end;
-
-  if RW[p].Tech[ad] = tsSeen then
-  begin
-    inc(nTech[p]);
-    inc(Researched[p]);
+      Inc(nTech[P], 2);
+    Inc(Researched[P], 8);
+    Exit;
+  end;
+
+  if RW[P].Tech[ad] = tsSeen then
+  begin
+    Inc(nTech[P]);
+    Inc(Researched[P]);
   end
   else
   begin
-    inc(nTech[p], 2);
-    inc(Researched[p], 2);
-  end;
-  RW[p].Tech[ad] := tsResearched;
-  TellAboutKeyTech(p, tsResearched);
-  CheckSpecialModels(p, ad);
+    Inc(nTech[P], 2);
+    Inc(Researched[P], 2);
+  end;
+  RW[P].Tech[ad] := tsResearched;
+  TellAboutKeyTech(P, tsResearched);
+  CheckSpecialModels(P, ad);
   if ad = adScience then
-    ResourceMask[p] := ResourceMask[p] or fSpecial2;
+    ResourceMask[P] := ResourceMask[P] or fSpecial2;
   if ad = adMassProduction then
-    ResourceMask[p] := ResourceMask[p] or fModern;
-
-  for i := 0 to nWonder - 1 do { check whether wonders expired }
-    if (GWonder[i].EffectiveOwner <> GWonder[woEiffel].EffectiveOwner) and
-      (Imp[i].Expiration = ad) then
-    begin
-      GWonder[i].EffectiveOwner := -1;
-      if i = woPyramids then
+    ResourceMask[P] := ResourceMask[P] or fModern;
+
+  for I := 0 to nWonder - 1 do { check whether wonders expired }
+    if (GWonder[I].EffectiveOwner <> GWonder[woEiffel].EffectiveOwner) and
+      (Imp[I].Expiration = ad) then
+    begin
+      GWonder[I].EffectiveOwner := -1;
+      if I = woPyramids then
         FreeSlaves;
     end;
 end;
 
-procedure CheckExpiration(Wonder: integer);
+procedure CheckExpiration(Wonder: Integer);
 // GWonder[Wonder].EffectiveOwner must be set before!
 var
-  p: integer;
+  P: Integer;
 begin
   if (Imp[Wonder].Expiration >= 0) and
     (GWonder[woEiffel].EffectiveOwner <> GWonder[Wonder].EffectiveOwner) then
-    for p := 0 to nPl - 1 do // check if already expired
-      if (1 shl p and GAlive <> 0) and
-        (RW[p].Tech[Imp[Wonder].Expiration] >= tsApplicable) then
+    for P := 0 to nPl - 1 do // check if already expired
+      if (1 shl P and GAlive <> 0) and
+        (RW[P].Tech[Imp[Wonder].Expiration] >= tsApplicable) then
       begin
         GWonder[Wonder].EffectiveOwner := -1;
@@ -484 +484 @@
   ____________________________________________________________________
 }
-function dLoc(Loc, dx, dy: integer): integer;
+function dLoc(Loc, dx, dy: Integer): Integer;
 { relative location, dx in hor and dy in ver direction from Loc }
 var
-  y0: integer;
+  y0: Integer;
 begin
   if not (Loc >= 0) and (Loc < MapSize) and (dx + lx >= 0) then
     raise Exception.Create('Relative location error');
-  assert((Loc >= 0) and (Loc < MapSize) and (dx + lx >= 0));
+  Assert((Loc >= 0) and (Loc < MapSize) and (dx + lx >= 0));
   y0 := Loc div lx;
-  result := (Loc + (dx + y0 and 1 + lx + lx) shr 1) mod lx + lx * (y0 + dy);
-  if (result < 0) or (result >= MapSize) then
-    result := -1;
-end;
-
-procedure dxdy(Loc0, Loc1: integer; var dx, dy: integer);
+  Result := (Loc + (dx + y0 and 1 + lx + lx) shr 1) mod lx + lx * (y0 + dy);
+  if (Result < 0) or (Result >= MapSize) then
+    Result := -1;
+end;
+
+procedure dxdy(Loc0, Loc1: Integer; var dx, dy: Integer);
 begin
   dx := ((Loc1 mod lx * 2 + Loc1 div lx and 1) -
@@ -505 +505 @@
 end;
 
-function Distance(Loc0, Loc1: integer): integer;
-var
-  dx, dy: integer;
+function Distance(Loc0, Loc1: Integer): Integer;
+var
+  dx, dy: Integer;
 begin
   dxdy(Loc0, Loc1, dx, dy);
   dx := abs(dx);
   dy := abs(dy);
-  result := dx + dy + abs(dx - dy) shr 1;
-end;
-
-procedure V8_to_Loc(Loc0: integer; var VicinityLoc: TVicinity8Loc);
-var
-  x0, y0, lx0: integer;
+  Result := dx + dy + abs(dx - dy) shr 1;
+end;
+
+procedure V8_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity8Loc);
+var
+  x0, y0, lx0: Integer;
 begin
   lx0 := lx; // put in register!
@@ -527 +527 @@
   VicinityLoc[5] := Loc0 - lx0 * 2;
   VicinityLoc[7] := Loc0 + 1;
-  inc(Loc0, y0);
+  Inc(Loc0, y0);
   VicinityLoc[0] := Loc0 + lx0;
   VicinityLoc[2] := Loc0 + lx0 - 1;
@@ -538 +538 @@
     if x0 = 0 then
     begin
-      inc(VicinityLoc[3], lx0);
+      Inc(VicinityLoc[3], lx0);
       if y0 = 0 then
       begin
-        inc(VicinityLoc[2], lx0);
-        inc(VicinityLoc[4], lx0);
+        Inc(VicinityLoc[2], lx0);
+        Inc(VicinityLoc[4], lx0);
       end;
     end;
@@ -548 +548 @@
   else
   begin
-    dec(VicinityLoc[7], lx0);
+    Dec(VicinityLoc[7], lx0);
     if y0 = 1 then
     begin
-      dec(VicinityLoc[0], lx0);
-      dec(VicinityLoc[6], lx0);
-    end;
-  end;
-end;
-
-procedure V21_to_Loc(Loc0: integer; var VicinityLoc: TVicinity21Loc);
-var
-  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: integer;
-  dst: ^integer;
+      Dec(VicinityLoc[0], lx0);
+      Dec(VicinityLoc[6], lx0);
+    end;
+  end;
+end;
+
+procedure V21_to_Loc(Loc0: Integer; var VicinityLoc: TVicinity21Loc);
+var
+  dx, dy, bit, y0, xComp, yComp, xComp0, xCompSwitch: Integer;
+  dst: ^Integer;
 begin
   y0 := Loc0 div lx;
@@ -566 +566 @@
   xCompSwitch := xComp0 - 1 + y0 and 1;
   if xComp0 < 0 then
-    inc(xComp0, lx);
+    Inc(xComp0, lx);
   if xCompSwitch < 0 then
-    inc(xCompSwitch, lx);
+    Inc(xCompSwitch, lx);
   xCompSwitch := xCompSwitch xor xComp0;
   yComp := lx * (y0 - 3);
@@ -583 +583 @@
       else
         dst^ := -1;
-      inc(xComp);
+      Inc(xComp);
       if xComp >= lx then
-        dec(xComp, lx);
-      inc(dst);
+        Dec(xComp, lx);
+      Inc(dst);
       bit := bit shl 1;
     end;
-    inc(yComp, lx);
+    Inc(yComp, lx);
   end;
 end;
@@ -598 +598 @@
 }
 var
-  primitive: integer;
-  StartLoc, StartLoc2: array [0 .. nPl - 1] of integer; { starting coordinates }
+  primitive: Integer;
+  StartLoc, StartLoc2: array [0 .. nPl - 1] of Integer; { starting coordinates }
   Elevation: array [0 .. lxmax * lymax - 1] of Byte; { map elevation }
-  ElCount: array [Byte] of integer; { count of elevation occurance }
+  ElCount: array [Byte] of Integer; { count of elevation occurance }
 
 procedure CalculatePrimitive;
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   primitive := 1;
-  i := 2;
-  while i * i <= MapSize + 1 do // test whether prime
-  begin
-    if (MapSize + 1) mod i = 0 then
+  I := 2;
+  while I * I <= MapSize + 1 do // test whether prime
+  begin
+    if (MapSize + 1) mod I = 0 then
       primitive := 0;
-    inc(i);
+    Inc(I);
   end;
 
   if primitive > 0 then
     repeat
-      inc(primitive);
-      i := 1;
-      j := 0;
+      Inc(primitive);
+      I := 1;
+      J := 0;
       repeat
-        inc(j);
-        i := i * primitive mod (MapSize + 1);
-      until (i = 1) or (j = MapSize + 1);
-    until j = MapSize;
-end;
-
-function MapGeneratorAvailable: boolean;
-begin
-  result := (primitive > 0) and (lx >= 20) and (ly >= 40);
+        Inc(J);
+        I := I * primitive mod (MapSize + 1);
+      until (I = 1) or (J = MapSize + 1);
+    until J = MapSize;
+end;
+
+function MapGeneratorAvailable: Boolean;
+begin
+  Result := (primitive > 0) and (lx >= 20) and (ly >= 40);
 end;
 
 procedure CreateElevation;
 const
-  d = 64;
+  D = 64;
   Smooth = 0.049; { causes low amplitude of short waves }
   Detail = 0.095; { causes short period of short waves }
@@ -642 +642 @@
 
 var
-  sa, ca, f1, f2: array [1 .. d] of single;
-  imerge, x, y: integer;
-  v, maxv: single;
-
-  function Value(x, y: integer): single; { elevation formula }
+  sa, ca, f1, f2: array [1 .. D] of Single;
+  imerge, X, Y: Integer;
+  V, maxv: Single;
+
+  function Value(X, Y: Integer): Single; { elevation formula }
   var
-    i: integer;
-  begin
-    result := 0;
-    for i := 1 to d do
-      result := result + sin(f1[i] * ((x * 2 + y and 1) * sa[i] + y * 1.5 *
-        ca[i])) * f2[i];
+    I: Integer;
+  begin
+    Result := 0;
+    for I := 1 to D do
+      Result := Result + sin(f1[I] * ((X * 2 + Y and 1) * sa[I] + Y * 1.5 *
+        ca[I])) * f2[I];
     { x values effectively multiplied with 2 to get 2 horizantal periods
       of the prime waves }
@@ -659 +659 @@
 
 begin
-  for x := 1 to d do { prepare formula parameters }
-  begin
-{$IFNDEF SCR} if x = 1 then
-      v := pi / 2 { first wave goes horizontal }
-    else {$ENDIF} v := DelphiRandom * 2 * pi;
-    sa[x] := sin(v) / lx;
-    ca[x] := cos(v) / ly;
-    f1[x] := 2 * pi * exp(Detail * (x - 1));
-    f2[x] := exp(-x * Smooth);
+  for X := 1 to D do { prepare formula parameters }
+  begin
+{$IFNDEF SCR} if X = 1 then
+      V := pi / 2 { first wave goes horizontal }
+    else {$ENDIF} V := DelphiRandom * 2 * pi;
+    sa[X] := sin(V) / lx;
+    ca[X] := cos(V) / ly;
+    f1[X] := 2 * pi * exp(Detail * (X - 1));
+    f2[X] := exp(-X * Smooth);
   end;
 
@@ -673 +673 @@
   FillChar(ElCount, SizeOf(ElCount), 0);
   maxv := 0;
-  for x := 0 to lx - 1 do
-    for y := 0 to ly - 1 do
-    begin
-      v := Value(x, y);
-      if x * 2 < imerge then
-        v := (x * 2 * v + (imerge - x * 2) * Value(x + lx, y)) / imerge;
-      v := v - sqr(sqr(2 * y / ly - 1)); { soft cut at poles }
-      if v > maxv then
-        maxv := v;
-
-      if v < -4 then
-        Elevation[x + lx * y] := 0
-      else if v > 8.75 then
-        Elevation[x + lx * y] := 255
+  for X := 0 to lx - 1 do
+    for Y := 0 to ly - 1 do
+    begin
+      V := Value(X, Y);
+      if X * 2 < imerge then
+        V := (X * 2 * V + (imerge - X * 2) * Value(X + lx, Y)) / imerge;
+      V := V - sqr(sqr(2 * Y / ly - 1)); { soft cut at poles }
+      if V > maxv then
+        maxv := V;
+
+      if V < -4 then
+        Elevation[X + lx * Y] := 0
+      else if V > 8.75 then
+        Elevation[X + lx * Y] := 255
       else
-        Elevation[x + lx * y] := Round((v + 4) * 20);
-      inc(ElCount[Elevation[x + lx * y]]);
+        Elevation[X + lx * Y] := Round((V + 4) * 20);
+      Inc(ElCount[Elevation[X + lx * Y]]);
     end;
 end;
@@ -695 +695 @@
 procedure FindContinents;
 
-  procedure ReplaceCont(a, b, Stop: integer);
+  procedure ReplaceCont(A, B, Stop: Integer);
   { replace continent name a by b }
   // make sure always continent[loc]<=loc
   var
-    i: integer;
-  begin
-    if a < b then
-    begin
-      i := a;
-      a := b;
-      b := i
-    end;
-    if a > b then
-      for i := a to Stop do
-        if Continent[i] = a then
-          Continent[i] := b;
-  end;
-
-var
-  x, y, Loc, Wrong: integer;
-begin
-  for y := 1 to ly - 2 do
-    for x := 0 to lx - 1 do
-    begin
-      Loc := x + lx * y;
+    I: Integer;
+  begin
+    if A < B then
+    begin
+      I := A;
+      A := B;
+      B := I
+    end;
+    if A > B then
+      for I := A to Stop do
+        if Continent[I] = A then
+          Continent[I] := B;
+  end;
+
+var
+  X, Y, Loc, Wrong: Integer;
+begin
+  for Y := 1 to ly - 2 do
+    for X := 0 to lx - 1 do
+    begin
+      Loc := X + lx * Y;
       Continent[Loc] := -1;
       if RealMap[Loc] and fTerrain >= fGrass then
       begin
-        if (y - 2 >= 1) and (RealMap[Loc - 2 * lx] and fTerrain >= fGrass) then
+        if (Y - 2 >= 1) and (RealMap[Loc - 2 * lx] and fTerrain >= fGrass) then
           Continent[Loc] := Continent[Loc - 2 * lx];
-        if (x - 1 + y and 1 >= 0) and (y - 1 >= 1) and
-          (RealMap[Loc - 1 + y and 1 - lx] and fTerrain >= fGrass) then
-          Continent[Loc] := Continent[Loc - 1 + y and 1 - lx];
-        if (x + y and 1 < lx) and (y - 1 >= 1) and
-          (RealMap[Loc + y and 1 - lx] and fTerrain >= fGrass) then
-          Continent[Loc] := Continent[Loc + y and 1 - lx];
-        if (x - 1 >= 0) and (RealMap[Loc - 1] and fTerrain >= fGrass) then
+        if (X - 1 + Y and 1 >= 0) and (Y - 1 >= 1) and
+          (RealMap[Loc - 1 + Y and 1 - lx] and fTerrain >= fGrass) then
+          Continent[Loc] := Continent[Loc - 1 + Y and 1 - lx];
+        if (X + Y and 1 < lx) and (Y - 1 >= 1) and
+          (RealMap[Loc + Y and 1 - lx] and fTerrain >= fGrass) then
+          Continent[Loc] := Continent[Loc + Y and 1 - lx];
+        if (X - 1 >= 0) and (RealMap[Loc - 1] and fTerrain >= fGrass) then
           if Continent[Loc] = -1 then
             Continent[Loc] := Continent[Loc - 1]
@@ -742 +742 @@
 
   { connect continents due to round earth }
-  for y := 1 to ly - 2 do
-    if RealMap[lx * y] and fTerrain >= fGrass then
+  for Y := 1 to ly - 2 do
+    if RealMap[lx * Y] and fTerrain >= fGrass then
     begin
       Wrong := -1;
-      if RealMap[lx - 1 + lx * y] and fTerrain >= fGrass then
-        Wrong := Continent[lx - 1 + lx * y];
-      if (y and 1 = 0) and (y - 1 >= 1) and
-        (RealMap[lx - 1 + lx * (y - 1)] and fTerrain >= fGrass) then
-        Wrong := Continent[lx - 1 + lx * (y - 1)];
-      if (y and 1 = 0) and (y + 1 < ly - 1) and
-        (RealMap[lx - 1 + lx * (y + 1)] and fTerrain >= fGrass) then
-        Wrong := Continent[lx - 1 + lx * (y + 1)];
+      if RealMap[lx - 1 + lx * Y] and fTerrain >= fGrass then
+        Wrong := Continent[lx - 1 + lx * Y];
+      if (Y and 1 = 0) and (Y - 1 >= 1) and
+        (RealMap[lx - 1 + lx * (Y - 1)] and fTerrain >= fGrass) then
+        Wrong := Continent[lx - 1 + lx * (Y - 1)];
+      if (Y and 1 = 0) and (Y + 1 < ly - 1) and
+        (RealMap[lx - 1 + lx * (Y + 1)] and fTerrain >= fGrass) then
+        Wrong := Continent[lx - 1 + lx * (Y + 1)];
       if Wrong >= 0 then
-        ReplaceCont(Wrong, Continent[lx * y], MapSize - 1);
+        ReplaceCont(Wrong, Continent[lx * Y], MapSize - 1);
     end;
 end;
@@ -763 +763 @@
 // must be done after FindContinents
 var
-  i, j, Cnt, x, y, dx, dy, Loc0, Loc1, xworst, yworst, totalrare, RareMaxWater,
-    RareType, iBest, jbest, MinDist, xBlock, yBlock, V8: integer;
-  AreaCount, RareByArea, RareAdjacent: array [0 .. 7, 0 .. 4] of integer;
-  RareLoc: array [0 .. 11] of integer;
-  Dist: array [0 .. 11, 0 .. 11] of integer;
+  I, J, Cnt, X, Y, dx, dy, Loc0, Loc1, xworst, yworst, totalrare, RareMaxWater,
+    RareType, iBest, jbest, MinDist, xBlock, yBlock, V8: Integer;
+  AreaCount, RareByArea, RareAdjacent: array [0 .. 7, 0 .. 4] of Integer;
+  RareLoc: array [0 .. 11] of Integer;
+  Dist: array [0 .. 11, 0 .. 11] of Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -773 +773 @@
   repeat
     FillChar(AreaCount, SizeOf(AreaCount), 0);
-    for y := 1 to ly - 2 do
-    begin
-      yBlock := y * 5 div ly;
-      if yBlock = (y + 1) * 5 div ly then
-        for x := 0 to lx - 1 do
-        begin
-          xBlock := x * 8 div lx;
-          if xBlock = (x + 1) * 8 div lx then
+    for Y := 1 to ly - 2 do
+    begin
+      yBlock := Y * 5 div ly;
+      if yBlock = (Y + 1) * 5 div ly then
+        for X := 0 to lx - 1 do
+        begin
+          xBlock := X * 8 div lx;
+          if xBlock = (X + 1) * 8 div lx then
           begin
-            Loc0 := x + lx * y;
+            Loc0 := X + lx * Y;
             if RealMap[Loc0] and fTerrain >= fGrass then
             begin
@@ -792 +792 @@
                 if (Loc1 >= 0) and (Loc1 < MapSize) and
                   (RealMap[Loc1] and fTerrain < fGrass) then
-                  inc(Cnt); // count adjacent water
+                  Inc(Cnt); // count adjacent water
               end;
               if Cnt <= RareMaxWater then // inner land
               begin
-                inc(AreaCount[xBlock, yBlock]);
+                Inc(AreaCount[xBlock, yBlock]);
                 if DelphiRandom(AreaCount[xBlock, yBlock]) = 0 then
                   RareByArea[xBlock, yBlock] := Loc0;
@@ -805 +805 @@
     end;
     totalrare := 0;
-    for x := 0 to 7 do
-      for y := 0 to 4 do
-        if AreaCount[x, y] > 0 then
-          inc(totalrare);
-    inc(RareMaxWater);
+    for X := 0 to 7 do
+      for Y := 0 to 4 do
+        if AreaCount[X, Y] > 0 then
+          Inc(totalrare);
+    Inc(RareMaxWater);
   until totalrare >= 12;
 
@@ -815 +815 @@
   begin // remove rarebyarea resources too close to each other
     FillChar(RareAdjacent, SizeOf(RareAdjacent), 0);
-    for x := 0 to 7 do
-      for y := 0 to 4 do
-        if AreaCount[x, y] > 0 then
-        begin
-          if (AreaCount[(x + 1) mod 8, y] > 0) and
-            (Continent[RareByArea[x, y]] = Continent
-            [RareByArea[(x + 1) mod 8, y]]) then
+    for X := 0 to 7 do
+      for Y := 0 to 4 do
+        if AreaCount[X, Y] > 0 then
+        begin
+          if (AreaCount[(X + 1) mod 8, Y] > 0) and
+            (Continent[RareByArea[X, Y]] = Continent
+            [RareByArea[(X + 1) mod 8, Y]]) then
           begin
-            inc(RareAdjacent[x, y]);
-            inc(RareAdjacent[(x + 1) mod 8, y]);
+            Inc(RareAdjacent[X, Y]);
+            Inc(RareAdjacent[(X + 1) mod 8, Y]);
           end;
-          if y < 4 then
+          if Y < 4 then
           begin
-            if (AreaCount[x, y + 1] > 0) and
-              (Continent[RareByArea[x, y]] = Continent[RareByArea[x, y + 1]])
+            if (AreaCount[X, Y + 1] > 0) and
+              (Continent[RareByArea[X, Y]] = Continent[RareByArea[X, Y + 1]])
             then
             begin
-              inc(RareAdjacent[x, y]);
-              inc(RareAdjacent[x, y + 1]);
+              Inc(RareAdjacent[X, Y]);
+              Inc(RareAdjacent[X, Y + 1]);
             end;
-            if (AreaCount[(x + 1) mod 8, y + 1] > 0) and
-              (Continent[RareByArea[x, y]] = Continent[RareByArea[(x + 1) mod 8,
-              y + 1]]) then
+            if (AreaCount[(X + 1) mod 8, Y + 1] > 0) and
+              (Continent[RareByArea[X, Y]] = Continent[RareByArea[(X + 1) mod 8,
+              Y + 1]]) then
             begin
-              inc(RareAdjacent[x, y]);
-              inc(RareAdjacent[(x + 1) mod 8, y + 1]);
+              Inc(RareAdjacent[X, Y]);
+              Inc(RareAdjacent[(X + 1) mod 8, Y + 1]);
             end;
-            if (AreaCount[(x + 7) mod 8, y + 1] > 0) and
-              (Continent[RareByArea[x, y]] = Continent[RareByArea[(x + 7) mod 8,
-              y + 1]]) then
+            if (AreaCount[(X + 7) mod 8, Y + 1] > 0) and
+              (Continent[RareByArea[X, Y]] = Continent[RareByArea[(X + 7) mod 8,
+              Y + 1]]) then
             begin
-              inc(RareAdjacent[x, y]);
-              inc(RareAdjacent[(x + 7) mod 8, y + 1]);
+              Inc(RareAdjacent[X, Y]);
+              Inc(RareAdjacent[(X + 7) mod 8, Y + 1]);
             end;
           end;
@@ -854 +854 @@
     yworst := 0;
     Cnt := 0;
-    for x := 0 to 7 do
-      for y := 0 to 4 do
-        if AreaCount[x, y] > 0 then
-        begin
-          if (Cnt = 0) or (RareAdjacent[x, y] > RareAdjacent[xworst, yworst])
+    for X := 0 to 7 do
+      for Y := 0 to 4 do
+        if AreaCount[X, Y] > 0 then
+        begin
+          if (Cnt = 0) or (RareAdjacent[X, Y] > RareAdjacent[xworst, yworst])
           then
           begin
-            xworst := x;
-            yworst := y;
+            xworst := X;
+            yworst := Y;
             Cnt := 1;
           end
-          else if (RareAdjacent[x, y] = RareAdjacent[xworst, yworst]) then
+          else if (RareAdjacent[X, Y] = RareAdjacent[xworst, yworst]) then
           begin
-            inc(Cnt);
+            Inc(Cnt);
             if DelphiRandom(Cnt) = 0 then
             begin
-              xworst := x;
-              yworst := y;
+              xworst := X;
+              yworst := Y;
             end;
           end;
         end;
     AreaCount[xworst, yworst] := 0;
-    dec(totalrare);
+    Dec(totalrare);
   end;
 
   Cnt := 0;
-  for x := 0 to 7 do
-    for y := 0 to 4 do
-      if AreaCount[x, y] > 0 then
-      begin
-        RareLoc[Cnt] := RareByArea[x, y];
-        inc(Cnt);
-      end;
-  for i := 0 to 11 do
-  begin
-    RealMap[RareLoc[i]] := RealMap[RareLoc[i]] and not(fTerrain or fSpecial) or
+  for X := 0 to 7 do
+    for Y := 0 to 4 do
+      if AreaCount[X, Y] > 0 then
+      begin
+        RareLoc[Cnt] := RareByArea[X, Y];
+        Inc(Cnt);
+      end;
+  for I := 0 to 11 do
+  begin
+    RealMap[RareLoc[I]] := RealMap[RareLoc[I]] and not(fTerrain or fSpecial) or
       (fDesert or fDeadLands);
     for dy := -1 to 1 do
@@ -895 +895 @@
         if (dx + dy) and 1 = 0 then
         begin
-          Loc1 := dLoc(RareLoc[i], dx, dy);
+          Loc1 := dLoc(RareLoc[I], dx, dy);
           if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain = fMountains) then
             RealMap[Loc1] := RealMap[Loc1] and not fTerrain or fHills;
         end;
   end;
-  for i := 0 to 11 do
-    for j := 0 to 11 do
-      Dist[i, j] := Distance(RareLoc[i], RareLoc[j]);
+  for I := 0 to 11 do
+    for J := 0 to 11 do
+      Dist[I, J] := Distance(RareLoc[I], RareLoc[J]);
 
   ibest := 0;
@@ -910 +910 @@
   begin
     Cnt := 0;
-    for i := 0 to 11 do
-      if RareLoc[i] >= 0 then
-        for j := 0 to 11 do
-          if RareLoc[j] >= 0 then
+    for I := 0 to 11 do
+      if RareLoc[I] >= 0 then
+        for J := 0 to 11 do
+          if RareLoc[J] >= 0 then
             if (Cnt > 0) and (Dist[iBest, jbest] >= MinDist) then
             begin
-              if Dist[i, j] >= MinDist then
+              if Dist[I, J] >= MinDist then
               begin
-                inc(Cnt);
+                Inc(Cnt);
                 if DelphiRandom(Cnt) = 0 then
                 begin
-                  iBest := i;
-                  jbest := j;
+                  iBest := I;
+                  jbest := J;
                 end;
               end;
             end
-            else if (Cnt = 0) or (Dist[i, j] > Dist[iBest, jbest]) then
+            else if (Cnt = 0) or (Dist[I, J] > Dist[iBest, jbest]) then
             begin
-              iBest := i;
-              jbest := j;
+              iBest := I;
+              jbest := J;
               Cnt := 1;
             end;
@@ -941 +941 @@
 end;
 
-function CheckShore(Loc: integer): boolean;
-var
-  Loc1, OldTile, V21: integer;
+function CheckShore(Loc: Integer): Boolean;
+var
+  Loc1, OldTile, V21: Integer;
   Radius: TVicinity21Loc;
 begin
-  result := false;
+  Result := False;
   OldTile := RealMap[Loc];
   if OldTile and fTerrain < fGrass then
@@ -961 +961 @@
     end;
     if (RealMap[Loc] xor Cardinal(OldTile)) and fTerrain <> 0 then
-      result := true;
-  end;
-end;
-
-function ActualSpecialTile(Loc: integer): Cardinal;
-begin
-  result := SpecialTile(Loc, RealMap[Loc] and fTerrain, lx);
-end;
-
-procedure CreateMap(preview: boolean);
+      Result := True;
+  end;
+end;
+
+function ActualSpecialTile(Loc: Integer): Cardinal;
+begin
+  Result := SpecialTile(Loc, RealMap[Loc] and fTerrain, lx);
+end;
+
+procedure CreateMap(preview: Boolean);
 const
   ShHiHills = 6; { of land }
@@ -981 +981 @@
   hotunification = 50; // min. 25
 
-  Zone: array [0 .. 3, 2 .. 9] of single = { terrain distribution }
+  Zone: array [0 .. 3, 2 .. 9] of Single = { terrain distribution }
     ((0.25, 0, 0, 0.4, 0, 0, 0, 0.35), (0.55, 0, 0.1, 0, 0, 0, 0, 0.35),
     (0.4, 0, 0.35, 0, 0, 0, 0, 0.25), (0, 0.7, 0, 0, 0, 0, 0, 0.3));
   { Grs  Dst  Pra  Tun  - - - For }
 
-  function RndLow(y: integer): Cardinal;
+  function RndLow(Y: Integer): Cardinal;
   { random lowland appropriate to climate }
   var
-    z0, i: integer;
-    p, p0, ZPlus: single;
-  begin
-    if ly - 1 - y > y then
-    begin
-      z0 := 6 * y div ly;
-      ZPlus := 6 * y / ly - z0;
+    z0, I: Integer;
+    P, p0, ZPlus: Single;
+  begin
+    if ly - 1 - Y > Y then
+    begin
+      z0 := 6 * Y div ly;
+      ZPlus := 6 * Y / ly - z0;
     end
     else
     begin
-      z0 := 6 * (ly - 1 - y) div ly;
-      ZPlus := 6 * (ly - 1 - y) / ly - z0;
+      z0 := 6 * (ly - 1 - Y) div ly;
+      ZPlus := 6 * (ly - 1 - Y) / ly - z0;
     end;
     p0 := 1;
-    for i := 2 to 9 do
-    begin
-      p := Zone[z0, i] * (1 - ZPlus) + Zone[z0 + 1, i] * ZPlus;
+    for I := 2 to 9 do
+    begin
+      P := Zone[z0, I] * (1 - ZPlus) + Zone[z0 + 1, I] * ZPlus;
       { weight between zones z0 and z0+1 }
-      if DelphiRandom * p0 < p then
-      begin
-        RndLow := i;
+      if DelphiRandom * p0 < P then
+      begin
+        RndLow := I;
         Break;
       end;
-      p0 := p0 - p;
-    end;
-  end;
-
-  function RunRiver(Loc0: integer): integer;
+      p0 := p0 - P;
+    end;
+  end;
+
+  function RunRiver(Loc0: Integer): Integer;
   { runs river from start point Loc0; return value: length }
   var
-    Dir, T, Loc, Loc1, Cost: integer;
+    Dir, T, Loc, Loc1, Cost: Integer;
     Q: TIPQ;
-    From: array [0 .. lxmax * lymax - 1] of integer;
-    Time: array [0 .. lxmax * lymax - 1] of integer;
-    OneTileLake: boolean;
+    From: array [0 .. lxmax * lymax - 1] of Integer;
+    Time: array [0 .. lxmax * lymax - 1] of Integer;
+    OneTileLake: Boolean;
   begin
     FillChar(Time, SizeOf(Time), 255); { -1 }
@@ -1032 +1032 @@
       if (RealMap[Loc] and fTerrain < fGrass) then
       begin
-        OneTileLake := true;
+        OneTileLake := True;
         for Dir := 0 to 3 do
         begin
           Loc1 := dLoc(Loc, Dir and 1 * 2 - 1, Dir shr 1 * 2 - 1);
           if (Loc1 >= 0) and (RealMap[Loc1] and fTerrain < fGrass) then
-            OneTileLake := false;
+            OneTileLake := False;
         end;
         if not OneTileLake then
@@ -1062 +1062 @@
     end;
     Loc1 := Loc;
-    result := 0;
+    Result := 0;
     while Loc <> Loc0 do
     begin
       Loc := From[Loc];
-      inc(result);
-    end;
-    if (result > 1) and ((result >= MinRivLen) or
+      Inc(Result);
+    end;
+    if (Result > 1) and ((Result >= MinRivLen) or
       (RealMap[Loc1] and fTerrain >= fGrass)) then
     begin
@@ -1082 +1082 @@
     end
     else
-      result := 0;
+      Result := 0;
     FreeAndNil(Q);
   end;
 
 var
-  x, y, n, Dir, plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: integer;
-  CopyFrom: array [0 .. lxmax * lymax - 1] of integer;
+  X, Y, N, Dir, plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: Integer;
+  CopyFrom: array [0 .. lxmax * lymax - 1] of Integer;
   Adjacent: TVicinity8Loc;
 
@@ -1097 +1097 @@
   while plus < MapSize * LandMass * ShMountains div 10000 do
   begin
-    dec(bMountains);
-    inc(plus, ElCount[bMountains]);
+    Dec(bMountains);
+    Inc(plus, ElCount[bMountains]);
   end;
   Count := plus;
@@ -1105 +1105 @@
   while plus < MapSize * LandMass * ShHiHills div 10000 do
   begin
-    dec(bHills);
-    inc(plus, ElCount[bHills]);
-  end;
-  inc(Count, plus);
+    Dec(bHills);
+    Inc(plus, ElCount[bHills]);
+  end;
+  Inc(Count, plus);
   bLand := bHills;
   while Count < MapSize * LandMass div 100 do
   begin
-    dec(bLand);
-    inc(Count, ElCount[bLand]);
+    Dec(bLand);
+    Inc(Count, ElCount[bLand]);
   end;
 
@@ -1136 +1136 @@
           (RealMap[Loc1] and fTerrain < fGrass) or
           (RealMap[Loc1] and fTerrain = fArctic) then
-          inc(Count); // count adjacent water
+          Inc(Count); // count adjacent water
       end;
       if Count = 8 then
@@ -1148 +1148 @@
       plus := MapSize;
     Loc0 := DelphiRandom(MapSize);
-    for n := 0 to plus - 1 do
+    for N := 0 to plus - 1 do
     begin
       if (RealMap[Loc0] and fTerrain >= fGrass) and (Loc0 >= lx) and
@@ -1165 +1165 @@
     CopyFrom[Loc0] := Loc0;
 
-  for n := 0 to unification * MapSize div 100 do
-  begin
-    y := DelphiRandom(ly);
-    if abs(y - (ly shr 1)) > ly div 4 + DelphiRandom(ly * hotunification div 100) then
-      if y < ly shr 1 then
-        y := ly shr 1 - y
+  for N := 0 to unification * MapSize div 100 do
+  begin
+    Y := DelphiRandom(ly);
+    if abs(Y - (ly shr 1)) > ly div 4 + DelphiRandom(ly * hotunification div 100) then
+      if Y < ly shr 1 then
+        Y := ly shr 1 - Y
       else
-        y := 3 * ly shr 1 - y;
-    Loc0 := lx * y + DelphiRandom(lx);
+        Y := 3 * ly shr 1 - Y;
+    Loc0 := lx * Y + DelphiRandom(lx);
     if RealMap[Loc0] and fTerrain = fGrass then
     begin
@@ -1226 +1226 @@
           if Loc1 >= 0 then
             if RealMap[Loc1] and fTerrain < fGrass then
-              inc(Count, 2);
+              Inc(Count, 2);
         end;
       end;
@@ -1242 +1242 @@
         if Loc1 >= 0 then
           if RealMap[Loc1] and fTerrain <> fDesert then
-            inc(Count);
+            Inc(Count);
       end;
       if Count >= 4 then
@@ -1250 +1250 @@
   for Loc0 := 0 to MapSize - 1 do
     CheckShore(Loc0); // change ocean to shore
-  for x := 0 to lx - 1 do
-  begin
-    RealMap[x + lx * 0] := fArctic;
-    if RealMap[x + lx * 1] >= fGrass then
-      RealMap[x + lx * 1] := RealMap[x + lx * 1] and not fTerrain or fTundra;
-    if RealMap[x + lx * (ly - 2)] >= fGrass then
-      RealMap[x + lx * (ly - 2)] := RealMap[x + lx * (ly - 2)] and
+  for X := 0 to lx - 1 do
+  begin
+    RealMap[X + lx * 0] := fArctic;
+    if RealMap[X + lx * 1] >= fGrass then
+      RealMap[X + lx * 1] := RealMap[X + lx * 1] and not fTerrain or fTundra;
+    if RealMap[X + lx * (ly - 2)] >= fGrass then
+      RealMap[X + lx * (ly - 2)] := RealMap[X + lx * (ly - 2)] and
         not fTerrain or fTundra;
-    RealMap[x + lx * (ly - 1)] := fArctic;
+    RealMap[X + lx * (ly - 1)] := fArctic;
   end;
 
@@ -1279 +1279 @@
   CountGood: (cgBest, cgFlat, cgLand);
 
-  function IsGoodTile(Loc: integer): boolean;
+  function IsGoodTile(Loc: Integer): Boolean;
   var
-    xLoc, yLoc: integer;
+    xLoc, yLoc: Integer;
   begin
     xLoc := Loc mod lx;
     yLoc := Loc div lx;
     if RealMap[Loc] and fDeadLands <> 0 then
-      result := false
+      Result := False
     else
       case CountGood of
         cgBest:
-          result := (RealMap[Loc] and fTerrain in [fGrass, fPrairie, fTundra,
+          Result := (RealMap[Loc] and fTerrain in [fGrass, fPrairie, fTundra,
             fSwamp, fForest]) and Odd((lymax + xLoc - yLoc shr 1) shr 1 + xLoc +
             (yLoc + 1) shr 1);
         cgFlat:
-          result := (RealMap[Loc] and fTerrain in [fGrass, fPrairie, fTundra,
+          Result := (RealMap[Loc] and fTerrain in [fGrass, fPrairie, fTundra,
             fSwamp, fForest]);
         cgLand:
-          result := RealMap[Loc] and fTerrain >= fGrass;
+          Result := RealMap[Loc] and fTerrain >= fGrass;
       end;
   end;
@@ -1305 +1305 @@
 
 var
-  p1, p2, nAlive, c, Loc, Loc1, CntGood, CntGoodGrass, MinDist, i, j, n,
+  p1, p2, nAlive, C, Loc, Loc1, CntGood, CntGoodGrass, MinDist, I, J, N,
     nsc, V21, V8, BestDist, TestDist, MinGood, nIrrLoc,
-    FineDistSQR, nRest: integer;
-  ccount: array [0 .. lxmax * lymax - 1] of word;
-  sc, StartLoc0, sccount: array [1 .. nPl] of integer;
-  TestStartLoc: array [0 .. nPl - 1] of integer;
-  CityLoc: array [1 .. nPl, 0 .. MaxCityLoc - 1] of integer;
-  nCityLoc: array [1 .. nPl] of integer;
-  RestLoc: array [0 .. MaxCityLoc - 1] of integer;
-  IrrLoc: array [0 .. 20] of integer;
+    FineDistSQR, nRest: Integer;
+  ccount: array [0 .. lxmax * lymax - 1] of Word;
+  sc, StartLoc0, sccount: array [1 .. nPl] of Integer;
+  TestStartLoc: array [0 .. nPl - 1] of Integer;
+  CityLoc: array [1 .. nPl, 0 .. MaxCityLoc - 1] of Integer;
+  nCityLoc: array [1 .. nPl] of Integer;
+  RestLoc: array [0 .. MaxCityLoc - 1] of Integer;
+  IrrLoc: array [0 .. 20] of Integer;
   Radius: TVicinity21Loc;
   Adjacent: TVicinity8Loc;
-  ok: boolean;
+  ok: Boolean;
 
 begin
@@ -1323 +1323 @@
   for p1 := 0 to nPl - 1 do
     if 1 shl p1 and GAlive <> 0 then
-      inc(nAlive);
+      Inc(nAlive);
   if nAlive = 0 then
-    exit;
+    Exit;
 
   { count good tiles }
@@ -1332 +1332 @@
     if RealMap[Loc] and fTerrain = fGrass then
       if ActualSpecialTile(Loc) = 1 then
-        inc(ccount[Continent[Loc]], 3)
+        Inc(ccount[Continent[Loc]], 3)
       else
-        inc(ccount[Continent[Loc]], 2)
+        Inc(ccount[Continent[Loc]], 2)
     else if RealMap[Loc] and fTerrain in [fPrairie, fSwamp, fForest, fHills]
     then
-      inc(ccount[Continent[Loc]]);
+      Inc(ccount[Continent[Loc]]);
 
   Loc := 0;
   while ccount[Loc] > 0 do
-    inc(Loc);
-  for i := 1 to nAlive do
-  begin
-    sc[i] := Loc;
-    sccount[i] := 1
+    Inc(Loc);
+  for I := 1 to nAlive do
+  begin
+    sc[I] := Loc;
+    sccount[I] := 1
   end;
   { init with zero size start continents, then search bigger ones }
@@ -1356 +1356 @@
         if p1 < nAlive + 1 then
           sc[p1] := sc[p1 - 1];
-        dec(p1);
+        Dec(p1);
       end;
       if p1 < nAlive + 1 then
@@ -1363 +1363 @@
   nsc := nAlive;
   repeat
-    c := 1; // search least crowded continent after smallest
-    for i := 2 to nsc - 1 do
-      if ccount[sc[i]] * (2 * sccount[c] + 1) > ccount[sc[c]] *
-        (2 * sccount[i] + 1) then
-        c := i;
-    if ccount[sc[nsc]] * (2 * sccount[c] + 1) > ccount[sc[c]] then
+    C := 1; // search least crowded continent after smallest
+    for I := 2 to nsc - 1 do
+      if ccount[sc[I]] * (2 * sccount[C] + 1) > ccount[sc[C]] *
+        (2 * sccount[I] + 1) then
+        C := I;
+    if ccount[sc[nsc]] * (2 * sccount[C] + 1) > ccount[sc[C]] then
       Break; // even least crowded continent is more crowded than smallest
-    inc(sccount[c]);
-    dec(nsc);
+    Inc(sccount[C]);
+    Dec(nsc);
   until sccount[nsc] > 1;
 
@@ -1377 +1377 @@
   CountGood := cgBest;
   repeat
-    dec(MinGood);
+    Dec(MinGood);
     if (MinGood = 3) and (CountGood < cgLand) then // too demanding!
     begin
-      inc(CountGood);
+      Inc(CountGood);
       MinGood := 6;
     end;
     FillChar(nCityLoc, SizeOf(nCityLoc), 0);
     Loc := DelphiRandom(MapSize);
-    for i := 0 to MapSize - 1 do
+    for I := 0 to MapSize - 1 do
     begin
       if ((Loc >= 4 * lx) and (Loc < MapSize - 4 * lx) or (CountGood >= cgLand))
         and IsGoodTile(Loc) then
       begin
-        c := nsc;
-        while (c > 0) and (Continent[Loc] <> sc[c]) do
-          dec(c);
-        if (c > 0) and (nCityLoc[c] < MaxCityLoc) then
+        C := nsc;
+        while (C > 0) and (Continent[Loc] <> sc[C]) do
+          Dec(C);
+        if (C > 0) and (nCityLoc[C] < MaxCityLoc) then
         begin
           CntGood := 1;
@@ -1402 +1402 @@
               Loc1 := Radius[V21];
               if (Loc1 >= 0) and (Loc1 < MapSize) and IsGoodTile(Loc1) then
-                inc(CntGood);
+                Inc(CntGood);
             end;
           if CntGood >= MinGood then
           begin
-            CityLoc[c, nCityLoc[c]] := Loc;
-            inc(nCityLoc[c]);
+            CityLoc[C, nCityLoc[C]] := Loc;
+            Inc(nCityLoc[C]);
           end;
         end;
@@ -1414 +1414 @@
     end;
 
-    ok := true;
-    for c := 1 to nsc do
-      if nCityLoc[c] < sccount[c] * (8 - MinGood) div (7 - MinGood) then
-        ok := false;
+    ok := True;
+    for C := 1 to nsc do
+      if nCityLoc[C] < sccount[C] * (8 - MinGood) div (7 - MinGood) then
+        ok := False;
   until ok;
 
   FineDistSQR := MapSize * LandMass * 9 div (nAlive * 100);
   p1 := 1;
-  for c := 1 to nsc do
+  for C := 1 to nsc do
   begin // for all start continents
-    if sccount[c] = 1 then
-      StartLoc0[p1] := CityLoc[c, DelphiRandom(nCityLoc[c])]
+    if sccount[C] = 1 then
+      StartLoc0[p1] := CityLoc[C, DelphiRandom(nCityLoc[C])]
     else
     begin
       BestDist := 0;
-      n := 1 shl sccount[c] * 32; // number of tries to find good distribution
-      if n > 1 shl 12 then
-        n := 1 shl 12;
-      while (n > 0) and (BestDist * BestDist < FineDistSQR) do
+      N := 1 shl sccount[C] * 32; // number of tries to find good distribution
+      if N > 1 shl 12 then
+        N := 1 shl 12;
+      while (N > 0) and (BestDist * BestDist < FineDistSQR) do
       begin
         MinDist := MaxInt;
-        nRest := nCityLoc[c];
-        for i := 0 to nRest - 1 do
-          RestLoc[i] := CityLoc[c, i];
-        for i := 0 to sccount[c] - 1 do
+        nRest := nCityLoc[C];
+        for I := 0 to nRest - 1 do
+          RestLoc[I] := CityLoc[C, I];
+        for I := 0 to sccount[C] - 1 do
         begin
           if nRest = 0 then
             Break;
-          j := DelphiRandom(nRest);
-          TestStartLoc[i] := RestLoc[j];
-          RestLoc[j] := RestLoc[nRest - 1];
-          dec(nRest);
-          for j := 0 to i - 1 do
+          J := DelphiRandom(nRest);
+          TestStartLoc[I] := RestLoc[J];
+          RestLoc[J] := RestLoc[nRest - 1];
+          Dec(nRest);
+          for J := 0 to I - 1 do
           begin
-            TestDist := Distance(TestStartLoc[i], TestStartLoc[j]);
+            TestDist := Distance(TestStartLoc[I], TestStartLoc[J]);
             if TestDist < MinDist then
               MinDist := TestDist;
           end;
-          if i = sccount[c] - 1 then
+          if I = sccount[C] - 1 then
           begin
-            assert(MinDist > BestDist);
+            Assert(MinDist > BestDist);
             BestDist := MinDist;
-            for j := 0 to sccount[c] - 1 do
-              StartLoc0[p1 + j] := TestStartLoc[j];
+            for J := 0 to sccount[C] - 1 do
+              StartLoc0[p1 + J] := TestStartLoc[J];
           end
           else if BestDist > 0 then
           begin
-            j := 0;
-            while j < nRest do
+            J := 0;
+            while J < nRest do
             begin // remove all locs from rest which have too little distance to this one
-              TestDist := Distance(TestStartLoc[i], RestLoc[j]);
+              TestDist := Distance(TestStartLoc[I], RestLoc[J]);
               if TestDist <= BestDist then
               begin
-                RestLoc[j] := RestLoc[nRest - 1];
-                dec(nRest);
+                RestLoc[J] := RestLoc[nRest - 1];
+                Dec(nRest);
               end
               else
-                inc(j);
+                Inc(J);
             end;
           end;
         end;
-        dec(n)
-      end;
-    end;
-    p1 := p1 + sccount[c]
+        Dec(N)
+      end;
+    end;
+    p1 := p1 + sccount[C]
   end;
 
@@ -1495 +1495 @@
         if (Loc1 >= 0) and (Loc1 < MapSize) and IsGoodTile(Loc1) then
           if RealMap[Loc1] and fTerrain = fGrass then
-            inc(CntGoodGrass)
+            Inc(CntGoodGrass)
           else
-            inc(CntGood);
+            Inc(CntGood);
       end;
     for V21 := 1 to 26 do
@@ -1529 +1529 @@
         begin
           IrrLoc[nIrrLoc] := Loc1;
-          inc(nIrrLoc);
-        end;
-      end;
-    i := 2;
-    if i > nIrrLoc then
-      i := nIrrLoc;
-    while i > 0 do
-    begin
-      j := DelphiRandom(nIrrLoc);
-      RealMap[IrrLoc[j]] := RealMap[IrrLoc[j]] or tiIrrigation;
-      IrrLoc[j] := IrrLoc[nIrrLoc - 1];
-      dec(nIrrLoc);
-      dec(i);
+          Inc(nIrrLoc);
+        end;
+      end;
+    I := 2;
+    if I > nIrrLoc then
+      I := nIrrLoc;
+    while I > 0 do
+    begin
+      J := DelphiRandom(nIrrLoc);
+      RealMap[IrrLoc[J]] := RealMap[IrrLoc[J]] or tiIrrigation;
+      IrrLoc[J] := IrrLoc[nIrrLoc - 1];
+      Dec(nIrrLoc);
+      Dec(I);
     end;
   end;
@@ -1550 +1550 @@
     begin
       repeat
-        i := DelphiRandom(nAlive) + 1
-      until StartLoc0[i] >= 0;
-      StartLoc[p1] := StartLoc0[i];
-      StartLoc0[i] := -1
+        I := DelphiRandom(nAlive) + 1
+      until StartLoc0[I] >= 0;
+      StartLoc[p1] := StartLoc0[I];
+      StartLoc0[I] := -1
     end;
   SaveMapCenterLoc := StartLoc[0];
@@ -1586 +1586 @@
           StartLoc2[p1] := Loc1;
           BestDist := TestDist;
-          n := 1;
+          N := 1;
         end
         else if TestDist = BestDist then
         begin
-          inc(n);
-          if DelphiRandom(n) = 0 then
+          Inc(N);
+          if DelphiRandom(N) = 0 then
             StartLoc2[p1] := Loc1;
         end;
@@ -1598 +1598 @@
 end;
 
-procedure PredefinedStartPositions(Human: integer);
+procedure PredefinedStartPositions(Human: Integer);
 // use predefined nation start positions
 var
-  i, p1, Loc1, nAlive, nStartLoc0, nPrefStartLoc0, imax: integer;
-  StartLoc0: array [0 .. lxmax * lymax - 1] of integer;
-  ishuman: boolean;
+  I, p1, Loc1, nAlive, nStartLoc0, nPrefStartLoc0, imax: Integer;
+  StartLoc0: array [0 .. lxmax * lymax - 1] of Integer;
+  ishuman: Boolean;
 begin
   nAlive := 0;
   for p1 := 0 to nPl - 1 do
     if 1 shl p1 and GAlive <> 0 then
-      inc(nAlive);
+      Inc(nAlive);
   if nAlive = 0 then
-    exit;
+    Exit;
 
   for I := 0 to Length(StartLoc0) - 1 do
@@ -1623 +1623 @@
       StartLoc0[nStartLoc0] := StartLoc0[nPrefStartLoc0];
       StartLoc0[nPrefStartLoc0] := Loc1;
-      inc(nPrefStartLoc0);
-      inc(nStartLoc0);
+      Inc(nPrefStartLoc0);
+      Inc(nStartLoc0);
       RealMap[Loc1] := RealMap[Loc1] and not fPrefStartPos;
     end
@@ -1630 +1630 @@
     begin
       StartLoc0[nStartLoc0] := Loc1;
-      inc(nStartLoc0);
+      Inc(nStartLoc0);
       RealMap[Loc1] := RealMap[Loc1] and not fStartPos;
     end;
-  assert(nStartLoc0 >= nAlive);
+  Assert(nStartLoc0 >= nAlive);
 
   StartLoc[0] := 0;
-  for ishuman := true downto false do
+  for ishuman := True downto False do
     for p1 := 0 to nPl - 1 do
       if (1 shl p1 and GAlive <> 0) and ((1 shl p1 and Human <> 0) = ishuman)
       then
       begin
-        dec(nStartLoc0);
+        Dec(nStartLoc0);
         imax := nStartLoc0;
         if nPrefStartLoc0 > 0 then
         begin
-          dec(nPrefStartLoc0);
+          Dec(nPrefStartLoc0);
           imax := nPrefStartLoc0;
         end;
-        i := DelphiRandom(imax + 1);
-        StartLoc[p1] := StartLoc0[i];
-        StartLoc2[p1] := StartLoc0[i];
-        StartLoc0[i] := StartLoc0[imax];
+        I := DelphiRandom(imax + 1);
+        StartLoc[p1] := StartLoc0[I];
+        StartLoc2[p1] := StartLoc0[I];
+        StartLoc0[I] := StartLoc0[imax];
         StartLoc0[imax] := StartLoc0[nStartLoc0];
       end;
@@ -1659 +1659 @@
 procedure InitGame;
 var
-  i, p, p1, uix, Loc1: integer;
+  I, P, p1, uix, Loc1: Integer;
 begin
   {$IFDEF FastContact}
@@ -1683 +1683 @@
   GTestFlags := 0;
   GInitialized := GAlive or GWatching;
-  for p := 0 to nPl - 1 do
-    if 1 shl p and GInitialized <> 0 then
-      with RW[p] do
-      begin
-        Researched[p] := 0;
-        Discovered[p] := 0;
-        TerritoryCount[p] := 0;
-        nTech[p] := 0;
-        if Difficulty[p] = 0 then
-          ResourceMask[p] := $FFFFFFFF
+  for P := 0 to nPl - 1 do
+    if 1 shl P and GInitialized <> 0 then
+      with RW[P] do
+      begin
+        Researched[P] := 0;
+        Discovered[P] := 0;
+        TerritoryCount[P] := 0;
+        nTech[P] := 0;
+        if Difficulty[P] = 0 then
+          ResourceMask[P] := $FFFFFFFF
         else
-          ResourceMask[p] := $FFFFFFFF and not(fSpecial2 or fModern);
-        GrWallContinent[p] := -1;
+          ResourceMask[P] := $FFFFFFFF and not(fSpecial2 or fModern);
+        GrWallContinent[P] := -1;
 
         GetMem(Map, 4 * MapSize);
@@ -1713 +1713 @@
           if 1 shl p1 and GInitialized <> 0 then
           begin
-            FillChar(RWemix[p, p1], SizeOf(RWemix[p, p1]), 255); { -1 }
-            FillChar(Destroyed[p, p1], SizeOf(Destroyed[p, p1]), 0);
+            FillChar(RWemix[P, p1], SizeOf(RWemix[P, p1]), 255); { -1 }
+            FillChar(Destroyed[P, p1], SizeOf(Destroyed[P, p1]), 0);
           end;
           Attitude[p1] := atNeutral;
@@ -1722 +1722 @@
           Tribute[p1] := 0;
           TributePaid[p1] := 0;
-          if (p1 <> p) and (1 shl p1 and GAlive <> 0) then
+          if (p1 <> P) and (1 shl p1 and GAlive <> 0) then
           begin // initialize enemy report
             GetMem(EnemyReport[p1], SizeOf(TEnemyReport) - 2 *
@@ -1732 +1732 @@
             EnemyReport[p1].Attitude := atNeutral;
             EnemyReport[p1].Government := gDespotism;
-            if 1 shl p and GAlive = 0 then
+            if 1 shl P and GAlive = 0 then
               Treaty[p1] := trNone // supervisor
           end
@@ -1754 +1754 @@
 
   // create initial models and units
-  for p := 0 to nPl - 1 do
-    if (1 shl p and GAlive <> 0) then
-      with RW[p] do
+  for P := 0 to nPl - 1 do
+    if (1 shl P and GAlive <> 0) then
+      with RW[P] do
       begin
         nModel := 0;
-        for i := 0 to nSpecialModel - 1 do
-          if SpecialModelPreq[i] = preNone then
+        for I := 0 to nSpecialModel - 1 do
+          if SpecialModelPreq[I] = preNone then
           begin
-            Model[nModel] := SpecialModel[i];
+            Model[nModel] := SpecialModel[I];
             Model[nModel].Status := 0;
             Model[nModel].IntroTurn := 0;
             Model[nModel].Built := 0;
             Model[nModel].Lost := 0;
-            Model[nModel].ID := p shl 12 + nModel;
+            Model[nModel].ID := P shl 12 + nModel;
             SetModelFlags(Model[nModel]);
-            inc(nModel);
+            Inc(nModel);
           end;
         nUn := 0;
-        UnBuilt[p] := 0;
+        UnBuilt[P] := 0;
         for uix := 0 to nStartUn - 1 do
         begin
-          CreateUnit(p, StartUn[uix]);
-          dec(Model[StartUn[uix]].Built);
-          Un[uix].Loc := StartLoc2[p];
-          PlaceUnit(p, uix);
-        end;
-        FoundCity(p, StartLoc[p]); // capital
-        Founded[p] := 1;
+          CreateUnit(P, StartUn[uix]);
+          Dec(Model[StartUn[uix]].Built);
+          Un[uix].Loc := StartLoc2[P];
+          PlaceUnit(P, uix);
+        end;
+        FoundCity(P, StartLoc[P]); // capital
+        Founded[P] := 1;
         with City[0] do
         begin
-          ID := p shl 12;
+          ID := P shl 12;
           Flags := chFounded;
         end;
@@ -1798 +1798 @@
   CalculatePrimitive;
   CreateElevation;
-  CreateMap(false);
+  CreateMap(False);
   StartPositions;
   InitGame;
 end;
 
-procedure InitMapGame(Human: integer);
+procedure InitMapGame(Human: Integer);
 begin
   DelphiRandSeed := RND;
@@ -1813 +1813 @@
 procedure ReleaseGame;
 var
-  p1, p2: integer;
+  p1, p2: Integer;
 begin
   for p1 := 0 to nPl - 1 do
@@ -1835 +1835 @@
 procedure InitMapEditor;
 var
-  p1: integer;
+  p1: Integer;
 begin
   CalculatePrimitive;
@@ -1872 +1872 @@
 end;
 
-procedure EditTile(Loc, NewTile: integer);
-var
-  Loc1, V21: integer;
+procedure EditTile(Loc, NewTile: Integer);
+var
+  Loc1, V21: Integer;
   Radius: TVicinity21Loc;
 begin
@@ -1932 +1932 @@
   ____________________________________________________________________
 }
-function GetTileInfo(p, cix, Loc: integer; var Info: TTileInfo): integer;
+function GetTileInfo(P, cix, Loc: Integer; var Info: TTileInfo): Integer;
 // cix>=0 - known city index of player p -- only core internal!
 // cix=-1 - search city, player unknown, only if permission for p
 // cix=-2 - don't search city, don't calculate city benefits, just government of player p
 var
-  p0, Tile, special: integer;
+  p0, Tile, special: Integer;
 begin
   with Info do
   begin
-    p0 := p;
+    p0 := P;
     if cix >= 0 then
       Tile := RealMap[Loc]
     else
     begin
-      Tile := RW[p].Map[Loc];
+      Tile := RW[P].Map[Loc];
       if Tile and fTerrain = fUNKNOWN then
       begin
-        result := eNoPreq;
-        exit;
+        Result := eNoPreq;
+        Exit;
       end;
     end;
@@ -1956 +1956 @@
     if (cix = -1) and (UsedByCity[Loc] >= 0) then
     begin // search exploiting player and city
-      SearchCity(UsedByCity[Loc], p, cix);
-      if not((p = p0) or (ObserveLevel[UsedByCity[Loc]] shr (2 * p0) and
+      SearchCity(UsedByCity[Loc], P, cix);
+      if not((P = p0) or (ObserveLevel[UsedByCity[Loc]] shr (2 * p0) and
         3 = lObserveSuper)) then
         cix := -1
@@ -1963 +1963 @@
     if cix = -1 then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end; // no city found here
 
-    special := Tile and fSpecial and ResourceMask[p] shr 5;
+    special := Tile and fSpecial and ResourceMask[P] shr 5;
     with Terrain[Tile and fTerrain] do
     begin
@@ -1974 +1974 @@
       Trade := TradeRes[special];
       if (special > 0) and (Tile and fTerrain <> fGrass) and
-        (RW[p].NatBuilt[imSpacePort] > 0) then
+        (RW[P].NatBuilt[imSpacePort] > 0) then
       begin // GeoSat effect
         Food := 2 * Food - FoodRes[0];
@@ -1983 +1983 @@
       if (Tile and fTerImp = tiIrrigation) or (Tile and fTerImp = tiFarm) or
         (Tile and fCity <> 0) then
-        inc(Food, IrrEff); { irrigation effect }
+        Inc(Food, IrrEff); { irrigation effect }
       if Tile and fTerImp = tiMine then
-        inc(Prod, MineEff); { mining effect }
-      if (Tile and fRiver <> 0) and (RW[p].Tech[adMapMaking] >= tsApplicable)
+        Inc(Prod, MineEff); { mining effect }
+      if (Tile and fRiver <> 0) and (RW[P].Tech[adMapMaking] >= tsApplicable)
       then
-        inc(Trade); { river effect }
+        Inc(Trade); { river effect }
       if (Tile and (fRoad or fRR) <> 0) and (MoveCost = 1) and
-        (RW[p].Tech[adWheel] >= tsApplicable) then
-        inc(Trade); { road effect }
+        (RW[P].Tech[adWheel] >= tsApplicable) then
+        Inc(Trade); { road effect }
       if (Tile and (fRR or fCity) <> 0) and
-        (RW[p].Tech[adRailroad] >= tsApplicable) then
-        inc(Prod, Prod shr 1); { railroad effect }
+        (RW[P].Tech[adRailroad] >= tsApplicable) then
+        Inc(Prod, Prod shr 1); { railroad effect }
 
       ExplCity := -1;
-      if (cix >= 0) and (p = p0) then
+      if (cix >= 0) and (P = p0) then
         ExplCity := cix;
       if cix >= 0 then
@@ -2003 +2003 @@
         begin
           if ((Tile and fTerImp = tiFarm) or (Tile and fCity <> 0)) and
-            (RW[p].City[cix].Built[imSupermarket] > 0) then
-            inc(Food, Food shr 1); { farmland effect }
+            (RW[P].City[cix].Built[imSupermarket] > 0) then
+            Inc(Food, Food shr 1); { farmland effect }
           if (Tile and (fRoad or fRR) <> 0) and (MoveCost = 1) and
-            (RW[p].City[cix].Built[imHighways] > 0) then
-            inc(Trade, 1); { superhighway effect }
+            (RW[P].City[cix].Built[imHighways] > 0) then
+            Inc(Trade, 1); { superhighway effect }
         end
         else
         begin
-          if RW[p].City[cix].Built[imHarbor] > 0 then
-            inc(Food); { harbour effect }
-          if RW[p].City[cix].Built[imPlatform] > 0 then
-            inc(Prod); { oil platform effect }
-          if GWonder[woLighthouse].EffectiveOwner = p then
-            inc(Prod);
+          if RW[P].City[cix].Built[imHarbor] > 0 then
+            Inc(Food); { harbour effect }
+          if RW[P].City[cix].Built[imPlatform] > 0 then
+            Inc(Prod); { oil platform effect }
+          if GWonder[woLighthouse].EffectiveOwner = P then
+            Inc(Prod);
         end;
     end;
 
     { good government influence }
-    if (RW[p].Government in [gRepublic, gDemocracy, gFuture]) and (Trade > 0)
+    if (RW[P].Government in [gRepublic, gDemocracy, gFuture]) and (Trade > 0)
     then
-      inc(Trade);
-    if (RW[p].Government = gCommunism) and (Prod > 1) then
-      inc(Prod);
-
-    if RW[p].Government in [gAnarchy, gDespotism] then
+      Inc(Trade);
+    if (RW[P].Government = gCommunism) and (Prod > 1) then
+      Inc(Prod);
+
+    if RW[P].Government in [gAnarchy, gDespotism] then
     begin { bad government influence }
       if Food > 3 then
@@ -2039 +2039 @@
     if Tile and (fTerrain or fPoll) > fPoll then
     begin { pollution - decrease ressources }
-      dec(Food, Food shr 1);
-      dec(Prod, Prod shr 1);
-      dec(Trade, Trade shr 1);
+      Dec(Food, Food shr 1);
+      Dec(Prod, Prod shr 1);
+      Dec(Trade, Trade shr 1);
     end;
 
     if Tile and fCity <> 0 then
       Trade := 0
-    else if (cix >= 0) and (RW[p].City[cix].Built[imCourt] + RW[p].City[cix]
+    else if (cix >= 0) and (RW[P].City[cix].Built[imCourt] + RW[P].City[cix]
       .Built[imPalace] = 0) then
-      if RW[p].City[cix].Built[imTownHall] = 0 then
+      if RW[P].City[cix].Built[imTownHall] = 0 then
         Trade := 0
       else if Trade > 3 then
         Trade := 3;
   end;
-  result := eOK;
-end;
-
-procedure Strongest(Loc: integer; var uix, Strength, Bonus, Cnt: integer);
+  Result := eOK;
+end;
+
+procedure Strongest(Loc: Integer; var uix, Strength, Bonus, Cnt: Integer);
 { find strongest defender at Loc }
 var
   Defender, uix1, Det, Cost, TestStrength, TestBonus, TestDet, TestCost,
-    Domain: integer;
+    Domain: Integer;
   PUn: ^TUn;
   PModel: ^TModel;
@@ -2078 +2078 @@
     if PUn.Loc = Loc then
     begin
-      inc(Cnt);
+      Inc(Cnt);
       if PUn.Master < 0 then
       begin
@@ -2085 +2085 @@
           TestBonus := Terrain[RealMap[Loc] and fTerrain].Defense;
           if RealMap[Loc] and fTerImp = tiFort then
-            inc(TestBonus, 4);
+            Inc(TestBonus, 4);
           if PUn.Flags and unFortified <> 0 then
-            inc(TestBonus, 2);
+            Inc(TestBonus, 2);
           if (PModel.Kind = mkSpecial_TownGuard) and
             (RealMap[Loc] and fCity <> 0) then
-            inc(TestBonus, 4);
+            Inc(TestBonus, 4);
         end
         else
           TestBonus := 4;
-        inc(TestBonus, PUn.exp div ExpCost);
+        Inc(TestBonus, PUn.exp div ExpCost);
         TestStrength := PModel.Defense * TestBonus * PUn.Health;
         if (Domain = dAir) and ((RealMap[Loc] and fCity <> 0) or
@@ -2104 +2104 @@
         if PModel.Cap[mcStealth] > 0 then
         else if PModel.Cap[mcSub] > 0 then
-          inc(TestDet, 1 shl 28)
+          Inc(TestDet, 1 shl 28)
         else if (Domain = dGround) and (PModel.Cap[mcFanatic] > 0) and
           not(RW[Defender].Government in [gRepublic, gDemocracy, gFuture]) then
-          inc(TestDet, 4 shl 28) // fanatic ground units always defend
+          Inc(TestDet, 4 shl 28) // fanatic ground units always defend
         else if PModel.Flags and mdZOC <> 0 then
-          inc(TestDet, 3 shl 28)
+          Inc(TestDet, 3 shl 28)
         else
-          inc(TestDet, 2 shl 28);
+          Inc(TestDet, 2 shl 28);
         TestCost := RW[Defender].Model[PUn.mix].Cost;
         if (TestDet > Det) or (TestDet = Det) and (TestCost < Cost) then
@@ -2126 +2126 @@
 end;
 
-function UnitSpeed(p, mix, Health: integer): integer;
-begin
-  with RW[p].Model[mix] do
-  begin
-    result := Speed;
+function UnitSpeed(P, mix, Health: Integer): Integer;
+begin
+  with RW[P].Model[mix] do
+  begin
+    Result := Speed;
     if Domain = dSea then
     begin
-      if GWonder[woMagellan].EffectiveOwner = p then
-        inc(result, 200);
+      if GWonder[woMagellan].EffectiveOwner = P then
+        Inc(Result, 200);
       if Health < 100 then
-        result := ((result - 250) * Health div 5000) * 50 + 250;
-    end;
-  end;
-end;
-
-procedure GetUnitReport(p, uix: integer; var UnitReport: TUnitReport);
-var
-  TerrOwner: integer;
+        Result := ((Result - 250) * Health div 5000) * 50 + 250;
+    end;
+  end;
+end;
+
+procedure GetUnitReport(P, uix: Integer; var UnitReport: TUnitReport);
+var
+  TerrOwner: Integer;
   PModel: ^TModel;
 begin
@@ -2149 +2149 @@
   UnitReport.ProdSupport := 0;
   UnitReport.ReportFlags := 0;
-  if RW[p].Government <> gAnarchy then
-    with RW[p].Un[uix] do
-    begin
-      PModel := @RW[p].Model[mix];
+  if RW[P].Government <> gAnarchy then
+    with RW[P].Un[uix] do
+    begin
+      PModel := @RW[P].Model[mix];
       if (PModel.Kind = mkSettler)
       { and (GWonder[woFreeSettlers].EffectiveOwner<>p) } then
-        UnitReport.FoodSupport := SettlerFood[RW[p].Government]
+        UnitReport.FoodSupport := SettlerFood[RW[P].Government]
       else if Flags and unConscripts <> 0 then
         UnitReport.FoodSupport := 1;
 
-      if RW[p].Government <> gFundamentalism then
+      if RW[P].Government <> gFundamentalism then
       begin
         if GTestFlags and tfImmImprove = 0 then
@@ -2174 +2174 @@
         begin
           TerrOwner := RealMap[Loc] shr 27;
-          case RW[p].Government of
+          case RW[P].Government of
             gRepublic, gFuture:
-              if (TerrOwner <> p) and (TerrOwner < nPl) and
-                (RW[p].Treaty[TerrOwner] < trAlliance) then
+              if (TerrOwner <> P) and (TerrOwner < nPl) and
+                (RW[P].Treaty[TerrOwner] < trAlliance) then
                 UnitReport.ReportFlags := UnitReport.ReportFlags or urfDeployed;
             gDemocracy:
-              if (TerrOwner >= nPl) or (TerrOwner <> p) and
-                (RW[p].Treaty[TerrOwner] < trAlliance) then
+              if (TerrOwner >= nPl) or (TerrOwner <> P) and
+                (RW[P].Treaty[TerrOwner] < trAlliance) then
                 UnitReport.ReportFlags := UnitReport.ReportFlags or urfDeployed;
           end;
@@ -2189 +2189 @@
 end;
 
-procedure SearchCity(Loc: integer; var p, cix: integer);
+procedure SearchCity(Loc: Integer; var P, cix: Integer);
 // set p to supposed owner before call
 var
-  i: integer;
+  I: Integer;
 begin
   if RealMap[Loc] < nPl shl 27 then
-    p := RealMap[Loc] shr 27;
-  for i := 0 to nPl - 1 do
-  begin
-    if 1 shl p and GAlive <> 0 then
-      with RW[p] do
+    P := RealMap[Loc] shr 27;
+  for I := 0 to nPl - 1 do
+  begin
+    if 1 shl P and GAlive <> 0 then
+      with RW[P] do
       begin
         cix := nCity - 1;
         while (cix >= 0) and (City[cix].Loc <> Loc) do
-          dec(cix);
+          Dec(cix);
         if cix >= 0 then
-          exit;
-      end;
-    assert(i < nPl - 1);
-    p := (p + 1) mod nPl;
-  end;
-end;
-
-procedure MakeCityInfo(p, cix: integer; var ci: TCityInfo);
-begin
-  assert((p >= 0) and (p < nPl));
-  assert((cix >= 0) and (cix < RW[p].nCity));
-  with RW[p].City[cix] do
+          Exit;
+      end;
+    Assert(I < nPl - 1);
+    P := (P + 1) mod nPl;
+  end;
+end;
+
+procedure MakeCityInfo(P, cix: Integer; var ci: TCityInfo);
+begin
+  Assert((P >= 0) and (P < nPl));
+  Assert((cix >= 0) and (cix < RW[P].nCity));
+  with RW[P].City[cix] do
   begin
     ci.Loc := Loc;
     ci.ID := ID;
-    ci.Owner := p;
+    ci.Owner := P;
     ci.Size := Size;
     ci.Flags := 0;
     if Built[imPalace] > 0 then
-      inc(ci.Flags, ciCapital);
-    if (Built[imWalls] > 0) or (Continent[Loc] = GrWallContinent[p]) then
-      inc(ci.Flags, ciWalled);
+      Inc(ci.Flags, ciCapital);
+    if (Built[imWalls] > 0) or (Continent[Loc] = GrWallContinent[P]) then
+      Inc(ci.Flags, ciWalled);
     if Built[imCoastalFort] > 0 then
-      inc(ci.Flags, ciCoastalFort);
+      Inc(ci.Flags, ciCoastalFort);
     if Built[imMissileBat] > 0 then
-      inc(ci.Flags, ciMissileBat);
+      Inc(ci.Flags, ciMissileBat);
     if Built[imBunker] > 0 then
-      inc(ci.Flags, ciBunker);
+      Inc(ci.Flags, ciBunker);
     if Built[imSpacePort] > 0 then
-      inc(ci.Flags, ciSpacePort);
-  end;
-end;
-
-procedure TellAboutModel(p, taOwner, tamix: integer);
-var
-  i: integer;
-begin
-  if (p = taOwner) or (Mode < moPlaying) then
-    exit;
-  i := 0;
-  while (i < RW[p].nEnemyModel) and ((RW[p].EnemyModel[i].Owner <> taOwner) or
-    (RW[p].EnemyModel[i].mix <> tamix)) do
-    inc(i);
-  if i = RW[p].nEnemyModel then
-    IntServer(sIntTellAboutModel + p shl 4, taOwner, tamix, nil^);
-end;
-
-function emixSafe(p, taOwner, tamix: integer): integer;
-begin
-  result := RWemix[p, taOwner, tamix];
-  if result < 0 then
+      Inc(ci.Flags, ciSpacePort);
+  end;
+end;
+
+procedure TellAboutModel(P, taOwner, tamix: Integer);
+var
+  I: Integer;
+begin
+  if (P = taOwner) or (Mode < moPlaying) then
+    Exit;
+  I := 0;
+  while (I < RW[P].nEnemyModel) and ((RW[P].EnemyModel[I].Owner <> taOwner) or
+    (RW[P].EnemyModel[I].mix <> tamix)) do
+    Inc(I);
+  if I = RW[P].nEnemyModel then
+    IntServer(sIntTellAboutModel + P shl 4, taOwner, tamix, nil^);
+end;
+
+function emixSafe(P, taOwner, tamix: Integer): Integer;
+begin
+  Result := RWemix[P, taOwner, tamix];
+  if Result < 0 then
   begin // sIntTellAboutModel comes too late
-    assert(Mode = moMovie);
-    result := $FFFF;
-  end;
-end;
-
-procedure IntroduceEnemy(p1, p2: integer);
+    Assert(Mode = moMovie);
+    Result := $FFFF;
+  end;
+end;
+
+procedure IntroduceEnemy(p1, p2: Integer);
 begin
   RW[p1].Treaty[p2] := trNone;
@@ -2268 +2268 @@
 end;
 
-function DiscoverTile(Loc, p, pTell, Level: integer; EnableContact: boolean;
-  euix: integer = -2): boolean;
+function DiscoverTile(Loc, P, pTell, Level: Integer; EnableContact: Boolean;
+  euix: Integer = -2): Boolean;
 // euix = -2: full discover
 // euix = -1: unit and city only, append units in EnemyUn
 // euix >= 0: unit and city only, replace EnemyUn[euix]
 
-  procedure SetContact(p1, p2: integer);
+  procedure SetContact(p1, p2: Integer);
   begin
     if (Mode < moPlaying) or (p1 = p2) or (RW[p1].Treaty[p2] > trNoContact) then
-      exit;
+      Exit;
     IntServer(sIntTellAboutNation, p1, p2, nil^);
     // NewContact[p1,p2]:=true
@@ -2283 +2283 @@
 
 var
-  i, uix, cix, TerrOwner, TerrOwnerTreaty, Strength, Bonus, Cnt, pFoundCity,
-    cixFoundCity, MinLevel, Loc1, V8: integer;
+  I, uix, cix, TerrOwner, TerrOwnerTreaty, Strength, Bonus, Cnt, pFoundCity,
+    cixFoundCity, MinLevel, Loc1, V8: Integer;
   Tile, AddFlags: Cardinal;
   Adjacent: TVicinity8Loc;
@@ -2290 +2290 @@
   mox: ^TModel;
 begin
-  result := false;
+  Result := False;
   with RW[pTell] do
   begin
@@ -2306 +2306 @@
         AddFlags := AddFlags or fGrWall;
       if (Mode = moPlaying) and ((Tile and (nPl shl 27) <> nPl shl 27) and
-        (pTell = p)) then
+        (pTell = P)) then
       begin // set fPeace flag?
         TerrOwner := Tile shr 27;
@@ -2333 +2333 @@
           unx := @RW[Occupant[Loc]].Un[uix];
           mox := @RW[Occupant[Loc]].Model[unx.mix];
-          assert((ZoCMap[Loc] <> 0) = (mox.Flags and mdZOC <> 0));
+          Assert((ZoCMap[Loc] <> 0) = (mox.Flags and mdZOC <> 0));
           if (mox.Cap[mcStealth] > 0) and (Tile and fCity = 0) and
             (Tile and fTerImp <> tiBase) then
@@ -2349 +2349 @@
             begin
               uix := nEnemyUn;
-              inc(nEnemyUn);
-              assert(nEnemyUn < neumax);
+              Inc(nEnemyUn);
+              Assert(nEnemyUn < neumax);
             end;
             MakeUnitInfo(Occupant[Loc], unx^, EnemyUn[uix]);
             if Cnt > 1 then
               EnemyUn[uix].Flags := EnemyUn[uix].Flags or unMulti;
-            if (mox.Flags and mdZOC <> 0) and (pTell = p) and
+            if (mox.Flags and mdZOC <> 0) and (pTell = P) and
               (Treaty[Occupant[Loc]] < trAlliance) then
             begin // set fInEnemyZoC flags of surrounding tiles
@@ -2374 +2374 @@
             end;
             // Level:=lObserveSuper; // don't discover unit twice
-            if (pTell = p) and
+            if (pTell = P) and
               ((Tile and fCity = 0) or (1 shl pTell and GAI <> 0)) then
-              result := true;
+              Result := True;
           end
           else
@@ -2398 +2398 @@
           while (cixFoundCity >= 0) and
             (RW[pFoundCity].City[cixFoundCity].Loc <> Loc) do
-            dec(cixFoundCity);
-          assert(cixFoundCity >= 0);
-          i := 0;
-          while (i < nEnemyCity) and (EnemyCity[i].Loc <> Loc) do
-            inc(i);
-          if i = nEnemyCity then
+            Dec(cixFoundCity);
+          Assert(cixFoundCity >= 0);
+          I := 0;
+          while (I < nEnemyCity) and (EnemyCity[I].Loc <> Loc) do
+            Inc(I);
+          if I = nEnemyCity then
           begin
-            inc(nEnemyCity);
-            assert(nEnemyCity < necmax);
-            EnemyCity[i].Status := 0;
-            EnemyCity[i].SavedStatus := 0;
-            if pTell = p then
-              result := true;
+            Inc(nEnemyCity);
+            Assert(nEnemyCity < necmax);
+            EnemyCity[I].Status := 0;
+            EnemyCity[I].SavedStatus := 0;
+            if pTell = P then
+              Result := True;
           end;
-          MakeCityInfo(pFoundCity, cixFoundCity, EnemyCity[i]);
+          MakeCityInfo(pFoundCity, cixFoundCity, EnemyCity[I]);
         end;
       end
@@ -2421 +2421 @@
 
     if Map[Loc] and fTerrain = fUNKNOWN then
-      inc(Discovered[pTell]);
+      Inc(Discovered[pTell]);
     if euix >= -1 then
       Map[Loc] := Map[Loc] and not(fUnit or fCity or fOwned or fOwnZoCUnit) or
@@ -2440 +2440 @@
 end;
 
-function Discover9(Loc, p, Level: integer;
-  TellAllied, EnableContact: boolean): boolean;
-var
-  V9, Loc1, pTell, OldLevel: integer;
+function Discover9(Loc, P, Level: Integer;
+  TellAllied, EnableContact: Boolean): Boolean;
+var
+  V9, Loc1, pTell, OldLevel: Integer;
   Radius: TVicinity8Loc;
 begin
-  assert((Mode > moLoading_Fast) or (RW[p].nEnemyUn = 0));
-  result := false;
+  Assert((Mode > moLoading_Fast) or (RW[P].nEnemyUn = 0));
+  Result := False;
   V8_to_Loc(Loc, Radius);
   for V9 := 0 to 8 do
@@ -2459 +2459 @@
       begin
         for pTell := 0 to nPl - 1 do
-          if (pTell = p) or (1 shl pTell and GAlive <> 0) and
-            (RW[p].Treaty[pTell] = trAlliance) then
+          if (pTell = P) or (1 shl pTell and GAlive <> 0) and
+            (RW[P].Treaty[pTell] = trAlliance) then
           begin
             OldLevel := ObserveLevel[Loc1] shr (2 * pTell) and 3;
             if Level > OldLevel then
-              result := DiscoverTile(Loc1, p, pTell, Level, EnableContact)
-                or result;
+              Result := DiscoverTile(Loc1, P, pTell, Level, EnableContact)
+                or Result;
           end;
       end
       else
       begin
-        OldLevel := ObserveLevel[Loc1] shr (2 * p) and 3;
+        OldLevel := ObserveLevel[Loc1] shr (2 * P) and 3;
         if Level > OldLevel then
-          result := DiscoverTile(Loc1, p, p, Level, EnableContact) or result;
-      end;
-  end;
-end;
-
-function Discover21(Loc, p, AdjacentLevel: integer;
-  TellAllied, EnableContact: boolean): boolean;
-var
-  V21, Loc1, pTell, Level, OldLevel, AdjacentFlags: integer;
+          Result := DiscoverTile(Loc1, P, P, Level, EnableContact) or Result;
+      end;
+  end;
+end;
+
+function Discover21(Loc, P, AdjacentLevel: Integer;
+  TellAllied, EnableContact: Boolean): Boolean;
+var
+  V21, Loc1, pTell, Level, OldLevel, AdjacentFlags: Integer;
   Radius: TVicinity21Loc;
 begin
-  assert((Mode > moLoading_Fast) or (RW[p].nEnemyUn = 0));
-  result := false;
+  Assert((Mode > moLoading_Fast) or (RW[P].nEnemyUn = 0));
+  Result := False;
   AdjacentFlags := $00267620 shr 1;
   V21_to_Loc(Loc, Radius);
@@ -2499 +2499 @@
       begin
         for pTell := 0 to nPl - 1 do
-          if (pTell = p) or (1 shl pTell and GAlive <> 0) and
-            (RW[p].Treaty[pTell] = trAlliance) then
+          if (pTell = P) or (1 shl pTell and GAlive <> 0) and
+            (RW[P].Treaty[pTell] = trAlliance) then
           begin
             OldLevel := ObserveLevel[Loc1] shr (2 * pTell) and 3;
             if Level > OldLevel then
-              result := DiscoverTile(Loc1, p, pTell, Level, EnableContact)
-                or result;
+              Result := DiscoverTile(Loc1, P, pTell, Level, EnableContact)
+                or Result;
           end;
       end
       else
       begin
-        OldLevel := ObserveLevel[Loc1] shr (2 * p) and 3;
+        OldLevel := ObserveLevel[Loc1] shr (2 * P) and 3;
         if Level > OldLevel then
-          result := DiscoverTile(Loc1, p, p, Level, EnableContact) or result;
+          Result := DiscoverTile(Loc1, P, P, Level, EnableContact) or Result;
       end;
     end;
@@ -2519 +2519 @@
 end;
 
-procedure DiscoverAll(p, Level: integer);
+procedure DiscoverAll(P, Level: Integer);
 { player p discovers complete playground (for supervisor) }
 var
-  Loc, OldLevel: integer;
-begin
-  assert((Mode > moLoading_Fast) or (RW[p].nEnemyUn = 0));
+  Loc, OldLevel: Integer;
+begin
+  Assert((Mode > moLoading_Fast) or (RW[P].nEnemyUn = 0));
   for Loc := 0 to MapSize - 1 do
   begin
-    OldLevel := ObserveLevel[Loc] shr (2 * p) and 3;
+    OldLevel := ObserveLevel[Loc] shr (2 * P) and 3;
     if Level > OldLevel then
-      DiscoverTile(Loc, p, p, Level, false);
-  end;
-end;
-
-procedure DiscoverViewAreas(p: integer);
-var
-  pTell, uix, cix, ecix, Loc, RealOwner: integer;
+      DiscoverTile(Loc, P, P, Level, False);
+  end;
+end;
+
+procedure DiscoverViewAreas(P: Integer);
+var
+  pTell, uix, cix, ecix, Loc, RealOwner: Integer;
   PModel: ^TModel;
 begin // discover unit and city view areas
   for pTell := 0 to nPl - 1 do
-    if (pTell = p) or (RW[p].Treaty[pTell] = trAlliance) then
+    if (pTell = P) or (RW[P].Treaty[pTell] = trAlliance) then
     begin
       for uix := 0 to RW[pTell].nUn - 1 do
@@ -2547 +2547 @@
             PModel := @RW[pTell].Model[mix];
             if (PModel.Kind = mkDiplomat) or (PModel.Cap[mcSpy] > 0) then
-              Discover21(Loc, p, lObserveSuper, false, true)
+              Discover21(Loc, P, lObserveSuper, False, True)
             else if (PModel.Cap[mcRadar] + PModel.Cap[mcCarrier] > 0) or
               (PModel.Domain = dAir) then
-              Discover21(Loc, p, lObserveAll, false, false)
+              Discover21(Loc, P, lObserveAll, False, False)
             else if (RealMap[Loc] and fTerrain = fMountains) or
               (RealMap[Loc] and fTerImp = tiFort) or
               (RealMap[Loc] and fTerImp = tiBase) or (PModel.Cap[mcAcademy] > 0)
             then
-              Discover21(Loc, p, lObserveUnhidden, false,
+              Discover21(Loc, P, lObserveUnhidden, False,
                 PModel.Domain = dGround)
             else
-              Discover9(Loc, p, lObserveUnhidden, false,
+              Discover9(Loc, P, lObserveUnhidden, False,
                 PModel.Domain = dGround);
           end;
       for cix := 0 to RW[pTell].nCity - 1 do
         if RW[pTell].City[cix].Loc >= 0 then
-          Discover21(RW[pTell].City[cix].Loc, p, lObserveUnhidden, false, true);
+          Discover21(RW[pTell].City[cix].Loc, P, lObserveUnhidden, False, True);
       for ecix := 0 to RW[pTell].nEnemyCity - 1 do
       begin // players know territory, so no use in hiding city owner
@@ -2582 +2582 @@
 end;
 
-function GetUnitStack(p, Loc: integer): integer;
-var
-  uix: integer;
+function GetUnitStack(P, Loc: Integer): Integer;
+var
+  uix: Integer;
   unx: ^TUn;
 begin
-  result := 0;
+  Result := 0;
   if Occupant[Loc] < 0 then
-    exit;
+    Exit;
   for uix := 0 to RW[Occupant[Loc]].nUn - 1 do
   begin
@@ -2595 +2595 @@
     if unx.Loc = Loc then
     begin
-      MakeUnitInfo(Occupant[Loc], unx^, RW[p].EnemyUn[RW[p].nEnemyUn + result]);
-      TellAboutModel(p, Occupant[Loc], unx.mix);
-      RW[p].EnemyUn[RW[p].nEnemyUn + result].emix :=
-        RWemix[p, Occupant[Loc], unx.mix];
-      inc(result);
-    end;
-  end;
-end;
-
-procedure UpdateUnitMap(Loc: integer; CityChange: boolean = false);
+      MakeUnitInfo(Occupant[Loc], unx^, RW[P].EnemyUn[RW[P].nEnemyUn + Result]);
+      TellAboutModel(P, Occupant[Loc], unx.mix);
+      RW[P].EnemyUn[RW[P].nEnemyUn + Result].emix :=
+        RWemix[P, Occupant[Loc], unx.mix];
+      Inc(Result);
+    end;
+  end;
+end;
+
+procedure UpdateUnitMap(Loc: Integer; CityChange: Boolean = False);
 // update maps and enemy units of all players after unit change
 var
-  p, euix, OldLevel: integer;
+  P, euix, OldLevel: Integer;
   AddFlags, ClearFlags: Cardinal;
 begin
   if (Mode = moLoading_Fast) and not CityChange then
-    exit;
-  for p := 0 to nPl - 1 do
-    if 1 shl p and (GAlive or GWatching) <> 0 then
-    begin
-      OldLevel := ObserveLevel[Loc] shr (2 * p) and 3;
+    Exit;
+  for P := 0 to nPl - 1 do
+    if 1 shl P and (GAlive or GWatching) <> 0 then
+    begin
+      OldLevel := ObserveLevel[Loc] shr (2 * P) and 3;
       if OldLevel > lNoObserve then
       begin
-        if RW[p].Map[Loc] and (fUnit or fOwned) = fUnit then
+        if RW[P].Map[Loc] and (fUnit or fOwned) = fUnit then
         begin
           // replace unit located here in EnemyUn
           // do not just set loc:=-1 because total number would be unlimited
-          euix := RW[p].nEnemyUn - 1;
+          euix := RW[P].nEnemyUn - 1;
           while euix >= 0 do
           begin
-            if RW[p].EnemyUn[euix].Loc = Loc then
+            if RW[P].EnemyUn[euix].Loc = Loc then
             begin
-              RW[p].EnemyUn[euix].Loc := -1;
+              RW[P].EnemyUn[euix].Loc := -1;
               Break;
             end;
-            dec(euix);
+            Dec(euix);
           end;
-          RW[p].Map[Loc] := RW[p].Map[Loc] and not fUnit
+          RW[P].Map[Loc] := RW[P].Map[Loc] and not fUnit
         end
         else
         begin // look for empty slot in EnemyUn
-          euix := RW[p].nEnemyUn - 1;
-          while (euix >= 0) and (RW[p].EnemyUn[euix].Loc >= 0) do
-            dec(euix);
+          euix := RW[P].nEnemyUn - 1;
+          while (euix >= 0) and (RW[P].EnemyUn[euix].Loc >= 0) do
+            Dec(euix);
         end;
         if (Occupant[Loc] < 0) and not CityChange then
@@ -2645 +2645 @@
           if RealMap[Loc] and fCity = 0 then
             ClearFlags := ClearFlags or fOwned;
-          RW[p].Map[Loc] := RW[p].Map[Loc] and not ClearFlags;
+          RW[P].Map[Loc] := RW[P].Map[Loc] and not ClearFlags;
         end
-        else if (Occupant[Loc] <> p) or CityChange then
+        else if (Occupant[Loc] <> P) or CityChange then
         begin // city or enemy unit update necessary, call DiscoverTile
-          ObserveLevel[Loc] := ObserveLevel[Loc] and not(3 shl (2 * p));
-          DiscoverTile(Loc, p, p, OldLevel, false, euix);
+          ObserveLevel[Loc] := ObserveLevel[Loc] and not(3 shl (2 * P));
+          DiscoverTile(Loc, P, P, OldLevel, False, euix);
         end
         else { if (Occupant[Loc]=p) and not CityChange then }
@@ -2660 +2660 @@
           else
             ClearFlags := ClearFlags or fOwnZoCUnit;
-          RW[p].Map[Loc] := RW[p].Map[Loc] and not ClearFlags or AddFlags;
-        end;
-      end;
-    end;
-end;
-
-procedure RecalcV8ZoC(p, Loc: integer);
+          RW[P].Map[Loc] := RW[P].Map[Loc] and not ClearFlags or AddFlags;
+        end;
+      end;
+    end;
+end;
+
+procedure RecalcV8ZoC(P, Loc: Integer);
 // recalculate fInEnemyZoC flags around single tile
 var
-  V8, V8V8, Loc1, Loc2, p1, ObserveMask: integer;
+  V8, V8V8, Loc1, Loc2, p1, ObserveMask: Integer;
   Tile1: ^Cardinal;
   Adjacent, AdjacentAdjacent: TVicinity8Loc;
 begin
   if Mode = moLoading_Fast then
-    exit;
-  ObserveMask := 3 shl (2 * p);
+    Exit;
+  ObserveMask := 3 shl (2 * P);
   V8_to_Loc(Loc, Adjacent);
   for V8 := 0 to 7 do
@@ -2682 +2682 @@
     if (Loc1 >= 0) and (Loc1 < MapSize) then
     begin
-      Tile1 := @RW[p].Map[Loc1];
+      Tile1 := @RW[P].Map[Loc1];
       Tile1^ := Tile1^ and not fInEnemyZoC;
       V8_to_Loc(Loc1, AdjacentAdjacent);
@@ -2692 +2692 @@
         begin
           p1 := Occupant[Loc2];
-          assert(p1 <> nPl);
-          if (p1 <> p) and (RW[p].Treaty[p1] < trAlliance) then
+          Assert(p1 <> nPl);
+          if (p1 <> P) and (RW[P].Treaty[p1] < trAlliance) then
           begin
             Tile1^ := Tile1^ or fInEnemyZoC;
@@ -2704 +2704 @@
 end;
 
-procedure RecalcMapZoC(p: integer);
+procedure RecalcMapZoC(P: Integer);
 // recalculate fInEnemyZoC flags for the whole map
 var
-  Loc, Loc1, V8, p1, ObserveMask: integer;
+  Loc, Loc1, V8, p1, ObserveMask: Integer;
   Adjacent: TVicinity8Loc;
 begin
   if Mode = moLoading_Fast then
-    exit;
-  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fInEnemyZoC)));
-  ObserveMask := 3 shl (2 * p);
+    Exit;
+  MaskD(RW[P].Map^, MapSize, Cardinal(not Cardinal(fInEnemyZoC)));
+  ObserveMask := 3 shl (2 * P);
   for Loc := 0 to MapSize - 1 do
     if (ZoCMap[Loc] > 0) and (ObserveLevel[Loc] and ObserveMask <> 0) then
     begin
       p1 := Occupant[Loc];
-      assert(p1 <> nPl);
-      if (p1 <> p) and (RW[p].Treaty[p1] < trAlliance) then
+      Assert(p1 <> nPl);
+      if (p1 <> P) and (RW[P].Treaty[p1] < trAlliance) then
       begin // this non-allied enemy ZoC unit is known to this player -- set flags!
         V8_to_Loc(Loc, Adjacent);
@@ -2726 +2726 @@
           Loc1 := Adjacent[V8];
           if (Loc1 >= 0) and (Loc1 < MapSize) then
-            RW[p].Map[Loc1] := RW[p].Map[Loc1] or fInEnemyZoC;
-        end;
-      end;
-    end;
-end;
-
-procedure RecalcPeaceMap(p: integer);
+            RW[P].Map[Loc1] := RW[P].Map[Loc1] or fInEnemyZoC;
+        end;
+      end;
+    end;
+end;
+
+procedure RecalcPeaceMap(P: Integer);
 // recalculate fPeace flags for the whole map
 var
-  Loc, p1: integer;
-  PeacePlayer: array [-1 .. nPl - 1] of boolean;
+  Loc, p1: Integer;
+  PeacePlayer: array [-1 .. nPl - 1] of Boolean;
 begin
   if Mode <> moPlaying then
-    exit;
-  MaskD(RW[p].Map^, MapSize, Cardinal(not Cardinal(fPeace)));
+    Exit;
+  MaskD(RW[P].Map^, MapSize, Cardinal(not Cardinal(fPeace)));
   for p1 := -1 to nPl - 1 do
-    PeacePlayer[p1] := (p1 >= 0) and (p1 <> p) and (1 shl p1 and GAlive <> 0)
-      and (RW[p].Treaty[p1] in [trPeace, TrFriendlyContact]);
+    PeacePlayer[p1] := (p1 >= 0) and (p1 <> P) and (1 shl p1 and GAlive <> 0)
+      and (RW[P].Treaty[p1] in [trPeace, TrFriendlyContact]);
   for Loc := 0 to MapSize - 1 do
-    if PeacePlayer[RW[p].Territory[Loc]] then
-      RW[p].Map[Loc] := RW[p].Map[Loc] or fPeace;
+    if PeacePlayer[RW[P].Territory[Loc]] then
+      RW[P].Map[Loc] := RW[P].Map[Loc] or fPeace;
 end;
 
@@ -2756 +2756 @@
   BorderChanges: array [0 .. sIntExpandTerritory and $F - 1] of Cardinal;
 
-procedure ChangeTerritory(Loc, p: integer);
-var
-  p1: integer;
-begin
-  Assert(p >= 0); // no player's territory indicated by p=nPl
+procedure ChangeTerritory(Loc, P: Integer);
+var
+  p1: Integer;
+begin
+  Assert(P >= 0); // no player's territory indicated by p=nPl
   Dec(TerritoryCount[RealMap[Loc] shr 27]);
-  Inc(TerritoryCount[p]);
-  RealMap[Loc] := RealMap[Loc] and not($F shl 27) or Cardinal(p) shl 27;
-  if p = $F then
-    p := -1;
+  Inc(TerritoryCount[P]);
+  RealMap[Loc] := RealMap[Loc] and not($F shl 27) or Cardinal(P) shl 27;
+  if P = $F then
+    P := -1;
   for p1 := 0 to nPl - 1 do
     if 1 shl p1 and (GAlive or GWatching) <> 0 then
       if RW[p1].Map[Loc] and fTerrain <> fUNKNOWN then
       begin
-        RW[p1].Territory[Loc] := p;
-        if (p < nPl) and (p <> p1) and (1 shl p and GAlive <> 0) and
-          (RW[p1].Treaty[p] in [trPeace, TrFriendlyContact]) then
+        RW[p1].Territory[Loc] := P;
+        if (P < nPl) and (P <> p1) and (1 shl P and GAlive <> 0) and
+          (RW[p1].Treaty[P] in [trPeace, TrFriendlyContact]) then
           RW[p1].Map[Loc] := RW[p1].Map[Loc] or fPeace
         else
@@ -2779 +2779 @@
 end;
 
-procedure ExpandTerritory(OriginLoc: integer);
-var
-  i, dx, dy, dxMax, dyMax, Loc, NewOwner: integer;
+procedure ExpandTerritory(OriginLoc: Integer);
+var
+  I, dx, dy, dxMax, dyMax, Loc, NewOwner: Integer;
 begin
   if OriginLoc = -1 then
     raise Exception.Create('Location error');
-  i := 0;
+  I := 0;
   dyMax := 0;
   while (dyMax + 1) + (dyMax + 1) shr 1 <= CountryRadius do
-    inc(dyMax);
+    Inc(dyMax);
   for dy := -dyMax to dyMax do
   begin
@@ -2794 +2794 @@
     while abs(dy) + (dxMax + 2) + abs(abs(dy) - (dxMax + 2)) shr 1 <=
       CountryRadius do
-      inc(dxMax, 2);
+      Inc(dxMax, 2);
     for dx := -dxMax to dxMax do
       if (dy + dx) and 1 = 0 then
       begin
-        NewOwner := BorderChanges[i div 8] shr (i mod 8 * 4) and $F;
+        NewOwner := BorderChanges[I div 8] shr (I mod 8 * 4) and $F;
         Loc := dLoc(OriginLoc, dx, dy);
         if (Loc >= 0) and (Cardinal(NewOwner) <> RealMap[Loc] shr 27) then
           ChangeTerritory(Loc, NewOwner);
-        inc(i);
-      end;
-  end;
-end;
-
-procedure CheckBorders(OriginLoc, PlayerLosingCity: integer);
+        Inc(I);
+      end;
+  end;
+end;
+
+procedure CheckBorders(OriginLoc, PlayerLosingCity: Integer);
 // OriginLoc: only changes in CountryRadius around this location possible,
 // -1 for complete map, -2 for double-check (no more changes allowed)
@@ -2813 +2813 @@
 // player's territory, -1 for full border recalculation
 var
-  i, r, Loc, Loc1, dx, dy, p1, p2, cix, NewDist, dxMax, dyMax, OldOwner, V8: Integer;
+  I, R, Loc, Loc1, dx, dy, p1, p2, cix, NewDist, dxMax, dyMax, OldOwner, V8: Integer;
   NewOwner: Cardinal;
   Adjacent: TVicinity8Loc;
-  AtPeace: array [0 .. nPl, 0 .. nPl] of boolean;
+  AtPeace: array [0 .. nPl, 0 .. nPl] of Boolean;
   Country, FormerCountry, { to who's country a tile belongs }
   Dist, FormerDist, StolenDist: array [0 .. lxmax * lymax - 1] of ShortInt;
@@ -2828 +2828 @@
         StolenDist[RW[PlayerLosingCity].City[cix].Loc] := 0;
 
-    for r := 1 to CountryRadius shr 1 do
-    begin
-      move(StolenDist, FormerDist, MapSize);
+    for R := 1 to CountryRadius shr 1 do
+    begin
+      Move(StolenDist, FormerDist, MapSize);
       for Loc := 0 to MapSize - 1 do
         if (FormerDist[Loc] <= CountryRadius - 2)
@@ -2862 +2862 @@
         end;
 
-  for r := 1 to CountryRadius shr 1 do
-  begin
-    move(Country, FormerCountry, MapSize);
-    move(Dist, FormerDist, MapSize);
+  for R := 1 to CountryRadius shr 1 do
+  begin
+    Move(Country, FormerCountry, MapSize);
+    Move(Dist, FormerDist, MapSize);
     for Loc := 0 to MapSize - 1 do
       if (FormerDist[Loc] <= CountryRadius - 2) // use same conditions as above!
@@ -2871 +2871 @@
         (1 shl fShore + 1 shl fMountains + 1 shl fArctic) = 0) then
       begin
-        assert(FormerCountry[Loc] >= 0);
+        Assert(FormerCountry[Loc] >= 0);
         V8_to_Loc(Loc, Adjacent);
         for V8 := 0 to 7 do
@@ -2886 +2886 @@
   end;
 
-  FillChar(AtPeace, SizeOf(AtPeace), false);
+  FillChar(AtPeace, SizeOf(AtPeace), False);
   for p1 := 0 to nPl - 1 do
     if 1 shl p1 and GAlive <> 0 then
@@ -2892 +2892 @@
         if (p2 <> p1) and (1 shl p2 and GAlive <> 0) and
           (RW[p1].Treaty[p2] >= trPeace) then
-          AtPeace[p1, p2] := true;
+          AtPeace[p1, p2] := True;
 
   if OriginLoc >= 0 then
   begin // update area only
-    i := 0;
+    I := 0;
     FillChar(BorderChanges, SizeOf(BorderChanges), 0);
     dyMax := 0;
     while (dyMax + 1) + (dyMax + 1) shr 1 <= CountryRadius do
-      inc(dyMax);
+      Inc(dyMax);
     for dy := -dyMax to dyMax do
     begin
@@ -2906 +2906 @@
       while abs(dy) + (dxMax + 2) + abs(abs(dy) - (dxMax + 2)) shr 1 <=
         CountryRadius do
-        inc(dxMax, 2);
+        Inc(dxMax, 2);
       for dx := -dxMax to dxMax do
         if (dy + dx) and 1 = 0 then
@@ -2922 +2922 @@
               else
                 ChangeTerritory(Loc, NewOwner);
-            BorderChanges[i shr 3] := BorderChanges[i shr 3] or
-              ((NewOwner shl ((i and 7) * 4)) and $ffffffff);
+            BorderChanges[I shr 3] := BorderChanges[I shr 3] or
+              ((NewOwner shl ((I and 7) * 4)) and $ffffffff);
           end;
-          inc(i);
+          Inc(I);
         end;
     end;
@@ -2938 +2938 @@
       then
       begin
-        assert(OriginLoc <> -2); // test if border saving works
+        Assert(OriginLoc <> -2); // test if border saving works
         ChangeTerritory(Loc, NewOwner);
       end;
@@ -2947 +2947 @@
 end;
 
-procedure LogCheckBorders(p, cix, PlayerLosingCity: integer);
-begin
-  CheckBorders(RW[p].City[cix].Loc, PlayerLosingCity);
-  IntServer(sIntExpandTerritory, p, cix, BorderChanges);
+procedure LogCheckBorders(P, cix, PlayerLosingCity: Integer);
+begin
+  CheckBorders(RW[P].City[cix].Loc, PlayerLosingCity);
+  IntServer(sIntExpandTerritory, P, cix, BorderChanges);
 end;
 
@@ -2958 +2958 @@
 }
 
-procedure CreateUnit(p, mix: integer);
-begin
-  with RW[p] do
+procedure CreateUnit(P, mix: Integer);
+begin
+  with RW[P] do
   begin
     Un[nUn].mix := mix;
     with Un[nUn] do
     begin
-      ID := UnBuilt[p];
-      inc(UnBuilt[p]);
+      ID := UnBuilt[P];
+      Inc(UnBuilt[P]);
       Status := 0;
       SavedStatus := 0;
-      inc(Model[mix].Built);
+      Inc(Model[mix].Built);
       Home := -1;
       Health := 100;
@@ -2985 +2985 @@
       Master := -1;
     end;
-    inc(nUn);
+    Inc(nUn);
   end
 end;
 
-procedure FreeUnit(p, uix: integer);
+procedure FreeUnit(P, uix: Integer);
 // loc or master should be set after call
 // implementation is critical for loading performance, change carefully
 var
-  Loc0, uix1: integer;
-  Occ, ZoC: boolean;
-begin
-  with RW[p].Un[uix] do
+  Loc0, uix1: Integer;
+  Occ, ZoC: Boolean;
+begin
+  with RW[P].Un[uix] do
   begin
     Job := jNone;
@@ -3004 +3004 @@
   if Occupant[Loc0] >= 0 then
   begin
-    assert(Occupant[Loc0] = p);
-    Occ := false;
-    ZoC := false;
-    for uix1 := 0 to RW[p].nUn - 1 do
-      with RW[p].Un[uix1] do
+    Assert(Occupant[Loc0] = P);
+    Occ := False;
+    ZoC := False;
+    for uix1 := 0 to RW[P].nUn - 1 do
+      with RW[P].Un[uix1] do
         if (Loc = Loc0) and (Master < 0) and (uix1 <> uix) then
         begin
-          Occ := true;
-          if RW[p].Model[mix].Flags and mdZOC <> 0 then
+          Occ := True;
+          if RW[P].Model[mix].Flags and mdZOC <> 0 then
           begin
-            ZoC := true;
+            ZoC := True;
             Break;
           end;
@@ -3025 +3025 @@
 end;
 
-procedure PlaceUnit(p, uix: integer);
-begin
-  with RW[p].Un[uix] do
-  begin
-    Occupant[Loc] := p;
-    if RW[p].Model[mix].Flags and mdZOC <> 0 then
+procedure PlaceUnit(P, uix: Integer);
+begin
+  with RW[P].Un[uix] do
+  begin
+    Occupant[Loc] := P;
+    if RW[P].Model[mix].Flags and mdZOC <> 0 then
       ZoCMap[Loc] := 1;
   end;
 end;
 
-procedure CountLost(p, mix, Enemy: integer);
-begin
-  Inc(RW[p].Model[mix].Lost);
-  TellAboutModel(Enemy, p, mix);
-  Inc(Destroyed[Enemy, p, mix]);
-end;
-
-procedure RemoveUnit(p, uix: integer; Enemy: integer = -1);
+procedure CountLost(P, mix, Enemy: Integer);
+begin
+  Inc(RW[P].Model[mix].Lost);
+  TellAboutModel(Enemy, P, mix);
+  Inc(Destroyed[Enemy, P, mix]);
+end;
+
+procedure RemoveUnit(P, uix: Integer; Enemy: Integer = -1);
 // use enemy only from inside sMoveUnit if attack
 var
-  uix1: integer;
-begin
-  with RW[p].Un[uix] do
-  begin
-    assert((Loc >= 0) or (RW[p].Model[mix].Kind = mkDiplomat));
+  uix1: Integer;
+begin
+  with RW[P].Un[uix] do
+  begin
+    Assert((Loc >= 0) or (RW[P].Model[mix].Kind = mkDiplomat));
     // already freed when spy mission
     if Loc >= 0 then
-      FreeUnit(p, uix);
+      FreeUnit(P, uix);
     if Master >= 0 then
-      if RW[p].Model[mix].Domain = dAir then
-        dec(RW[p].Un[Master].AirLoad)
+      if RW[P].Model[mix].Domain = dAir then
+        Dec(RW[P].Un[Master].AirLoad)
       else
-        dec(RW[p].Un[Master].TroopLoad);
+        Dec(RW[P].Un[Master].TroopLoad);
     if (TroopLoad > 0) or (AirLoad > 0) then
-      for uix1 := 0 to RW[p].nUn - 1 do
-        if (RW[p].Un[uix1].Loc >= 0) and (RW[p].Un[uix1].Master = uix) then
+      for uix1 := 0 to RW[P].nUn - 1 do
+        if (RW[P].Un[uix1].Loc >= 0) and (RW[P].Un[uix1].Master = uix) then
         { unit mastered by removed unit -- remove too }
         begin
-          RW[p].Un[uix1].Loc := -1;
+          RW[P].Un[uix1].Loc := -1;
           if Enemy >= 0 then
-            CountLost(p, RW[p].Un[uix1].mix, Enemy);
+            CountLost(P, RW[P].Un[uix1].mix, Enemy);
         end;
     Loc := -1;
     if Enemy >= 0 then
-      CountLost(p, mix, Enemy);
-  end;
-end;
-
-procedure RemoveUnit_UpdateMap(p, uix: integer);
+      CountLost(P, mix, Enemy);
+  end;
+end;
+
+procedure RemoveUnit_UpdateMap(P, uix: Integer);
 var
   Loc0: Integer;
 begin
-  Loc0 := RW[p].Un[uix].Loc;
-  RemoveUnit(p, uix);
+  Loc0 := RW[P].Un[uix].Loc;
+  RemoveUnit(P, uix);
   if Mode > moLoading_Fast then
     UpdateUnitMap(Loc0);
 end;
 
-procedure RemoveAllUnits(p, Loc: integer; Enemy: integer = -1);
-var
-  uix: integer;
-begin
-  for uix := 0 to RW[p].nUn - 1 do
-    if RW[p].Un[uix].Loc = Loc then
+procedure RemoveAllUnits(P, Loc: Integer; Enemy: Integer = -1);
+var
+  uix: Integer;
+begin
+  for uix := 0 to RW[P].nUn - 1 do
+    if RW[P].Un[uix].Loc = Loc then
     begin
       if Enemy >= 0 then
-        CountLost(p, RW[p].Un[uix].mix, Enemy);
-      RW[p].Un[uix].Loc := -1;
+        CountLost(P, RW[P].Un[uix].mix, Enemy);
+      RW[P].Un[uix].Loc := -1;
     end;
   Occupant[Loc] := -1;
@@ -3098 +3098 @@
 end;
 
-procedure RemoveDomainUnits(d, p, Loc: integer);
-var
-  uix: integer;
-begin
-  for uix := 0 to RW[p].nUn - 1 do
-    if (RW[p].Model[RW[p].Un[uix].mix].Domain = d) and (RW[p].Un[uix].Loc = Loc)
+procedure RemoveDomainUnits(D, P, Loc: Integer);
+var
+  uix: Integer;
+begin
+  for uix := 0 to RW[P].nUn - 1 do
+    if (RW[P].Model[RW[P].Un[uix].mix].Domain = D) and (RW[P].Un[uix].Loc = Loc)
     then
-      RemoveUnit(p, uix);
-end;
-
-procedure FoundCity(p, FoundLoc: integer);
-var
-  p1, cix1, V21, dx, dy: integer;
-begin
-  if RW[p].nCity = ncmax then
-    exit;
-  inc(RW[p].nCity);
-  with RW[p].City[RW[p].nCity - 1] do
+      RemoveUnit(P, uix);
+end;
+
+procedure FoundCity(P, FoundLoc: Integer);
+var
+  p1, cix1, V21, dx, dy: Integer;
+begin
+  if RW[P].nCity = ncmax then
+    Exit;
+  Inc(RW[P].nCity);
+  with RW[P].City[RW[P].nCity - 1] do
   begin
     Size := 2;
@@ -3131 +3131 @@
     if UsedByCity[FoundLoc] >= 0 then
     begin { central tile is exploited - toggle in exploiting city }
-      p1 := p;
+      p1 := P;
       SearchCity(UsedByCity[FoundLoc], p1, cix1);
       dxdy(UsedByCity[FoundLoc], FoundLoc, dx, dy);
@@ -3142 +3142 @@
       (fTerrain or fSpecial or fRiver or nPl shl 27) or fCity;
 
-    ChangeTerritory(Loc, p);
-  end;
-end;
-
-procedure StealCity(p, cix: integer; SaveUnits: boolean);
-var
-  i, j, uix1, cix1, nearest: integer;
-begin
-  for i := 0 to nWonder - 1 do
-    if RW[p].City[cix].Built[i] = 1 then
-    begin
-      GWonder[i].EffectiveOwner := -1;
-      if i = woPyramids then
+    ChangeTerritory(Loc, P);
+  end;
+end;
+
+procedure StealCity(P, cix: Integer; SaveUnits: Boolean);
+var
+  I, J, uix1, cix1, nearest: Integer;
+begin
+  for I := 0 to nWonder - 1 do
+    if RW[P].City[cix].Built[I] = 1 then
+    begin
+      GWonder[I].EffectiveOwner := -1;
+      if I = woPyramids then
         FreeSlaves;
-      if i = woEiffel then // deactivate expired wonders
-        for j := 0 to nWonder - 1 do
-          if GWonder[j].EffectiveOwner = p then
-            CheckExpiration(j);
-    end;
-  for i := nWonder to nImp - 1 do
-    if (Imp[i].Kind <> ikCommon) and (RW[p].City[cix].Built[i] > 0) then
+      if I = woEiffel then // deactivate expired wonders
+        for J := 0 to nWonder - 1 do
+          if GWonder[J].EffectiveOwner = P then
+            CheckExpiration(J);
+    end;
+  for I := nWonder to nImp - 1 do
+    if (Imp[I].Kind <> ikCommon) and (RW[P].City[cix].Built[I] > 0) then
     begin { destroy national projects }
-      RW[p].NatBuilt[i] := 0;
-      if i = imGrWall then
-        GrWallContinent[p] := -1;
-    end;
-
-  for uix1 := 0 to RW[p].nUn - 1 do
-    with RW[p].Un[uix1] do
+      RW[P].NatBuilt[I] := 0;
+      if I = imGrWall then
+        GrWallContinent[P] := -1;
+    end;
+
+  for uix1 := 0 to RW[P].nUn - 1 do
+    with RW[P].Un[uix1] do
       if (Loc >= 0) and (Home = cix) then
         if SaveUnits then
         begin // support units by nearest other city
           nearest := -1;
-          for cix1 := 0 to RW[p].nCity - 1 do
-            if (cix1 <> cix) and (RW[p].City[cix1].Loc >= 0) and
-              ((nearest < 0) or (Distance(RW[p].City[cix1].Loc, Loc) <
-              Distance(RW[p].City[nearest].Loc, Loc))) then
+          for cix1 := 0 to RW[P].nCity - 1 do
+            if (cix1 <> cix) and (RW[P].City[cix1].Loc >= 0) and
+              ((nearest < 0) or (Distance(RW[P].City[cix1].Loc, Loc) <
+              Distance(RW[P].City[nearest].Loc, Loc))) then
               nearest := cix1;
           Home := nearest;
         end
         else
-          RemoveUnit(p, uix1); // destroy supported units
-end;
-
-procedure DestroyCity(p, cix: integer; SaveUnits: boolean);
-var
-  i, V21: integer;
+          RemoveUnit(P, uix1); // destroy supported units
+end;
+
+procedure DestroyCity(P, cix: Integer; SaveUnits: Boolean);
+var
+  I, V21: Integer;
   Radius: TVicinity21Loc;
 begin
-  StealCity(p, cix, SaveUnits);
-  with RW[p].City[cix] do begin
-    for i := 0 to nWonder - 1 do
-      if Built[i] > 0 then
-        GWonder[i].CityID := WonderDestroyed;
+  StealCity(P, cix, SaveUnits);
+  with RW[P].City[cix] do begin
+    for I := 0 to nWonder - 1 do
+      if Built[I] > 0 then
+        GWonder[I].CityID := WonderDestroyed;
     V21_to_Loc(Loc, Radius);
     for V21 := 1 to 26 do
@@ -3201 +3201 @@
         UsedByCity[Radius[V21]] := -1;
     RealMap[Loc] := RealMap[Loc] and not fCity;
-    Loc := -1
-  end;
-end;
-
-procedure ChangeCityOwner(pOld, cixOld, pNew: integer);
-var
-  i, j, cix1, Loc1, V21: integer;
+    Loc := -1;
+  end;
+end;
+
+procedure ChangeCityOwner(pOld, cixOld, pNew: Integer);
+var
+  I, J, cix1, Loc1, V21: Integer;
   Radius: TVicinity21Loc;
 begin
-  inc(RW[pNew].nCity);
+  Inc(RW[pNew].nCity);
   RW[pNew].City[RW[pNew].nCity - 1] := RW[pOld].City[cixOld];
-  StealCity(pOld, cixOld, false);
+  StealCity(pOld, cixOld, False);
   RW[pOld].City[cixOld].Loc := -1;
   with RW[pNew].City[(RW[pNew].nCity - 1)] do
@@ -3231 +3231 @@
       begin
         Loc1 := Radius[V21];
-        assert((Loc1 >= 0) and (Loc1 < MapSize) and (UsedByCity[Loc1] = Loc));
+        Assert((Loc1 >= 0) and (Loc1 < MapSize) and (UsedByCity[Loc1] = Loc));
         if (ZoCMap[Loc1] > 0) and (Occupant[Loc1] <> pNew) and
           (RW[pNew].Treaty[Occupant[Loc1]] < trAlliance) then
@@ -3243 +3243 @@
     Built[imTownHall] := 0;
     Built[imCourt] := 0;
-    for i := nWonder to nImp - 1 do
-      if Imp[i].Kind <> ikCommon then
-        Built[i] := 0; { destroy national projects }
-    for i := 0 to nWonder - 1 do
-      if Built[i] = 1 then
+    for I := nWonder to nImp - 1 do
+      if Imp[I].Kind <> ikCommon then
+        Built[I] := 0; { destroy national projects }
+    for I := 0 to nWonder - 1 do
+      if Built[I] = 1 then
       begin // new wonder owner!
-        GWonder[i].EffectiveOwner := pNew;
-        if i = woEiffel then // reactivate expired wonders
-        begin
-          for j := 0 to nWonder - 1 do
-            if Imp[j].Expiration >= 0 then
+        GWonder[I].EffectiveOwner := pNew;
+        if I = woEiffel then // reactivate expired wonders
+        begin
+          for J := 0 to nWonder - 1 do
+            if Imp[J].Expiration >= 0 then
               for cix1 := 0 to (RW[pNew].nCity - 1) do
-                if RW[pNew].City[cix1].Built[j] = 1 then
-                  GWonder[j].EffectiveOwner := pNew;
+                if RW[pNew].City[cix1].Built[J] = 1 then
+                  GWonder[J].EffectiveOwner := pNew;
         end
         else
-          CheckExpiration(i);
-        case i of
+          CheckExpiration(I);
+        case I of
           woLighthouse:
             CheckSpecialModels(pNew, preLighthouse);
@@ -3274 +3274 @@
     cix1 := RW[pNew].nEnemyCity - 1;
     while (cix1 >= 0) and (RW[pNew].EnemyCity[cix1].Loc <> Loc) do
-      dec(cix1);
-    assert(cix1 >= 0);
+      Dec(cix1);
+    Assert(cix1 >= 0);
     RW[pNew].EnemyCity[cix1].Loc := -1;
 
@@ -3282 +3282 @@
 end;
 
-procedure CompleteJob(p, Loc, Job: integer);
-var
-  ChangedTerrain, p1: integer;
-begin
-  assert(Job <> jCity);
+procedure CompleteJob(P, Loc, Job: Integer);
+var
+  ChangedTerrain, p1: Integer;
+begin
+  Assert(Job <> jCity);
   ChangedTerrain := -1;
   case Job of
@@ -3328 +3328 @@
         if not(RealMap[Loc] and fTerrain in TerrType_Canalable) then
         begin
-          RemoveDomainUnits(dSea, p, Loc);
+          RemoveDomainUnits(dSea, P, Loc);
           RealMap[Loc] := RealMap[Loc] and not fCanal;
         end;
@@ -3340 +3340 @@
       begin
         if RealMap[Loc] and fTerImp = tiBase then
-          RemoveDomainUnits(dAir, p, Loc);
+          RemoveDomainUnits(dAir, P, Loc);
         RealMap[Loc] := RealMap[Loc] and not fTerImp
       end
       else if RealMap[Loc] and fCanal <> 0 then
       begin
-        RemoveDomainUnits(dSea, p, Loc);
+        RemoveDomainUnits(dSea, P, Loc);
         RealMap[Loc] := RealMap[Loc] and not fCanal
       end
@@ -3381 +3381 @@
   ____________________________________________________________________
 }
-procedure GiveCivilReport(p, pAbout: integer);
-begin
-  with RW[p].EnemyReport[pAbout]^ do
+procedure GiveCivilReport(P, pAbout: Integer);
+begin
+  with RW[P].EnemyReport[pAbout]^ do
   begin
     // general info
     TurnOfCivilReport := LastValidStat[pAbout];
-    move(RW[pAbout].Treaty, Treaty, SizeOf(Treaty));
+    Move(RW[pAbout].Treaty, Treaty, SizeOf(Treaty));
     Government := RW[pAbout].Government;
     Money := RW[pAbout].Money;
@@ -3396 +3396 @@
     if ResearchDone > 100 then
       ResearchDone := 100;
-    move(RW[pAbout].Tech, Tech, nAdv);
-  end;
-end;
-
-procedure GiveMilReport(p, pAbout: integer);
-var
-  uix, mix: integer;
-begin
-  with RW[p].EnemyReport[pAbout]^ do
+    Move(RW[pAbout].Tech, Tech, nAdv);
+  end;
+end;
+
+procedure GiveMilReport(P, pAbout: Integer);
+var
+  uix, mix: Integer;
+begin
+  with RW[P].EnemyReport[pAbout]^ do
   begin
     TurnOfMilReport := LastValidStat[pAbout];
@@ -3410 +3410 @@
     for mix := 0 to RW[pAbout].nModel - 1 do
     begin
-      TellAboutModel(p, pAbout, mix);
+      TellAboutModel(P, pAbout, mix);
       UnCount[mix] := 0
     end;
     for uix := 0 to RW[pAbout].nUn - 1 do
       if RW[pAbout].Un[uix].Loc >= 0 then
-        inc(UnCount[RW[pAbout].Un[uix].mix]);
-  end;
-end;
-
-procedure ShowPrice(pSender, pTarget, Price: integer);
+        Inc(UnCount[RW[pAbout].Un[uix].mix]);
+  end;
+end;
+
+procedure ShowPrice(pSender, pTarget, Price: Integer);
 begin
   case Price and opMask of
@@ -3434 +3434 @@
 end;
 
-function CopyCivilReport(pSender, pTarget, pAbout: integer): boolean;
-var
-  i: integer;
+function CopyCivilReport(pSender, pTarget, pAbout: Integer): Boolean;
+var
+  I: Integer;
   rSender, rTarget: ^TEnemyReport;
 begin // copy third nation civil report
-  result := false;
+  Result := False;
   if RW[pTarget].Treaty[pAbout] = trNoContact then
     IntroduceEnemy(pTarget, pAbout);
-  rSender := pointer(RW[pSender].EnemyReport[pAbout]);
-  rTarget := pointer(RW[pTarget].EnemyReport[pAbout]);
+  rSender := Pointer(RW[pSender].EnemyReport[pAbout]);
+  rTarget := Pointer(RW[pTarget].EnemyReport[pAbout]);
   if rSender.TurnOfCivilReport > rTarget.TurnOfCivilReport then
   begin // only if newer than current information
@@ -3452 +3452 @@
     rTarget.ResearchTech := rSender.ResearchTech;
     rTarget.ResearchDone := rSender.ResearchDone;
-    result := true;
-  end;
-  for i := 0 to nAdv - 1 do
-    if rTarget.Tech[i] < rSender.Tech[i] then
-    begin
-      rTarget.Tech[i] := rSender.Tech[i];
-      result := true;
-    end;
-end;
-
-function CopyMilReport(pSender, pTarget, pAbout: integer): boolean;
-var
-  mix: integer;
+    Result := True;
+  end;
+  for I := 0 to nAdv - 1 do
+    if rTarget.Tech[I] < rSender.Tech[I] then
+    begin
+      rTarget.Tech[I] := rSender.Tech[I];
+      Result := True;
+    end;
+end;
+
+function CopyMilReport(pSender, pTarget, pAbout: Integer): Boolean;
+var
+  mix: Integer;
   rSender, rTarget: ^TEnemyReport;
 begin // copy third nation military report
-  result := false;
+  Result := False;
   if RW[pTarget].Treaty[pAbout] = trNoContact then
     IntroduceEnemy(pTarget, pAbout);
-  rSender := pointer(RW[pSender].EnemyReport[pAbout]);
-  rTarget := pointer(RW[pTarget].EnemyReport[pAbout]);
+  rSender := Pointer(RW[pSender].EnemyReport[pAbout]);
+  rTarget := Pointer(RW[pTarget].EnemyReport[pAbout]);
   if rSender.TurnOfMilReport > rTarget.TurnOfMilReport then
   begin // only if newer than current information
     rTarget.TurnOfMilReport := rSender.TurnOfMilReport;
     rTarget.nModelCounted := rSender.nModelCounted;
-    move(rSender.UnCount, rTarget.UnCount, 2 * rSender.nModelCounted);
+    Move(rSender.UnCount, rTarget.UnCount, 2 * rSender.nModelCounted);
     for mix := 0 to rTarget.nModelCounted - 1 do
       TellAboutModel(pTarget, pAbout, mix);
-    result := true;
-  end;
-end;
-
-procedure CopyModel(pSender, pTarget, mix: integer);
-var
-  i: integer;
+    Result := True;
+  end;
+end;
+
+procedure CopyModel(pSender, pTarget, mix: Integer);
+var
+  I: Integer;
   miSender, miTarget: TModelInfo;
-  ok: boolean;
+  ok: Boolean;
 begin
   // only if target doesn't already have a model like this
   ok := RW[pTarget].nModel < nmmax;
   MakeModelInfo(pSender, mix, RW[pSender].Model[mix], miSender);
-  for i := 0 to RW[pTarget].nModel - 1 do
-  begin
-    MakeModelInfo(pTarget, i, RW[pTarget].Model[i], miTarget);
+  for I := 0 to RW[pTarget].nModel - 1 do
+  begin
+    MakeModelInfo(pTarget, I, RW[pTarget].Model[I], miTarget);
     if IsSameModel(miSender, miTarget) then
-      ok := false;
+      ok := False;
   end;
   if ok then
@@ -3511 +3511 @@
       Lost := 0;
     end;
-    inc(RW[pTarget].nModel);
-    inc(Researched[pTarget]);
+    Inc(RW[pTarget].nModel);
+    Inc(Researched[pTarget]);
     TellAboutModel(pSender, pTarget, RW[pTarget].nModel - 1);
   end;
 end;
 
-procedure CopyMap(pSender, pTarget: integer);
-var
-  Loc, i, cix: integer;
+procedure CopyMap(pSender, pTarget: Integer);
+var
+  Loc, I, cix: Integer;
   Tile: Cardinal;
 begin
@@ -3529 +3529 @@
       if Tile and fCity <> 0 then
       begin
-        i := 0;
-        while (i < RW[pTarget].nEnemyCity) and
-          (RW[pTarget].EnemyCity[i].Loc <> Loc) do
-          inc(i);
-        if i = RW[pTarget].nEnemyCity then
-        begin
-          inc(RW[pTarget].nEnemyCity);
-          assert(RW[pTarget].nEnemyCity < necmax);
-          RW[pTarget].EnemyCity[i].Status := 0;
-          RW[pTarget].EnemyCity[i].SavedStatus := 0;
+        I := 0;
+        while (I < RW[pTarget].nEnemyCity) and
+          (RW[pTarget].EnemyCity[I].Loc <> Loc) do
+          Inc(I);
+        if I = RW[pTarget].nEnemyCity then
+        begin
+          Inc(RW[pTarget].nEnemyCity);
+          Assert(RW[pTarget].nEnemyCity < necmax);
+          RW[pTarget].EnemyCity[I].Status := 0;
+          RW[pTarget].EnemyCity[I].SavedStatus := 0;
         end;
         if Tile and fOwned <> 0 then
@@ -3544 +3544 @@
           cix := RW[pSender].nCity - 1;
           while (cix >= 0) and (RW[pSender].City[cix].Loc <> Loc) do
-            dec(cix);
-          MakeCityInfo(pSender, cix, RW[pTarget].EnemyCity[i]);
+            Dec(cix);
+          MakeCityInfo(pSender, cix, RW[pTarget].EnemyCity[I]);
         end
         else // city not owned by sender -- copy old info
@@ -3551 +3551 @@
           cix := RW[pSender].nEnemyCity - 1;
           while (cix >= 0) and (RW[pSender].EnemyCity[cix].Loc <> Loc) do
-            dec(cix);
-          RW[pTarget].EnemyCity[i] := RW[pSender].EnemyCity[cix];
+            Dec(cix);
+          RW[pTarget].EnemyCity[I] := RW[pSender].EnemyCity[cix];
         end;
       end
@@ -3566 +3566 @@
 
       if RW[pTarget].Map[Loc] and fTerrain = fUNKNOWN then
-        inc(Discovered[pTarget]);
+        Inc(Discovered[pTarget]);
       RW[pTarget].Map[Loc] := RW[pTarget].Map[Loc] and fInEnemyZoC
       // always preserve this flag!
@@ -3582 +3582 @@
 end;
 
-function PayPrice(pSender, pTarget, Price: integer; execute: boolean): boolean;
-var
-  pSubject, i, n, NewTreaty: integer;
-begin
-  result := true;
+function PayPrice(pSender, pTarget, Price: Integer; execute: Boolean): Boolean;
+var
+  pSubject, I, N, NewTreaty: Integer;
+begin
+  Result := True;
   case Price and opMask of
     opCivilReport: // + turn + concerned player shl 16
@@ -3592 +3592 @@
         pSubject := Price shr 16 and $F;
         if pTarget = pSubject then
-          result := false
+          Result := False
         else if pSender = pSubject then
         begin
@@ -3599 +3599 @@
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfCivilReport < 0 then
-          result := false
+          Result := False
         else if execute then
           CopyCivilReport(pSender, pTarget, pSubject);
@@ -3607 +3607 @@
         pSubject := Price shr 16 and $F;
         if pTarget = pSubject then
-          result := false
+          Result := False
         else if pSender = pSubject then
         begin
@@ -3614 +3614 @@
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfMilReport < 0 then
-          result := false
+          Result := False
         else if execute then
           CopyMilReport(pSender, pTarget, pSubject);
@@ -3629 +3629 @@
         begin // agreed treaty end
           if execute then
-            CancelTreaty(pSender, pTarget, false);
+            CancelTreaty(pSender, pTarget, False);
         end
         else
@@ -3640 +3640 @@
             NewTreaty := trPeace;
           if NewTreaty < 0 then
-            result := false
+            Result := False
           else if execute then
           begin
-            assert(NewTreaty > RW[pSender].Treaty[pTarget]);
+            Assert(NewTreaty > RW[pSender].Treaty[pTarget]);
             RW[pSender].Treaty[pTarget] := NewTreaty;
             RW[pTarget].Treaty[pSender] := NewTreaty;
@@ -3672 +3672 @@
     opShipParts: // + number + part type shl 16
       begin
-        n := Price and $FFFF; // number
-        i := Price shr 16 and $F; // type
-        if (i < nShipPart) and (GShip[pSender].Parts[i] >= n) then
+        N := Price and $FFFF; // number
+        I := Price shr 16 and $F; // type
+        if (I < nShipPart) and (GShip[pSender].Parts[I] >= N) then
         begin
           if execute then
           begin
-            dec(GShip[pSender].Parts[i], n);
-            RW[pSender].Ship[pSender].Parts[i] := GShip[pSender].Parts[i];
-            RW[pTarget].Ship[pSender].Parts[i] := GShip[pSender].Parts[i];
+            Dec(GShip[pSender].Parts[I], N);
+            RW[pSender].Ship[pSender].Parts[I] := GShip[pSender].Parts[I];
+            RW[pTarget].Ship[pSender].Parts[I] := GShip[pSender].Parts[I];
             if RW[pTarget].NatBuilt[imSpacePort] > 0 then
             begin // space ship control requires space port
-              inc(GShip[pTarget].Parts[i], n);
-              RW[pSender].Ship[pTarget].Parts[i] := GShip[pTarget].Parts[i];
-              RW[pTarget].Ship[pTarget].Parts[i] := GShip[pTarget].Parts[i];
+              Inc(GShip[pTarget].Parts[I], N);
+              RW[pSender].Ship[pTarget].Parts[I] := GShip[pTarget].Parts[I];
+              RW[pTarget].Ship[pTarget].Parts[I] := GShip[pTarget].Parts[I];
             end;
           end;
         end
         else
-          result := false;
+          Result := False;
       end;
     opMoney: // + value
@@ -3698 +3698 @@
         if execute then
         begin
-          dec(RW[pSender].Money, Price - opMoney);
-          inc(RW[pTarget].Money, Price - opMoney);
+          Dec(RW[pSender].Money, Price - opMoney);
+          Inc(RW[pTarget].Money, Price - opMoney);
         end;
       end
       else
-        result := false;
+        Result := False;
     opTribute: // + value
       if execute then
@@ -3718 +3718 @@
       end
       else
-        result := false;
+        Result := False;
     opAllTech:
       if execute then
-        for i := 0 to nAdv - 1 do
-          if (RW[pSender].Tech[i] >= tsApplicable) and
-            (RW[pTarget].Tech[i] = tsNA) then
+        for I := 0 to nAdv - 1 do
+          if (RW[pSender].Tech[I] >= tsApplicable) and
+            (RW[pTarget].Tech[I] = tsNA) then
           begin
-            SeeTech(pTarget, i);
-            RW[pSender].EnemyReport[pTarget].Tech[i] := tsSeen;
-            RW[pTarget].EnemyReport[pSender].Tech[i] := tsApplicable;
+            SeeTech(pTarget, I);
+            RW[pSender].EnemyReport[pTarget].Tech[I] := tsSeen;
+            RW[pTarget].EnemyReport[pSender].Tech[I] := tsApplicable;
           end;
     opModel: // + model index
@@ -3736 +3736 @@
       end
       else
-        result := false;
+        Result := False;
     opAllModel:
       if execute then
-        for i := 0 to RW[pSender].nModel - 1 do
-        begin
-          TellAboutModel(pTarget, pSender, i);
-          CopyModel(pSender, pTarget, i);
+        for I := 0 to RW[pSender].nModel - 1 do
+        begin
+          TellAboutModel(pTarget, pSender, I);
+          CopyModel(pSender, pTarget, I);
         end;
     { opCity: // + city ID
       begin
-      result:=false
+      Result:=False
       end; }
   end;
 end;
 
-procedure CancelTreaty(p, pWith: integer; DecreaseCredibility: boolean);
+procedure CancelTreaty(P, pWith: Integer; DecreaseCredibility: Boolean);
 // side effect: PeaceEnded := bitarray of players with which peace treaty was canceled
 var
-  p1, OldTreaty: integer;
-begin
-  OldTreaty := RW[p].Treaty[pWith];
+  p1, OldTreaty: Integer;
+begin
+  OldTreaty := RW[P].Treaty[pWith];
   PeaceEnded := 0;
   if OldTreaty >= trPeace then
-    RW[p].LastCancelTreaty[pWith] := GTurn;
+    RW[P].LastCancelTreaty[pWith] := GTurn;
   if DecreaseCredibility then
   begin
@@ -3765 +3765 @@
       trPeace:
         begin
-          RW[p].Credibility := RW[p].Credibility shr 1;
-          if RW[p].MaxCredibility > 0 then
-            dec(RW[p].MaxCredibility, 10);
-          if RW[p].Credibility > RW[p].MaxCredibility then
-            RW[p].Credibility := RW[p].MaxCredibility;
+          RW[P].Credibility := RW[P].Credibility shr 1;
+          if RW[P].MaxCredibility > 0 then
+            Dec(RW[P].MaxCredibility, 10);
+          if RW[P].Credibility > RW[P].MaxCredibility then
+            RW[P].Credibility := RW[P].MaxCredibility;
         end;
       trAlliance:
-        RW[p].Credibility := RW[p].Credibility * 3 div 4;
-    end;
-    RW[pWith].EnemyReport[p].Credibility := RW[p].Credibility;
+        RW[P].Credibility := RW[P].Credibility * 3 div 4;
+    end;
+    RW[pWith].EnemyReport[P].Credibility := RW[P].Credibility;
   end;
 
@@ -3780 +3780 @@
   begin
     for p1 := 0 to nPl - 1 do
-      if (p1 = pWith) or DecreaseCredibility and (p1 <> p) and
-        (RW[pWith].Treaty[p1] = trAlliance) and (RW[p].Treaty[p1] >= trPeace)
+      if (p1 = pWith) or DecreaseCredibility and (p1 <> P) and
+        (RW[pWith].Treaty[p1] = trAlliance) and (RW[P].Treaty[p1] >= trPeace)
       then
       begin
-        RW[p].Treaty[p1] := trNone;
-        RW[p1].Treaty[p] := trNone;
-        RW[p].EvaStart[p1] := -PeaceEvaTurns - 1;
-        RW[p1].EvaStart[p] := -PeaceEvaTurns - 1;
-        inc(PeaceEnded, 1 shl p1);
+        RW[P].Treaty[p1] := trNone;
+        RW[p1].Treaty[P] := trNone;
+        RW[P].EvaStart[p1] := -PeaceEvaTurns - 1;
+        RW[p1].EvaStart[P] := -PeaceEvaTurns - 1;
+        Inc(PeaceEnded, 1 shl p1);
       end;
     CheckBorders(-1);
     if (Mode > moLoading_Fast) and (PeaceEnded > 0) then
-      RecalcMapZoC(p);
+      RecalcMapZoC(P);
   end
   else
   begin
-    RW[p].Treaty[pWith] := OldTreaty - 1;
-    RW[pWith].Treaty[p] := OldTreaty - 1;
+    RW[P].Treaty[pWith] := OldTreaty - 1;
+    RW[pWith].Treaty[P] := OldTreaty - 1;
     if OldTreaty = TrFriendlyContact then
     begin // necessary for loading
-      GiveCivilReport(p, pWith);
-      GiveCivilReport(pWith, p);
+      GiveCivilReport(P, pWith);
+      GiveCivilReport(pWith, P);
     end
     else if OldTreaty = trAlliance then
     begin // necessary for loading
-      GiveMilReport(p, pWith);
-      GiveMilReport(pWith, p);
+      GiveMilReport(P, pWith);
+      GiveMilReport(pWith, P);
     end;
     if (Mode > moLoading_Fast) and (OldTreaty = trAlliance) then
     begin
-      RecalcMapZoC(p);
+      RecalcMapZoC(P);
       RecalcMapZoC(pWith);
     end;
@@ -3816 +3816 @@
   if OldTreaty in [trPeace, trAlliance] then
   begin
-    RecalcPeaceMap(p);
+    RecalcPeaceMap(P);
     RecalcPeaceMap(pWith);
   end;
 end;
 
-function DoSpyMission(p, pCity, cix, Mission: integer): Cardinal;
-var
-  p1: integer;
-begin
-  result := 0;
+function DoSpyMission(P, pCity, cix, Mission: Integer): Cardinal;
+var
+  p1: Integer;
+begin
+  Result := 0;
   case Mission of
     smSabotageProd:
@@ -3832 +3832 @@
     smStealMap:
       begin
-        CopyMap(pCity, p);
-        RecalcPeaceMap(p);
+        CopyMap(pCity, P);
+        RecalcPeaceMap(P);
       end;
     smStealCivilReport:
       begin
-        if RW[p].Treaty[pCity] = trNoContact then
-          IntroduceEnemy(p, pCity);
-        GiveCivilReport(p, pCity);
+        if RW[P].Treaty[pCity] = trNoContact then
+          IntroduceEnemy(P, pCity);
+        GiveCivilReport(P, pCity);
       end;
     smStealMilReport:
       begin
-        if RW[p].Treaty[pCity] = trNoContact then
-          IntroduceEnemy(p, pCity);
-        GiveMilReport(p, pCity);
+        if RW[P].Treaty[pCity] = trNoContact then
+          IntroduceEnemy(P, pCity);
+        GiveMilReport(P, pCity);
       end;
     smStealForeignReports:
       begin
         for p1 := 0 to nPl - 1 do
-          if (p1 <> p) and (p1 <> pCity) and (RW[pCity].EnemyReport[p1] <> nil)
+          if (p1 <> P) and (p1 <> pCity) and (RW[pCity].EnemyReport[p1] <> nil)
           then
           begin
             if RW[pCity].EnemyReport[p1].TurnOfCivilReport >= 0 then
-              if CopyCivilReport(pCity, p, p1) then
-                result := result or (1 shl (2 * p1));
+              if CopyCivilReport(pCity, P, p1) then
+                Result := Result or (1 shl (2 * p1));
             if RW[pCity].EnemyReport[p1].TurnOfMilReport >= 0 then
-              if CopyMilReport(pCity, p, p1) then
-                result := result or (2 shl (2 * p1));
+              if CopyMilReport(pCity, P, p1) then
+                Result := Result or (2 shl (2 * p1));
           end;
       end;
@@ -3868 +3868 @@
   ____________________________________________________________________
 }
-procedure ClearTestFlags(ClearFlags: integer);
-var
-  p1: integer;
+procedure ClearTestFlags(ClearFlags: Integer);
+var
+  p1: Integer;
 begin
   GTestFlags := GTestFlags and (not ClearFlags or tfTested or tfAllTechs or
@@ -3879 +3879 @@
 end;
 
-procedure SetTestFlags(p, SetFlags: integer);
-var
-  i, p1, p2, MoreFlags: integer;
+procedure SetTestFlags(P, SetFlags: Integer);
+var
+  I, p1, p2, MoreFlags: Integer;
 begin
   MoreFlags := SetFlags and not GTestFlags;
@@ -3905 +3905 @@
       if 1 shl p1 and GAlive <> 0 then
       begin
-        for i := 0 to nAdv - 1 do // give all techs to player p1
-          if not(i in FutureTech) and (RW[p1].Tech[i] < tsApplicable) then
+        for I := 0 to nAdv - 1 do // give all techs to player p1
+          if not(I in FutureTech) and (RW[p1].Tech[I] < tsApplicable) then
           begin
-            RW[p1].Tech[i] := tsCheat;
-            CheckSpecialModels(p1, i);
+            RW[p1].Tech[I] := tsCheat;
+            CheckSpecialModels(p1, I);
           end;
         for p2 := 0 to nPl - 1 do
           if (p2 <> p1) and (1 shl p2 and (GAlive or GWatching) <> 0) then
-            for i := 1 to 3 do
-              if RW[p2].EnemyReport[p1].Tech[AgePreq[i]] < tsApplicable then
-                RW[p2].EnemyReport[p1].Tech[AgePreq[i]] := tsCheat;
+            for I := 1 to 3 do
+              if RW[p2].EnemyReport[p1].Tech[AgePreq[I]] < tsApplicable then
+                RW[p2].EnemyReport[p1].Tech[AgePreq[I]] := tsCheat;
       end;
     end;
@@ -3921 +3921 @@
   if MoreFlags and tfUncover <> 0 then
   begin
-    DiscoverAll(p, lObserveSuper);
+    DiscoverAll(P, lObserveSuper);
     for p1 := 0 to nPl - 1 do
       if 1 shl p1 and GAlive <> 0 then
       begin
         ResourceMask[p1] := $FFFFFFFF;
-        if p1 <> p then
-        begin
-          GiveCivilReport(p, p1);
-          GiveMilReport(p, p1);
+        if p1 <> P then
+        begin
+          GiveCivilReport(P, p1);
+          GiveMilReport(P, p1);
         end;
       end;
@@ -3939 +3939 @@
   ____________________________________________________________________
 }
-procedure IntServer(Command, Player, Subject: integer; var Data);
-var
-  i, p1: integer;
+procedure IntServer(Command, Player, Subject: Integer; var Data);
+var
+  I, p1: Integer;
 begin
   if Mode = moPlaying then
@@ -3951 +3951 @@
       begin
 {$IFDEF TEXTLOG}CmdInfo := Format('IntTellAboutNation P%d+P%d', [Player, Subject]); {$ENDIF}
-        assert((Player >= 0) and (Player < nPl) and (Subject >= 0) and
+        Assert((Player >= 0) and (Player < nPl) and (Subject >= 0) and
           (Subject < nPl));
         IntroduceEnemy(Player, Subject);
@@ -3959 +3959 @@
       begin
 {$IFDEF TEXTLOG}CmdInfo := Format('IntHaveContact P%d+P%d', [Player, Subject]); {$ENDIF}
-        assert(RW[Player].Treaty[Subject] > trNoContact);
+        Assert(RW[Player].Treaty[Subject] > trNoContact);
         RW[Player].EnemyReport[Subject].TurnOfContact := GTurn;
         RW[Subject].EnemyReport[Player].TurnOfContact := GTurn;
@@ -3981 +3981 @@
         p1 := (Command - sIntTellAboutModel) shr 4; // told player
 {$IFDEF TEXTLOG}CmdInfo := Format('IntTellAboutModel P%d about P%d Mod%d', [p1, Player, Subject]); {$ENDIF}
-        assert((Player >= 0) and (Player < nPl));
-        assert((Subject >= 0) and (Subject < RW[Player].nModel));
+        Assert((Player >= 0) and (Player < nPl));
+        Assert((Subject >= 0) and (Subject < RW[Player].nModel));
         MakeModelInfo(Player, Subject, RW[Player].Model[Subject],
           RW[p1].EnemyModel[RW[p1].nEnemyModel]);
         RWemix[p1, Player, Subject] := RW[p1].nEnemyModel;
-        inc(RW[p1].nEnemyModel);
-        assert(RW[p1].nEnemyModel < nemmax);
+        Inc(RW[p1].nEnemyModel);
+        Assert(RW[p1].nEnemyModel < nemmax);
       end;
 
     sIntDiscoverZOC:
       begin
-{$IFDEF TEXTLOG}CmdInfo := Format('IntDiscoverZOC P%d Loc%d', [Player, integer(Data)]); {$ENDIF}
-        Discover9(integer(Data), Player, lObserveUnhidden, true, false);
+{$IFDEF TEXTLOG}CmdInfo := Format('IntDiscoverZOC P%d Loc%d', [Player, Integer(Data)]); {$ENDIF}
+        Discover9(Integer(Data), Player, lObserveUnhidden, True, False);
       end;
 
@@ -4000 +4000 @@
       begin
 {$IFDEF TEXTLOG}CmdInfo := Format('IntExpandTerritory P%d Loc%d', [Player, RW[Player].City[Subject].Loc]); {$ENDIF}
-        move(Data, BorderChanges, SizeOf(BorderChanges));
+        Move(Data, BorderChanges, SizeOf(BorderChanges));
         ExpandTerritory(RW[Player].City[Subject].Loc);
       end;
@@ -4007 +4007 @@
       with RW[Player].City[Subject] do
       begin
-{$IFDEF TEXTLOG}CmdInfo := Format('IntBuyMaterial P%d Loc%d Cost%d', [Player, Loc, integer(Data)]); {$ENDIF}
-        dec(RW[Player].Money, integer(Data));
+{$IFDEF TEXTLOG}CmdInfo := Format('IntBuyMaterial P%d Loc%d Cost%d', [Player, Loc, Integer(Data)]); {$ENDIF}
+        Dec(RW[Player].Money, Integer(Data));
         if (GWonder[woMich].EffectiveOwner = Player) and (Project and cpImp <> 0)
         then
-          inc(Prod, integer(Data) div 2)
+          Inc(Prod, Integer(Data) div 2)
         else
-          inc(Prod, integer(Data) div 4);
+          Inc(Prod, Integer(Data) div 4);
         if Project0 and not cpAuto <> Project and not cpAuto then
           Project0 := Project;
@@ -4022 +4022 @@
       begin
 {$IFDEF TEXTLOG}CmdInfo := Format('IntPayPrices P%d+P%d', [Player, Subject]); {$ENDIF}
-        for i := 0 to TOffer(Data).nDeliver - 1 do
-          PayPrice(Player, Subject, TOffer(Data).Price[i], true);
-        for i := 0 to TOffer(Data).nCost - 1 do
+        for I := 0 to TOffer(Data).nDeliver - 1 do
+          PayPrice(Player, Subject, TOffer(Data).Price[I], True);
+        for I := 0 to TOffer(Data).nCost - 1 do
           PayPrice(Subject, Player, TOffer(Data).Price[TOffer(Data).nDeliver
-            + i], true);
-        for i := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
-          if TOffer(Data).Price[i] = opTreaty + trAlliance then
+            + I], True);
+        for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
+          if TOffer(Data).Price[I] = opTreaty + trAlliance then
           begin // add view area of allied player
             DiscoverViewAreas(Player);
@@ -4045 +4045 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetModelStatus P%d', [Player]);
         {$ENDIF}
-        RW[Player].Model[Subject].Status := integer(Data);
+        RW[Player].Model[Subject].Status := Integer(Data);
       end;
 
@@ -4053 +4053 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetUnitStatus P%d', [Player]);
         {$ENDIF}
-        RW[Player].Un[Subject].Status := integer(Data);
+        RW[Player].Un[Subject].Status := Integer(Data);
       end;
 
@@ -4061 +4061 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetCityStatus P%d', [Player]);
         {$ENDIF}
-        RW[Player].City[Subject].Status := integer(Data);
+        RW[Player].City[Subject].Status := Integer(Data);
       end;
 
@@ -4069 +4069 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetECityStatus P%d', [Player]);
         {$ENDIF}
-        RW[Player].EnemyCity[Subject].Status := integer(Data);
+        RW[Player].EnemyCity[Subject].Status := Integer(Data);
       end;
   end;

trunk/Direct.pas

@@ -29 +29 @@
     Gone: Boolean;
     Quick: Boolean;
-    procedure SetInfo(x: string);
-    procedure SetState(x: integer);
+    procedure SetInfo(X: string);
+    procedure SetState(X: Integer);
     procedure OnGo(var Msg: TMessage); message WM_GO;
     procedure OnChangeClient(var Msg: TMessage); message WM_CHANGECLIENT;
@@ -57 +57 @@
 //  hMem: Cardinal;
 //  p: pointer;
-  s: string;
+  S: string;
 Begin
   case ID of
@@ -72 +72 @@
       if visible then
       begin
-        s := Format(Phrases.Lookup('BUSY_MOD'), [Brains[Index].Name]);
-        while BiColorTextWidth(Canvas, s) + 64 > ClientWidth do
-          Delete(s, Length(s), 1);
-        SetInfo(s);
+        S := Format(Phrases.Lookup('BUSY_MOD'), [Brains[Index].Name]);
+        while BiColorTextWidth(Canvas, S) + 64 > ClientWidth do
+          Delete(S, Length(S), 1);
+        SetInfo(S);
       end;
     ntCreateWorld:
@@ -111 +111 @@
           hMem := GlobalAlloc(GMEM_MOVEABLE or GMEM_DDESHARE,
             Length(NotifyMessage));
-          p := GlobalLock(hMem);
-          if p <> nil then
-            move(NotifyMessage[1], p^, Length(NotifyMessage));
+          P := GlobalLock(hMem);
+          if P <> nil then
+            Move(NotifyMessage[1], P^, Length(NotifyMessage));
           GlobalUnlock(hMem);
           SetClipboardData(CF_TEXT, hMem);
@@ -198 +198 @@
   begin
     PostMessage(Handle, WM_GO, 0, 0);
-    Gone := true;
+    Gone := True;
   end;
 end;
@@ -209 +209 @@
 procedure TDirectDlg.OnGo(var Msg: TMessage);
 var
-  i: integer;
-  s: string;
+  I: Integer;
+  S: string;
   FileName: string;
 begin
@@ -220 +220 @@
     Exit;
   end;
-  Quick := false;
+  Quick := False;
   if ParamCount > 0 then
   begin
-    s := ParamStr(1);
-    if (s[1] = '-') {$IFDEF WINDOWS}or (s[1] = '/'){$ENDIF} then
+    S := ParamStr(1);
+    if (S[1] = '-') {$IFDEF WINDOWS}or (S[1] = '/'){$ENDIF} then
     begin // special mode
-      Delete(s, 1, 1);
-      for i := 1 to Length(s) do
-        if s[i] in ['a' .. 'z'] then
-          dec(s[i], 32);
-      if s = 'MAN' then
+      Delete(S, 1, 1);
+      for I := 1 to Length(S) do
+        if S[I] in ['a' .. 'z'] then
+          Dec(S[I], 32);
+      if S = 'MAN' then
       begin
-        Quick := true;
+        Quick := True;
         DirectHelp(cHelpOnly);
         Close;
@@ -242 +242 @@
         Quick := True;
         if not LoadGame(ExtractFilePath(ParamStr(1)), ExtractFileName(ParamStr(1)
-        ), -1, false) then begin
+        ), -1, False) then begin
           SimpleMessage(Phrases.Lookup('LOADERR'));
           Close;
@@ -297 +297 @@
 end;
 
-procedure TDirectDlg.SetInfo(x: string);
-begin
-  Info := x;
+procedure TDirectDlg.SetInfo(X: string);
+begin
+  Info := X;
   Invalidate;
   Update;
@@ -307 +307 @@
 end;
 
-procedure TDirectDlg.SetState(x: integer);
-begin
-  if (x < 0) <> (State < 0) then begin
-    State := x;
+procedure TDirectDlg.SetState(X: Integer);
+begin
+  if (X < 0) <> (State < 0) then begin
+    State := X;
     Invalidate;
     Update;
   end
-  else if x <> State then begin
-    State := x;
+  else if X <> State then begin
+    State := X;
     PaintProgressBar(Canvas, 6, ClientWidth div 2 - 64, 40, State, 128 - State,
       128, MainTexture);

trunk/GameServer.pas

@@ -49 +49 @@
   // PARAMETERS
   PlayersBrain: TBrains; { brain of the players view }
-  Difficulty: array [0 .. nPl - 1] of integer absolute Database.Difficulty;
+  Difficulty: array [0 .. nPl - 1] of Integer absolute Database.Difficulty;
   { difficulty }
 
@@ -70 +70 @@
 
 procedure StartNewGame(const Path, FileName, Map: string;
-  Newlx, Newly, NewLandMass, NewMaxTurn: integer);
-function LoadGame(const Path, FileName: string; Turn: integer;
-  MovieMode: boolean): boolean;
-procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: integer);
-procedure DirectHelp(Command: integer);
+  Newlx, Newly, NewLandMass, NewMaxTurn: Integer);
+function LoadGame(const Path, FileName: string; Turn: Integer;
+  MovieMode: Boolean): Boolean;
+procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: Integer);
+procedure DirectHelp(Command: Integer);
 
 procedure ChangeClient;
 procedure NextPlayer;
-function PreviewMap(lm: integer): pointer;
+function PreviewMap(lm: Integer): Pointer;
 
 
@@ -112 +112 @@
   MapField: ^Cardinal; // predefined map
   LastOffer: TOffer;
-  CCData: array [0 .. 14] of integer;
+  CCData: array [0 .. 14] of Integer;
   bix: TBrains; { brain of the players }
   DevModelTurn: array [0 .. nPl - 1] of Integer; { turn of last call to sResetModel }
   OriginalDataVersion: array [0 .. nPl - 1] of Integer;
   SavedTiles { , SavedResourceWeights } : array [0 .. ncmax - 1] of Cardinal;
-  SavedData: array [0 .. nPl - 1] of pointer;
+  SavedData: array [0 .. nPl - 1] of Pointer;
   LogFileName: string;
   SavePath: string; { name of file for saving the current game }
@@ -135 +135 @@
   PreviewRND = 41601260; { randseed for preview map }
 
-function Server(Command, Player, Subject: integer; var Data): integer;
+function Server(Command, Player, Subject: Integer; var Data): Integer;
   stdcall; forward;
 
-procedure CallPlayer(Command, p: integer; var Data);
+procedure CallPlayer(Command, P: Integer; var Data);
 begin
-  if ((Mode <> moMovie) or (p = 0)) then
+  if ((Mode <> moMovie) or (P = 0)) then
   begin
 {$IFOPT O-}
-    HandoverStack[nHandoverStack] := p;
+    HandoverStack[nHandoverStack] := P;
     HandoverStack[nHandoverStack + 1] := Command;
-    inc(nHandoverStack, 2);
-    bix[p].Client(Command, p, Data);
-    dec(nHandoverStack, 2);
+    Inc(nHandoverStack, 2);
+    bix[P].Client(Command, P, Data);
+    Dec(nHandoverStack, 2);
 {$ELSE}
     try
-      bix[p].Client(Command, p, Data);
+      bix[P].Client(Command, P, Data);
     except
-      Notify(ntException + bix[p]);
+      Notify(ntException + bix[P]);
     end;
 {$ENDIF}
@@ -167 +167 @@
 end;
 
-procedure CallClient(bix, Command: integer; var Data);
+procedure CallClient(bix, Command: Integer; var Data);
 begin
   if ((Mode <> moMovie) or (bix = Brains.IndexOf(GameServer.bix[0]))) then
@@ -174 +174 @@
     HandoverStack[nHandoverStack] := bix;
     HandoverStack[nHandoverStack + 1] := Command;
-    inc(nHandoverStack, 2);
+    Inc(nHandoverStack, 2);
     Brains[bix].Client(Command, -1, Data);
-    dec(nHandoverStack, 2);
+    Dec(nHandoverStack, 2);
 {$ELSE}
     try
@@ -189 +189 @@
 procedure Init(NotifyFunction: TNotifyFunction);
 var
-  f: TSearchRec;
+  F: TSearchRec;
   BasePath: string;
   NewBrain: TBrain;
@@ -195 +195 @@
 begin
   Notify := NotifyFunction;
-  PreviewElevation := false;
+  PreviewElevation := False;
   PlayersBrain := TBrains.Create(False);
   PlayersBrain.Count := nPl;
@@ -246 +246 @@
   end;
 
-  if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
+  if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, F) = 0 then
   repeat
-    BasePath := GetAiDir + DirectorySeparator + f.Name;
-    if (f.Name <> '.') and (f.Name <> '..') and DirectoryExists(BasePath) then begin
+    BasePath := GetAiDir + DirectorySeparator + F.Name;
+    if (F.Name <> '.') and (F.Name <> '..') and DirectoryExists(BasePath) then begin
       NewBrain := Brains.AddNew;
       NewBrain.Kind := btAI;
@@ -258 +258 @@
         end else Brains.Delete(Brains.Count - 1);
     end;
-  until FindNext(f) <> 0;
+  until FindNext(F) <> 0;
   FindClose(F);
 
@@ -281 +281 @@
 end;
 
-function PreviewMap(lm: integer): pointer;
+function PreviewMap(lm: Integer): Pointer;
 begin
   lx := lxmax;
@@ -291 +291 @@
   begin
     CreateElevation;
-    PreviewElevation := true;
+    PreviewElevation := True;
   end;
-  CreateMap(true);
+  CreateMap(True);
   Result := @RealMap;
 end;
 
-procedure ChangeClientWhenDone(Command, Player: integer; var Data;
-  DataSize: integer);
+procedure ChangeClientWhenDone(Command, Player: Integer; var Data;
+  DataSize: Integer);
 begin
   CCCommand := Command;
   CCPlayer := Player;
   if DataSize > 0 then
-    move(Data, CCData, DataSize);
+    Move(Data, CCData, DataSize);
   Notify(ntChangeClient);
 end;
 
-procedure PutMessage(Level: integer; Text: string);
+procedure PutMessage(Level: Integer; Text: string);
 begin
-  bix[0].Client(cDebugMessage, Level, pchar(Text)^);
+  bix[0].Client(cDebugMessage, Level, PChar(Text)^);
 end;
 
@@ -336 +336 @@
 // hand over control to other client (as specified by CC...)
 var
-  p: integer;
+  P: Integer;
   T: TDateTime;
 begin
@@ -346 +346 @@
     [CCPlayer, bix[CCPlayer].Name]));
   if CCCommand = cTurn then
-    for p := 0 to nPl - 1 do
-      if (p <> CCPlayer) and (1 shl p and GWatching <> 0) then
-        CallPlayer(cShowTurnChange, p, CCPlayer);
-
-  p := CCPlayer;
+    for P := 0 to nPl - 1 do
+      if (P <> CCPlayer) and (1 shl P and GWatching <> 0) then
+        CallPlayer(cShowTurnChange, P, CCPlayer);
+
+  P := CCPlayer;
   CCPlayer := -1;
-  CallPlayer(CCCommand, p, CCData);
-  if (Mode = moPlaying) and (bix[p].Flags and aiThreaded = 0) and
+  CallPlayer(CCCommand, P, CCData);
+  if (Mode = moPlaying) and (bix[P].Flags and aiThreaded = 0) and
     (CCPlayer < 0) then
   begin
-    Notify(ntDeactivationMissing, p);
+    Notify(ntDeactivationMissing, P);
     ForceClientDeactivation;
   end;
 end;
 
-procedure Inform(p: integer);
+procedure Inform(P: Integer);
 var
-  i, p1: integer;
+  I, p1: Integer;
 begin
-  RW[p].Turn := GTurn;
-  if (GTurn = MaxTurn) and (p = pTurn) and (p = 0) then
-    RW[p].Happened := RW[p].Happened or phTimeUp;
-  if (GWinner > 0) and (p = pTurn) and (p = 0) then
-    RW[p].Happened := RW[p].Happened or phShipComplete;
-  RW[p].Alive := GAlive;
-  move(GWonder, RW[p].Wonder, SizeOf(GWonder));
-  move(GShip, RW[p].Ship, SizeOf(GShip));
+  RW[P].Turn := GTurn;
+  if (GTurn = MaxTurn) and (P = pTurn) and (P = 0) then
+    RW[P].Happened := RW[P].Happened or phTimeUp;
+  if (GWinner > 0) and (P = pTurn) and (P = 0) then
+    RW[P].Happened := RW[P].Happened or phShipComplete;
+  RW[P].Alive := GAlive;
+  Move(GWonder, RW[P].Wonder, SizeOf(GWonder));
+  Move(GShip, RW[P].Ship, SizeOf(GShip));
   for p1 := 0 to nPl - 1 do
-    if (p1 <> p) and Assigned(bix[p1]) and (Difficulty[p1] > 0) then
-      RW[p].EnemyReport[p1].Credibility := RW[p1].Credibility;
+    if (p1 <> P) and Assigned(bix[p1]) and (Difficulty[p1] > 0) then
+      RW[P].EnemyReport[p1].Credibility := RW[p1].Credibility;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> p) and (1 shl p1 and GAlive <> 0) then
+    if (p1 <> P) and (1 shl p1 and GAlive <> 0) then
     begin
-      if (GTestFlags and tfUncover <> 0) or (Difficulty[p] = 0) or
-        (RW[p].Treaty[p1] >= trFriendlyContact) then
-        GiveCivilReport(p, p1);
-      if (GTestFlags and tfUncover <> 0) or (Difficulty[p] = 0) or
-        (RW[p].Treaty[p1] = trAlliance) then
-        GiveMilReport(p, p1)
+      if (GTestFlags and tfUncover <> 0) or (Difficulty[P] = 0) or
+        (RW[P].Treaty[p1] >= trFriendlyContact) then
+        GiveCivilReport(P, p1);
+      if (GTestFlags and tfUncover <> 0) or (Difficulty[P] = 0) or
+        (RW[P].Treaty[p1] = trAlliance) then
+        GiveMilReport(P, p1)
     end;
-  for i := 0 to RW[p].nEnemyModel - 1 do
-    with RW[p].EnemyModel[i] do
-      Lost := Destroyed[p, Owner, mix];
+  for I := 0 to RW[P].nEnemyModel - 1 do
+    with RW[P].EnemyModel[I] do
+      Lost := Destroyed[P, Owner, mix];
 end;
 
 procedure LogChanges;
 var
-  p, ix: integer;
+  P, ix: Integer;
 begin
-  for p := 0 to nPl - 1 do
-    if (1 shl p and GWatching <> 0) and ProcessClientData[p] then
+  for P := 0 to nPl - 1 do
+    if (1 shl P and GWatching <> 0) and ProcessClientData[P] then
     begin
       // log unit status changes
-      for ix := 0 to RW[p].nUn - 1 do
-        with RW[p].Un[ix] do
+      for ix := 0 to RW[P].nUn - 1 do
+        with RW[P].Un[ix] do
           if (Loc >= 0) and (SavedStatus <> Status) then
           begin
-            CL.Put(sIntSetUnitStatus, p, ix, @Status);
+            CL.Put(sIntSetUnitStatus, P, ix, @Status);
             SavedStatus := Status;
           end;
       // log city status changes
-      for ix := 0 to RW[p].nCity - 1 do
-        with RW[p].City[ix] do
+      for ix := 0 to RW[P].nCity - 1 do
+        with RW[P].City[ix] do
           if (Loc >= 0) and (SavedStatus <> Status) then
           begin
-            CL.Put(sIntSetCityStatus, p, ix, @Status);
+            CL.Put(sIntSetCityStatus, P, ix, @Status);
             SavedStatus := Status;
           end;
       // log model status changes
-      for ix := 0 to RW[p].nModel - 1 do
-        with RW[p].Model[ix] do
+      for ix := 0 to RW[P].nModel - 1 do
+        with RW[P].Model[ix] do
           if SavedStatus <> Status then
           begin
-            CL.Put(sIntSetModelStatus, p, ix, @Status);
+            CL.Put(sIntSetModelStatus, P, ix, @Status);
             SavedStatus := Status;
           end;
       // log enemy city status changes
-      for ix := 0 to RW[p].nEnemyCity - 1 do
-        with RW[p].EnemyCity[ix] do
+      for ix := 0 to RW[P].nEnemyCity - 1 do
+        with RW[P].EnemyCity[ix] do
           if (Loc >= 0) and (SavedStatus <> Status) then
           begin
-            CL.Put(sIntSetECityStatus, p, ix, @Status);
+            CL.Put(sIntSetECityStatus, P, ix, @Status);
             SavedStatus := Status;
           end;
       // log data changes
-      if bix[p].DataSize > 0 then
-      begin
-        CL.PutDataChanges(sIntDataChange, p, SavedData[p], RW[p].Data,
-          bix[p].DataSize);
-        Move(RW[p].Data^, SavedData[p]^, bix[p].DataSize * 4);
+      if bix[P].DataSize > 0 then
+      begin
+        CL.PutDataChanges(sIntDataChange, P, SavedData[P], RW[P].Data,
+          bix[P].DataSize);
+        Move(RW[P].Data^, SavedData[P]^, bix[P].DataSize * 4);
       end;
     end;
@@ -442 +442 @@
 procedure NoLogChanges;
 var
-  p, ix: integer;
+  P, ix: Integer;
 begin
-  for p := 0 to nPl - 1 do
-    if (1 shl p and GWatching <> 0) and ProcessClientData[p] then
+  for P := 0 to nPl - 1 do
+    if (1 shl P and GWatching <> 0) and ProcessClientData[P] then
     begin
-      for ix := 0 to RW[p].nUn - 1 do
-        with RW[p].Un[ix] do
+      for ix := 0 to RW[P].nUn - 1 do
+        with RW[P].Un[ix] do
           SavedStatus := Status;
-      for ix := 0 to RW[p].nCity - 1 do
-        with RW[p].City[ix] do
+      for ix := 0 to RW[P].nCity - 1 do
+        with RW[P].City[ix] do
           SavedStatus := Status;
-      for ix := 0 to RW[p].nModel - 1 do
-        with RW[p].Model[ix] do
+      for ix := 0 to RW[P].nModel - 1 do
+        with RW[P].Model[ix] do
           SavedStatus := Status;
-      for ix := 0 to RW[p].nEnemyCity - 1 do
-        with RW[p].EnemyCity[ix] do
+      for ix := 0 to RW[P].nEnemyCity - 1 do
+        with RW[P].EnemyCity[ix] do
           SavedStatus := Status;
-      if bix[p].DataSize > 0 then
-        Move(RW[p].Data^, SavedData[p]^, bix[p].DataSize * 4);
+      if bix[P].DataSize > 0 then
+        Move(RW[P].Data^, SavedData[P]^, bix[P].DataSize * 4);
     end;
 end;
 
-function HasChanges(p: integer): boolean;
+function HasChanges(P: Integer): Boolean;
 type
   TDWordList = array [0 .. INFIN] of Cardinal;
   PDWortList = ^TDWordList;
 var
-  ix: integer;
+  ix: Integer;
 begin
   Result := False;
-  for ix := 0 to RW[p].nUn - 1 do
-    with RW[p].Un[ix] do
+  for ix := 0 to RW[P].nUn - 1 do
+    with RW[P].Un[ix] do
       if (Loc >= 0) and (SavedStatus <> Status) then
         Result := True;
-  for ix := 0 to RW[p].nCity - 1 do
-    with RW[p].City[ix] do
+  for ix := 0 to RW[P].nCity - 1 do
+    with RW[P].City[ix] do
       if (Loc >= 0) and (SavedStatus <> Status) then
         Result := True;
-  for ix := 0 to RW[p].nModel - 1 do
-    with RW[p].Model[ix] do
+  for ix := 0 to RW[P].nModel - 1 do
+    with RW[P].Model[ix] do
       if SavedStatus <> Status then
         Result := True;
-  for ix := 0 to RW[p].nEnemyCity - 1 do
-    with RW[p].EnemyCity[ix] do
+  for ix := 0 to RW[P].nEnemyCity - 1 do
+    with RW[P].EnemyCity[ix] do
       if (Loc >= 0) and (SavedStatus <> Status) then
         Result := True;
-  if RW[p].Data <> nil then
-    for ix := 0 to bix[p].DataSize - 1 do
-      if PDWortList(SavedData[p])[ix] <> PDWortList(RW[p].Data)[ix] then
+  if RW[P].Data <> nil then
+    for ix := 0 to bix[P].DataSize - 1 do
+      if PDWortList(SavedData[P])[ix] <> PDWortList(RW[P].Data)[ix] then
         Result := True;
 end;
@@ -498 +498 @@
   InitModuleData: TInitModuleData;
 begin
-  assert(bix.Kind <> btSuperVirtual);
+  Assert(bix.Kind <> btSuperVirtual);
   with bix do begin
     if Initialized then
-      exit;
+      Exit;
     if Kind = btAI then
     begin { get client function }
@@ -509 +509 @@
       else
       begin
-        hm := LoadLibrary(pchar(DLLName));
+        hm := LoadLibrary(PChar(DLLName));
         if hm = 0 then
         begin
@@ -525 +525 @@
     if @Client <> nil then
     begin
-      Initialized := true;
+      Initialized := True;
       InitModuleData.Server := @Server;
       InitModuleData.DataVersion := 0;
@@ -542 +542 @@
 procedure SaveMap(FileName: string);
 var
-  i: integer;
+  I: Integer;
   MapFile: TFileStream;
-  s: string[255];
+  S: string[255];
 begin
   MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
@@ -550 +550 @@
   try
     MapFile.Position := 0;
-    s := 'cEvoMap'#0;
-    MapFile.write(s[1], 8); { file id }
-    i := 0;
-    MapFile.write(i, 4); { format id }
+    S := 'cEvoMap'#0;
+    MapFile.write(S[1], 8); { file id }
+    I := 0;
+    MapFile.write(I, 4); { format id }
     MapFile.write(MaxTurn, 4);
     MapFile.write(lx, 4);
@@ -563 +563 @@
 end;
 
-function LoadMap(FileName: string): boolean;
+function LoadMap(FileName: string): Boolean;
 var
-  i, Loc1: integer;
+  I, Loc1: Integer;
   MapFile: TFileStream;
-  s: string[255];
+  S: string[255];
 begin
-  result := false;
+  Result := False;
   MapFile := nil;
   try
     MapFile := TFileStream.Create(FileName, fmOpenRead or fmShareExclusive);
     MapFile.Position := 0;
-    MapFile.read(s[1], 8); { file id }
-    MapFile.read(i, 4); { format id }
-    if i = 0 then
+    MapFile.read(S[1], 8); { file id }
+    MapFile.read(I, 4); { format id }
+    if I = 0 then
     begin
-      MapFile.read(i, 4); // MaxTurn
+      MapFile.read(I, 4); // MaxTurn
       MapFile.read(lx, 4);
       MapFile.read(ly, 4);
@@ -600 +600 @@
             or fDesert;
       end;
-      result := true;
+      Result := True;
     end;
     FreeAndNil(MapFile);
@@ -609 +609 @@
 end;
 
-procedure SaveGame(FileName: string; auto: boolean);
+procedure SaveGame(FileName: string; auto: Boolean);
 var
-  x, y, i, zero, Tile, nLocal: integer;
+  X, Y, I, zero, Tile, nLocal: Integer;
   LogFile: TFileStream;
-  s: string[255];
+  S: string[255];
   SaveMap: array [0 .. lxmax * lymax - 1] of Byte;
 begin
   nLocal := 0;
-  for i := 0 to nPl - 1 do
-    if Assigned(bix[i]) and (bix[i].Kind = btTerm) then
-      inc(nLocal);
+  for I := 0 to nPl - 1 do
+    if Assigned(bix[I]) and (bix[I].Kind = btTerm) then
+      Inc(nLocal);
   if Difficulty[0] = 0 then
     nLocal := 0;
   if nLocal <= 1 then
-    for y := 0 to ly - 1 do
-      for x := 0 to lx - 1 do
-      begin
-        Tile := RW[0].Map[(x + SaveMapCenterLoc + lx shr 1) mod lx + lx * y];
-        SaveMap[x + lx * y] := Tile and fTerrain + Tile and
+    for Y := 0 to ly - 1 do
+      for X := 0 to lx - 1 do
+      begin
+        Tile := RW[0].Map[(X + SaveMapCenterLoc + lx shr 1) mod lx + lx * Y];
+        SaveMap[X + lx * Y] := Tile and fTerrain + Tile and
           (fCity or fUnit or fOwned) shr 16;
       end;
@@ -640 +640 @@
   zero := 0;
   LogFile.Position := 0;
-  s := 'cEvoBook';
-  LogFile.write(s[1], 8); { file id }
-  i := CevoVersion;
-  LogFile.write(i, 4); { c-evo version }
+  S := 'cEvoBook';
+  LogFile.write(S[1], 8); { file id }
+  I := CevoVersion;
+  LogFile.write(I, 4); { c-evo version }
   LogFile.write(ExeInfo.Time, 4);
   LogFile.write(lx, 4);
@@ -656 +656 @@
   if nLocal > 1 then // multiplayer game -- no quick view
   begin
-    i := $80;
-    LogFile.write(i, 4);
+    I := $80;
+    LogFile.write(I, 4);
   end
   else
     LogFile.write(SaveMap, ((MapSize - 1) div 4 + 1) * 4);
-  for i := 0 to nPl - 1 do
-    if not Assigned(bix[i]) then
+  for I := 0 to nPl - 1 do
+    if not Assigned(bix[I]) then
       LogFile.write(zero, 4)
     else
     begin
-      if PlayersBrain[i].Kind in [btRandom, btAI] then
-        s := bix[i].FileName
-      else
-        s := PlayersBrain[i].FileName;
-      move(zero, s[Length(s) + 1], 4);
-      LogFile.write(s, (Length(s) div 4 + 1) * 4);
-      LogFile.write(OriginalDataVersion[i], 4);
-      s := ''; { behavior }
-      move(zero, s[Length(s) + 1], 4);
-      LogFile.write(s, (Length(s) div 4 + 1) * 4);
-      LogFile.write(Difficulty[i], 4);
+      if PlayersBrain[I].Kind in [btRandom, btAI] then
+        S := bix[I].FileName
+      else
+        S := PlayersBrain[I].FileName;
+      Move(zero, S[Length(S) + 1], 4);
+      LogFile.write(S, (Length(S) div 4 + 1) * 4);
+      LogFile.write(OriginalDataVersion[I], 4);
+      S := ''; { behavior }
+      Move(zero, S[Length(S) + 1], 4);
+      LogFile.write(S, (Length(S) div 4 + 1) * 4);
+      LogFile.write(Difficulty[I], 4);
     end;
 
@@ -687 +687 @@
   begin
     AutoSaveState := CL.State;
-    AutoSaveExists := true;
+    AutoSaveExists := True;
   end
 end;
@@ -693 +693 @@
 procedure StartGame;
 var
-  i, p, p1, Human, nAlive, bixUni: integer;
+  I, P, p1, Human, nAlive, bixUni: Integer;
   Game: TNewGameData;
   // GameEx: TNewGameExData;
@@ -722 +722 @@
 
   BrainUsed := [];
-  for p := 0 to nPl - 1 do
-    if Assigned(bix[p]) and ((Mode <> moMovie) or (p = 0)) then
+  for P := 0 to nPl - 1 do
+    if Assigned(bix[P]) and ((Mode <> moMovie) or (P = 0)) then
     begin { initiate selected control module }
-      AIInfo[p] := bix[p].Name + #0;
-      InitBrain(bix[p]);
+      AIInfo[P] := bix[P].Name + #0;
+      InitBrain(bix[P]);
       if Mode = moPlaying then
       begin // new game, this data version is original
-        OriginalDataVersion[p] := bix[p].DataVersion;
-        ProcessClientData[p] := true;
+        OriginalDataVersion[P] := bix[P].DataVersion;
+        ProcessClientData[P] := True;
       end
       else // loading game, compare with data version read from file
-        ProcessClientData[p] := ProcessClientData[p] and
-          (OriginalDataVersion[p] = bix[p].DataVersion);
-      if @bix[p].Client = nil then // client function not found
+        ProcessClientData[P] := ProcessClientData[P] and
+          (OriginalDataVersion[P] = bix[P].DataVersion);
+      if @bix[P].Client = nil then // client function not found
         if bix[0].Kind = btNoTerm then
-          bix[p] := nil
+          bix[P] := nil
         else
         begin
-          bix[p] := BrainTerm;
-          OriginalDataVersion[p] := -1;
-          ProcessClientData[p] := false;
+          bix[P] := BrainTerm;
+          OriginalDataVersion[P] := -1;
+          ProcessClientData[P] := False;
         end;
-      if Assigned(bix[p]) then
-        include(BrainUsed, Brains.IndexOf(bix[p]));
+      if Assigned(bix[P]) then
+        Include(BrainUsed, Brains.IndexOf(bix[P]));
     end;
 
@@ -760 +760 @@
     begin
       if Mode <> moMovie then
-        inc(GWatching, 1 shl p1);
+        Inc(GWatching, 1 shl p1);
       if bix[p1].Kind = btAI then
-        inc(GAI, 1 shl p1);
+        Inc(GAI, 1 shl p1);
       if Difficulty[p1] > 0 then
       begin
-        inc(GAlive, 1 shl p1);
-        inc(nAlive);
+        Inc(GAlive, 1 shl p1);
+        Inc(nAlive);
       end;
       ServerVersion[p1] := bix[p1].ServerVersion;
@@ -779 +779 @@
 
   GTurn := 0;
-  for i := 0 to nWonder - 1 do
-    with GWonder[i] do
+  for I := 0 to nWonder - 1 do
+    with GWonder[I] do
     begin
       CityID := -1;
@@ -787 +787 @@
   FillChar(GShip, SizeOf(GShip), 0);
 
-  for p := 0 to nPl - 1 do
-    if 1 shl p and (GAlive or GWatching) <> 0 then
-      with RW[p] do
+  for P := 0 to nPl - 1 do
+    if 1 shl P and (GAlive or GWatching) <> 0 then
+      with RW[P] do
       begin
         Government := gDespotism;
@@ -799 +799 @@
         AnarchyStart := -AnarchyTurns - 1;
         Happened := 0;
-        LastValidStat[p] := -1;
-        Worked[p] := 0;
-        Founded[p] := 0;
-        DevModelTurn[p] := -1;
+        LastValidStat[P] := -1;
+        Worked[P] := 0;
+        Founded[P] := 0;
+        DevModelTurn[P] := -1;
         OracleIncome := 0;
 
-        if bix[p].DataSize > 0 then
+        if bix[P].DataSize > 0 then
         begin
-          GetMem(SavedData[p], bix[p].DataSize * 4);
-          GetMem(Data, bix[p].DataSize * 4);
-          FillChar(SavedData[p]^, bix[p].DataSize * 4, 0);
-          FillChar(Data^, bix[p].DataSize * 4, 0);
+          GetMem(SavedData[P], bix[P].DataSize * 4);
+          GetMem(Data, bix[P].DataSize * 4);
+          FillChar(SavedData[P]^, bix[P].DataSize * 4, 0);
+          FillChar(Data^, bix[P].DataSize * 4, 0);
         end
         else
         begin
           Data := nil;
-          SavedData[p] := nil;
+          SavedData[P] := nil;
         end;
         nBattleHistory := 0;
@@ -825 +825 @@
           end
           else } BorderHelper := nil;
-        for i := 0 to nStat - 1 do
-          GetMem(Stat[i, p], 4 * (MaxTurn + 1));
-        if bix[p].Flags and fDotNet <> 0 then
+        for I := 0 to nStat - 1 do
+          GetMem(Stat[I, P], 4 * (MaxTurn + 1));
+        if bix[P].Flags and fDotNet <> 0 then
         begin
-          GetMem(RW[p].DefaultDebugMap, MapSize * 4);
-          FillChar(RW[p].DefaultDebugMap^, MapSize * 4, 0);
-          DebugMap[p] := RW[p].DefaultDebugMap;
+          GetMem(RW[P].DefaultDebugMap, MapSize * 4);
+          FillChar(RW[P].DefaultDebugMap^, MapSize * 4, 0);
+          DebugMap[P] := RW[P].DefaultDebugMap;
         end
         else
-          RW[p].DefaultDebugMap := nil;
+          RW[P].DefaultDebugMap := nil;
 
         { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2); }
@@ -842 +842 @@
   begin // random map
     InitRandomGame;
-    PreviewElevation := false;
+    PreviewElevation := False;
     MapField := nil;
   end
@@ -850 +850 @@
       LoadMap(MapFileName); // new game -- load map from file
     GetMem(MapField, MapSize * 4);
-    move(RealMap, MapField^, MapSize * 4);
+    Move(RealMap, MapField^, MapSize * 4);
     Human := 0;
     for p1 := 0 to nPl - 1 do
       if Assigned(bix[p1]) and (bix[p1].Kind = btTerm) then
-        inc(Human, 1 shl p1);
+        Inc(Human, 1 shl p1);
     InitMapGame(Human);
   end;
   CityProcessing.InitGame;
   UnitProcessing.InitGame;
-  for p := 0 to nPl - 1 do
-    if 1 shl p and (GAlive or GWatching) <> 0 then
-      Inform(p);
+  for P := 0 to nPl - 1 do
+    if 1 shl P and (GAlive or GWatching) <> 0 then
+      Inform(P);
 
   pTurn := -1;
@@ -870 +870 @@
   Game.LandMass := LandMass;
   Game.MaxTurn := MaxTurn;
-  move(Difficulty, Game.Difficulty, SizeOf(Difficulty));
+  Move(Difficulty, Game.Difficulty, SizeOf(Difficulty));
   // GameEx.lx:=lx; GameEx.ly:=ly; GameEx.LandMass:=LandMass;
   // GameEx.MaxTurn:=MaxTurn; GameEx.RND:=RND;
   // move(Difficulty,GameEx.Difficulty,SizeOf(Difficulty));
   AICredits := '';
-  for i := 0 to Brains.Count - 1 do
+  for I := 0 to Brains.Count - 1 do
   with Brains[I] do begin
     if Initialized then
-      if i in BrainUsed then
+      if I in BrainUsed then
       begin
         if Kind = btAI then
           Notify(ntInitPlayers);
-        for p := 0 to nPl - 1 do
+        for P := 0 to nPl - 1 do
         begin
-          if Brains.IndexOf(bix[p]) = i then
-            Game.RO[p] := @RW[p]
+          if Brains.IndexOf(bix[P]) = I then
+            Game.RO[P] := @RW[P]
           else
-            Game.RO[p] := nil;
-          if (Kind = btTerm) and (Difficulty[0] = 0) and Assigned(bix[p]) then
-            Game.SuperVisorRO[p] := @RW[p]
+            Game.RO[P] := nil;
+          if (Kind = btTerm) and (Difficulty[0] = 0) and Assigned(bix[P]) then
+            Game.SuperVisorRO[P] := @RW[P]
           else
-            Game.SuperVisorRO[p] := nil;
+            Game.SuperVisorRO[P] := nil;
         end;
         if Flags and fDotNet > 0 then
         begin
           Path := DLLName;
-          move(Path[1], Game.AssemblyPath, Length(Path));
+          Move(Path[1], Game.AssemblyPath, Length(Path));
           Game.AssemblyPath[Length(Path)] := #0;
         end
@@ -903 +903 @@
         case Mode of
           moLoading, moLoading_Fast:
-            CallClient(i, cLoadGame, Game);
+            CallClient(I, cLoadGame, Game);
           moMovie:
-            CallClient(i, cMovie, Game);
+            CallClient(I, cMovie, Game);
           moPlaying:
-            CallClient(i, cNewGame, Game);
+            CallClient(I, cNewGame, Game);
         end;
         if (Kind = btAI) and (Credits <> '') then
@@ -917 +917 @@
       else
       begin { module no longer used -- unload }
-        CallClient(i, cReleaseModule, nil^);
+        CallClient(I, cReleaseModule, nil^);
         if Kind = btAI then
         begin
@@ -924 +924 @@
           Client := nil;
         end;
-        Initialized := false;
+        Initialized := False;
       end;
   end;
@@ -952 +952 @@
   CheckBorders(-1);
 {$IFOPT O-}InvalidTreatyMap := 0; {$ENDIF}
-  AutoSaveExists := false;
+  AutoSaveExists := False;
   pDipActive := -1;
   pTurn := 0;
@@ -962 +962 @@
 procedure EndGame;
 var
-  i, p1: integer;
+  I, p1: Integer;
 begin
   if LandMass = 0 then
@@ -969 +969 @@
     if Assigned(bix[p1]) then
     begin
-      for i := 0 to nStat - 1 do
-        FreeMem(Stat[i, p1]);
+      for I := 0 to nStat - 1 do
+        FreeMem(Stat[I, p1]);
       if RW[p1].BattleHistory <> nil then
         FreeMem(RW[p1].BattleHistory);
@@ -985 +985 @@
 end;
 
-procedure GenerateStat(p: integer);
+procedure GenerateStat(P: Integer);
 var
-  cix, uix: integer;
+  cix, uix: Integer;
 begin
-  if Difficulty[p] > 0 then
-    with RW[p] do
+  if Difficulty[P] > 0 then
+    with RW[P] do
     begin
-      Stat[stPop, p, GTurn] := 0;
+      Stat[stPop, P, GTurn] := 0;
       for cix := 0 to nCity - 1 do
         if City[cix].Loc >= 0 then
-          inc(Stat[stPop, p, GTurn], City[cix].Size);
-      Stat[stScience, p, GTurn] := Researched[p] * 50;
-      if (RW[p].ResearchTech >= 0) and (RW[p].ResearchTech <> adMilitary) then
-        inc(Stat[stScience, p, GTurn], Research * 100 div TechBaseCost(nTech[p],
-          Difficulty[p]));
-      Stat[stMil, p, GTurn] := 0;
+          Inc(Stat[stPop, P, GTurn], City[cix].Size);
+      Stat[stScience, P, GTurn] := Researched[P] * 50;
+      if (RW[P].ResearchTech >= 0) and (RW[P].ResearchTech <> adMilitary) then
+        Inc(Stat[stScience, P, GTurn], Research * 100 div TechBaseCost(nTech[P],
+          Difficulty[P]));
+      Stat[stMil, P, GTurn] := 0;
       for uix := 0 to nUn - 1 do
         if Un[uix].Loc >= 0 then
@@ -1006 +1006 @@
           begin
             if (Kind <= mkEnemyDeveloped) and (Un[uix].mix <> 1) then
-              inc(Stat[stMil, p, GTurn], Weight * MStrength *
+              Inc(Stat[stMil, P, GTurn], Weight * MStrength *
                 Un[uix].Health div 100)
             else if Domain = dGround then
-              inc(Stat[stMil, p, GTurn], (Attack + 2 * Defense) *
+              Inc(Stat[stMil, P, GTurn], (Attack + 2 * Defense) *
                 Un[uix].Health div 100)
             else
-              inc(Stat[stMil, p, GTurn], (Attack + Defense) *
+              Inc(Stat[stMil, P, GTurn], (Attack + Defense) *
                 Un[uix].Health div 100);
             case Kind of
               mkSlaves:
-                inc(Stat[stPop, p, GTurn]);
+                Inc(Stat[stPop, P, GTurn]);
               mkSettler:
-                inc(Stat[stPop, p, GTurn], 2);
+                Inc(Stat[stPop, P, GTurn], 2);
             end;
           end;
-      Stat[stMil, p, GTurn] := Stat[stMil, p, GTurn] div 16;
-      Stat[stExplore, p, GTurn] := Discovered[p];
-      Stat[stTerritory, p, GTurn] := TerritoryCount[p];
-      Stat[stWork, p, GTurn] := Worked[p];
-      LastValidStat[p] := GTurn;
+      Stat[stMil, P, GTurn] := Stat[stMil, P, GTurn] div 16;
+      Stat[stExplore, P, GTurn] := Discovered[P];
+      Stat[stTerritory, P, GTurn] := TerritoryCount[P];
+      Stat[stWork, P, GTurn] := Worked[P];
+      LastValidStat[P] := GTurn;
     end;
 end;
@@ -1031 +1031 @@
 procedure LogCityTileChanges;
 var
-  cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RW[pTurn].nCity - 1 do
@@ -1052 +1052 @@
 procedure NoLogCityTileChanges;
 var
-  cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RW[pTurn].nCity - 1 do
@@ -1063 +1063 @@
 end;
 
-function HasCityTileChanges: boolean;
+function HasCityTileChanges: Boolean;
 var
-  cix: integer;
+  cix: Integer;
 begin
-  result := false;
+  Result := False;
   for cix := 0 to RW[pTurn].nCity - 1 do
     with RW[pTurn].City[cix] do
@@ -1074 +1074 @@
         // if SavedResourceWeights[cix]<>ResourceWeights then result:=true;
         if SavedTiles[cix] <> Tiles then
-          result := true;
+          Result := True;
       end;
 end;
@@ -1080 +1080 @@
 procedure BeforeTurn0;
 var
-  p1, uix: integer;
+  p1, uix: Integer;
 begin
   for uix := 0 to RW[pTurn].nUn - 1 do { init movement points for first turn }
@@ -1101 +1101 @@
 end;
 
-function LoadGame(const Path, FileName: string; Turn: integer;
-  MovieMode: boolean): boolean;
+function LoadGame(const Path, FileName: string; Turn: Integer;
+  MovieMode: Boolean): Boolean;
 var
   J: TBrain;
-  i, ix, d, p1, Command, Subject: integer;
+  I, ix, D, p1, Command, Subject: Integer;
   K: Integer;
-{$IFDEF TEXTLOG}LoadPos0: integer; {$ENDIF}
-  Data: pointer;
+{$IFDEF TEXTLOG}LoadPos0: Integer; {$ENDIF}
+  Data: Pointer;
   LogFile: TFileStream;
   FormerCLState: TCmdListState;
-  s: string[255];
+  S: string[255];
   SaveMap: array [0 .. lxmax * lymax - 1] of Byte;
-  Started, StatRequest: boolean;
+  Started, StatRequest: Boolean;
 begin
   SavePath := Path;
@@ -1121 +1121 @@
     fmShareExclusive);
   LogFile.Position := 0;
-  LogFile.Read(s[1], 8); { file id }
-  LogFile.Read(i, 4); { c-evo version }
+  LogFile.Read(S[1], 8); { file id }
+  LogFile.Read(I, 4); { c-evo version }
   LogFile.Read(J, 4); { exe time }
 
-  if (i >= FirstBookCompatibleVersion) and (i <= CevoVersion) then
+  if (I >= FirstBookCompatibleVersion) and (I <= CevoVersion) then
   begin
-    result := true;
+    Result := True;
     LogFile.Read(lx, 4);
     LogFile.Read(ly, 4);
@@ -1142 +1142 @@
     for p1 := 0 to nPl - 1 do
     begin
-      LogFile.Read(s[0], 4);
-      if s[0] = #0 then
+      LogFile.Read(S[0], 4);
+      if S[0] = #0 then
         PlayersBrain[p1] := nil
       else
       begin
-        LogFile.Read(s[4], Byte(s[0]) div 4 * 4);
+        LogFile.Read(S[4], Byte(S[0]) div 4 * 4);
         LogFile.Read(OriginalDataVersion[p1], 4);
-        LogFile.Read(d, 4); { behavior }
+        LogFile.Read(D, 4); { behavior }
         LogFile.Read(Difficulty[p1], 4);
         J := Brains.Last;
-        while Assigned(J) and (AnsiCompareFileName(J.FileName, s) <> 0) do begin
+        while Assigned(J) and (AnsiCompareFileName(J.FileName, S) <> 0) do begin
           K := Brains.IndexOf(J) - 1;
           if K >= 0 then J := Brains[K]
@@ -1159 +1159 @@
         if not Assigned(J) then
         begin // ai not found -- replace by local player
-          ProcessClientData[p1] := false;
-          NotifyMessage := s;
+          ProcessClientData[p1] := False;
+          NotifyMessage := S;
           Notify(ntAIError);
           J := BrainTerm;
         end
         else
-          ProcessClientData[p1] := true;
-        if j.Kind = btNoTerm then
-          j := BrainSuperVirtual;
+          ProcessClientData[p1] := True;
+        if J.Kind = btNoTerm then
+          J := BrainSuperVirtual;
         // crashed tournament -- load as supervisor
-        PlayersBrain[p1] := j;
+        PlayersBrain[p1] := J;
       end;
     end;
   end
   else
-    Result := false;
+    Result := False;
 
   if Result then begin
@@ -1181 +1181 @@
   end;
   FreeAndNil(LogFile);
-  if not result then
+  if not Result then
     Exit;
 
@@ -1195 +1195 @@
 {$IFDEF TEXTLOG}AssignFile(TextLog, SavePath + LogFileName + '.txt');
   Rewrite(TextLog); {$ENDIF}
-  LoadOK := true;
+  LoadOK := True;
   StartGame;
   if MovieMode then
@@ -1205 +1205 @@
     Notify(ntLoadBegin);
 
-  started := false;
-  StatRequest := false;
-  MovieStopped := false;
+  started := False;
+  StatRequest := False;
+  MovieStopped := False;
 {$IFDEF LOADPERF}QueryPerformanceCounter(time_total0);
   time_a := 0;
@@ -1222 +1222 @@
     begin
       GenerateStat(pTurn);
-      StatRequest := false;
+      StatRequest := False;
     end;
     // complete all internal commands following an sTurn before generating statistics
@@ -1237 +1237 @@
         CallPlayer(cMovieTurn, 0, nil^);
       end;
-      StatRequest := true;
-      started := true;
+      StatRequest := True;
+      started := True;
     end
     else if (Command = sTurn) and (pTurn = 0) and (GTurn = LoadTurn) then
     begin
-      assert(CL.State.LoadPos = FormerCLState.LoadPos + 4); // size of sTurn
+      Assert(CL.State.LoadPos = FormerCLState.LoadPos + 4); // size of sTurn
       CL.State := FormerCLState;
       CL.Cut;
@@ -1278 +1278 @@
     EndGame;
     Notify(ntStartGo);
-    result := false;
-    exit;
+    Result := False;
+    Exit;
   end;
 
   if StatRequest then
     GenerateStat(pTurn);
-  assert(started);
+  Assert(started);
 {$IFDEF TEXTLOG}CloseFile(TextLog); {$ENDIF}
 {$IFDEF LOADPERF}QueryPerformanceCounter(time_total); { time in s is: (time_total-time_total0)/PerfFreq }{$ENDIF}
@@ -1328 +1328 @@
 procedure InsertTerritoryUpdateCommands;
 var
-  p1, Command, Subject: integer;
-  Data: pointer;
+  p1, Command, Subject: Integer;
+  Data: Pointer;
   FormerCLState: TCmdListState;
 begin
@@ -1351 +1351 @@
 
 procedure StartNewGame(const Path, FileName, Map: string;
-  Newlx, Newly, NewLandMass, NewMaxTurn: integer);
+  Newlx, Newly, NewLandMass, NewMaxTurn: Integer);
 var
   I: Integer;
@@ -1395 +1395 @@
 end;
 
-procedure DirectHelp(Command: integer);
+procedure DirectHelp(Command: Integer);
 begin
   InitBrain(BrainTerm);
@@ -1402 +1402 @@
 end;
 
-procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: integer);
+procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: Integer);
 var
-  p1, Loc1: integer;
+  p1, Loc1: Integer;
   Game: TNewGameData;
 begin
@@ -1446 +1446 @@
 end;
 
-procedure DestroySpacePort_TellPlayers(p, pCapturer: integer);
+procedure DestroySpacePort_TellPlayers(P, pCapturer: Integer);
 var
-  cix, i, p1: integer;
+  cix, I, p1: Integer;
   ShowShipChange: TShowShipChange;
 begin
   // stop ship part production
-  for cix := 0 to RW[p].nCity - 1 do
-    with RW[p].City[cix] do
+  for cix := 0 to RW[P].nCity - 1 do
+    with RW[P].City[cix] do
       if (Loc >= 0) and (Project and cpImp <> 0) and
         ((Project and cpIndex = woMIR) or
         (Imp[Project and cpIndex].Kind = ikShipPart)) then
       begin
-        inc(RW[p].Money, Prod0);
+        Inc(RW[P].Money, Prod0);
         Prod := 0;
         Prod0 := 0;
@@ -1466 +1466 @@
 
   // destroy ship
-  with GShip[p] do
+  with GShip[P] do
     if Parts[0] + Parts[1] + Parts[2] > 0 then
     begin
-      for i := 0 to nShipPart - 1 do
-      begin
-        ShowShipChange.Ship1Change[i] := -Parts[i];
+      for I := 0 to nShipPart - 1 do
+      begin
+        ShowShipChange.Ship1Change[I] := -Parts[I];
         if pCapturer >= 0 then
         begin
-          ShowShipChange.Ship2Change[i] := Parts[i];
-          inc(GShip[pCapturer].Parts[i], Parts[i]);
+          ShowShipChange.Ship2Change[I] := Parts[I];
+          Inc(GShip[pCapturer].Parts[I], Parts[I]);
         end;
-        Parts[i] := 0;
+        Parts[I] := 0;
       end;
       if Mode >= moMovie then
@@ -1485 +1485 @@
         else
           ShowShipChange.Reason := scrDestruction;
-        ShowShipChange.Ship1Owner := p;
+        ShowShipChange.Ship1Owner := P;
         ShowShipChange.Ship2Owner := pCapturer;
         for p1 := 0 to nPl - 1 do
           if 1 shl p1 and (GAlive or GWatching) <> 0 then
           begin
-            move(GShip, RW[p1].Ship, SizeOf(GShip));
+            Move(GShip, RW[p1].Ship, SizeOf(GShip));
             if 1 shl p1 and GWatching <> 0 then
               CallPlayer(cShowShipChange, p1, ShowShipChange);
@@ -1498 +1498 @@
 end;
 
-procedure DestroyCity_TellPlayers(p, cix: integer; SaveUnits: boolean);
+procedure DestroyCity_TellPlayers(P, cix: Integer; SaveUnits: Boolean);
 begin
-  if RW[p].City[cix].built[imSpacePort] > 0 then
-    DestroySpacePort_TellPlayers(p, -1);
-  DestroyCity(p, cix, SaveUnits);
+  if RW[P].City[cix].built[imSpacePort] > 0 then
+    DestroySpacePort_TellPlayers(P, -1);
+  DestroyCity(P, cix, SaveUnits);
 end;
 
-procedure ChangeCityOwner_TellPlayers(pOld, cixOld, pNew: integer);
+procedure ChangeCityOwner_TellPlayers(pOld, cixOld, pNew: Integer);
 begin
   if RW[pOld].City[cixOld].built[imSpacePort] > 0 then
@@ -1515 +1515 @@
 end;
 
-procedure CheckWin(p: integer);
+procedure CheckWin(P: Integer);
 var
-  i: integer;
-  ShipComplete: boolean;
+  I: Integer;
+  ShipComplete: Boolean;
 begin
-  ShipComplete := true;
-  for i := 0 to nShipPart - 1 do
-    if GShip[p].Parts[i] < ShipNeed[i] then
-      ShipComplete := false;
+  ShipComplete := True;
+  for I := 0 to nShipPart - 1 do
+    if GShip[P].Parts[I] < ShipNeed[I] then
+      ShipComplete := False;
   if ShipComplete then
-    GWinner := GWinner or 1 shl p; // game won!
+    GWinner := GWinner or 1 shl P; // game won!
 end;
 
 procedure BeforeTurn;
 var
-  i, p1, uix, cix, V21, Loc1, Cost, Job0, nAlive, nAppliers, ad, OldLoc,
-    SiegedTiles, nUpdateLoc: integer;
-  UpdateLoc: array [0 .. numax - 1] of integer;
+  I, p1, uix, cix, V21, Loc1, Cost, Job0, nAlive, nAppliers, ad, OldLoc,
+    SiegedTiles, nUpdateLoc: Integer;
+  UpdateLoc: array [0 .. numax - 1] of Integer;
   Radius: TVicinity21Loc;
   ShowShipChange: TShowShipChange;
-  TribeExtinct, JobDone, MirBuilt: boolean;
+  TribeExtinct, JobDone, MirBuilt: Boolean;
 begin
-{$IFOPT O-}assert(1 shl pTurn and InvalidTreatyMap = 0); {$ENDIF}
-  assert(1 shl pTurn and (GAlive or GWatching) <> 0);
+{$IFOPT O-}Assert(1 shl pTurn and InvalidTreatyMap = 0); {$ENDIF}
+  Assert(1 shl pTurn and (GAlive or GWatching) <> 0);
   if (1 shl pTurn and GAlive = 0) and (Difficulty[pTurn] > 0) then
-    exit;
+    Exit;
 
   if (GWonder[woGrLibrary].EffectiveOwner = pTurn) and (GWinner = 0) then
@@ -1547 +1547 @@
     for p1 := 0 to nPl - 1 do
       if 1 shl p1 and GAlive <> 0 then
-        inc(nAlive);
+        Inc(nAlive);
     ad := 0;
     while ad <= (nAdv - 5) do begin
@@ -1556 +1556 @@
           if (p1 <> pTurn) and (1 shl p1 and GAlive <> 0) and
             (RW[p1].Tech[ad] >= tsApplicable) then
-            inc(nAppliers);
+            Inc(nAppliers);
         if nAppliers * 2 > nAlive then
         begin
           SeeTech(pTurn, ad);
-          inc(nTech[pTurn]);
+          Inc(nTech[pTurn]);
           if Mode >= moMovie then
             CallPlayer(cShowGreatLibTech, pTurn, ad);
@@ -1577 +1577 @@
   RW[pTurn].nEnemyUn := 0;
 
-  MirBuilt := false;
+  MirBuilt := False;
   if (Difficulty[pTurn] > 0) and (GWinner = 0) then
     with RW[pTurn] do
@@ -1600 +1600 @@
                   begin // transport unload
                     if Model[mix].Domain = dAir then
-                      dec(Un[Master].AirLoad)
+                      Dec(Un[Master].AirLoad)
                     else
-                      dec(Un[Master].TroopLoad);
+                      Dec(Un[Master].TroopLoad);
                     Master := -1;
                   end
@@ -1622 +1622 @@
       if Mode >= moMovie then
         FillChar(ShowShipChange, SizeOf(ShowShipChange), 0);
-      TribeExtinct := true;
+      TribeExtinct := True;
       nUpdateLoc := 0;
       for cix := 0 to nCity - 1 do
@@ -1638 +1638 @@
               begin
                 Loc1 := Radius[V21];
-                assert((Loc1 >= 0) and (Loc1 < MapSize) and
+                Assert((Loc1 >= 0) and (Loc1 < MapSize) and
                   (UsedByCity[Loc1] = Loc));
                 p1 := RealMap[Loc1] shr 27;
@@ -1649 +1649 @@
                   UsedByCity[Loc1] := -1;
                   Flags := Flags or chSiege;
-                  inc(SiegedTiles);
+                  Inc(SiegedTiles);
                 end;
               end;
@@ -1656 +1656 @@
               if not AddBestCityTile(pTurn, cix) then
                 Break;
-              dec(SiegedTiles);
+              Dec(SiegedTiles);
             end;
 
@@ -1664 +1664 @@
 
               if CityTurn(pTurn, cix) then
-                TribeExtinct := false
+                TribeExtinct := False
               else
               begin // city is erased
@@ -1671 +1671 @@
                 Map[Loc] := Map[Loc] and not fCity; // !!! do this in inner core
                 UpdateLoc[nUpdateLoc] := Loc;
-                inc(nUpdateLoc);
-                DestroyCity_TellPlayers(pTurn, cix, true);
+                Inc(nUpdateLoc);
+                DestroyCity_TellPlayers(pTurn, cix, True);
               end;
 
@@ -1679 +1679 @@
               begin
                 if Project0 and cpIndex = woMIR then // MIR completed
-                  MirBuilt := true
+                  MirBuilt := True
                 else if Project0 and cpIndex = woManhattan then
                   GColdWarStart := GTurn
                 else if Imp[Project0 and cpIndex].Kind = ikShipPart
                 then { ship parts produced }
-                  inc(ShowShipChange.Ship1Change[Project0 and cpIndex -
+                  Inc(ShowShipChange.Ship1Change[Project0 and cpIndex -
                     imShipComp]);
               end;
@@ -1692 +1692 @@
       begin
         CheckBorders(-1, pTurn);
-        for i := 0 to nUpdateLoc - 1 do
-          UpdateUnitMap(UpdateLoc[i], true);
+        for I := 0 to nUpdateLoc - 1 do
+          UpdateUnitMap(UpdateLoc[I], True);
         if Mode >= moMovie then
           for p1 := 0 to nPl - 1 do
             if (1 shl p1 and GWatching <> 0) and (p1 <> pTurn) then
-              for i := 0 to nUpdateLoc - 1 do
-                if ObserveLevel[UpdateLoc[i]] shr (2 * p1) and 3 >= lObserveUnhidden
+              for I := 0 to nUpdateLoc - 1 do
+                if ObserveLevel[UpdateLoc[I]] shr (2 * p1) and 3 >= lObserveUnhidden
                 then
-                  CallPlayer(cShowCityChanged, p1, UpdateLoc[i]);
+                  CallPlayer(cShowCityChanged, p1, UpdateLoc[I]);
       end;
 
@@ -1718 +1718 @@
               Movement := UnitSpeed(pTurn, mix, Health); { refresh movement }
 
-            assert(Loc >= 0);
+            Assert(Loc >= 0);
             if Model[mix].Kind <> mkDiplomat then
             begin // check treaty violation
@@ -1762 +1762 @@
               begin
                 AddBestCityTile(pTurn, RW[pTurn].nCity - 1);
-                UpdateUnitMap(Loc1, true);
+                UpdateUnitMap(Loc1, True);
                 if Mode >= moMovie then // tell enemies
                   for p1 := 0 to nPl - 1 do
@@ -1824 +1824 @@
           DiscoverTech(pTurn, ResearchTech);
 
-        dec(Research, Cost);
+        Dec(Research, Cost);
         Happened := Happened or phTech;
         ResearchTech := -1;
@@ -1839 +1839 @@
             (Treaty[p1] >= trPeace) then
           begin
-            inc(Credibility);
+            Inc(Credibility);
             Break;
           end;
@@ -1856 +1856 @@
           if (p1 <> pTurn) and (1 shl p1 and (GAlive or GWatching) <> 0) then
           begin
-            move(GShip, RW[p1].Ship, SizeOf(GShip));
+            Move(GShip, RW[p1].Ship, SizeOf(GShip));
             if 1 shl p1 and GWatching <> 0 then
               CallPlayer(cShowShipChange, p1, ShowShipChange);
@@ -1871 +1871 @@
           if (p1 <> pTurn) and ((GAlive or GWatching) and (1 shl p1) <> 0) then
             RW[p1].EnemyReport[pTurn].Government := gDespotism;
-        inc(Happened, phChangeGov);
+        Inc(Happened, phChangeGov);
       end;
     end; // if Difficulty[pTurn]>0
@@ -1912 +1912 @@
 procedure AfterTurn;
 var
-  cix, uix, p1, Loc1, Job0: integer;
-  JobDone: boolean;
+  cix, uix, p1, Loc1, Job0: Integer;
+  JobDone: Boolean;
 begin
   with RW[pTurn] do
@@ -1925 +1925 @@
       end;
 
-    inc(Money, OracleIncome);
+    Inc(Money, OracleIncome);
     OracleIncome := 0;
     if GWonder[woOracle].EffectiveOwner = pTurn then
@@ -1935 +1935 @@
             if (RW[p1].City[cix].Loc >= 0) and
               (RW[p1].City[cix].built[imTemple] > 0) then
-              inc(OracleIncome);
+              Inc(OracleIncome);
     end;
 
@@ -1962 +1962 @@
             begin
               AddBestCityTile(pTurn, RW[pTurn].nCity - 1);
-              UpdateUnitMap(Loc1, true);
+              UpdateUnitMap(Loc1, True);
               if Mode >= moMovie then // tell enemies
                 for p1 := 0 to nPl - 1 do
@@ -1993 +1993 @@
             else
             begin
-              dec(Fuel);
+              Dec(Fuel);
               if Fuel < 0 then
               begin
@@ -2013 +2013 @@
         Flags := Flags and not unWithdrawn;
         if (Loc >= 0) and (Model[mix].Domain = dGround) and (Master < 0) and
-          ((integer(Movement) = Model[mix].Speed) or
+          ((Integer(Movement) = Model[mix].Speed) or
           (Model[mix].Cap[mcAcademy] > 0) and (Movement * 2 >= Model[mix].Speed))
         then
@@ -2049 +2049 @@
 end;
 
-function ExecuteMove(p, uix, ToLoc: integer; var MoveInfo: TMoveInfo;
-  ShowMove: TShowMove): integer;
+function ExecuteMove(P, uix, ToLoc: Integer; var MoveInfo: TMoveInfo;
+  ShowMove: TShowMove): Integer;
 var
-  i, p1, FromLoc, uix1, nUpdateLoc: integer;
+  I, p1, FromLoc, uix1, nUpdateLoc: Integer;
   MinLevel, MissionResult: Cardinal;
   PModel: ^TModel;
-  UpdateLoc: array [0 .. numax - 1] of integer;
-  SeeFrom, SeeTo, ExtDiscover: boolean;
+  UpdateLoc: array [0 .. numax - 1] of Integer;
+  SeeFrom, SeeTo, ExtDiscover: Boolean;
 begin
-  result := 0;
-  with RW[p], Un[uix] do
+  Result := 0;
+  with RW[P], Un[uix] do
   begin
     PModel := @Model[mix];
@@ -2065 +2065 @@
 
     if Master < 0 then
-      FreeUnit(p, uix);
+      FreeUnit(P, uix);
     if (MoveInfo.MoveType in [mtMove, mtCapture]) and MoveInfo.MountainDelay
     then
@@ -2073 +2073 @@
     Loc := -2;
     if TroopLoad + AirLoad > 0 then
-      for i := 0 to nUn - 1 do
-        if (Un[i].Loc >= 0) and (Un[i].Master = uix) then
-          Un[i].Loc := -2;
+      for I := 0 to nUn - 1 do
+        if (Un[I].Loc >= 0) and (Un[I].Master = uix) then
+          Un[I].Loc := -2;
     UpdateUnitMap(FromLoc);
 
@@ -2093 +2093 @@
           ShowMove.Flags := ShowMove.Flags or umShipLoading;
       for p1 := 0 to nPl - 1 do
-        if (1 shl p1 and GWatching <> 0) and ((p1 <> p) or (bix[p1].Kind = btTerm))
+        if (1 shl p1 and GWatching <> 0) and ((p1 <> P) or (bix[p1].Kind = btTerm))
         then
         begin
@@ -2102 +2102 @@
           else
             MinLevel := lObserveUnhidden;
-          SeeFrom := (p1 = p) or (ObserveLevel[FromLoc] shr (2 * p1) and
+          SeeFrom := (p1 = P) or (ObserveLevel[FromLoc] shr (2 * p1) and
             3 >= MinLevel);
-          SeeTo := (p1 = p) or (ObserveLevel[ToLoc] shr (2 * p1) and
+          SeeTo := (p1 = P) or (ObserveLevel[ToLoc] shr (2 * p1) and
             3 >= MinLevel);
           if SeeFrom and SeeTo then
           begin
-            TellAboutModel(p1, p, mix);
-            if p1 = p then
+            TellAboutModel(p1, P, mix);
+            if p1 = P then
               ShowMove.emix := -1
             else
-              ShowMove.emix := emixSafe(p1, p, mix);
+              ShowMove.emix := emixSafe(p1, P, mix);
             if MoveInfo.MoveType = mtCapture then
               CallPlayer(cShowCapturing, p1, ShowMove)
@@ -2126 +2126 @@
       Loc := ToLoc;
     if TroopLoad + AirLoad > 0 then
-      for i := 0 to nUn - 1 do
-        if Un[i].Loc = -2 then
-          Un[i].Loc := ToLoc;
-
-    ExtDiscover := false;
+      for I := 0 to nUn - 1 do
+        if Un[I].Loc = -2 then
+          Un[I].Loc := ToLoc;
+
+    ExtDiscover := False;
     nUpdateLoc := 0;
     if MoveInfo.MoveType = mtCapture then
     begin
-      assert(Occupant[ToLoc] < 0);
+      Assert(Occupant[ToLoc] < 0);
       for uix1 := 0 to RW[MoveInfo.Defender].nUn - 1 do
         with RW[MoveInfo.Defender].Un[uix1] do
@@ -2140 +2140 @@
           begin
             UpdateLoc[nUpdateLoc] := Loc;
-            inc(nUpdateLoc);
+            Inc(nUpdateLoc);
           end;
       // unit will be removed -- remember position and update for all players
@@ -2147 +2147 @@
       then
       begin // city captured
-        ChangeCityOwner_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, p);
+        ChangeCityOwner_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, P);
         City[nCity - 1].Flags := CaptureTurns shl 16;
-        CityShrink(p, nCity - 1);
+        CityShrink(P, nCity - 1);
         if Mode = moPlaying then
-          with RW[p].City[nCity - 1] do
+          with RW[P].City[nCity - 1] do
           begin
             // SavedResourceWeights[nCity-1]:=ResourceWeights;
             SavedTiles[nCity - 1] := Tiles;
           end;
-        ExtDiscover := true;
+        ExtDiscover := True;
 
         // Temple of Zeus effect
-        if GWonder[woZeus].EffectiveOwner = p then
+        if GWonder[woZeus].EffectiveOwner = P then
         begin
-          GiveCivilReport(p, MoveInfo.Defender);
-          for i := 0 to nAdv - 1 do
-            if not(i in FutureTech) and (RW[p].Tech[i] < tsSeen) and
-              (RW[MoveInfo.Defender].Tech[i] >= tsApplicable) then
+          GiveCivilReport(P, MoveInfo.Defender);
+          for I := 0 to nAdv - 1 do
+            if not(I in FutureTech) and (RW[P].Tech[I] < tsSeen) and
+              (RW[MoveInfo.Defender].Tech[I] >= tsApplicable) then
             begin
               Happened := Happened or phStealTech;
@@ -2172 +2172 @@
         end;
         if Mode = moPlaying then
-          LogCheckBorders(p, nCity - 1, MoveInfo.Defender);
+          LogCheckBorders(P, nCity - 1, MoveInfo.Defender);
 {$IFOPT O-} if Mode < moPlaying then
-          InvalidTreatyMap := not(1 shl p); {$ENDIF}
+          InvalidTreatyMap := not(1 shl P); {$ENDIF}
         // territory should not be considered for the rest of the command
         // execution, because during loading a game it's incorrect before
@@ -2181 +2181 @@
       else // city destroyed
       begin
-        DestroyCity_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, false);
+        DestroyCity_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, False);
         CheckBorders(ToLoc, MoveInfo.Defender);
       end;
-      RecalcPeaceMap(p);
+      RecalcPeaceMap(P);
       if Mode >= moMovie then
-        move(GWonder, Wonder, SizeOf(GWonder));
+        Move(GWonder, Wonder, SizeOf(GWonder));
     end; { if MoveInfo.MoveType=mtCapture }
 
     if MoveInfo.MoveType = mtSpyMission then
     begin
-      MissionResult := DoSpyMission(p, MoveInfo.Defender, MoveInfo.Dcix,
+      MissionResult := DoSpyMission(P, MoveInfo.Defender, MoveInfo.Dcix,
         SpyMission);
       if (Mode = moPlaying) and (SpyMission = smStealForeignReports) then
-        CallPlayer(cShowMissionResult, p, MissionResult);
+        CallPlayer(cShowMissionResult, P, MissionResult);
     end;
 
     Health := MoveInfo.EndHealth;
-    dec(Movement, MoveInfo.Cost);
+    Dec(Movement, MoveInfo.Cost);
     // transport unload
     if Master >= 0 then
     begin
       if PModel.Domain = dAir then
-        dec(Un[Master].AirLoad)
-      else
-      begin
-        dec(Un[Master].TroopLoad);
-        assert(Movement <= 0);
+        Dec(Un[Master].AirLoad)
+      else
+      begin
+        Dec(Un[Master].TroopLoad);
+        Assert(Movement <= 0);
       end;
       Master := -1;
@@ -2213 +2213 @@
 
     if (Health <= 0) or (MoveInfo.MoveType = mtSpyMission) then
-      RemoveUnit(p, uix) // spy mission or victim of HostileDamage
+      RemoveUnit(P, uix) // spy mission or victim of HostileDamage
     else
     begin // transport load
@@ -2220 +2220 @@
       begin
         if PModel.Domain = dAir then
-          inc(Un[MoveInfo.ToMaster].AirLoad)
+          Inc(Un[MoveInfo.ToMaster].AirLoad)
         else
-          inc(Un[MoveInfo.ToMaster].TroopLoad);
+          Inc(Un[MoveInfo.ToMaster].TroopLoad);
       end
       else
-        PlaceUnit(p, uix);
+        PlaceUnit(P, uix);
     end;
 
     if (MoveInfo.MoveType = mtCapture) and (nUpdateLoc > 0) then
-      RecalcMapZoC(p);
+      RecalcMapZoC(P);
     UpdateUnitMap(ToLoc, MoveInfo.MoveType = mtCapture);
-    for i := 0 to nUpdateLoc - 1 do
-      UpdateUnitMap(UpdateLoc[i]);
+    for I := 0 to nUpdateLoc - 1 do
+      UpdateUnitMap(UpdateLoc[I]);
     // tell about lost units of defender
 
@@ -2242 +2242 @@
         (RealMap[ToLoc] and fTerImp = tiFort) or
         (RealMap[ToLoc] and fTerImp = tiBase) then
-        ExtDiscover := true;
+        ExtDiscover := True;
       if (PModel.Kind = mkDiplomat) or (PModel.Cap[mcSpy] > 0) then
-        i := lObserveSuper
+        I := lObserveSuper
       else if (PModel.Domain = dAir) or
         (PModel.Cap[mcRadar] + PModel.Cap[mcCarrier] > 0) then
-        i := lObserveAll
-      else
-        i := lObserveUnhidden;
+        I := lObserveAll
+      else
+        I := lObserveUnhidden;
       if ExtDiscover then
       begin
-        if Discover21(ToLoc, p, i, true, PModel.Domain = dGround) then
-          result := result or rEnemySpotted;
+        if Discover21(ToLoc, P, I, True, PModel.Domain = dGround) then
+          Result := Result or rEnemySpotted;
       end
       else
       begin
-        if Discover9(ToLoc, p, i, true, PModel.Domain = dGround) then
-          result := result or rEnemySpotted;
+        if Discover9(ToLoc, P, I, True, PModel.Domain = dGround) then
+          Result := Result or rEnemySpotted;
       end;
     end;
@@ -2264 +2264 @@
     if Mode >= moMovie then { show after-move in interface modules }
       for p1 := 0 to nPl - 1 do
-        if (1 shl p1 and GWatching <> 0) and ((p1 <> p) or (bix[p1].Kind = btTerm))
+        if (1 shl p1 and GWatching <> 0) and ((p1 <> P) or (bix[p1].Kind = btTerm))
         then
         begin
@@ -2273 +2273 @@
           else
             MinLevel := lObserveUnhidden;
-          SeeFrom := (p1 = p) or (ObserveLevel[FromLoc] shr (2 * p1) and
+          SeeFrom := (p1 = P) or (ObserveLevel[FromLoc] shr (2 * p1) and
             3 >= MinLevel);
-          SeeTo := (p1 = p) or (ObserveLevel[ToLoc] shr (2 * p1) and
+          SeeTo := (p1 = P) or (ObserveLevel[ToLoc] shr (2 * p1) and
             3 >= MinLevel);
           if SeeTo and (MoveInfo.MoveType = mtCapture) then
@@ -2283 +2283 @@
           else if (MoveInfo.MoveType <> mtSpyMission) and SeeTo then
             CallPlayer(cShowUnitChanged, p1, ToLoc);
-          for i := 0 to nUpdateLoc - 1 do
-            if ObserveLevel[UpdateLoc[i]] shr (2 * p1) and 3 >= lObserveUnhidden
+          for I := 0 to nUpdateLoc - 1 do
+            if ObserveLevel[UpdateLoc[I]] shr (2 * p1) and 3 >= lObserveUnhidden
             then
-              CallPlayer(cShowUnitChanged, p1, UpdateLoc[i]);
+              CallPlayer(cShowUnitChanged, p1, UpdateLoc[I]);
         end;
   end;
 end;
 
-function ExecuteAttack(p, uix, ToLoc: integer; var MoveInfo: TMoveInfo;
-  ShowMove: TShowMove): integer;
+function ExecuteAttack(P, uix, ToLoc: Integer; var MoveInfo: TMoveInfo;
+  ShowMove: TShowMove): Integer;
 
   procedure WriteBattleHistory(ToLoc, FromLoc, Attacker, Defender, mixAttacker,
-    mixDefender: integer; AttackerLost, DefenderLost: boolean);
+    mixDefender: Integer; AttackerLost, DefenderLost: Boolean);
   var
     AttackerBattle, DefenderBattle: ^TBattle;
@@ -2307 +2307 @@
         ReallocMem(BattleHistory, nBattleHistory * (2 * SizeOf(TBattle)));
       AttackerBattle := @BattleHistory[nBattleHistory];
-      inc(nBattleHistory);
+      Inc(nBattleHistory);
     end;
     with RW[Defender] do
@@ -2317 +2317 @@
         ReallocMem(BattleHistory, nBattleHistory * (2 * SizeOf(TBattle)));
       DefenderBattle := @BattleHistory[nBattleHistory];
-      inc(nBattleHistory);
+      Inc(nBattleHistory);
     end;
     AttackerBattle.Enemy := Defender;
@@ -2346 +2346 @@
 
 var
-  i, p1, FromLoc, uix1, nUpdateLoc, ExpGain, ExpelToLoc, cix1: integer;
+  I, p1, FromLoc, uix1, nUpdateLoc, ExpGain, ExpelToLoc, cix1: Integer;
   PModel: ^TModel;
-  UpdateLoc: array [0 .. numax - 1] of integer;
-  LoseCityPop, CityDestroyed, SeeFrom, SeeTo, ZoCDefenderDestroyed: boolean;
+  UpdateLoc: array [0 .. numax - 1] of Integer;
+  LoseCityPop, CityDestroyed, SeeFrom, SeeTo, ZoCDefenderDestroyed: Boolean;
 begin
-  result := 0;
-  with RW[p].Un[uix] do
+  Result := 0;
+  with RW[P].Un[uix] do
   begin
-    PModel := @RW[p].Model[mix];
+    PModel := @RW[P].Model[mix];
     FromLoc := Loc;
 
@@ -2360 +2360 @@
     ShowMove.EndHealthDef := MoveInfo.EndHealthDef;
     if MoveInfo.MoveType = mtAttack then
-      WriteBattleHistory(ToLoc, FromLoc, p, MoveInfo.Defender, mix,
+      WriteBattleHistory(ToLoc, FromLoc, P, MoveInfo.Defender, mix,
         RW[MoveInfo.Defender].Un[MoveInfo.Duix].mix, MoveInfo.EndHealth <= 0,
         MoveInfo.EndHealthDef <= 0);
@@ -2367 +2367 @@
       begin
       if Mode>=moMovie then
-      CallPlayer(cShowCancelTreaty,MoveInfo.Defender,p);
-      CancelTreaty(p,MoveInfo.Defender)
+      CallPlayer(cShowCancelTreaty,MoveInfo.Defender,P);
+      CancelTreaty(P,MoveInfo.Defender)
       end; }
     if Mode >= moMovie then { show attack in interface modules }
       for p1 := 0 to nPl - 1 do
-        if (1 shl p1 and GWatching <> 0) and ((p1 <> p) or (bix[p1].Kind = btTerm))
+        if (1 shl p1 and GWatching <> 0) and ((p1 <> P) or (bix[p1].Kind = btTerm))
         then
         begin
@@ -2380 +2380 @@
           if SeeFrom and SeeTo then
           begin
-            TellAboutModel(p1, p, mix);
-            if p1 = p then
+            TellAboutModel(p1, P, mix);
+            if p1 = P then
               ShowMove.emix := -1
             else
-              ShowMove.emix := emixSafe(p1, p, mix);
+              ShowMove.emix := emixSafe(p1, P, mix);
             CallPlayer(cShowAttacking, p1, ShowMove);
           end;
         end;
 
-    LoseCityPop := false;
+    LoseCityPop := False;
     if (RealMap[ToLoc] and fCity <> 0) and
       ((MoveInfo.MoveType = mtAttack) and (MoveInfo.EndHealthDef <= 0) or
@@ -2411 +2411 @@
     if MoveInfo.MoveType = mtBombard then
     begin
-      assert(Movement >= 100);
+      Assert(Movement >= 100);
       if PModel.Attack = 0 then
         Flags := Flags and not unBombsLoaded;
-      dec(Movement, 100);
+      Dec(Movement, 100);
     end
     else if MoveInfo.MoveType = mtExpel then
     begin
-      assert(Movement >= 100);
+      Assert(Movement >= 100);
       Job := jNone;
       Flags := Flags and not unFortified;
-      dec(Movement, 100);
+      Dec(Movement, 100);
     end
     else
     begin
-      assert(MoveInfo.MoveType = mtAttack);
+      Assert(MoveInfo.MoveType = mtAttack);
       if MoveInfo.EndHealth = 0 then
-        RemoveUnit(p, uix, MoveInfo.Defender) // destroy attacker
+        RemoveUnit(P, uix, MoveInfo.Defender) // destroy attacker
       else
       begin // update attacker
@@ -2434 +2434 @@
           Exp := (nExp - 1) * ExpCost
         else
-          inc(Exp, ExpGain);
+          Inc(Exp, ExpGain);
         Health := MoveInfo.EndHealth;
         Job := jNone;
@@ -2442 +2442 @@
         Flags := Flags and not unFortified;
         if Movement > 100 then
-          dec(Movement, 100)
+          Dec(Movement, 100)
         else
           Movement := 0;
@@ -2448 +2448 @@
     end;
 
-    ZoCDefenderDestroyed := false;
+    ZoCDefenderDestroyed := False;
     nUpdateLoc := 0;
     if MoveInfo.MoveType = mtExpel then
@@ -2469 +2469 @@
           PlaceUnit(MoveInfo.Defender, MoveInfo.Duix);
           UpdateLoc[nUpdateLoc] := Loc;
-          inc(nUpdateLoc);
+          Inc(nUpdateLoc);
           Flags := Flags or unWithdrawn;
         end;
@@ -2480 +2480 @@
           Exp := (nExp - 1) * ExpCost
         else
-          inc(Exp, ExpGain);
+          Inc(Exp, ExpGain);
         Health := MoveInfo.EndHealthDef;
       end
@@ -2493 +2493 @@
           (RealMap[ToLoc] and fTerImp <> tiFort)) or LoseCityPop and
           (RW[MoveInfo.Defender].City[MoveInfo.Dcix].Size = 2) then
-          RemoveAllUnits(MoveInfo.Defender, ToLoc, p)
+          RemoveAllUnits(MoveInfo.Defender, ToLoc, P)
           { no city, base or fortress }
         else
-          RemoveUnit(MoveInfo.Defender, MoveInfo.Duix, p);
+          RemoveUnit(MoveInfo.Defender, MoveInfo.Duix, P);
       end;
 
@@ -2509 +2509 @@
               begin
                 UpdateLoc[nUpdateLoc] := Loc;
-                inc(nUpdateLoc);
+                Inc(nUpdateLoc);
               end;
           // unit will be removed -- remember position and update for all players
-          DestroyCity_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, false);
+          DestroyCity_TellPlayers(MoveInfo.Defender, MoveInfo.Dcix, False);
           CheckBorders(ToLoc, MoveInfo.Defender);
-          RecalcPeaceMap(p);
+          RecalcPeaceMap(P);
         end;
     end;
 
     if CityDestroyed and (nUpdateLoc > 0) then
-      RecalcMapZoC(p)
+      RecalcMapZoC(P)
     else if ZoCDefenderDestroyed then
-      RecalcV8ZoC(p, ToLoc);
+      RecalcV8ZoC(P, ToLoc);
     UpdateUnitMap(FromLoc);
     UpdateUnitMap(ToLoc, LoseCityPop);
-    for i := 0 to nUpdateLoc - 1 do
-      UpdateUnitMap(UpdateLoc[i]);
+    for I := 0 to nUpdateLoc - 1 do
+      UpdateUnitMap(UpdateLoc[I]);
     // tell about lost units of defender
 
     if Mode >= moMovie then
     begin
-      for i := 0 to RW[p].nEnemyModel - 1 do
-        with RW[p].EnemyModel[i] do
-          Lost := Destroyed[p, Owner, mix];
+      for I := 0 to RW[P].nEnemyModel - 1 do
+        with RW[P].EnemyModel[I] do
+          Lost := Destroyed[P, Owner, mix];
       for p1 := 0 to nPl - 1 do { show after-attack in interface modules }
-        if (1 shl p1 and GWatching <> 0) and ((p1 <> p) or (bix[p1].Kind = btTerm))
+        if (1 shl p1 and GWatching <> 0) and ((p1 <> P) or (bix[p1].Kind = btTerm))
         then
         begin
@@ -2561 +2561 @@
 end;
 
-function MoveUnit(p, uix, dx, dy: integer; TestOnly: boolean): integer;
+function MoveUnit(P, uix, dx, dy: Integer; TestOnly: Boolean): Integer;
 var
-  ToLoc: integer;
+  ToLoc: Integer;
   MoveInfo: TMoveInfo;
   ShowMove: TShowMove;
 begin
-{$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
-  with RW[p].Un[uix] do
+{$IFOPT O-}Assert(1 shl P and InvalidTreatyMap = 0); {$ENDIF}
+  with RW[P].Un[uix] do
   begin
     ToLoc := dLoc(Loc, dx, dy);
     if (ToLoc < 0) or (ToLoc >= MapSize) then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end;
-    result := CalculateMove(p, uix, ToLoc, 3 - dy and 1, TestOnly, MoveInfo);
-    if result = eZOC_EnemySpotted then
+    Result := CalculateMove(P, uix, ToLoc, 3 - dy and 1, TestOnly, MoveInfo);
+    if Result = eZOC_EnemySpotted then
       ZOCTile := ToLoc;
-    if (result >= rExecuted) and not TestOnly then
+    if (Result >= rExecuted) and not TestOnly then
     begin
       ShowMove.dx := dx;
@@ -2589 +2589 @@
       ShowMove.Exp := Exp;
       ShowMove.Load := TroopLoad + AirLoad;
-      ShowMove.Owner := p;
+      ShowMove.Owner := P;
       if (TroopLoad > 0) or (AirLoad > 0) then
         ShowMove.Flags := unMulti
@@ -2606 +2606 @@
       case MoveInfo.MoveType of
         mtMove, mtCapture, mtSpyMission:
-          result := ExecuteMove(p, uix, ToLoc, MoveInfo, ShowMove) or result;
+          Result := ExecuteMove(P, uix, ToLoc, MoveInfo, ShowMove) or Result;
         mtAttack, mtBombard, mtExpel:
-          result := ExecuteAttack(p, uix, ToLoc, MoveInfo, ShowMove) or result;
+          Result := ExecuteAttack(P, uix, ToLoc, MoveInfo, ShowMove) or Result;
       end;
     end;
@@ -2614 +2614 @@
 end;
 
-function Server(Command, Player, Subject: integer; var Data): integer; stdcall;
-
-  function CountPrice(const Offer: TOffer; PriceType: integer): integer;
+function Server(Command, Player, Subject: Integer; var Data): Integer; stdcall;
+
+  function CountPrice(const Offer: TOffer; PriceType: Integer): Integer;
   var
-    i: integer;
+    I: Integer;
   begin
-    result := 0;
-    for i := 0 to Offer.nDeliver + Offer.nCost - 1 do
-      if Offer.Price[i] and $FFFF0000 = Cardinal(PriceType) then
-        inc(result);
+    Result := 0;
+    for I := 0 to Offer.nDeliver + Offer.nCost - 1 do
+      if Offer.Price[I] and $FFFF0000 = Cardinal(PriceType) then
+        Inc(Result);
   end;
 
 { procedure UpdateBorderHelper;
   var
-  x, y, Loc, Loc1, dx, dy, ObserveMask: integer;
+  X, Y, Loc, Loc1, dx, dy, ObserveMask: Integer;
   begin
   ObserveMask:=3 shl (2*pTurn);
-  for x:=0 to lx-1 do for y:=0 to ly shr 1-1 do
+  for X:=0 to lx-1 do for Y:=0 to ly shr 1-1 do
   begin
-  Loc:=lx*(y*2)+x;
+  Loc:=lx*(Y*2)+X;
   if ObserveLevel[Loc] and ObserveMask<>0 then
   begin
   for dy:=0 to 1 do for dx:=0 to 1 do
   begin
-  Loc1:=(Loc+dx-1+lx) mod lx +lx*((y+dy)*2-1);
+  Loc1:=(Loc+dx-1+lx) mod lx +lx*((Y+dy)*2-1);
   if (Loc1>=0) and (Loc1<MapSize)
   and (ObserveLevel[Loc1] and ObserveMask<>0) then
@@ -2666 +2666 @@
   ptInvalid = 8;
 
-  function ProjectType(Project: integer): integer;
+  function ProjectType(Project: Integer): Integer;
   begin
     if Project and cpCompleted <> 0 then
-      result := ptSelect
+      Result := ptSelect
     else if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-      result := ptTrGoods
+      Result := ptTrGoods
     else if Project and cpImp = 0 then
       if RW[Player].Model[Project and cpIndex].Kind = mkCaravan then
-        result := ptCaravan
-      else
-        result := ptUn
+        Result := ptCaravan
+      else
+        Result := ptUn
     else if Project and cpIndex >= nImp then
-      result := ptInvalid
+      Result := ptInvalid
     else if Imp[Project and cpIndex].Kind = ikWonder then
-      result := ptWonder
+      Result := ptWonder
     else if Imp[Project and cpIndex].Kind = ikShipPart then
-      result := ptShip
+      Result := ptShip
     else
-      result := ptImp;
+      Result := ptImp;
   end;
 
 var
-  d, i, j, p1, p2, pt0, pt1, uix1, cix1, Loc0, Loc1, dx, dy, NewCap, MinCap,
+  D, I, J, p1, p2, pt0, pt1, uix1, cix1, Loc0, Loc1, dx, dy, NewCap, MinCap,
     MaxCap, CapWeight, Cost, NextProd, Preq, TotalFood, TotalProd, CheckSum,
     StopTurn, FutureMCost, NewProject, OldImp, mix, V8, V21, AStr, DStr,
-    ABaseDamage, DBaseDamage: integer;
+    ABaseDamage, DBaseDamage: Integer;
   CityReport: TCityReport;
   FormerCLState: TCmdListState;
@@ -2708 +2708 @@
   end;
 
-  assert(MapSize = lx * ly);
-  assert(Command and (sctMask or sExecute) <> sctInternal or sExecute);
+  Assert(MapSize = lx * ly);
+  Assert(Command and (sctMask or sExecute) <> sctInternal or sExecute);
   // not for internal commands
   if (Command < 0) or (Command >= $10000) then
   begin
-    result := eUnknown;
-    exit;
+    Result := eUnknown;
+    Exit;
   end;
 
@@ -2721 +2721 @@
     ((Subject < 0) or (Subject >= $1000))) then
   begin
-    result := eInvalid;
-    exit;
+    Result := eInvalid;
+    Exit;
   end;
 
@@ -2731 +2731 @@
   begin
     PutMessage(1 shl 16 + 1, Format('NOT Alive: %d', [Player]));
-    result := eNoTurn;
-    exit;
+    Result := eNoTurn;
+    Exit;
   end;
 
-  result := eOK;
+  Result := eOK;
 
   // check if command allowed now
@@ -2758 +2758 @@
     PutMessage(1 shl 16 + 1, Format('No Turn: %d calls %x',
       [Player, Command shr 4]));
-    result := eNoTurn;
-    exit;
+    Result := eNoTurn;
+    Exit;
   end;
 
@@ -2767 +2767 @@
   HandoverStack[nHandoverStack] := Player + $1000;
   HandoverStack[nHandoverStack + 1] := Command;
-  inc(nHandoverStack, 2);
+  Inc(nHandoverStack, 2);
 
   InvalidTreatyMap := 0;
@@ -2780 +2780 @@
     FormerCLState := CL.State;
     CL.Put(Command, Player, Subject, @Data);
-    logged := true;
+    logged := True;
   end
   else
-    logged := false;
+    logged := False;
 
   case Command of
@@ -2798 +2798 @@
 
     sGetDebugMap:
-      pointer(Data) := DebugMap[Subject];
+      Pointer(Data) := DebugMap[Subject];
 
     { sChangeSuperView:
       if Difficulty[Player]=0 then
       begin
-      for i:=0 to nBrain-1 do if Brain[i].Initialized then
-      CallClient(i, cShowSuperView, Subject)
+      for I:=0 to nBrain-1 do if Brain[I].Initialized then
+      CallClient(I, cShowSuperView, Subject)
       end
-      else result:=eInvalid; }
+      else Result:=eInvalid; }
 
     sRefreshDebugMap:
@@ -2829 +2829 @@
           else
             StopTurn := RW[Player].EnemyReport[Subject].TurnOfCivilReport + 1;
-        move(Stat[Command shr 4 and $F, Subject]^, Data,
-          StopTurn * SizeOf(integer));
+        Move(Stat[Command shr 4 and $F, Subject]^, Data,
+          StopTurn * SizeOf(Integer));
         FillChar(TChart(Data)[StopTurn], (GTurn - StopTurn) *
-          SizeOf(integer), 0);
+          SizeOf(Integer), 0);
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetTechCost:
-      integer(Data) := TechCost(Player);
+      Integer(Data) := TechCost(Player);
 
     sGetAIInfo:
       if AIInfo[Subject] = '' then
-        pchar(Data) := nil
-      else
-        pchar(Data) := @AIInfo[Subject][1];
+        PChar(Data) := nil
+      else
+        PChar(Data) := @AIInfo[Subject][1];
 
     sGetAICredits:
       if AICredits = '' then
-        pchar(Data) := nil
-      else
-        pchar(Data) := @AICredits[1];
+        PChar(Data) := nil
+      else
+        PChar(Data) := @AICredits[1];
 
     sGetVersion:
-      integer(Data) := CevoVersion;
+      Integer(Data) := CevoVersion;
 
     sGetGameChanged:
       if Player <> 0 then
-        result := eInvalid
+        Result := eInvalid
       else if (CL <> nil) and (CL.State.nLog = nLogOpened) and
         (CL.State.MoveCode = 0) and not HasCityTileChanges and
         not HasChanges(Player) then
-        result := eNotChanged;
+        Result := eNotChanged;
 
     sGetTileInfo:
       if (Subject >= 0) and (Subject < MapSize) then
-        result := GetTileInfo(Player, -2, Subject, TTileInfo(Data))
-      else
-        result := eInvalid;
+        Result := GetTileInfo(Player, -2, Subject, TTileInfo(Data))
+      else
+        Result := eInvalid;
 
     sGetCityTileInfo:
       if (Subject >= 0) and (Subject < MapSize) then
-        result := GetTileInfo(Player, -1, Subject, TTileInfo(Data))
-      else
-        result := eInvalid;
+        Result := GetTileInfo(Player, -1, Subject, TTileInfo(Data))
+      else
+        Result := eInvalid;
 
     sGetHypoCityTileInfo:
@@ -2880 +2880 @@
         if (TTileInfo(Data).ExplCity < 0) or
           (TTileInfo(Data).ExplCity >= RW[Player].nCity) then
-          result := eInvalid
+          Result := eInvalid
         else if ObserveLevel[Subject] shr (Player * 2) and 3 = 0 then
-          result := eNoPreq
+          Result := eNoPreq
         else
-          result := GetTileInfo(Player, TTileInfo(Data).ExplCity, Subject,
+          Result := GetTileInfo(Player, TTileInfo(Data).ExplCity, Subject,
             TTileInfo(Data));
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetJobProgress:
@@ -2894 +2894 @@
       begin
         if ObserveLevel[Subject] shr (Player * 2) and 3 = 0 then
-          result := eNoPreq
+          Result := eNoPreq
         else
-          result := GetJobProgress(Player, Subject, TJobProgressData(Data));
+          Result := GetJobProgress(Player, Subject, TJobProgressData(Data));
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetModels:
@@ -2911 +2911 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetUnits:
       if (Subject >= 0) and (Subject < MapSize) and
         (ObserveLevel[Subject] shr (Player * 2) and 3 = lObserveSuper) then
-        integer(Data) := GetUnitStack(Player, Subject)
-      else
-        result := eNoPreq;
+        Integer(Data) := GetUnitStack(Player, Subject)
+      else
+        Result := eNoPreq;
 
     sGetDefender:
       if (Subject >= 0) and (Subject < MapSize) and (Occupant[Subject] = Player)
       then
-        Strongest(Subject, integer(Data), d, i, j)
-      else
-        result := eInvalid;
+        Strongest(Subject, Integer(Data), D, I, J)
+      else
+        Result := eInvalid;
 
     sGetBattleForecast, sGetBattleForecastEx:
@@ -2935 +2935 @@
             ((pAtt = Player) or (RWemix[Player, pAtt, mixAtt] >= 0)) then
           begin
-            result := GetBattleForecast(Subject, TBattleForecast(Data), uix1,
+            Result := GetBattleForecast(Subject, TBattleForecast(Data), uix1,
               cix1, AStr, DStr, ABaseDamage, DBaseDamage);
             if Command = sGetBattleForecastEx then
@@ -2944 +2944 @@
               TBattleForecastEx(Data).DBaseDamage := DBaseDamage;
             end;
-            if result = eOK then
-              result := eInvalid; // no enemy unit there!
+            if Result = eOK then
+              Result := eInvalid; // no enemy unit there!
           end
           else
-            result := eInvalid
-      else
-        result := eInvalid;
+            Result := eInvalid
+      else
+        Result := eInvalid;
 
     sGetUnitReport:
       if (Subject < 0) or (Subject >= RW[Player].nUn) or
         (RW[Player].Un[Subject].Loc < 0) then
-        result := eInvalid
+        Result := eInvalid
       else
         GetUnitReport(Player, Subject, TUnitReport(Data));
@@ -2962 +2962 @@
       if (Subject < 0) or (Subject >= RW[Player].nUn) or
         (RW[Player].Un[Subject].Loc < 0) then
-        result := eInvalid
-      else
-        result := GetMoveAdvice(Player, Subject, TMoveAdviceData(Data));
+        Result := eInvalid
+      else
+        Result := GetMoveAdvice(Player, Subject, TMoveAdviceData(Data));
 
     sGetPlaneReturn:
@@ -2970 +2970 @@
         (RW[Player].Un[Subject].Loc < 0) or
         (RW[Player].Model[RW[Player].Un[Subject].mix].Domain <> dAir) then
-        result := eInvalid
+        Result := eInvalid
       else
       begin
         if CanPlaneReturn(Player, Subject, TPlaneReturnData(Data)) then
-          result := eOK
+          Result := eOK
         else
-          result := eNoWay;
+          Result := eNoWay;
       end;
 
@@ -2987 +2987 @@
           Owner := Player;
           SearchCity(Subject, Owner, cix1);
-          c := RW[Owner].City[cix1];
-          if (Owner <> Player) and (c.Project and cpImp = 0) then
-            TellAboutModel(Player, Owner, c.Project and cpIndex);
+          C := RW[Owner].City[cix1];
+          if (Owner <> Player) and (C.Project and cpImp = 0) then
+            TellAboutModel(Player, Owner, C.Project and cpIndex);
         end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetCityReport:
       if (Subject < 0) or (Subject >= RW[Player].nCity) or
         (RW[Player].City[Subject].Loc < 0) then
-        result := eInvalid
-      else
-        result := GetCityReport(Player, Subject, TCityReport(Data));
+        Result := eInvalid
+      else
+        Result := GetCityReport(Player, Subject, TCityReport(Data));
 
     sGetCityReportNew:
       if (Subject < 0) or (Subject >= RW[Player].nCity) or
         (RW[Player].City[Subject].Loc < 0) then
-        result := eInvalid
+        Result := eInvalid
       else
         GetCityReportNew(Player, Subject, TCityReportNew(Data));
@@ -3011 +3011 @@
       if (Subject < 0) or (Subject >= RW[Player].nCity) or
         (RW[Player].City[Subject].Loc < 0) then
-        result := eInvalid
+        Result := eInvalid
       else
         GetCityAreaInfo(Player, RW[Player].City[Subject].Loc,
@@ -3031 +3031 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetEnemyCityReportNew:
@@ -3048 +3048 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetEnemyCityAreaInfo:
@@ -3062 +3062 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sGetCityTileAdvice:
       if (Subject < 0) or (Subject >= RW[Player].nCity) or
         (RW[Player].City[Subject].Loc < 0) then
-        result := eInvalid
+        Result := eInvalid
       else
         GetCityTileAdvice(Player, Subject, TCityTileAdviceData(Data));
@@ -3080 +3080 @@
           EditTile(Loc, NewTile)
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sRandomMap:
@@ -3086 +3086 @@
       begin
         CreateElevation;
-        PreviewElevation := false;
-        CreateMap(false);
+        PreviewElevation := False;
+        CreateMap(False);
         FillChar(ObserveLevel, MapSize * 4, 0);
         DiscoverAll(Player, lObserveSuper);
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sMapGeneratorRequest:
       if not MapGeneratorAvailable then
-        result := eInvalid;
+        Result := eInvalid;
 
     {
@@ -3104 +3104 @@
     sTurn, sTurn - sExecute:
       begin
-        AllHumansDead := true;
+        AllHumansDead := True;
         for p1 := 0 to nPl - 1 do
           if (1 shl p1 and GAlive <> 0) and (bix[p1].Kind = btTerm) then
-            AllHumansDead := false;
+            AllHumansDead := False;
         if (pDipActive >= 0) // still in negotiation mode
           or (pTurn = 0) and ((GWinner > 0) or (GTurn = MaxTurn) or
           (Difficulty[0] > 0) and AllHumansDead) then // game end reached
-          result := eViolation
+          Result := eViolation
         else if Command >= sExecute then
         begin
@@ -3122 +3122 @@
             begin
               LogChanges;
-              SaveGame('~' + LogFileName, true);
+              SaveGame('~' + LogFileName, True);
             end;
 {$ENDIF}
@@ -3137 +3137 @@
             TotalFood := 0;
             TotalProd := 0;
-            for i := 0 to RW[pTurn].nCity - 1 do
-              if RW[pTurn].City[i].Loc >= 0 then
+            for I := 0 to RW[pTurn].nCity - 1 do
+              if RW[pTurn].City[I].Loc >= 0 then
               begin
-                inc(TotalFood, RW[pTurn].City[i].Food);
-                inc(TotalProd, RW[pTurn].City[i].Prod);
+                Inc(TotalFood, RW[pTurn].City[I].Food);
+                Inc(TotalProd, RW[pTurn].City[I].Prod);
               end;
             CheckSum := TotalFood and 7 + TotalProd and 7 shl 3 +
@@ -3152 +3152 @@
           begin
             if CheckSum <> Subject then
-              LoadOK := false;
+              LoadOK := False;
           end
           else // save checksum
@@ -3179 +3179 @@
             pTurn := (pTurn + 1) mod nPl;
             if pTurn = 0 then
-              inc(GTurn);
+              Inc(GTurn);
             if Assigned(bix[pTurn]) and ((1 shl pTurn) and GAlive = 0) then
             begin // already made extinct -- continue statistics
@@ -3218 +3218 @@
     sBreak, sResign, sNextRound, sReload:
       if Mode = moMovie then
-        MovieStopped := true
+        MovieStopped := True
       else
       begin
@@ -3224 +3224 @@
         begin
           ok := (Difficulty[0] = 0) and (bix[0].Kind <> btNoTerm) and
-            (integer(Data) >= 0) and (integer(Data) < GTurn);
+            (Integer(Data) >= 0) and (Integer(Data) < GTurn);
           for p1 := 1 to nPl - 1 do
             if bix[p1].Kind = btTerm then
-              ok := false;
+              ok := False;
           // allow reload in AI-only games only
         end
@@ -3236 +3236 @@
           if (Command = sBreak) or (Command = sResign) then
             Notify(ntBackOn);
-          for i := 0 to Brains.Count - 1 do
-            if Brains[i].Initialized then
+          for I := 0 to Brains.Count - 1 do
+            if Brains[I].Initialized then
             begin
-              if Brains[i].Kind = btAI then
-                Notify(ntDeinitModule, i);
-              CallClient(i, cBreakGame, nil^);
+              if Brains[I].Kind = btAI then
+                Notify(ntDeinitModule, I);
+              CallClient(I, cBreakGame, nil^);
             end;
           Notify(ntEndInfo);
@@ -3248 +3248 @@
             LogCityTileChanges;
             LogChanges;
-            SaveGame(LogFileName, false);
+            SaveGame(LogFileName, False);
           end;
           DeleteFile(SavePath + '~' + LogFileName);
@@ -3261 +3261 @@
                 LandMass, MaxTurn);
             sReload:
-              LoadGame(SavePath, LogFileName, integer(Data), false);
+              LoadGame(SavePath, LogFileName, Integer(Data), False);
           end;
         end
         else
-          result := eInvalid;
+          Result := eInvalid;
       end;
 
@@ -3282 +3282 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     scContact .. scContact + (nPl - 1) shl 4, scContact - sExecute .. scContact
       - sExecute + (nPl - 1) shl 4:
       if (pDipActive >= 0) or (1 shl (Command shr 4 and $F) and GAlive = 0) then
-        result := eInvalid
+        Result := eInvalid
       else if GWinner > 0 then
-        result := eViolation // game end reached
+        Result := eViolation // game end reached
       else if RW[Player].Treaty[Command shr 4 and $F] = trNoContact then
-        result := eNoPreq
+        Result := eNoPreq
       else if GTurn < GColdWarStart + ColdWarTurns then
-        result := eColdWar
+        Result := eColdWar
       else if RW[Player].Government = gAnarchy then
-        result := eAnarchy
+        Result := eAnarchy
       else if RW[Command shr 4 and $F].Government = gAnarchy then
       begin
-        result := eAnarchy;
+        Result := eAnarchy;
         LastEndClientCommand := scReject; // enable cancel treaty
         pContacted := Command shr 4 and $F;
@@ -3306 +3306 @@
         pContacted := Command shr 4 and $F;
         pDipActive := pContacted;
-        assert(Mode = moPlaying);
+        Assert(Mode = moPlaying);
         Inform(pDipActive);
         ChangeClientWhenDone(scContact, pDipActive, pTurn, 4);
@@ -3317 +3317 @@
         begin // contact requested and not accepted yet
           pDipActive := -1;
-          assert(Mode = moPlaying);
+          Assert(Mode = moPlaying);
           ChangeClientWhenDone(cContinue, pTurn, nil^, 0);
         end;
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     scDipStart, scDipStart - sExecute:
@@ -3333 +3333 @@
             RW[pTurn].Credibility;
           pDipActive := pTurn;
-          assert(Mode = moPlaying);
+          Assert(Mode = moPlaying);
           IntServer(sIntHaveContact, pTurn, pContacted, nil^);
           ChangeClientWhenDone(scDipStart, pDipActive, nil^, 0);
@@ -3339 +3339 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     scDipNotice, scDipAccept, scDipCancelTreaty, scDipBreak,
@@ -3346 +3346 @@
       if pDipActive >= 0 then
       begin
-        assert(Mode = moPlaying);
+        Assert(Mode = moPlaying);
         if pDipActive = pTurn then
           p1 := pContacted
@@ -3362 +3362 @@
             // check if offer can be accepted
             if nDeliver + nCost = 0 then
-              result := eOfferNotAcceptable;
-            for i := 0 to nDeliver + nCost - 1 do
-              if Price[i] = opChoose then
-                result := eOfferNotAcceptable;
-            for i := 0 to nCost - 1 do
-              if not PayPrice(pDipActive, p1, Price[nDeliver + i], false) then
-                result := eOfferNotAcceptable;
-            if (Command >= sExecute) and (result >= rExecuted) then
+              Result := eOfferNotAcceptable;
+            for I := 0 to nDeliver + nCost - 1 do
+              if Price[I] = opChoose then
+                Result := eOfferNotAcceptable;
+            for I := 0 to nCost - 1 do
+              if not PayPrice(pDipActive, p1, Price[nDeliver + I], False) then
+                Result := eOfferNotAcceptable;
+            if (Command >= sExecute) and (Result >= rExecuted) then
             begin
               IntServer(sIntPayPrices + nDeliver + nCost, p1, pDipActive,
@@ -3376 +3376 @@
 
               // tell other players about ship part trades
-              HasShipChanged := false;
+              HasShipChanged := False;
               FillChar(ShowShipChange, SizeOf(ShowShipChange), 0);
-              for i := 0 to nDeliver + nCost - 1 do
-                if Price[i] and opMask = opShipParts then
+              for I := 0 to nDeliver + nCost - 1 do
+                if Price[I] and opMask = opShipParts then
                 begin
-                  HasShipChanged := true;
-                  if i >= nDeliver then
+                  HasShipChanged := True;
+                  if I >= nDeliver then
                   begin // p1 has demanded from pDipActive
-                    ShowShipChange.Ship1Change[Price[i] shr 16 and 3] :=
-                      +integer(Price[i] and $FFFF);
-                    ShowShipChange.Ship2Change[Price[i] shr 16 and 3] :=
-                      -integer(Price[i] and $FFFF);
+                    ShowShipChange.Ship1Change[Price[I] shr 16 and 3] :=
+                      +Integer(Price[I] and $FFFF);
+                    ShowShipChange.Ship2Change[Price[I] shr 16 and 3] :=
+                      -Integer(Price[I] and $FFFF);
                   end
                   else
                   begin // p1 has delivered to pDipActive
-                    ShowShipChange.Ship1Change[Price[i] shr 16 and 3] :=
-                      -integer(Price[i] and $FFFF);
-                    ShowShipChange.Ship2Change[Price[i] shr 16 and 3] :=
-                      +integer(Price[i] and $FFFF);
+                    ShowShipChange.Ship1Change[Price[I] shr 16 and 3] :=
+                      -Integer(Price[I] and $FFFF);
+                    ShowShipChange.Ship2Change[Price[I] shr 16 and 3] :=
+                      +Integer(Price[I] and $FFFF);
                   end;
                 end;
@@ -3406 +3406 @@
                     (1 shl p2 and (GAlive or GWatching) <> 0) then
                   begin
-                    move(GShip, RW[p2].Ship, SizeOf(GShip));
+                    Move(GShip, RW[p2].Ship, SizeOf(GShip));
                     if 1 shl p2 and GWatching <> 0 then
                       CallPlayer(cShowShipChange, p2, ShowShipChange);
@@ -3419 +3419 @@
             (GTurn < RW[pDipActive].LastCancelTreaty[p1] + CancelTreatyTurns)
           then
-            result := eCancelTreatyRush
+            Result := eCancelTreatyRush
           else if Command >= sExecute then
           begin
@@ -3426 +3426 @@
               if (p2 <> p1) and (1 shl p2 and PeaceEnded <> 0) then
               begin
-                i := p1 shl 4 + pDipActive;
-                CallPlayer(cShowSupportAllianceAgainst, p2, i);
+                I := p1 shl 4 + pDipActive;
+                CallPlayer(cShowSupportAllianceAgainst, p2, I);
               end;
             for p2 := 0 to nPl - 1 do
               if (p2 <> p1) and (1 shl p2 and PeaceEnded <> 0) then
               begin
-                i := p2;
-                CallPlayer(cShowCancelTreatyByAlliance, pDipActive, i);
+                I := p2;
+                CallPlayer(cShowCancelTreatyByAlliance, pDipActive, I);
               end;
           end;
         end
         else
-          result := eInvalid;
-        if (Command >= sExecute) and (result >= rExecuted) then
+          Result := eInvalid;
+        if (Command >= sExecute) and (Result >= rExecuted) then
           if LastEndClientCommand = scDipBreak then
           begin // break negotiation
@@ -3461 +3461 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     scDipOffer, scDipOffer - sExecute:
@@ -3474 +3474 @@
             pDipActive := -1;
             CallPlayer(cShowEndContact, pContacted, nil^);
-            assert(Mode = moPlaying);
+            Assert(Mode = moPlaying);
             ChangeClientWhenDone(cContinue, pTurn, nil^, 0);
           end;
@@ -3487 +3487 @@
           if RW[pDipActive].Treaty[p1] < trPeace then
           begin // no tribute allowed!
-            for i := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
-              if (TOffer(Data).Price[i] and opMask = opTribute) then
-                result := eInvalidOffer;
-            for i := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
-              if (TOffer(Data).Price[i] = opTreaty + trPeace) then
-                result := eOK;
+            for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
+              if (TOffer(Data).Price[I] and opMask = opTribute) then
+                Result := eInvalidOffer;
+            for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
+              if (TOffer(Data).Price[I] = opTreaty + trPeace) then
+                Result := eOK;
           end;
-          for i := 0 to TOffer(Data).nDeliver - 1 do
-            if (TOffer(Data).Price[i] <> opChoose) and
-              not PayPrice(pDipActive, p1, TOffer(Data).Price[i], false) then
-              result := eInvalidOffer;
+          for I := 0 to TOffer(Data).nDeliver - 1 do
+            if (TOffer(Data).Price[I] <> opChoose) and
+              not PayPrice(pDipActive, p1, TOffer(Data).Price[I], False) then
+              Result := eInvalidOffer;
           if CountPrice(TOffer(Data), opTreaty) > 1 then
-            result := eInvalidOffer;
-          for i := 0 to nShipPart - 1 do
-            if CountPrice(TOffer(Data), opShipParts + i shl 16) > 1 then
-              result := eInvalidOffer;
+            Result := eInvalidOffer;
+          for I := 0 to nShipPart - 1 do
+            if CountPrice(TOffer(Data), opShipParts + I shl 16) > 1 then
+              Result := eInvalidOffer;
           if CountPrice(TOffer(Data), opMoney) > 1 then
-            result := eInvalidOffer;
+            Result := eInvalidOffer;
           if CountPrice(TOffer(Data), opTribute) > 1 then
-            result := eInvalidOffer;
+            Result := eInvalidOffer;
           case CountPrice(TOffer(Data), opChoose) of
             0:
@@ -3512 +3512 @@
             1:
               if (TOffer(Data).nCost = 0) or (TOffer(Data).nDeliver = 0) then
-                result := eInvalidOffer;
+                Result := eInvalidOffer;
           else
-            result := eInvalidOffer;
+            Result := eInvalidOffer;
           end;
 
           // !!! check here if cost can be demanded
 
-          if (Command >= sExecute) and (result >= rExecuted) then
+          if (Command >= sExecute) and (Result >= rExecuted) then
           begin
             OfferFullySupported := (TOffer(Data).nDeliver <= 2) and
               (TOffer(Data).nCost <= 2); // >2 no more allowed
-            for i := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
+            for I := 0 to TOffer(Data).nDeliver + TOffer(Data).nCost - 1 do
             begin
-              if TOffer(Data).Price[i] and opMask = opTribute then
-                OfferFullySupported := false;
+              if TOffer(Data).Price[I] and opMask = opTribute then
+                OfferFullySupported := False;
               // tribute no more part of the game
-              if (TOffer(Data).Price[i] and opMask = opTreaty) and
-                (TOffer(Data).Price[i] - opTreaty <= RW[pDipActive].Treaty[p1])
+              if (TOffer(Data).Price[I] and opMask = opTreaty) and
+                (TOffer(Data).Price[I] - opTreaty <= RW[pDipActive].Treaty[p1])
               then
-                OfferFullySupported := false;
+                OfferFullySupported := False;
               // agreed treaty end no more part of the game
-              if TOffer(Data).Price[i] = opTreaty + trCeaseFire then
-                OfferFullySupported := false;
+              if TOffer(Data).Price[I] = opTreaty + trCeaseFire then
+                OfferFullySupported := False;
               // ceasefire no more part of the game
             end;
@@ -3559 +3559 @@
               LastOffer := TOffer(Data);
               // show offered things to receiver
-              for i := 0 to LastOffer.nDeliver - 1 do
-                ShowPrice(pDipActive, p1, LastOffer.Price[i]);
+              for I := 0 to LastOffer.nDeliver - 1 do
+                ShowPrice(pDipActive, p1, LastOffer.Price[I]);
               pDipActive := p1;
-              assert(Mode = moPlaying);
+              Assert(Mode = moPlaying);
               ChangeClientWhenDone(scDipOffer, pDipActive, LastOffer,
                 SizeOf(LastOffer));
@@ -3569 +3569 @@
         end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     {
@@ -3582 +3582 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sSetTestFlag:
@@ -3592 +3592 @@
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sSetGovernment, sSetGovernment - sExecute:
@@ -3598 +3598 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('SetGovernment P%d: %d', [Player, Subject]); {$ENDIF}
         if RW[Player].Happened and phChangeGov = 0 then
-          result := eViolation
+          Result := eViolation
         else if RW[Player].Government = Subject then
-          result := eNotChanged
+          Result := eNotChanged
         else if (Subject >= nGov) then
-          result := eInvalid
+          Result := eInvalid
         else if (Subject >= gMonarchy) and
           (RW[Player].Tech[GovPreq[Subject]] < tsApplicable) then
-          result := eNoPreq
+          Result := eNoPreq
         else if Command >= sExecute then
         begin
@@ -3620 +3620 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('SetRates P%d: %d/%d', [Player, Subject and $F * 10, Subject shr 4 * 10]); {$ENDIF}
         if Subject and $F + Subject shr 4 > 10 then
-          result := eInvalid
+          Result := eInvalid
         else if (RW[Player].TaxRate = Subject and $F * 10) and
           (RW[Player].LuxRate = Subject shr 4 * 10) then
-          result := eNotChanged
+          Result := eNotChanged
         else if Command >= sExecute then
         begin
@@ -3635 +3635 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('Revolution P%d', [Player]); {$ENDIF}
         if RW[Player].Government = gAnarchy then
-          result := eInvalid
+          Result := eInvalid
         else
         begin
@@ -3657 +3657 @@
           if (Mode = moPlaying) and (Subject = adMilitary) and
             (DevModelTurn[Player] <> GTurn) then
-            result := eNoModel
+            Result := eNoModel
           else if Subject <> adMilitary then
           begin
@@ -3663 +3663 @@
             begin
               if Tech[Subject] >= MaxFutureTech_Computing then
-                result := eInvalid;
+                Result := eInvalid;
             end
             else if Subject in FutureTech then
             begin
               if Tech[Subject] >= MaxFutureTech then
-                result := eInvalid;
+                Result := eInvalid;
             end
             else if Tech[Subject] >= tsApplicable then
-              result := eInvalid; // already discovered
+              Result := eInvalid; // already discovered
             if Tech[Subject] <> tsSeen then // look if preqs met
               if AdvPreq[Subject, 2] <> preNone then
               begin // 2 of 3 required
-                i := 0;
-                for j := 0 to 2 do
-                  if Tech[AdvPreq[Subject, j]] >= tsApplicable then
-                    inc(i);
-                if i < 2 then
-                  result := eNoPreq;
+                I := 0;
+                for J := 0 to 2 do
+                  if Tech[AdvPreq[Subject, J]] >= tsApplicable then
+                    Inc(I);
+                if I < 2 then
+                  Result := eNoPreq;
               end
               else if (AdvPreq[Subject, 0] <> preNone) and
@@ -3686 +3686 @@
                 (AdvPreq[Subject, 1] <> preNone) and
                 (Tech[AdvPreq[Subject, 1]] < tsApplicable) then
-                result := eNoPreq;
+                Result := eNoPreq;
           end;
-          if (result = eOK) and (Command >= sExecute) then
+          if (Result = eOK) and (Command >= sExecute) then
           begin
             if (Mode = moPlaying) and (Subject = adMilitary) then
@@ -3697 +3697 @@
         end
         else
-          result := eViolation;
+          Result := eViolation;
       end;
 
@@ -3705 +3705 @@
         {$ENDIF}
         if RW[Player].Happened and phStealTech = 0 then
-          result := eInvalid
+          Result := eInvalid
         else if (Subject >= nAdv) or (Subject in FutureTech) or
           (RW[Player].Tech[Subject] >= tsSeen) or
           (RW[GStealFrom].Tech[Subject] < tsApplicable) then
-          result := eInvalid
+          Result := eInvalid
         else if Command >= sExecute then
         begin
           SeeTech(Player, Subject);
-          dec(RW[Player].Happened, phStealTech);
+          Dec(RW[Player].Happened, phStealTech);
         end;
       end;
@@ -3724 +3724 @@
         if (Subject >= nAttitude) or (p1 >= nPl) or
           (RW[Player].EnemyReport[p1] = nil) then
-          result := eInvalid
+          Result := eInvalid
         else if RW[Player].Treaty[p1] = trNoContact then
-          result := eNoPreq
+          Result := eNoPreq
         else if RW[Player].Attitude[p1] = Subject then
-          result := eNotChanged
+          Result := eNotChanged
         else if Command >= sExecute then
         begin
@@ -3739 +3739 @@
       if (LastEndClientCommand <> scReject) or
         (RW[Player].Treaty[pContacted] < trPeace) then
-        result := eInvalid
+        Result := eInvalid
       else if (ServerVersion[Player] >= $010100) and
         (GTurn < RW[Player].LastCancelTreaty[pContacted] + CancelTreatyTurns)
       then
-        result := eCancelTreatyRush
+        Result := eCancelTreatyRush
       else if Command >= sExecute then
       begin
@@ -3751 +3751 @@
           if (p2 <> pContacted) and (1 shl p2 and PeaceEnded <> 0) then
           begin
-            i := pContacted shl 4 + Player;
-            CallPlayer(cShowSupportAllianceAgainst, p2, i);
+            I := pContacted shl 4 + Player;
+            CallPlayer(cShowSupportAllianceAgainst, p2, I);
           end;
         for p2 := 0 to nPl - 1 do
           if (p2 <> pContacted) and (1 shl p2 and PeaceEnded <> 0) then
           begin
-            i := p2;
-            CallPlayer(cShowCancelTreatyByAlliance, Player, i);
+            I := p2;
+            CallPlayer(cShowCancelTreatyByAlliance, Player, I);
           end;
         LastEndClientCommand := sTurn;
@@ -3771 +3771 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('CreateDevModel P%d', [Player]); {$ENDIF}
         if Subject >= 4 then
-          result := eInvalid
+          Result := eInvalid
         else if (upgrade[Subject, 0].Preq <> preNone) and
           (RW[Player].Tech[upgrade[Subject, 0].Preq] < tsApplicable) then
-          result := eNoPreq
+          Result := eNoPreq
         else if Command >= sExecute then
         begin
@@ -3785 +3785 @@
             Upgrades := 0;
             FutureMCost := 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
                   ((RW[Player].Tech[Preq] >= tsApplicable) or
@@ -3793 +3793 @@
                   if Preq in FutureTech then
                   begin
-                    j := RW[Player].Tech[Preq];
-                    inc(FutureMCost, j * Cost);
+                    J := RW[Player].Tech[Preq];
+                    Inc(FutureMCost, J * Cost);
                   end
                   else
                   begin
-                    j := 1;
+                    J := 1;
                     if Cost > MCost then
                       MCost := Cost;
                   end;
-                  inc(Upgrades, 1 shl i);
-                  inc(MStrength, j * Strength);
-                  inc(MTrans, j * Trans);
+                  Inc(Upgrades, 1 shl I);
+                  Inc(MStrength, J * Strength);
+                  Inc(MTrans, J * Trans);
                 end;
-            inc(MCost, FutureMCost);
+            Inc(MCost, FutureMCost);
             FillChar(Cap, SizeOf(Cap), 0);
             Cap[mcOffense] := 2;
             Cap[mcDefense] := 1;
-            for i := 0 to nFeature - 1 do
-              with Feature[i] do
+            for I := 0 to nFeature - 1 do
+              with Feature[I] do
                 if (1 shl Domain and Domains <> 0) and
                   ((Preq = preNone) or (Preq = preSun) and
                   (GWonder[woSun].EffectiveOwner = Player) or (Preq >= 0) and
-                  (RW[Player].Tech[Preq] >= tsApplicable)) and (i in AutoFeature)
+                  (RW[Player].Tech[Preq] >= tsApplicable)) and (I in AutoFeature)
                 then
-                  Cap[i] := 1;
+                  Cap[I] := 1;
             MaxWeight := 5;
             if (WeightPreq7[Domain] <> preNA) and
@@ -3839 +3839 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('SetDevModelCap P%d', [Player]); {$ENDIF}
         if Subject >= nFeature then
-          result := eInvalid
+          Result := eInvalid
         else if DevModelTurn[Player] = GTurn then
         begin
@@ -3845 +3845 @@
           with RW[Player].DevModel do
             if 1 shl Domain and Feature[Subject].Domains = 0 then
-              result := eDomainMismatch
+              Result := eDomainMismatch
             else if not((Feature[Subject].Preq = preNone) or
               (Feature[Subject].Preq = preSun) and
@@ -3851 +3851 @@
               (Feature[Subject].Preq >= 0) and
               (RW[Player].Tech[Feature[Subject].Preq] >= tsApplicable)) then
-              result := eNoPreq
+              Result := eNoPreq
             else
             begin
@@ -3867 +3867 @@
                   MaxCap := 3;
                 if RW[Player].Tech[adSteel] >= tsApplicable then
-                  inc(MaxCap);
+                  Inc(MaxCap);
               end
               else
@@ -3877 +3877 @@
               if (NewCap < MinCap) or (NewCap > MaxCap) or
                 (Weight + (NewCap - Cap[Subject]) * CapWeight > MaxWeight) then
-                result := eViolation
+                Result := eViolation
               else if Command >= sExecute then
               begin
@@ -3920 +3920 @@
         end
         else
-          result := eNoModel;
+          Result := eNoModel;
       end;
 
@@ -3931 +3931 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('RemoveUnit P%d Mod%d Loc%d', [Player, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else
         begin
-          result := eRemoved;
+          Result := eRemoved;
           Loc0 := RW[Player].Un[Subject].Loc;
           if RealMap[Loc0] and fCity <> 0 then { check utilize }
@@ -3946 +3946 @@
                 (Project and cpImp = 0) and
                 (RW[Player].Model[Project and cpIndex].Kind <> mkCaravan) then
-                result := eUtilized;
+                Result := eUtilized;
               if Command >= sExecute then
               begin
-                if result = eUtilized then
+                if Result = eUtilized then
                 begin
                   with RW[Player].Un[Subject] do
                   begin
-                    Cost := integer(RW[Player].Model[mix].Cost) * Health *
+                    Cost := Integer(RW[Player].Model[mix].Cost) * Health *
                       BuildCostMod[Difficulty[Player]] div 1200;
                     if RW[Player].Model[mix].Cap[mcLine] > 0 then
@@ -3959 +3959 @@
                   end;
                   if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-                    inc(RW[Player].Money, Cost)
+                    Inc(RW[Player].Money, Cost)
                   else
                   begin
-                    inc(Prod, Cost * 2 div 3);
+                    Inc(Prod, Cost * 2 div 3);
                     Project0 := Project0 and not cpCompleted;
                     if Project0 and not cpAuto <> Project and not cpAuto then
@@ -3982 +3982 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('SetUnitHome P%d Mod%d Loc%d', [Player, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else
         begin
           Loc0 := RW[Player].Un[Subject].Loc;
           if RealMap[Loc0] and fCity = 0 then
-            result := eInvalid
+            Result := eInvalid
           else
           begin
             SearchCity(Loc0, Player, cix1);
             if RW[Player].City[cix1].Flags and chCaptured <> 0 then
-              result := eViolation
+              Result := eViolation
             else if Command >= sExecute then
               RW[Player].Un[Subject].Home := cix1;
@@ -4009 +4009 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('LoadUnit P%d Mod%d Loc%d', [Player, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else
-          result := LoadUnit(Player, Subject, Command < sExecute);
+          Result := LoadUnit(Player, Subject, Command < sExecute);
       end;
 
@@ -4018 +4018 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('UnloadUnit P%d Mod%d Loc%d', [Player, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else
-          result := UnloadUnit(Player, Subject, Command < sExecute);
+          Result := UnloadUnit(Player, Subject, Command < sExecute);
       end;
 
     sSelectTransport, sSelectTransport - sExecute:
       if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-        result := eInvalid
+        Result := eInvalid
       else
         with RW[Player].Model[RW[Player].Un[Subject].mix] do
         begin
           if Cap[mcSeaTrans] + Cap[mcAirTrans] + Cap[mcCarrier] = 0 then
-            result := eInvalid
+            Result := eInvalid
           else if Command >= sExecute then
             uixSelectedTransport := Subject;
@@ -4041 +4041 @@
       begin
         p1 := Command shr 4 and $F;
-        Loc1 := integer(Data);
+        Loc1 := Integer(Data);
         if (Occupant[Loc1] >= 0) and (p1 <> Occupant[Loc1]) or
           (RealMap[Loc1] and fCity <> 0) and
           (RealMap[Loc1] shr 27 <> Cardinal(p1)) or
           (RW[p1].Model[Subject].Domain < dAir) and
-          ((RW[p1].Model[Subject].Domain = dSea) <> (RealMap[integer(Data)] and
+          ((RW[p1].Model[Subject].Domain = dSea) <> (RealMap[Integer(Data)] and
           fTerrain < fGrass)) then
-          result := eViolation
+          Result := eViolation
         else if Command >= sExecute then
         begin
           CreateUnit(p1, Subject);
-          RW[p1].Un[RW[p1].nUn - 1].Loc := integer(Data);
+          RW[p1].Un[RW[p1].nUn - 1].Loc := Integer(Data);
           PlaceUnit(p1, RW[p1].nUn - 1);
-          UpdateUnitMap(integer(Data));
+          UpdateUnitMap(Integer(Data));
         end;
       end
       else
-        result := eInvalid;
+        Result := eInvalid;
 
     sMoveUnit + (0 + 6 * 8) * 16, sMoveUnit + (1 + 7 * 8) * 16,
@@ -4075 +4075 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('MoveUnit P%d I%d Mod%d Loc%d (%d,%d)', [Player, Subject, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc, dx, dy]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else
-          result := MoveUnit(Player, Subject, dx, dy, Command < sExecute);
+          Result := MoveUnit(Player, Subject, dx, dy, Command < sExecute);
       end;
 
@@ -4088 +4088 @@
 {$IFDEF TEXTLOG}CmdInfo := Format('AddToCity P%d Mod%d Loc%d', [Player, RW[Player].Un[Subject].mix, RW[Player].Un[Subject].Loc]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (RW[Player].Un[Subject].Loc < 0) then
-          result := eInvalid
+          Result := eInvalid
         else if not(RW[Player].Model[RW[Player].Un[Subject].mix].Kind
           in [mkSettler, mkSlaves]) and
           (RW[Player].Un[Subject].Flags and unConscripts = 0) then
-          result := eViolation
+          Result := eViolation
         else
         begin
           Loc0 := RW[Player].Un[Subject].Loc;
           if RealMap[Loc0] and fCity = 0 then
-            result := eInvalid
+            Result := eInvalid
           else
           begin
@@ -4103 +4103 @@
             with RW[Player].City[cix1] do
               if not CanCityGrow(Player, cix1) then
-                result := eMaxSize
+                Result := eMaxSize
               else if Command >= sExecute then
               begin { add to city }
@@ -4123 +4123 @@
       begin
         Loc0 := RW[Player].Un[Subject].Loc;
-        i := Command shr 4 and $3F; // new job
-{$IFDEF TEXTLOG}CmdInfo := Format('StartJob P%d Mod%d Loc%d: %d', [Player, RW[Player].Un[Subject].mix, Loc0, i]); {$ENDIF}
+        I := Command shr 4 and $3F; // new job
+{$IFDEF TEXTLOG}CmdInfo := Format('StartJob P%d Mod%d Loc%d: %d', [Player, RW[Player].Un[Subject].mix, Loc0, I]); {$ENDIF}
         if (Subject >= RW[Player].nUn) or (Loc0 < 0) then
-          result := eInvalid
-        else if i >= nJob then
-          result := eInvalid
+          Result := eInvalid
+        else if I >= nJob then
+          Result := eInvalid
         else
         begin
-          result := StartJob(Player, Subject, i, Command < sExecute);
-          if result = eCity then
+          Result := StartJob(Player, Subject, I, Command < sExecute);
+          if Result = eCity then
           begin // new city
             cix1 := RW[Player].nCity - 1;
@@ -4157 +4157 @@
     sSetCityProject, sSetCityProject - sExecute:
       begin
-        NewProject := integer(Data) and not cpAuto;
+        NewProject := Integer(Data) and not cpAuto;
 {$IFDEF TEXTLOG}CmdInfo := Format('SetCityProject P%d Loc%d: %d', [Player, RW[Player].City[Subject].Loc, NewProject]); {$ENDIF}
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else
           with RW[Player].City[Subject] do
           begin
             if NewProject = Project then
-              result := eNotChanged
+              Result := eNotChanged
             else
             begin
@@ -4174 +4174 @@
               begin
                 if NewProject and cpIndex >= RW[Player].nModel then
-                  result := eInvalid
+                  Result := eInvalid
                 else if (NewProject and cpConscripts <> 0) and
                   not((RW[Player].Tech[adConscription] >= tsApplicable) and
@@ -4180 +4180 @@
                   and (RW[Player].Model[NewProject and cpIndex].Kind < mkScout))
                 then
-                  result := eViolation
+                  Result := eViolation
                   // else if (RW[Player].Model[NewProject and cpIndex].Kind=mkSlaves)
                   // and (GWonder[woPyramids].EffectiveOwner<>Player) then
@@ -4186 +4186 @@
               end
               else if NewProject and cpIndex >= nImp then
-                result := eInvalid
+                Result := eInvalid
               else
               begin
                 Preq := Imp[NewProject and cpIndex].Preq;
-                for i := 0 to nImpReplacement - 1 do
-                  if (ImpReplacement[i].OldImp = NewProject and cpIndex) and
-                    (built[ImpReplacement[i].NewImp] > 0) then
-                    result := eObsolete;
-                if result = eObsolete then
+                for I := 0 to nImpReplacement - 1 do
+                  if (ImpReplacement[I].OldImp = NewProject and cpIndex) and
+                    (built[ImpReplacement[I].NewImp] > 0) then
+                    Result := eObsolete;
+                if Result = eObsolete then
                 else if Preq = preNA then
-                  result := eInvalid
+                  Result := eInvalid
                 else if (Preq >= 0) and (RW[Player].Tech[Preq] < tsApplicable)
                 then
-                  result := eNoPreq
+                  Result := eNoPreq
                 else if built[NewProject and cpIndex] > 0 then
-                  result := eInvalid
+                  Result := eInvalid
                 else if (NewProject and cpIndex < nWonder) and
                   (GWonder[NewProject and cpIndex].CityID <> WonderNotBuiltYet) then
-                  result := eViolation // wonder already exists
+                  Result := eViolation // wonder already exists
                 else if (NewProject and cpIndex = imSpacePort) and
                   (RW[Player].NatBuilt[imSpacePort] > 0) then
-                  result := eViolation // space port already exists
+                  Result := eViolation // space port already exists
                 else if (NewProject = cpImp + imBank) and (built[imMarket] = 0)
                   or (NewProject = cpImp + imUniversity) and
@@ -4213 +4213 @@
                   (built[imUniversity] = 0) or (NewProject = cpImp + imMfgPlant)
                   and (built[imFactory] = 0) then
-                  result := eNoPreq;
+                  Result := eNoPreq;
                 case NewProject - cpImp of
                   woLighthouse, woMagellan, imCoastalFort, imHarbor, imPlatform:
@@ -4224 +4224 @@
                         if (Loc1 >= 0) and (Loc1 < MapSize) and
                           (RealMap[Loc1] and fTerrain = fShore) then
-                          inc(Preq);
+                          Inc(Preq);
                       end;
                       if Preq = 0 then
-                        result := eNoPreq;
+                        Result := eNoPreq;
                     end;
                   woHoover, imHydro:
@@ -4239 +4239 @@
                           ((RealMap[Loc1] and fTerrain = fMountains) or
                           (RealMap[Loc1] and fRiver <> 0)) then
-                          inc(Preq);
+                          Inc(Preq);
                       end;
                       if Preq = 0 then
-                        result := eNoPreq;
+                        Result := eNoPreq;
                     end;
                   woMIR, imShipComp, imShipPow, imShipHab:
                     if RW[Player].NatBuilt[imSpacePort] = 0 then
-                      result := eNoPreq;
+                      Result := eNoPreq;
                 end;
                 if (GTestFlags and tfNoRareNeed = 0) and
                   (Imp[NewProject and cpIndex].Kind = ikShipPart) then
                   if RW[Player].Tech[adMassProduction] < tsApplicable then
-                    result := eNoPreq
+                    Result := eNoPreq
                   else
                   begin // check for rare resources
                     if NewProject and cpIndex = imShipComp then
-                      j := 1
+                      J := 1
                     else if NewProject and cpIndex = imShipPow then
-                      j := 2
+                      J := 2
                     else { if NewProject and cpIndex=imShipHab then }
-                      j := 3;
+                      J := 3;
                     // j = rare resource required
                     Preq := 0;
@@ -4267 +4267 @@
                       Loc1 := Radius[V21];
                       if (Loc1 >= 0) and (Loc1 < MapSize) and
-                        (RealMap[Loc1] shr 25 and 3 = Cardinal(j)) then
-                        inc(Preq);
+                        (RealMap[Loc1] shr 25 and 3 = Cardinal(J)) then
+                        Inc(Preq);
                     end;
                     if Preq = 0 then
-                      result := eNoPreq;
+                      Result := eNoPreq;
                   end;
               end;
 
-              if (Command >= sExecute) and (result >= rExecuted) then
+              if (Command >= sExecute) and (Result >= rExecuted) then
               begin
                 if pt0 <> ptSelect then
@@ -4284 +4284 @@
                     and (pt0 <> ptCaravan) then
                   begin
-                    inc(RW[Player].Money, Prod0);
+                    Inc(RW[Player].Money, Prod0);
                     Prod := 0;
                     Prod0 := 0;
@@ -4291 +4291 @@
                   else
                     Prod := Prod0 * 2 div 3;
-                Project := NewProject
+                Project := NewProject;
               end;
             end;
@@ -4302 +4302 @@
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else
           with RW[Player].City[Subject] do
             if (RW[Player].Government = gAnarchy) or (Flags and chCaptured <> 0)
             then
-              result := eOutOfControl
+              Result := eOutOfControl
             else if (Project and cpImp <> 0) and
               ((Project and cpIndex = imTrGoods) or
               (Imp[Project and cpIndex].Kind = ikShipPart)) then
-              result := eInvalid // don't buy colony ship
+              Result := eInvalid // don't buy colony ship
             else
             begin
@@ -4330 +4330 @@
                 Cost := Cost * 4;
               if Cost <= 0 then
-                result := eNotChanged
+                Result := eNotChanged
               else if Cost > RW[Player].Money then
-                result := eViolation
+                Result := eViolation
               else if Command >= sExecute then
                 IntServer(sIntBuyMaterial, Player, Subject, Cost);
@@ -4345 +4345 @@
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else if Command >= sExecute then
           with RW[Player].City[Subject] do
           begin
-            inc(RW[Player].Money, Prod0);
+            Inc(RW[Player].Money, Prod0);
             Prod := 0;
             Prod0 := 0;
@@ -4357 +4357 @@
     sSellCityImprovement, sSellCityImprovement - sExecute:
       begin
-{$IFDEF TEXTLOG}CmdInfo := Format('SellCityImprovement P%d Loc%d: %d', [Player, RW[Player].City[Subject].Loc, integer(Data)]); {$ENDIF}
+{$IFDEF TEXTLOG}CmdInfo := Format('SellCityImprovement P%d Loc%d: %d', [Player, RW[Player].City[Subject].Loc, Integer(Data)]); {$ENDIF}
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else
           with RW[Player].City[Subject] do
-            if built[integer(Data)] = 0 then
-              result := eInvalid
+            if built[Integer(Data)] = 0 then
+              Result := eInvalid
             else if (RW[Player].Government = gAnarchy) or
               (Flags and chCaptured <> 0) then
-              result := eOutOfControl
+              Result := eOutOfControl
             else if Flags and chImprovementSold <> 0 then
-              result := eOnlyOnce
+              Result := eOnlyOnce
             else if Command >= sExecute then
             begin
-              inc(RW[Player].Money, Imp[integer(Data)].Cost * BuildCostMod
+              Inc(RW[Player].Money, Imp[Integer(Data)].Cost * BuildCostMod
                 [Difficulty[Player]] div 12);
-              built[integer(Data)] := 0;
-              if Imp[integer(Data)].Kind in [ikNatLocal, ikNatGlobal] then
+              built[Integer(Data)] := 0;
+              if Imp[Integer(Data)].Kind in [ikNatLocal, ikNatGlobal] then
               begin
-                RW[Player].NatBuilt[integer(Data)] := 0;
-                case integer(Data) of
+                RW[Player].NatBuilt[Integer(Data)] := 0;
+                case Integer(Data) of
                   imGrWall:
                     GrWallContinent[Player] := -1;
@@ -4385 +4385 @@
                 end;
               end;
-              inc(Flags, chImprovementSold);
+              Inc(Flags, chImprovementSold);
             end;
       end;
@@ -4391 +4391 @@
     sRebuildCityImprovement, sRebuildCityImprovement - sExecute:
       begin
-        OldImp := integer(Data);
+        OldImp := Integer(Data);
 {$IFDEF TEXTLOG}CmdInfo := Format('RebuildCityImprovement P%d Loc%d: %d', [Player, RW[Player].City[Subject].Loc, OldImp]); {$ENDIF}
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else
         begin
           if (OldImp < 0) or (OldImp >= nImp) or
             not(Imp[OldImp].Kind in [ikCommon, ikNatLocal, ikNatGlobal]) then
-            result := eInvalid
+            Result := eInvalid
           else
             with RW[Player].City[Subject] do
@@ -4406 +4406 @@
                 not(Imp[Project and cpIndex].Kind in [ikCommon, ikNatLocal,
                 ikNatGlobal]) then
-                result := eInvalid
+                Result := eInvalid
               else if (RW[Player].Government = gAnarchy) or
                 (Flags and chCaptured <> 0) then
-                result := eOutOfControl
+                Result := eOutOfControl
               else if Flags and chImprovementSold <> 0 then
-                result := eOnlyOnce
+                Result := eOnlyOnce
               else if Command >= sExecute then
               begin
-                inc(Prod, Imp[OldImp].Cost * BuildCostMod[Difficulty[Player]]
+                Inc(Prod, Imp[OldImp].Cost * BuildCostMod[Difficulty[Player]]
                   div 12 * 2 div 3);
                 Project0 := Project0 and not cpCompleted;
@@ -4431 +4431 @@
                   end;
                 end;
-                inc(Flags, chImprovementSold);
+                Inc(Flags, chImprovementSold);
               end;
         end;
@@ -4438 +4438 @@
     sSetCityTiles, sSetCityTiles - sExecute:
       begin
-{$IFDEF TEXTLOG}CmdInfo := Format('SetCityTiles P%d Loc%d: %x', [Player, RW[Player].City[Subject].Loc, integer(Data)]); {$ENDIF}
+{$IFDEF TEXTLOG}CmdInfo := Format('SetCityTiles P%d Loc%d: %x', [Player, RW[Player].City[Subject].Loc, Integer(Data)]); {$ENDIF}
         if (Subject >= RW[Player].nCity) or (RW[Player].City[Subject].Loc < 0)
         then
-          result := eInvalid
+          Result := eInvalid
         else
-          result := SetCityTiles(Player, Subject, integer(Data),
+          Result := SetCityTiles(Player, Subject, Integer(Data),
             Command < sExecute);
       end;
@@ -4460 +4460 @@
     end
     else
-      result := eUnknown;
+      Result := eUnknown;
   end; { case command }
 
   // do not log invalid and non-relevant commands
-  if result = eZOC_EnemySpotted then
+  if Result = eZOC_EnemySpotted then
   begin
-    assert(Mode = moPlaying);
+    Assert(Mode = moPlaying);
     CL.State := FormerCLState;
     IntServer(sIntDiscoverZOC, Player, 0, ZOCTile);
   end
-  else if result and rEffective = 0 then
+  else if Result and rEffective = 0 then
     if Mode < moPlaying then
     begin
-{$IFDEF TEXTLOG}CmdInfo := Format('***ERROR (%x) ', [result]) + CmdInfo;
+{$IFDEF TEXTLOG}CmdInfo := Format('***ERROR (%x) ', [Result]) + CmdInfo;
       {$ENDIF}
-      LoadOK := false;
+      LoadOK := False;
     end
     else
@@ -4481 +4481 @@
       if logged then
         CL.State := FormerCLState;
-      if (result < rExecuted) and (Command >= sExecute) then
+      if (Result < rExecuted) and (Command >= sExecute) then
         PutMessage(1 shl 16 + 1, Format('INVALID: %d calls %x (%d)',
           [Player, Command, Subject]));
@@ -4487 +4487 @@
 
   if (Command and (cClientEx or sExecute or sctMask) = sExecute or sctEndClient)
-    and (result >= rExecuted) then
+    and (Result >= rExecuted) then
     LastEndClientCommand := Command;
-{$IFOPT O-}dec(nHandoverStack, 2); {$ENDIF}
+{$IFOPT O-}Dec(nHandoverStack, 2); {$ENDIF}
 end;
 

trunk/Global.pas

@@ -28 +28 @@
 end.
 
+

trunk/IPQ.pas

@@ -1 +1 @@
 { binary heap priority queue
-  code contributed by Rassim Eminli }
+  Code contributed by Rassim Eminli }
 
 {$INCLUDE Switches.inc}
@@ -8 +8 @@
 
 type
-  TIntegerArray = array [0 .. $40000000 div sizeof(integer)] of integer;
+  TIntegerArray = array [0 .. $40000000 div SizeOf(Integer)] of Integer;
   PIntegerArray = ^TIntegerArray;
 
   TheapItem = record
-    Item: integer;
-    Value: integer;
+    Item: Integer;
+    Value: Integer;
   end;
 
-  TItemArray = array [0 .. $40000000 div sizeof(TheapItem)] of TheapItem;
+  TItemArray = array [0 .. $40000000 div SizeOf(TheapItem)] of TheapItem;
   PItemArray = ^TItemArray;
 
   TIPQ = class
-    constructor Create(max: integer);
+    constructor Create(Max: Integer);
     destructor Destroy; override;
     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;
   private
     // n - is the size of the heap.
     // fmax - is the max size of the heap.
-    n, fmax: integer;
+    N, fmax: Integer;
 
     // bh - stores (Value, Item) pairs of the heap.
@@ -39 +39 @@
 implementation
 
-constructor TIPQ.Create(max: integer);
+constructor TIPQ.Create(Max: Integer);
 begin
   inherited Create;
-  fmax := max;
-  GetMem(bh, fmax * sizeof(TheapItem));
-  GetMem(Ix, fmax * sizeof(integer));
-  n := -1;
+  fmax := Max;
+  GetMem(bh, fmax * SizeOf(TheapItem));
+  GetMem(Ix, fmax * SizeOf(Integer));
+  N := -1;
   Empty;
 end;
@@ -58 +58 @@
 procedure TIPQ.Empty;
 begin
-  if n <> 0 then
+  if N <> 0 then
   begin
-    FillChar(Ix^, fmax * sizeof(integer), 255);
-    n := 0;
+    FillChar(Ix^, fmax * SizeOf(Integer), 255);
+    N := 0;
   end;
 end;
 
 // Parent(i) = (i-1)/2.
-function TIPQ.Put(Item, Value: integer): boolean; // O(lg(n))
+function TIPQ.Put(Item, Value: Integer): Boolean; // O(lg(n))
 var
-  i, j: integer;
+  I, J: Integer;
   lbh: PItemArray;
   lIx: PIntegerArray;
@@ -74 +74 @@
   lIx := Ix;
   lbh := bh;
-  i := lIx[Item];
-  if i >= 0 then
+  I := lIx[Item];
+  if I >= 0 then
   begin
-    if lbh[i].Value <= Value then
+    if lbh[I].Value <= Value then
     begin
-      result := False;
-      exit;
+      Result := False;
+      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 >= lbh[j].Value then
-      break;
-    lbh[i] := lbh[j];
-    lIx[lbh[i].Item] := i;
-    i := j;
+    J := (I - 1) shr 1; // Parent(i) = (i-1)/2
+    if Value >= lbh[J].Value then
+      Break;
+    lbh[I] := lbh[J];
+    lIx[lbh[I].Item] := I;
+    I := J;
   end;
   // Insert the new Item at the insertion point found.
-  lbh[i].Value := Value;
-  lbh[i].Item := Item;
-  lIx[lbh[i].Item] := i;
-  result := True;
+  lbh[I].Value := Value;
+  lbh[I].Item := Item;
+  lIx[lbh[I].Item] := I;
+  Result := True;
 end;
 
-function TIPQ.TestPut(Item, Value: integer): boolean;
+function TIPQ.TestPut(Item, Value: Integer): Boolean;
 var
-  i: integer;
+  I: Integer;
 begin
-  i := Ix[Item];
-  result := (i < 0) or (bh[i].Value > Value);
+  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 TIPQ.Get(var Item, Value: integer): boolean; // O(lg(n))
+function TIPQ.Get(var Item, Value: Integer): Boolean; // O(lg(n))
 var
-  i, j: integer;
-  last: TheapItem;
+  I, J: Integer;
+  Last: TheapItem;
   lbh: PItemArray;
 begin
-  if n = 0 then
+  if N = 0 then
   begin
-    result := False;
-    exit;
+    Result := False;
+    Exit;
   end;
 
@@ -133 +133 @@
   Ix[Item] := -1;
 
-  dec(n);
-  if n > 0 then
+  Dec(N);
+  if N > 0 then
   begin
-    last := lbh[n];
-    i := 0;
-    j := 1;
-    while j < n do
+    Last := lbh[N];
+    I := 0;
+    J := 1;
+    while J < N do
     begin
       // Right(i) = Left(i)+1
-      if (j < n - 1) and (lbh[j].Value > lbh[j + 1].Value) then
-        Inc(j);
-      if last.Value <= lbh[j].Value then
-        break;
+      if (J < N - 1) and (lbh[J].Value > lbh[J + 1].Value) then
+        Inc(J);
+      if Last.Value <= lbh[J].Value then
+        Break;
 
-      lbh[i] := lbh[j];
-      Ix[lbh[i].Item] := i;
-      i := j;
-      j := j shl 1 + 1; // Left(j) = 2*j+1
+      lbh[I] := lbh[J];
+      Ix[lbh[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.
-    lbh[i] := last;
-    Ix[last.Item] := i;
+    lbh[I] := Last;
+    Ix[Last.Item] := I;
   end;
-  result := True;
+  Result := True;
 end;
 

trunk/Inp.pas

@@ -21 +21 @@
     procedure CenterToRect(Rect: TRect);
   private
-    Center: boolean;
+    Center: Boolean;
   end;
 
@@ -54 +54 @@
     9, Caption);
   { Corner(canvas,1,1,0,MainTexture);
-    Corner(canvas,ClientWidth-9,1,1,MainTexture);
-    Corner(canvas,1,ClientHeight-9,2,MainTexture);
-    Corner(canvas,ClientWidth-9,ClientHeight-9,3,MainTexture); }
+    Corner(Canvas,ClientWidth-9,1,1,MainTexture);
+    Corner(Canvas,1,ClientHeight-9,2,MainTexture);
+    Corner(Canvas,ClientWidth-9,ClientHeight-9,3,MainTexture); }
 end;
 

trunk/LocalPlayer/Battle.pas

@@ -32 +32 @@
     uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
-    IsSuicideQuery: boolean;
+    IsSuicideQuery: Boolean;
   end;
 
@@ -63 +63 @@
   TextSize: TSize;
   LabelText: string;
-  FirstStrike: boolean;
+  FirstStrike: Boolean;
 begin
   MaxBar := 65;
@@ -196 +196 @@
   BitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
     ym + 8 + 12);
-  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  MakeUnitInfo(Me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
@@ -216 +216 @@
     ClientWidth := 300;
     ClientHeight := 288;
-    OKBtn.Visible := true;
-    CancelBtn.Visible := true;
+    OKBtn.Visible := True;
+    CancelBtn.Visible := True;
     Left := (Screen.Width - ClientWidth) div 2; // center on screen
     Top := (Screen.Height - ClientHeight) div 2;
@@ -225 +225 @@
     ClientWidth := 178;
     ClientHeight := 178;
-    OKBtn.Visible := false;
-    CancelBtn.Visible := false;
+    OKBtn.Visible := False;
+    CancelBtn.Visible := False;
   end;
 end;
@@ -232 +232 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-  ym, cix, p: Integer;
-  s, s1: string;
+  ym, cix, P: Integer;
+  S, s1: string;
 begin
   with Canvas do
@@ -253 +253 @@
   begin
     Canvas.Font.Assign(UniFont[ftCaption]);
-    s := Phrases.Lookup('TITLE_SUICIDE');
-    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-      7 + Border, s);
+    S := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+      7 + Border, S);
     Canvas.Font.Assign(UniFont[ftNormal]);
-    s := Phrases.Lookup('SUICIDE');
-    p := pos('\', s);
-    if p = 0 then
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-        div 2, 205, s)
+    S := Phrases.Lookup('SUICIDE');
+    P := Pos('\', S);
+    if P = 0 then
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+        div 2, 205, S)
     else
     begin
-      s1 := copy(s, 1, p - 1);
+      s1 := Copy(S, 1, P - 1);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 - MessageLineSpacing div 2, s1);
-      s1 := copy(s, p + 1, 255);
+      s1 := Copy(S, P + 1, 255);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);

trunk/LocalPlayer/CityScreen.pas

@@ -39 +39 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure BuyClick(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
@@ -53 +53 @@
     procedure PageDownBtnClick(Sender: TObject);
   private
-    c: TCity;
+    C: TCity;
     Report: TCityReportNew;
     cOwner: Integer;
@@ -70 +70 @@
     Optimize_cixTileChange: Integer;
     Optimize_TilesBeforeChange: Integer;
-    Happened: cardinal;
-    imix: array [0 .. 15] of integer;
+    Happened: Cardinal;
+    imix: array [0 .. 15] of Integer;
     CityAreaInfo: TCityAreaInfo;
     AreaMap: TIsoMap;
@@ -89 +89 @@
     procedure InitZoomCityMap;
     procedure ChooseProject;
-    procedure ChangeCity(d: integer);
-    procedure ChangeResourceWeights(iResourceWeights: integer);
+    procedure ChangeCity(D: Integer);
+    procedure ChangeResourceWeights(iResourceWeights: Integer);
     procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   public
@@ -96 +96 @@
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
     procedure Reset;
     procedure CheckAge;
@@ -202 +202 @@
   NoMap := TIsoMap.Create;
   AreaMap := TIsoMap.Create;
-  AreaMap.SetOutput(offscreen);
+  AreaMap.SetOutput(Offscreen);
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
@@ -293 +293 @@
 procedure TCityDlg.InitSmallCityMap;
 var
-  i, iix, cli1, Color0, Color1, Color2: integer;
+  I, iix, cli1, Color0, Color1, Color2: Integer;
 begin
   if cix >= 0 then
-    c := MyCity[cix];
+    C := MyCity[cix];
   case MyMap[cLoc] and fTerrain of
     fPrairie: cli1 := cliPrairie;
@@ -329 +329 @@
   begin
     Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
-    for i := 0 to 29 do
+    for I := 0 to 29 do
     begin
       for iix := nWonder to nImp - 1 do
-        if (ImpPosition[iix] = i) and (c.Built[iix] > 0) then
+        if (ImpPosition[iix] = I) and (C.Built[iix] > 0) then
         begin
-          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-            11 + 12 * (i mod 18 div 3)));
-          break;
+          FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+            3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+            11 + 12 * (I mod 18 div 3)));
+          Break;
         end;
     end;
-    i := 30;
+    I := 30;
     for iix := 0 to nImp do
-      if (c.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
+      if (C.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
       begin
-        FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-          3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-          11 + 12 * (i mod 18 div 3)));
-        inc(i);
-        if i = 36 then
-          break; // area is full
+        FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+          3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+          11 + 12 * (I mod 18 div 3)));
+        Inc(I);
+        if I = 36 then
+          Break; // area is full
       end;
-    if c.Project and cpImp <> 0 then
-    begin
-      iix := c.Project and cpIndex;
+    if C.Project and cpImp <> 0 then
+    begin
+      iix := C.Project and cpIndex;
       if iix <> imTrGoods then
       begin
         if (iix >= nWonder) and (ImpPosition[iix] >= 0) then
-          i := ImpPosition[iix];
-        if i < 36 then
+          I := ImpPosition[iix];
+        if I < 36 then
         begin
-          brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
-          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-            11 + 12 * (i mod 18 div 3)));
+          Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
+          FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+            3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+            11 + 12 * (I mod 18 div 3)));
         end;
       end;
     end;
-    brush.style := bsClear;
+    Brush.style := bsClear;
   end;
 end;
@@ -384 +384 @@
         112 * (ZoomArea - 3), wZoomMap - wZoomEnvironment, hZoomMap);
       ImageOp_B(ZoomCityMap, CityMapTemplate, wZoomMap - wZoomEnvironment, 0,
-        1504 + wZoomEnvironment * byte(IsPort), 112 * (ZoomArea - 3),
+        1504 + wZoomEnvironment * Byte(IsPort), 112 * (ZoomArea - 3),
         wZoomEnvironment, hZoomMap);
     end;
@@ -392 +392 @@
 procedure TCityDlg.OffscreenPaint;
 
-  procedure FillBar(x, y, pos, Growth, max, Kind: integer;
-    IndicateComplete: boolean);
+  procedure FillBar(X, Y, Pos, Growth, Max, Kind: Integer;
+    IndicateComplete: Boolean);
   begin
     BarTex.Assign(MainTexture);
@@ -400 +400 @@
       BarTex.ColorBevelShade := BarTex.ColorBevelLight;
     end;
-    PaintRelativeProgressBar(offscreen.Canvas, Kind, x - 3, y, wBar - 4, pos,
-      Growth, max, IndicateComplete, BarTex);
-  end;
-
-  procedure PaintResources(x, y, Loc: integer; Add4Happy: boolean);
+    PaintRelativeProgressBar(Offscreen.Canvas, Kind, X - 3, Y, wBar - 4, Pos,
+      Growth, Max, IndicateComplete, BarTex);
+  end;
+
+  procedure PaintResources(X, Y, Loc: Integer; Add4Happy: Boolean);
   var
-    d, i, Total, xGr, yGr: integer;
+    D, I, Total, xGr, yGr: Integer;
     TileInfo: TTileInfo;
-    rare: boolean;
+    rare: Boolean;
   begin
     with AreaMap do begin
-    if Server(sGetCityTileInfo, me, Loc, TileInfo) <> eOk then
-    begin
-      assert(cix < 0);
-      exit
+    if Server(sGetCityTileInfo, Me, Loc, TileInfo) <> eOk then
+    begin
+      Assert(cix < 0);
+      Exit
     end;
     Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
     rare := MyMap[Loc] and $06000000 > 0;
     if rare then
-      inc(Total);
+      Inc(Total);
     if Add4Happy then
-      inc(Total, 4);
+      Inc(Total, 4);
     if Total > 1 then
-      d := (xxt - 11) div (Total - 1);
-    if d < 1 then
-      d := 1;
-    if d > 4 then
-      d := 4;
-    for i := 0 to Total - 1 do
+      D := (xxt - 11) div (Total - 1);
+    if D < 1 then
+      D := 1;
+    if D > 4 then
+      D := 4;
+    for I := 0 to Total - 1 do
     begin
       yGr := 115;
-      if Add4Happy and (i >= Total - 4) then
+      if Add4Happy and (I >= Total - 4) then
       begin
         xGr := 132;
         yGr := 126
       end
-      else if rare and (i = Total - 1) then
+      else if rare and (I = Total - 1) then
         xGr := 66 + 110
-      else if i >= TileInfo.Food + TileInfo.Prod then
+      else if I >= TileInfo.Food + TileInfo.Prod then
         xGr := 66 + 44
-      else if i >= TileInfo.Prod then
+      else if I >= TileInfo.Prod then
         xGr := 66
       else
         xGr := 66 + 22;
-      Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
-        y + yyt - 5, 10, 10, xGr, yGr);
+      Sprite(Offscreen, HGrSystem, X + xxt - 5 + D * (2 * I + 1 - Total),
+        Y + yyt - 5, 10, 10, xGr, yGr);
     end;
     end;
   end;
 var
-  line, MessageCount: integer;
-
-  procedure CheckMessage(Flag: integer);
+  Line, MessageCount: Integer;
+
+  procedure CheckMessage(Flag: Integer);
   var
-    i, test: integer;
-    s: string;
+    I, Test: Integer;
+    S: string;
   begin
     if Happened and Flag <> 0 then
     begin
-      i := 0;
-      test := 1;
-      while test < Flag do
+      I := 0;
+      Test := 1;
+      while Test < Flag do
       begin
-        inc(i);
-        inc(test, test)
+        Inc(I);
+        Inc(Test, Test);
       end;
 
       if AllowChange and (Sounds <> nil) and (OpenSoundEvent = -1) then
       begin
-        s := CityEventSoundItem[i];
-        if s <> '' then
-          s := Sounds.Lookup(s);
-        if (Flag = chProduction) or (s <> '') and (s[1] <> '*') and (s[1] <> '[')
+        S := CityEventSoundItem[I];
+        if S <> '' then
+          S := Sounds.Lookup(S);
+        if (Flag = chProduction) or (S <> '') and (S[1] <> '*') and (S[1] <> '[')
         then
-          OpenSoundEvent := i
+          OpenSoundEvent := I;
       end;
 
-      s := CityEventName(i);
+      S := CityEventName(I);
       { if Flag=chNoGrowthWarning then
-        if c.Built[imAqueduct]=0 then
-        s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-        else s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
-      RisedTextOut(offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
-        16 * line, s);
-      inc(line)
+        if C.Built[imAqueduct]=0 then
+        S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
+        else S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
+      RisedTextOut(Offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
+        16 * Line, S);
+      Inc(Line);
     end;
   end;
 
 var
-  x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+  X, Y, xGr, I, J, iix, D, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
     HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: Integer;
   av: Integer;
-  PrName, s: string;
+  PrName, S: string;
   UnitInfo: TUnitInfo;
   UnitReport: TUnitReport;
@@ -499 +499 @@
   inherited;
   if cix >= 0 then
-    c := MyCity[cix];
+    C := MyCity[cix];
   Report.HypoTiles := -1;
   Report.HypoTaxRate := -1;
   Report.HypoLuxuryRate := -1;
   if cix >= 0 then
-    Server(sGetCityReportNew, me, cix, Report) // own city
+    Server(sGetCityReportNew, Me, cix, Report) // own city
   else
-    Server(sGetEnemyCityReportNew, me, cLoc, Report); // enemy city
-  TrueFood := c.Food;
-  TrueProd := c.Prod;
-  TruePoll := c.Pollution;
+    Server(sGetEnemyCityReportNew, Me, cLoc, Report); // enemy city
+  TrueFood := C.Food;
+  TrueProd := C.Prod;
+  TruePoll := C.Pollution;
   if Supervising or (cix < 0) then
   begin // normalize city from after-turn state
@@ -522 +522 @@
       TruePoll := 0; // shouldn't happen
   end;
-  IsCityAlive := (cGov <> gAnarchy) and (c.Flags and chCaptured = 0);
+  IsCityAlive := (cGov <> gAnarchy) and (C.Flags and chCaptured = 0);
   if not IsCityAlive then
-    Report.Working := c.Size;
+    Report.Working := C.Size;
 
   RedTex.Assign(MainTexture);
@@ -532 +532 @@
   RedTex.ColorTextShade := $0000FF;
 
-  BitBltCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+  BitBltCanvas(Offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
 
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
@@ -544 +544 @@
     Brush.style := bsClear;
     Font.Color := $000000;
-    s := IntToStr(c.Size);
-    TextOut(8 + 14 - TextWidth(s) div 2, 7, s);
+    S := IntToStr(C.Size);
+    TextOut(8 + 14 - TextWidth(S) div 2, 7, S);
   end;
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
@@ -553 +553 @@
     MakeRed(Offscreen, 18, 280, 298, 40);
     if cGov = gAnarchy then
-      s := Phrases.Lookup('GOVERNMENT', gAnarchy)
+      S := Phrases.Lookup('GOVERNMENT', gAnarchy)
     else { if c.Flags and chCaptured<>0 then }
-      s := Phrases.Lookup('CITYEVENTS', 14);
-    RisedTextOut(offscreen.Canvas, 167 - BiColorTextWidth(offscreen.Canvas, s)
-      div 2, ymOpt - 9, s);
+      S := Phrases.Lookup('CITYEVENTS', 14);
+    RisedTextOut(Offscreen.Canvas, 167 - BiColorTextWidth(Offscreen.Canvas, S)
+      div 2, ymOpt - 9, S);
   end
   else if AllowChange then
   begin
-    OptiType := c.Status shr 4 and $0F;
-    Sprite(offscreen, HGrSystem2, xmOpt - 32, ymOpt - 32, 64, 64,
+    OptiType := C.Status shr 4 and $0F;
+    Sprite(Offscreen, HGrSystem2, xmOpt - 32, ymOpt - 32, 64, 64,
       1 + OptiType mod 3 * 64, 217 + OptiType div 3 * 64);
 
     { display messages now }
     MessageCount := 0;
-    for i := 0 to 31 do
-      if Happened and ($FFFFFFFF - chCaptured) and (1 shl i) <> 0 then
-        inc(MessageCount);
+    for I := 0 to 31 do
+      if Happened and ($FFFFFFFF - chCaptured) and (1 shl I) <> 0 then
+        Inc(MessageCount);
     if MessageCount > 3 then
       MessageCount := 3;
     if MessageCount > 0 then
     begin
-      MakeBlue(offscreen, 74, 280, 242, 40);
-      line := 0;
-      for i := 0 to nCityEventPriority - 1 do
-        if line < MessageCount then
-          CheckMessage(CityEventPriority[i]);
+      MakeBlue(Offscreen, 74, 280, 242, 40);
+      Line := 0;
+      for I := 0 to nCityEventPriority - 1 do
+        if Line < MessageCount then
+          CheckMessage(CityEventPriority[I]);
     end
     else
     begin
-      s := Phrases.Lookup('CITYMANAGETYPE', OptiType);
-      j := pos('\', s);
-      if j = 0 then
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
-          ymOpt - 9, s)
+      S := Phrases.Lookup('CITYMANAGETYPE', OptiType);
+      J := Pos('\', S);
+      if J = 0 then
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 9, S)
       else
       begin
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
-          ymOpt - 17, copy(s, 1, j - 1));
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
-          copy(s, j + 1, 255));
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 17, Copy(S, 1, J - 1));
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
+          Copy(S, J + 1, 255));
       end;
     end;
@@ -602 +602 @@
     AreaMap.Paint(xmArea - xxt * 2 * rx, ymArea - yyt * 2 * ry - 3 * yyt,
       dLoc(cLoc, -2 * rx + 1, -2 * ry - 1), 4 * rx - 1, 4 * ry + 1, cLoc, cOwner,
-      false, AllowChange and IsCityAlive and
-      (c.Status and csResourceWeightsMask = 0));
-    BitBltCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+      False, AllowChange and IsCityAlive and
+      (C.Status and csResourceWeightsMask = 0));
+    BitBltCanvas(Offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
       xmArea + 102, 42);
 
@@ -616 +616 @@
               ((Loc1 < 0) or (Loc1 >= G.lx * G.ly) or (MyMap[Loc1] and fCity = 0))
             then
-              Sprite(offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
+              Sprite(Offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
                 ymArea - yyt + yyt * dy, xxt * 2, yyt * 2, 1 + 5 * (xxt * 2 + 1),
                 1 + yyt + 15 * (yyt * 3 + 1));
-            if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and c.Tiles <> 0) then
+            if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and C.Tiles <> 0) then
               PaintResources(xmArea - xxt + xxt * dx, ymArea - yyt + yyt * dy,
                 Loc1, (dx = 0) and (dy = 0));
@@ -626 +626 @@
 
   if Report.Working > 1 then
-    d := (xService - (xmArea - 192) - 8 - 32) div (Report.Working - 1);
-  if d > 28 then
-    d := 28;
-  for i := Report.Working - 1 downto 0 do
+    D := (xService - (xmArea - 192) - 8 - 32) div (Report.Working - 1);
+  if D > 28 then
+    D := 28;
+  for I := Report.Working - 1 downto 0 do
   begin
     if IsCityAlive then
@@ -635 +635 @@
     else
       xGr := 141;
-    BitBltCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+    BitBltCanvas(Offscreen.Canvas, xmArea - 192 + 5 + I * D, ymArea - 96 - 29,
       27, 30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
-    Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
+    Sprite(Offscreen, HGrSystem, xmArea - 192 + 4 + I * D, ymArea - 96 - 30, 27,
       30, xGr, 171);
   end;
-  if c.Size - Report.Working > 1 then
-    d := (xmArea + 192 - xService - 32) div (c.Size - Report.Working - 1);
-  if d > 28 then
-    d := 28;
-  for i := 0 to c.Size - Report.Working - 1 do
+  if C.Size - Report.Working > 1 then
+    D := (xmArea + 192 - xService - 32) div (C.Size - Report.Working - 1);
+  if D > 28 then
+    D := 28;
+  for I := 0 to C.Size - Report.Working - 1 do
   begin
     xGr := 1 + 112;
-    BitBltCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+    BitBltCanvas(Offscreen.Canvas, xmArea + 192 - 27 + 1 - I * D, 29 + 1, 27,
       30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 - I * D, 29, 27, 30,
       xGr, 171);
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 4 - i * d, 29 + 32, 10,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 + 4 - I * D, 29 + 32, 10,
       10, 121, 126);
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 13 - i * d, 29 + 32, 10,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 + 13 - I * D, 29 + 32, 10,
       10, 121, 126);
     // Sprite(offscreen,HGrSystem,xmArea+192-31+18-i*d,ymArea-96-80+32,10,10,88,115);
   end;
 
-  if c.Project and cpImp = 0 then
-    PrName := Tribe[cOwner].ModelName[c.Project and cpIndex]
+  if C.Project and cpImp = 0 then
+    PrName := Tribe[cOwner].ModelName[C.Project and cpIndex]
   else
-    PrName := Phrases.Lookup('IMPROVEMENTS', c.Project and cpIndex);
+    PrName := Phrases.Lookup('IMPROVEMENTS', C.Project and cpIndex);
   PrCost := Report.ProjectCost;
 
@@ -668 +668 @@
   begin
     if cGov = gFundamentalism then
-      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp, yHapp + dyBar, wBar, 17,
         Phrases.Lookup('FAITH'), Report.CollectedControl, MainTexture)
     else
     begin
-      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp, yHapp + dyBar, wBar, 17,
         Phrases.Lookup('HAPPINESS'), Report.Morale, MainTexture);
-      CountBar(offscreen, xHapp, yHapp + 2 * dyBar, wBar, 16,
+      CountBar(Offscreen, xHapp, yHapp + 2 * dyBar, wBar, 16,
         Phrases.Lookup('CONTROL'), Report.CollectedControl, MainTexture);
     end;
-    CountBar(offscreen, xHapp, yHapp, wBar, 8, Phrases.Lookup('LUX'),
+    CountBar(Offscreen, xHapp, yHapp, wBar, 8, Phrases.Lookup('LUX'),
       Report.Luxury, MainTexture);
-    CountBar(offscreen, xHapp + dxBar, yHapp, wBar, 19,
+    CountBar(Offscreen, xHapp + dxBar, yHapp, wBar, 19,
       Phrases.Lookup('UNREST'), 2 * Report.Deployed, MainTexture);
-    CountBar(offscreen, xHapp + dxBar, yHapp + dyBar, wBar, 17,
-      Phrases.Lookup('HAPPINESSDEMAND'), c.Size, MainTexture);
+    CountBar(Offscreen, xHapp + dxBar, yHapp + dyBar, wBar, 17,
+      Phrases.Lookup('HAPPINESSDEMAND'), C.Size, MainTexture);
     if Report.HappinessBalance >= 0 then
-      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 17,
         Phrases.Lookup('HAPPINESSPLUS'), Report.HappinessBalance, MainTexture)
     else
     begin
       MakeRed(Offscreen, xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
-      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
+      CountBar(Offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
         Phrases.Lookup('LACK'), -Report.HappinessBalance, RedTex);
     end;
@@ -697 +697 @@
   if IsCityAlive then
   begin
-    CountBar(offscreen, xFood, yFood + dyBar div 2, wBar, 0,
+    CountBar(Offscreen, xFood, yFood + dyBar div 2, wBar, 0,
       Phrases.Lookup('FOOD'), Report.CollectedFood, MainTexture);
-    CountBar(offscreen, xFood + dxBar, yFood + dyBar, wBar, 0,
-      Phrases.Lookup('DEMAND'), 2 * c.Size, MainTexture);
-    CountBar(offscreen, xFood + dxBar, yFood, wBar, 0,
+    CountBar(Offscreen, xFood + dxBar, yFood + dyBar, wBar, 0,
+      Phrases.Lookup('DEMAND'), 2 * C.Size, MainTexture);
+    CountBar(Offscreen, xFood + dxBar, yFood, wBar, 0,
       Phrases.Lookup('SUPPORT'), Report.FoodSupport, MainTexture);
     if Report.FoodSurplus >= 0 then
-      if (cGov = gFuture) or (c.Size >= NeedAqueductSize) and
+      if (cGov = gFuture) or (C.Size >= NeedAqueductSize) and
         (Report.FoodSurplus < 2) then
-        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 6,
+        CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 6,
           Phrases.Lookup('PROFIT'), Report.FoodSurplus, MainTexture)
       else
-        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 0,
+        CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 0,
           Phrases.Lookup('SURPLUS'), Report.FoodSurplus, MainTexture)
     else
     begin
       MakeRed(Offscreen, xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
-      CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
+      CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
         Phrases.Lookup('LACK'), -Report.FoodSurplus, RedTex);
     end;
   end;
-  CanGrow := (c.Size < MaxCitySize) and (cGov <> gFuture) and
-    (Report.FoodSurplus > 0) and ((c.Size < NeedAqueductSize) or
-    (c.Built[imAqueduct] = 1) and (c.Size < NeedSewerSize) or
-    (c.Built[imSewer] = 1));
+  CanGrow := (C.Size < MaxCitySize) and (cGov <> gFuture) and
+    (Report.FoodSurplus > 0) and ((C.Size < NeedAqueductSize) or
+    (C.Built[imAqueduct] = 1) and (C.Size < NeedSewerSize) or
+    (C.Built[imSewer] = 1));
   FillBar(xFood + 3, yFood + 102, TrueFood,
-    CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, c.Size),
+    CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, C.Size),
     Report.Storage, 1, CanGrow);
-  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
+  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
     yFood + 102 - 20, Format('%d/%d', [TrueFood, Report.Storage]));
-  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
+  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
     Phrases.Lookup('STORAGE'));
 
@@ -733 +733 @@
   if IsCityAlive then
   begin
-    CountBar(offscreen, xProd, yProd, wBar, 2, Phrases.Lookup('MATERIAL'),
+    CountBar(Offscreen, xProd, yProd, wBar, 2, Phrases.Lookup('MATERIAL'),
       Report.CollectedMaterial, MainTexture);
-    CountBar(offscreen, xProd + dxBar, yProd, wBar, 2,
+    CountBar(Offscreen, xProd + dxBar, yProd, wBar, 2,
       Phrases.Lookup('SUPPORT'), Report.MaterialSupport, MainTexture);
     if Report.Production >= 0 then
-      if c.Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 6,
+      if C.Project and (cpImp + cpIndex) = cpImp + imTrGoods then
+        CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 6,
           Phrases.Lookup('PROFIT'), Report.Production, MainTexture)
       else
-        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 2,
+        CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 2,
           Phrases.Lookup('PROD'), Report.Production, MainTexture)
     else
     begin
       MakeRed(Offscreen, xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
-      CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
+      CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
         Phrases.Lookup('LACK'), -Report.Production, RedTex);
     end;
   end;
-  if c.Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
-    with offscreen.Canvas do
-    begin
-      i := Report.Production;
-      if (i < 0) or not IsCityAlive then
-        i := 0;
-      FillBar(xProd + 3, yProd + 16 + 63, TrueProd, i, PrCost, 4, true);
-      LoweredTextout(offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
+  if C.Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
+    with Offscreen.Canvas do
+    begin
+      I := Report.Production;
+      if (I < 0) or not IsCityAlive then
+        I := 0;
+      FillBar(xProd + 3, yProd + 16 + 63, TrueProd, I, PrCost, 4, True);
+      LoweredTextout(Offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
         yProd + 16 + 43, Format('%d/%d', [TrueProd, PrCost]));
-      if BiColorTextWidth(offscreen.Canvas, PrName) > wBar + dxBar then
+      if BiColorTextWidth(Offscreen.Canvas, PrName) > wBar + dxBar then
       begin
         repeat
-          Delete(PrName, length(PrName), 1)
-        until BiColorTextWidth(offscreen.Canvas, PrName) <= wBar + dxBar;
+          Delete(PrName, Length(PrName), 1)
+        until BiColorTextWidth(Offscreen.Canvas, PrName) <= wBar + dxBar;
         PrName := PrName + '.'
       end;
     end;
-  RisedTextOut(offscreen.Canvas, xProd - 2, yProd + 36, PrName);
+  RisedTextOut(Offscreen.Canvas, xProd - 2, yProd + 36, PrName);
 
   // pollution section
@@ -774 +774 @@
   begin
     FillBar(xPoll + 3, yPoll + 20, TruePoll, Report.AddPollution,
-      MaxPollution, 3, true);
-    RisedTextOut(offscreen.Canvas, xPoll + 3 - 5, yPoll + 20 - 20,
+      MaxPollution, 3, True);
+    RisedTextOut(Offscreen.Canvas, xPoll + 3 - 5, yPoll + 20 - 20,
       Phrases.Lookup('POLL'));
   end;
@@ -782 +782 @@
   if IsCityAlive and (Report.CollectedTrade > 0) then
   begin
-    CountBar(offscreen, xTrade, yTrade + dyBar div 2, wBar, 4,
+    CountBar(Offscreen, xTrade, yTrade + dyBar div 2, wBar, 4,
       Phrases.Lookup('TRADE'), Report.CollectedTrade, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade + 2 * dyBar, wBar, 5,
+    CountBar(Offscreen, xTrade + dxBar, yTrade + 2 * dyBar, wBar, 5,
       Phrases.Lookup('CORR'), Report.Corruption, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade, wBar, 6, Phrases.Lookup('TAX'),
+    CountBar(Offscreen, xTrade + dxBar, yTrade, wBar, 6, Phrases.Lookup('TAX'),
       Report.Tax, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade + dyBar, wBar, 12,
+    CountBar(Offscreen, xTrade + dxBar, yTrade + dyBar, wBar, 12,
       Phrases.Lookup('SCIENCE'), Report.Science, MainTexture);
   end;
 
   // small map
-  BitBltCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+  BitBltCanvas(Offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
     SmallCityMap.Canvas, 0, 0);
   if SmallMapMode = smImprovements then
-    Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
+    Frame(Offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
       ySmallMap + 24 * (ZoomArea mod 3), xSmallMap + 48 * (ZoomArea div 3) + 49,
       ySmallMap + 24 * (ZoomArea mod 3) + 25, MainTexture.ColorMark,
       MainTexture.ColorMark);
-  Frame(offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
+  Frame(Offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
     ySmallMap + hSmallMap, $B0B0B0, $FFFFFF);
-  RFrame(offscreen.Canvas, xSmallMap - 2, ySmallMap - 2, xSmallMap + wSmallMap +
+  RFrame(Offscreen.Canvas, xSmallMap - 2, ySmallMap - 2, xSmallMap + wSmallMap +
     1, ySmallMap + hSmallMap + 1, $FFFFFF, $B0B0B0);
 
-  Frame(offscreen.Canvas, xSupport - 1, ySupport - 1, xSupport + wSupport,
+  Frame(Offscreen.Canvas, xSupport - 1, ySupport - 1, xSupport + wSupport,
     ySupport + hSupport, $B0B0B0, $FFFFFF);
-  RFrame(offscreen.Canvas, xSupport - 2, ySupport - 2, xSupport + wSupport + 1,
+  RFrame(Offscreen.Canvas, xSupport - 2, ySupport - 2, xSupport + wSupport + 1,
     ySupport + hSupport + 1, $FFFFFF, $B0B0B0);
-  x := xSupport + wSupport div 2;
-  y := ySupport + hSupport div 2;
+  X := xSupport + wSupport div 2;
+  Y := ySupport + hSupport div 2;
   if SmallMapMode = smSupportedUnits then
   begin
-    offscreen.Canvas.brush.Color := MainTexture.ColorMark;
-    offscreen.Canvas.FillRect(Rect(x - 27, y - 6, x + 27, y + 6));
-    offscreen.Canvas.brush.style := bsClear;
-  end;
-  Sprite(offscreen, HGrSystem, x - 16, y - 5, 10, 10, 88, 115);
-  Sprite(offscreen, HGrSystem, x - 5, y - 5, 10, 10, 66, 115);
-  Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
-
-  BitBltCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+    Offscreen.Canvas.Brush.Color := MainTexture.ColorMark;
+    Offscreen.Canvas.FillRect(Rect(X - 27, Y - 6, X + 27, Y + 6));
+    Offscreen.Canvas.Brush.style := bsClear;
+  end;
+  Sprite(Offscreen, HGrSystem, X - 16, Y - 5, 10, 10, 88, 115);
+  Sprite(Offscreen, HGrSystem, X - 5, Y - 5, 10, 10, 66, 115);
+  Sprite(Offscreen, HGrSystem, X + 6, Y - 5, 10, 10, 154, 126);
+
+  BitBltCanvas(Offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
     ZoomCityMap.Canvas, 0, 0);
 
-  for i := 0 to 5 do
-    imix[i] := -1;
+  for I := 0 to 5 do
+    imix[I] := -1;
   if SmallMapMode = smImprovements then
   begin
@@ -832 +832 @@
       Cnt := 0;
       for iix := 0 to nImp - 1 do
-        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
+        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (C.Built[iix] > 0) then
         begin
-          i := Cnt - Page * 6;
-          if (i >= 0) and (i < 6) then
-            imix[i] := iix;
-          inc(Cnt);
+          I := Cnt - Page * 6;
+          if (I >= 0) and (I < 6) then
+            imix[I] := iix;
+          Inc(Cnt);
         end;
       PageCount := (Cnt + 5) div 6;
@@ -845 +845 @@
       for iix := nWonder to nImp - 1 do
       begin
-        i := ImpPosition[iix] - 6 * ZoomArea;
-        if (i >= 0) and (i < 6) and (c.Built[iix] > 0) then
-          imix[i] := iix;
+        I := ImpPosition[iix] - 6 * ZoomArea;
+        if (I >= 0) and (I < 6) and (C.Built[iix] > 0) then
+          imix[I] := iix;
       end;
       PageCount := 0;
     end;
-    for i := 0 to 5 do
-      if imix[i] >= 0 then
+    for I := 0 to 5 do
+      if imix[I] >= 0 then
       begin
-        iix := imix[i];
-        x := xZoomMap + 14 + 72 * (i mod 3);
-        y := yZoomMap + 14 + 56 * (i div 3);
-        ImpImage(offscreen.Canvas, x, y, iix, cGov, AllowChange and
+        iix := imix[I];
+        X := xZoomMap + 14 + 72 * (I mod 3);
+        Y := yZoomMap + 14 + 56 * (I div 3);
+        ImpImage(Offscreen.Canvas, X, Y, iix, cGov, AllowChange and
           (ClientMode < scContact));
         if IsCityAlive then
@@ -863 +863 @@
           if iix = imColosseum then
           begin
-            Sprite(offscreen, HGrSystem, x + 46, y, 14, 14, 82, 100);
+            Sprite(Offscreen, HGrSystem, X + 46, Y, 14, 14, 82, 100);
           end
           else
@@ -881 +881 @@
             if HappyGain > 1 then
             begin
-              d := 30 div (HappyGain - 1);
-              if d > 10 then
-                d := 10
+              D := 30 div (HappyGain - 1);
+              if D > 10 then
+                D := 10
             end;
-            for j := 0 to HappyGain - 1 do
-              Sprite(offscreen, HGrSystem, x + 50, y + d * j, 10, 10, 132, 126);
+            for J := 0 to HappyGain - 1 do
+              Sprite(Offscreen, HGrSystem, X + 50, Y + D * J, 10, 10, 132, 126);
           end;
-          for j := 0 to Imp[iix].Maint - 1 do
-            Sprite(offscreen, HGrSystem, x - 4, y + 29 - 3 * j, 10, 10,
+          for J := 0 to Imp[iix].Maint - 1 do
+            Sprite(Offscreen, HGrSystem, X - 4, Y + 29 - 3 * J, 10, 10,
               132, 115);
         end
@@ -920 +920 @@
   else { if SmallMapMode = smSupportedUnits then }
   begin
-    LoweredTextout(offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
+    LoweredTextout(Offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
       yZoomMap + 2, Phrases.Lookup('SUPUNITS'));
-    FreeSupp := c.Size * SupportFree[cGov] shr 1;
+    FreeSupp := C.Size * SupportFree[cGov] shr 1;
     Cnt := 0;
-    for i := 0 to MyRO.nUn - 1 do
-      if (MyUn[i].Loc >= 0) and (MyUn[i].Home = cix) then
-        with MyModel[MyUn[i].mix] do
+    for I := 0 to MyRO.nUn - 1 do
+      if (MyUn[I].Loc >= 0) and (MyUn[I].Home = cix) then
+        with MyModel[MyUn[I].mix] do
         begin
-          Server(sGetUnitReport, me, i, UnitReport);
+          Server(sGetUnitReport, Me, I, UnitReport);
           if (Cnt >= 6 * Page) and (Cnt < 6 * (Page + 1)) then
           begin // unit visible in display
-            imix[Cnt - 6 * Page] := i;
-            x := ((Cnt - 6 * Page) mod 3) * 64 + xZoomMap;
-            y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
-            MakeUnitInfo(me, MyUn[i], UnitInfo);
-            NoMap.SetOutput(offscreen);
-            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
-
-            for j := 0 to UnitReport.FoodSupport - 1 do
-              Sprite(offscreen, HGrSystem, x + 38 + 11 * j, y + 40, 10,
+            imix[Cnt - 6 * Page] := I;
+            X := ((Cnt - 6 * Page) mod 3) * 64 + xZoomMap;
+            Y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
+            MakeUnitInfo(Me, MyUn[I], UnitInfo);
+            NoMap.SetOutput(Offscreen);
+            NoMap.PaintUnit(X, Y, UnitInfo, MyUn[I].Status);
+
+            for J := 0 to UnitReport.FoodSupport - 1 do
+              Sprite(Offscreen, HGrSystem, X + 38 + 11 * J, Y + 40, 10,
                 10, 66, 115);
-            for j := 0 to UnitReport.ProdSupport - 1 do
+            for J := 0 to UnitReport.ProdSupport - 1 do
             begin
               if (FreeSupp > 0) and
                 (UnitReport.ReportFlags and urfAlwaysSupport = 0) then
               begin
-                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                Sprite(Offscreen, HGrSystem, X + 16 - 11 * J, Y + 40, 10,
                   10, 143, 115);
-                dec(FreeSupp);
+                Dec(FreeSupp);
               end
               else
-                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                Sprite(Offscreen, HGrSystem, X + 16 - 11 * J, Y + 40, 10,
                   10, 88, 115);
             end;
             if UnitReport.ReportFlags and urfDeployed <> 0 then
-              for j := 0 to 1 do
-                Sprite(offscreen, HGrSystem, x + 27 + 11 * j, y + 40, 10,
+              for J := 0 to 1 do
+                Sprite(Offscreen, HGrSystem, X + 27 + 11 * J, Y + 40, 10,
                   10, 154, 126)
           end // unit visible in display
@@ -977 +977 @@
   begin
     { display project now }
-    DLine(offscreen.Canvas, xView + 9 + xSizeBig, xProd + 2 * wBar + 10,
+    DLine(Offscreen.Canvas, xView + 9 + xSizeBig, xProd + 2 * wBar + 10,
       yProd + dyBar + 16, $FFFFFF, $B0B0B0);
     if ProdHint then
     begin
-      ScreenTools.Frame(offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
+      ScreenTools.Frame(Offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
         xView + 9 + xSizeBig, yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
-      RFrame(offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
+      RFrame(Offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
         xView + 9 + xSizeBig + 1, yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
-      with offscreen.Canvas do
+      with Offscreen.Canvas do
       begin
-        brush.Color := $000000;
+        Brush.Color := $000000;
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        brush.style := bsClear;
+        Brush.style := bsClear;
       end;
     end
-    else if AllowChange and (c.Status and 7 <> 0) then
+    else if AllowChange and (C.Status and 7 <> 0) then
     begin // city type autobuild
-      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
-        ySizeBig, (c.Status and 7 - 1 + 3) * xSizeBig, 0, (cix >= 0) and
+      FrameImage(Offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+        ySizeBig, (C.Status and 7 - 1 + 3) * xSizeBig, 0, (cix >= 0) and
         (ClientMode < scContact));
     end
-    else if c.Project and cpImp = 0 then
+    else if C.Project and cpImp = 0 then
     begin // project is unit
-      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+      FrameImage(Offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
         ySizeBig, 0, 0, AllowChange and (ClientMode < scContact));
-      with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
-        Sprite(offscreen, HGr, xView + 5, yView + 1, 64, 44,
+      with Tribe[cOwner].ModelPicture[C.Project and cpIndex] do
+        Sprite(Offscreen, HGr, xView + 5, yView + 1, 64, 44,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
     end
@@ -1010 +1010 @@
     begin // project is building
       if ProdHint then
-        Paintiix := c.Project0 and cpIndex
+        Paintiix := C.Project0 and cpIndex
       else
-        Paintiix := c.Project and cpIndex;
-      ImpImage(offscreen.Canvas, xView + 9, yView + 5, Paintiix, cGov,
+        Paintiix := C.Project and cpIndex;
+      ImpImage(Offscreen.Canvas, xView + 9, yView + 5, Paintiix, cGov,
         AllowChange and (ClientMode < scContact));
     end;
@@ -1020 +1020 @@
   if AllowChange and (ClientMode < scContact) then
   begin
-    i := Server(sBuyCityProject - sExecute, me, cix, nil^);
-    BuyBtn.Visible := (i = eOk) or (i = eViolation);
+    I := Server(sBuyCityProject - sExecute, Me, cix, nil^);
+    BuyBtn.Visible := (I = eOk) or (I = eViolation);
   end
   else
-    BuyBtn.Visible := false;
+    BuyBtn.Visible := False;
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
@@ -1031 +1031 @@
 procedure TCityDlg.FormShow(Sender: TObject);
 var
-  dx, dy, Loc1: integer;
+  dx, dy, Loc1: Integer;
   GetCityData: TGetCityData;
 begin
@@ -1037 +1037 @@
   if cix >= 0 then
   begin { own city }
-    c := MyCity[cix];
-    cOwner := me;
+    C := MyCity[cix];
+    cOwner := Me;
     cGov := MyRO.Government;
     ProdHint := (cGov <> gAnarchy) and
       (Happened and (chProduction or chFounded or chCaptured or
       chAllImpsMade) <> 0);
-    Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+    Server(sGetCityAreaInfo, Me, cix, CityAreaInfo);
     NextCityBtn.Visible := WindowMode = wmPersistent;
     PrevCityBtn.Visible := WindowMode = wmPersistent;
@@ -1050 +1050 @@
   begin
     SmallMapMode := smImprovements;
-    Server(sGetCity, me, cLoc, GetCityData);
-    c := GetCityData.c;
+    Server(sGetCity, Me, cLoc, GetCityData);
+    C := GetCityData.C;
     cOwner := GetCityData.Owner;
     cGov := MyRO.EnemyReport[cOwner].Government;
-    Happened := c.Flags and $7FFFFFFF;
-    ProdHint := false;
-    Server(sGetEnemyCityAreaInfo, me, cLoc, CityAreaInfo);
-
-    if c.Project and cpImp = 0 then
+    Happened := C.Flags and $7FFFFFFF;
+    ProdHint := False;
+    Server(sGetEnemyCityAreaInfo, Me, cLoc, CityAreaInfo);
+
+    if C.Project and cpImp = 0 then
     begin
       emix := MyRO.nEnemyModel - 1;
       while (emix > 0) and ((MyRO.EnemyModel[emix].Owner <> cOwner) or
-        (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do
-        dec(emix);
-      if not Assigned(Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr) then
+        (Integer(MyRO.EnemyModel[emix].mix) <> C.Project and cpIndex)) do
+        Dec(emix);
+      if not Assigned(Tribe[cOwner].ModelPicture[C.Project and cpIndex].HGr) then
         InitEnemyModel(emix);
     end;
@@ -1073 +1073 @@
   Page := 0;
 
-  if c.Size < 5 then
+  if C.Size < 5 then
     SizeClass := 0
-  else if c.Size < 9 then
+  else if C.Size < 9 then
     SizeClass := 1
-  else if c.Size < 13 then
+  else if C.Size < 13 then
     SizeClass := 2
   else
@@ -1100 +1100 @@
   end;
 
-  Caption := CityName(c.ID);
+  Caption := CityName(C.ID);
 
   InitSmallCityMap;
@@ -1109 +1109 @@
 end;
 
-procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
+procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
 begin
   if MyMap[Loc] and fOwned <> 0 then
@@ -1115 +1115 @@
     cix := MyRO.nCity - 1;
     while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-      dec(cix);
-    assert(cix >= 0);
+      Dec(cix);
+    Assert(cix >= 0);
     if (Optimize_cixTileChange >= 0) and
       (Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange].Tiles
@@ -1132 +1132 @@
   else
     cix := -1;
-  AllowChange := not supervising and (cix >= 0);
+  AllowChange := not Supervising and (cix >= 0);
   cLoc := Loc;
   Happened := ShowEvent;
@@ -1139 +1139 @@
 
 procedure TCityDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, qx, qy, dx, dy, fix, NewTiles, Loc1, iix, SellResult: integer;
-  Rebuild: boolean;
-begin
-  if (ssLeft in Shift) and (x >= xSmallMap) and (x < xSmallMap + wSmallMap) and
-    (y >= ySmallMap) and (y < ySmallMap + hSmallMap) then
+  I, qx, qy, dx, dy, fix, NewTiles, Loc1, iix, SellResult: Integer;
+  Rebuild: Boolean;
+begin
+  if (ssLeft in Shift) and (X >= xSmallMap) and (X < xSmallMap + wSmallMap) and
+    (Y >= ySmallMap) and (Y < ySmallMap + hSmallMap) then
   begin
     SmallMapMode := smImprovements;
-    ZoomArea := (y - ySmallMap) * 3 div hSmallMap + 3 *
-      ((x - xSmallMap) * 2 div wSmallMap);
+    ZoomArea := (Y - ySmallMap) * 3 div hSmallMap + 3 *
+      ((X - xSmallMap) * 2 div wSmallMap);
     Page := 0;
     InitZoomCityMap;
@@ -1155 +1155 @@
     Exit;
   end;
-  if (ssLeft in Shift) and (x >= xSupport) and (x < xSupport + wSupport) and
-    (y >= ySupport) and (y < ySupport + hSupport) then
+  if (ssLeft in Shift) and (X >= xSupport) and (X < xSupport + wSupport) and
+    (Y >= ySupport) and (Y < ySupport + hSupport) then
   begin
     SmallMapMode := smSupportedUnits;
@@ -1168 +1168 @@
 
   if (ssLeft in Shift) then
-    if (ClientMode < scContact) and (x >= xView) and (y >= yView) and
-      (x < xView + 73) and (y < yView + 50) then
+    if (ClientMode < scContact) and (X >= xView) and (Y >= yView) and
+      (X < xView + 73) and (Y < yView + 50) then
       if cGov = gAnarchy then
         with MessgExDlg do
         begin
           { MessgText:=Phrases.Lookup('OUTOFCONTROL');
-            if c.Project and cpImp=0 then
-            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[c.Project and cpIndex]])
-            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',c.Project and cpIndex)]); }
+            if C.Project and cpImp=0 then
+            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[C.Project and cpIndex]])
+            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',C.Project and cpIndex)]); }
           MessgText := Phrases.Lookup('NOCHANGEINANARCHY');
           Kind := mkOk;
@@ -1185 +1185 @@
         if ProdHint then
         begin
-          ProdHint := false;
+          ProdHint := False;
           SmartUpdateContent
         end;
         ChooseProject;
       end
-    else if (SmallMapMode = smImprovements) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
-      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
-    begin
-      i := 5;
-      while (i >= 0) and not((x >= xZoomMap + 14 + 72 * (i mod 3)) and
-        (x < xZoomMap + 14 + 56 + 72 * (i mod 3)) and
-        (y >= yZoomMap + 14 + 56 * (i div 3)) and
-        (y < yZoomMap + 14 + 40 + 56 * (i div 3))) do
-        dec(i);
-      if i >= 0 then
+    else if (SmallMapMode = smImprovements) and (X >= xZoomMap) and (X < xZoomMap + wZoomMap) and
+      (Y >= yZoomMap) and (Y < yZoomMap + hZoomMap) then
+    begin
+      I := 5;
+      while (I >= 0) and not((X >= xZoomMap + 14 + 72 * (I mod 3)) and
+        (X < xZoomMap + 14 + 56 + 72 * (I mod 3)) and
+        (Y >= yZoomMap + 14 + 56 * (I div 3)) and
+        (Y < yZoomMap + 14 + 40 + 56 * (I div 3))) do
+        Dec(I);
+      if I >= 0 then
       begin
-        iix := imix[i];
+        iix := imix[I];
         if iix >= 0 then
           if ssShift in Shift then
@@ -1221 +1221 @@
               else
               begin
-                SellResult := Server(sSellCityImprovement - sExecute, me,
+                SellResult := Server(sSellCityImprovement - sExecute, Me,
                   cix, iix);
                 if SellResult < rExecuted then
@@ -1236 +1236 @@
                 else
                 begin
-                  if Server(sRebuildCityImprovement - sExecute, me, cix, iix) < rExecuted
+                  if Server(sRebuildCityImprovement - sExecute, Me, cix, iix) < rExecuted
                   then
                   begin // no rebuild possible, ask for sell only
-                    Rebuild := false;
+                    Rebuild := False;
                     MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
                     if not Phrases2FallenBackToEnglish then
                       MessgText := Format(Phrases2.Lookup('SELL2'),
                         [MessgText, Imp[iix].Cost * BuildCostMod
-                        [G.Difficulty[me]] div 12])
+                        [G.Difficulty[Me]] div 12])
                     else
                       MessgText := Format(Phrases.Lookup('SELL'), [MessgText]);
                     if iix = imSpacePort then
-                      with MyRO.Ship[me] do
+                      with MyRO.Ship[Me] do
                         if Parts[0] + Parts[1] + Parts[2] > 0 then
                           MessgText := MessgText + ' ' +
@@ -1259 +1259 @@
                   else
                   begin
-                    Rebuild := true;
+                    Rebuild := True;
                     MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
                     if not Phrases2FallenBackToEnglish then
                       MessgText := Format(Phrases2.Lookup('DISPOSE2'),
                         [MessgText, Imp[iix].Cost * BuildCostMod
-                        [G.Difficulty[me]] div 12 * 2 div 3])
+                        [G.Difficulty[Me]] div 12 * 2 div 3])
                     else
                       MessgText := Format(Phrases.Lookup('DISPOSE'),
                         [MessgText]);
                     if iix = imSpacePort then
-                      with MyRO.Ship[me] do
+                      with MyRO.Ship[Me] do
                         if Parts[0] + Parts[1] + Parts[2] > 0 then
                           MessgText := MessgText + ' ' +
@@ -1283 +1283 @@
                     begin
                       Play('CITY_REBUILDIMP');
-                      Server(sRebuildCityImprovement, me, cix, iix);
+                      Server(sRebuildCityImprovement, Me, cix, iix);
                     end
                     else
                     begin
                       Play('CITY_SELLIMP');
-                      Server(sSellCityImprovement, me, cix, iix);
+                      Server(sSellCityImprovement, Me, cix, iix);
                     end;
                     CityOptimizer_CityChange(cix);
@@ -1301 +1301 @@
       end;
     end
-    else if (SmallMapMode = smSupportedUnits) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
-      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
-    begin
-      i := 5;
-      while (i >= 0) and not((x >= xZoomMap + 64 * (i mod 3)) and
-        (x < xZoomMap + 64 + 64 * (i mod 3)) and
-        (y >= yZoomMap + 20 + 48 * (i div 3)) and
-        (y < yZoomMap + 20 + 52 + 48 * (i div 3))) do
-        dec(i);
-      if (i >= 0) and (imix[i] >= 0) then
+    else if (SmallMapMode = smSupportedUnits) and (X >= xZoomMap) and (X < xZoomMap + wZoomMap) and
+      (Y >= yZoomMap) and (Y < yZoomMap + hZoomMap) then
+    begin
+      I := 5;
+      while (I >= 0) and not((X >= xZoomMap + 64 * (I mod 3)) and
+        (X < xZoomMap + 64 + 64 * (I mod 3)) and
+        (Y >= yZoomMap + 20 + 48 * (I div 3)) and
+        (Y < yZoomMap + 20 + 52 + 48 * (I div 3))) do
+        Dec(I);
+      if (I >= 0) and (imix[I] >= 0) then
         if ssShift in Shift then
         else if (cix >= 0) and (ClientMode < scContact) and
@@ -1317 +1317 @@
           CloseAction := None;
           Close;
-          MainScreen.CityClosed(imix[i], false, true);
+          MainScreen.CityClosed(imix[I], False, True);
         end;
     end
-    else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
-      and (y < ymArea + 96) then
+    else if (X >= xmArea - 192) and (X < xmArea + 192) and (Y >= ymArea - 96)
+      and (Y < ymArea + 96) then
     with AreaMap do begin
-      qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)
+      qx := ((4000 * xxt * yyt) + (X - xmArea) * (yyt * 2) + (Y - ymArea + yyt)
         * (xxt * 2)) div (xxt * yyt * 4) - 1000;
-      qy := ((4000 * xxt * yyt) + (y - ymArea + yyt) * (xxt * 2) - (x - xmArea)
+      qy := ((4000 * xxt * yyt) + (Y - ymArea + yyt) * (xxt * 2) - (X - xmArea)
         * (yyt * 2)) div (xxt * yyt * 4) - 1000;
       dx := qx - qy;
@@ -1338 +1338 @@
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and
-          (c.Flags and chCaptured = 0) then
+          (C.Flags and chCaptured = 0) then
         begin // toggle exploitation
-          assert(not supervising);
-          if c.Status and csResourceWeightsMask <> 0 then
+          Assert(not Supervising);
+          if C.Status and csResourceWeightsMask <> 0 then
           begin
             with MessgExDlg do
@@ -1355 +1355 @@
               MyCity[cix].Status := MyCity[cix].Status and
                 not csResourceWeightsMask; // off
-              c.Status := MyCity[cix].Status;
+              C.Status := MyCity[cix].Status;
               SmartUpdateContent;
             end;
-            exit;
+            Exit;
           end;
           fix := (dy + 3) shl 2 + (dx + 3) shr 1;
           NewTiles := MyCity[cix].Tiles xor (1 shl fix);
-          if Server(sSetCityTiles, me, cix, NewTiles) >= rExecuted then
+          if Server(sSetCityTiles, Me, cix, NewTiles) >= rExecuted then
           begin
             SmartUpdateContent;
@@ -1371 +1371 @@
     end
     else if (ClientMode < scContact) and (cGov <> gAnarchy) and
-      (c.Flags and chCaptured = 0) and (x >= xmOpt - 32) and (x < xmOpt + 32)
-      and (y >= ymOpt - 32) and (y < ymOpt + 32) then
-    begin
-      i := sqr(x - xmOpt) + sqr(y - ymOpt); // click radius
-      if i <= 32 * 32 then
+      (C.Flags and chCaptured = 0) and (X >= xmOpt - 32) and (X < xmOpt + 32)
+      and (Y >= ymOpt - 32) and (Y < ymOpt + 32) then
+    begin
+      I := sqr(X - xmOpt) + sqr(Y - ymOpt); // click radius
+      if I <= 32 * 32 then
       begin
-        if i < 16 * 16 then // inner area clicked
-          if c.Status and csResourceWeightsMask <> 0 then
-            i := (c.Status shr 4 and $0F) mod 5 + 1 // rotate except off
+        if I < 16 * 16 then // inner area clicked
+          if C.Status and csResourceWeightsMask <> 0 then
+            I := (C.Status shr 4 and $0F) mod 5 + 1 // rotate except off
           else
-            i := 3 // rwGrowth
+            I := 3 // rwGrowth
         else
-          case trunc(arctan2(x - xmOpt, ymOpt - y) * 180 / pi) of
+          case trunc(arctan2(X - xmOpt, ymOpt - Y) * 180 / pi) of
             - 25 - 52 * 2 .. -26 - 52:
-              i := 1;
+              I := 1;
             -25 - 52 .. -26:
-              i := 2;
+              I := 2;
             -25 .. 25:
-              i := 3;
+              I := 3;
             26 .. 25 + 52:
-              i := 4;
+              I := 4;
             26 + 52 .. 25 + 52 * 2:
-              i := 5;
+              I := 5;
             180 - 26 .. 180, -180 .. -180 + 26:
-              i := 0;
+              I := 0;
           else
-            i := -1;
+            I := -1;
           end;
-        if i >= 0 then
+        if I >= 0 then
         begin
-          ChangeResourceWeights(i);
+          ChangeResourceWeights(I);
           SmartUpdateContent;
           if WindowMode <> wmModal then
@@ -1423 +1423 @@
   );
 
-  function ProjectType(Project: integer): TProjectType;
+  function ProjectType(Project: Integer): TProjectType;
   begin
     if Project and cpCompleted <> 0 then
@@ -1445 +1445 @@
 
 var
-  NewProject, OldMoney, cix1: integer;
+  NewProject, OldMoney, cix1: Integer;
   pt0, pt1: TProjectType;
-  QueryOk: boolean;
-begin
-  Assert(not supervising);
+  QueryOk: Boolean;
+begin
+  Assert(not Supervising);
   ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
-  if ModalSelectDlg.result <> -1 then
-  begin
-    if ModalSelectDlg.result and cpType <> 0 then
+  if ModalSelectDlg.Result <> -1 then
+  begin
+    if ModalSelectDlg.Result and cpType <> 0 then
     begin
       MyCity[cix].Status := MyCity[cix].Status and not 7 or
-        (1 + ModalSelectDlg.result and cpIndex);
-      AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.result and cpIndex]);
+        (1 + ModalSelectDlg.Result and cpIndex);
+      AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.Result and cpIndex]);
     end
     else
@@ -1522 +1522 @@
         then
           NewProject := NewProject or cpDisbandCity;
-      Server(sSetCityProject, me, cix, NewProject);
-      c.Project := MyCity[cix].Project;
+      Server(sSetCityProject, Me, cix, NewProject);
+      C.Project := MyCity[cix].Project;
       if MyRO.Money > OldMoney then
         Play('CITY_SELLIMP');
@@ -1538 +1538 @@
 procedure TCityDlg.BuyClick(Sender: TObject);
 var
-  NextProd, Cost: integer;
+  NextProd, Cost: Integer;
 begin
   if (cix < 0) or (ClientMode >= scContact) then
-    exit;
+    Exit;
   with MyCity[cix], MessgExDlg do
   begin
@@ -1549 +1549 @@
       NextProd := 0;
     Cost := Cost - Prod - NextProd;
-    if (MyRO.Wonder[woMich].EffectiveOwner = me) and (Project and cpImp <> 0)
+    if (MyRO.Wonder[woMich].EffectiveOwner = Me) and (Project and cpImp <> 0)
     then
       Cost := Cost * 2
@@ -1573 +1573 @@
     if (Kind = mkYesNo) and (ModalResult = mrOK) then
     begin
-      if Server(sBuyCityProject, me, cix, nil^) >= rExecuted then
+      if Server(sBuyCityProject, Me, cix, nil^) >= rExecuted then
       begin
         Play('CITY_BUYPROJECT');
@@ -1633 +1633 @@
     else if BlinkTime = 6 then
     begin
-      if AllowChange and (c.Status and 7 <> 0) then
+      if AllowChange and (C.Status and 7 <> 0) then
       begin // city type autobuild
         FrameImage(Canvas, bigimp, xView + 9, yView + 5, xSizeBig, ySizeBig,
-          (c.Status and 7 - 1 + 3) * xSizeBig, 0, true);
+          (C.Status and 7 - 1 + 3) * xSizeBig, 0, True);
       end
-      else if c.Project and cpImp = 0 then
+      else if C.Project and cpImp = 0 then
       begin // project is unit
         BitBltCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
           Bigimp.Canvas, 0, 0);
-        with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
+        with Tribe[cOwner].ModelPicture[C.Project and cpIndex] do
           Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
       end
       else
-        ImpImage(Canvas, xView + 9, yView + 5, c.Project0 and cpIndex,
-          cGov, true);
+        ImpImage(Canvas, xView + 9, yView + 5, C.Project0 and cpIndex,
+          cGov, True);
     end;
   end;
@@ -1664 +1664 @@
   if 1 shl OpenSoundEvent = chProduction then
   begin
-    if c.Project0 and cpImp <> 0 then
-    begin
-      if c.Project0 and cpIndex >= 28 then
+    if C.Project0 and cpImp <> 0 then
+    begin
+      if C.Project0 and cpIndex >= 28 then
       // wonders have already extra message with sound
-        if Imp[c.Project0 and cpIndex].Kind = ikShipPart then
+        if Imp[C.Project0 and cpIndex].Kind = ikShipPart then
           Play('SHIP_BUILT')
         else
@@ -1682 +1682 @@
 end;
 
-function Prio(iix: integer): integer;
+function Prio(iix: Integer): Integer;
 begin
   case Imp[iix].Kind of
     ikWonder:
-      result := iix + 10000;
+      Result := iix + 10000;
     ikNatLocal, ikNatGlobal:
       case iix of
         imPalace:
-          result := 0;
+          Result := 0;
       else
-        result := iix + 20000;
+        Result := iix + 20000;
       end;
   else
     case iix of
       imTownHall, imCourt:
-        result := iix + 30000;
+        Result := iix + 30000;
       imAqueduct, imSewer:
-        result := iix + 40000;
+        Result := iix + 40000;
       imTemple, imTheater, imCathedral:
-        result := iix + 50000;
-    else
-      result := iix + 90000;
+        Result := iix + 50000;
+    else
+      Result := iix + 90000;
     end;
   end;
@@ -1718 +1718 @@
 end;
 
-procedure TCityDlg.ChangeCity(d: integer);
+procedure TCityDlg.ChangeCity(D: Integer);
 var
-  cixNew: integer;
+  cixNew: Integer;
 begin
   cixNew := cix;
   repeat
-    cixNew := (cixNew + MyRO.nCity + d) mod MyRO.nCity;
+    cixNew := (cixNew + MyRO.nCity + D) mod MyRO.nCity;
   until (MyCity[cixNew].Loc >= 0) or (cixNew = cix);
   if cixNew <> cix then
@@ -1766 +1766 @@
 end;
 
-procedure TCityDlg.ChangeResourceWeights(iResourceWeights: integer);
+procedure TCityDlg.ChangeResourceWeights(iResourceWeights: Integer);
 var
   Advice: TCityTileAdviceData;
 begin
-  assert(not supervising);
-  assert(cix >= 0);
+  Assert(not Supervising);
+  Assert(cix >= 0);
   MyCity[cix].Status := MyCity[cix].Status and not csResourceWeightsMask or
     (iResourceWeights shl 4);
-  c.Status := MyCity[cix].Status;
+  C.Status := MyCity[cix].Status;
   if iResourceWeights > 0 then
   begin
     Advice.ResourceWeights := OfferedResourceWeights[iResourceWeights];
-    Server(sGetCityTileAdvice, me, cix, Advice);
+    Server(sGetCityTileAdvice, Me, cix, Advice);
     if Advice.Tiles <> MyCity[cix].Tiles then
-      Server(sSetCityTiles, me, cix, Advice.Tiles);
+      Server(sSetCityTiles, Me, cix, Advice.Tiles);
   end;
 end;
@@ -1786 +1786 @@
 procedure SortImprovements;
 var
-  i, j, k: integer;
-begin
-  for i := 0 to nImp - 1 do
-    ImpSorted[i] := i;
-  for i := 0 to nImp - 2 do
-    for j := i + 1 to nImp - 1 do
-      if Prio(ImpSorted[i]) > Prio(ImpSorted[j]) then begin
-        k := ImpSorted[i];
-        ImpSorted[i] := ImpSorted[j];
-        ImpSorted[j] := k;
+  I, J, K: Integer;
+begin
+  for I := 0 to nImp - 1 do
+    ImpSorted[I] := I;
+  for I := 0 to nImp - 2 do
+    for J := I + 1 to nImp - 1 do
+      if Prio(ImpSorted[I]) > Prio(ImpSorted[J]) then begin
+        K := ImpSorted[I];
+        ImpSorted[I] := ImpSorted[J];
+        ImpSorted[J] := K;
       end;
 end;

trunk/LocalPlayer/CityType.pas

@@ -18 +18 @@
     procedure FormShow(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure DeleteBtnClick(Sender: TObject);
@@ -28 +28 @@
     procedure OffscreenPaint; override;
   private
-    nPool, dragiix, ctype: integer;
-    Pooliix: array [0 .. nImp - 1] of integer;
+    nPool, dragiix, ctype: Integer;
+    Pooliix: array [0 .. nImp - 1] of Integer;
     listed: Set of 0 .. nImp;
-    Changed: boolean;
-    procedure LoadType(NewType: integer);
+    Changed: Boolean;
+    procedure LoadType(NewType: Integer);
     procedure SaveType;
   end;
@@ -82 +82 @@
 procedure TCityTypeDlg.OffscreenPaint;
 var
-  i, iix: integer;
-  s: string;
+  I, iix: Integer;
+  S: string;
 begin
   inherited;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   FillOffscreen(xList - 7, yList, 42 * nListCol + 14, 32 * nListRow);
   FillOffscreen(xPool - 7, yPool, 42 * nPoolCol + 14, 32 * nPoolRow);
@@ -92 +92 @@
     yPool - yList - 32 * nListRow);
 
-  Frame(offscreen.Canvas, 0, yList + 32 * nListRow, InnerWidth - 255,
+  Frame(Offscreen.Canvas, 0, yList + 32 * nListRow, InnerWidth - 255,
     yPool - 23, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  Frame(offscreen.Canvas, InnerWidth - 254, yList + 32 * nListRow,
+  Frame(Offscreen.Canvas, InnerWidth - 254, yList + 32 * nListRow,
     InnerWidth - 89, yPool - 23, MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  Frame(offscreen.Canvas, InnerWidth - 88, yList + 32 * nListRow,
+  Frame(Offscreen.Canvas, InnerWidth - 88, yList + 32 * nListRow,
     InnerWidth - 1, yPool - 23, MainTexture.ColorBevelLight,
     MainTexture.ColorBevelShade);
-  Frame(offscreen.Canvas, 0, yPool - 22, InnerWidth - 1, yPool - 1,
+  Frame(Offscreen.Canvas, 0, yPool - 22, InnerWidth - 1, yPool - 1,
     MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  for i := 0 to nCityType - 1 do
-  begin
-    RFrame(offscreen.Canvas, xSwitch + i * 42, ySwitch, xSwitch + 39 + i * 42,
+  for I := 0 to nCityType - 1 do
+  begin
+    RFrame(Offscreen.Canvas, xSwitch + I * 42, ySwitch, xSwitch + 39 + I * 42,
       ySwitch + 23, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-    if i = ctype then
-      Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
-        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.ColorBevelShade,
+    if I = ctype then
+      Frame(Offscreen.Canvas, xSwitch + 1 + I * 42, ySwitch + 1,
+        xSwitch + 38 + I * 42, ySwitch + 22, MainTexture.ColorBevelShade,
         MainTexture.ColorBevelLight)
     else
-      Frame(offscreen.Canvas, xSwitch + 1 + i * 42, ySwitch + 1,
-        xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.ColorBevelLight,
+      Frame(Offscreen.Canvas, xSwitch + 1 + I * 42, ySwitch + 1,
+        xSwitch + 38 + I * 42, ySwitch + 22, MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
-    BitBltCanvas(offscreen.Canvas, xSwitch + 2 + i * 42, ySwitch + 2,
-      xSizeSmall, ySizeSmall, SmallImp.Canvas, (i + 3) * xSizeSmall, 0);
-  end;
-  RisedTextOut(offscreen.Canvas, 8, yList + 32 * nListRow + 2,
+    BitBltCanvas(Offscreen.Canvas, xSwitch + 2 + I * 42, ySwitch + 2,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas, (I + 3) * xSizeSmall, 0);
+  end;
+  RisedTextOut(Offscreen.Canvas, 8, yList + 32 * nListRow + 2,
     Phrases.Lookup('BUILDORDER'));
-  RisedTextOut(offscreen.Canvas, 8, ySwitch + 26,
+  RisedTextOut(Offscreen.Canvas, 8, ySwitch + 26,
     Phrases.Lookup('CITYTYPE', ctype));
-  s := Phrases.Lookup('BUILDREST');
-  RisedTextOut(offscreen.Canvas,
-    (InnerWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
-    yList + 72 + 32 * nListRow, s);
-
-  with offscreen.Canvas do
-  begin
-    for i := 1 to nListRow - 1 do
-      DLine(offscreen.Canvas, xList - 5, xList + 4 + 42 * nListCol,
-        yList - 1 + 32 * i, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-    for i := 0 to nListCol * nListRow - 1 do
-    begin
-      s := IntToStr(i + 1);
+  S := Phrases.Lookup('BUILDREST');
+  RisedTextOut(Offscreen.Canvas,
+    (InnerWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2,
+    yList + 72 + 32 * nListRow, S);
+
+  with Offscreen.Canvas do
+  begin
+    for I := 1 to nListRow - 1 do
+      DLine(Offscreen.Canvas, xList - 5, xList + 4 + 42 * nListCol,
+        yList - 1 + 32 * I, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
+    for I := 0 to nListCol * nListRow - 1 do
+    begin
+      S := IntToStr(I + 1);
       Font.Color := MainTexture.ColorTextLight;
-      Textout(xList + 20 + i mod nListCol * 42 - TextWidth(s) div 2,
-        yList + 15 + i div nListCol * 32 - TextHeight(s) div 2, s);
-    end;
-  end;
-
-  i := 0;
-  while MyData.ImpOrder[ctype, i] >= 0 do
-  begin
-    RFrame(offscreen.Canvas, xList + 20 - xSizeSmall div 2 + i mod nListCol *
-      42, yList + 15 - ySizeSmall div 2 + i div nListCol * 32,
-      xList + 21 + xSizeSmall div 2 + i mod nListCol * 42,
-      yList + 16 + ySizeSmall div 2 + i div nListCol * 32,
+      Textout(xList + 20 + I mod nListCol * 42 - TextWidth(S) div 2,
+        yList + 15 + I div nListCol * 32 - TextHeight(S) div 2, S);
+    end;
+  end;
+
+  I := 0;
+  while MyData.ImpOrder[ctype, I] >= 0 do
+  begin
+    RFrame(Offscreen.Canvas, xList + 20 - xSizeSmall div 2 + I mod nListCol *
+      42, yList + 15 - ySizeSmall div 2 + I div nListCol * 32,
+      xList + 21 + xSizeSmall div 2 + I mod nListCol * 42,
+      yList + 16 + ySizeSmall div 2 + I div nListCol * 32,
       MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-    BitBltCanvas(offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
-      i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
+    BitBltCanvas(Offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
+      I mod nListCol * 42, yList + 16 - ySizeSmall div 2 + I div nListCol * 32,
       xSizeSmall, ySizeSmall, SmallImp.Canvas,
-      MyData.ImpOrder[ctype, i] mod 7 * xSizeSmall,
-      (MyData.ImpOrder[ctype, i] + SystemIconLines * 7) div 7 *
+      MyData.ImpOrder[ctype, I] mod 7 * xSizeSmall,
+      (MyData.ImpOrder[ctype, I] + SystemIconLines * 7) div 7 *
       ySizeSmall);
-    inc(i);
+    Inc(I);
   end;
 
@@ -165 +165 @@
     begin
       Pooliix[nPool] := iix;
-      RFrame(offscreen.Canvas, xPool + 20 - xSizeSmall div 2 +
+      RFrame(Offscreen.Canvas, xPool + 20 - xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 15 - ySizeSmall div 2 +
         nPool div nPoolCol * 32, xPool + 21 + xSizeSmall div 2 +
@@ -171 +171 @@
         nPool div nPoolCol * 32, MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
-      BitBltCanvas(offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
+      BitBltCanvas(Offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 16 - ySizeSmall div 2 +
         nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas,
         iix mod 7 * xSizeSmall, (iix + SystemIconLines * 7) div 7 *
         ySizeSmall);
-      inc(nPool);
+      Inc(nPool);
     end;
   DeleteBtn.Visible := MyData.ImpOrder[ctype, 0] >= 0;
@@ -182 +182 @@
   if dragiix >= 0 then
   begin
-    ImpImage(offscreen.Canvas, xView + 9, yView + 5, dragiix);
-    s := Phrases.Lookup('IMPROVEMENTS', dragiix);
-    RisedTextOut(offscreen.Canvas,
-      xView + 36 - BiColorTextWidth(offscreen.Canvas, s) div 2,
-      ySwitch + 26, s);
+    ImpImage(Offscreen.Canvas, xView + 9, yView + 5, dragiix);
+    S := Phrases.Lookup('IMPROVEMENTS', dragiix);
+    RisedTextOut(Offscreen.Canvas,
+      xView + 36 - BiColorTextWidth(Offscreen.Canvas, S) div 2,
+      ySwitch + 26, S);
   end;
   MarkUsedOffscreen(InnerWidth, InnerHeight);
 end;
 
-procedure TCityTypeDlg.LoadType(NewType: integer);
-var
-  i: integer;
+procedure TCityTypeDlg.LoadType(NewType: Integer);
+var
+  I: Integer;
 begin
   ctype := NewType;
   listed := [];
-  i := 0;
-  while MyData.ImpOrder[ctype, i] >= 0 do
-  begin
-    include(listed, MyData.ImpOrder[ctype, i]);
-    inc(i);
-  end;
-  Changed := false;
+  I := 0;
+  while MyData.ImpOrder[ctype, I] >= 0 do
+  begin
+    Include(listed, MyData.ImpOrder[ctype, I]);
+    Inc(I);
+  end;
+  Changed := False;
 end;
 
 procedure TCityTypeDlg.SaveType;
 var
-  cix: integer;
+  cix: Integer;
 begin
   if Changed then
@@ -215 +215 @@
       if (MyCity[cix].Loc >= 0) and (MyCity[cix].Status and 7 = ctype + 1) then
         AutoBuild(cix, MyData.ImpOrder[ctype]);
-    Changed := false;
+    Changed := False;
   end;
 end;
@@ -232 +232 @@
 
 procedure TCityTypeDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-var
-  i: integer;
-begin
-  x := x - SideFrame;
-  y := y - WideFrame;
-  i := (x - xList) div 42 + (y - yList) div 32 * nListCol;
-  if (i < nImp) and (MyData.ImpOrder[ctype, i] >= 0) and
-    (x > xList + 2 + i mod nListCol * 42) and
-    (y > yList + 5 + i div nListCol * 32) and
-    (x < xList + 3 + 36 + i mod nListCol * 42) and
-    (y < yList + 6 + 20 + i div nListCol * 32) then
+  Shift: TShiftState; X, Y: Integer);
+var
+  I: Integer;
+begin
+  X := X - SideFrame;
+  Y := Y - WideFrame;
+  I := (X - xList) div 42 + (Y - yList) div 32 * nListCol;
+  if (I < nImp) and (MyData.ImpOrder[ctype, I] >= 0) and
+    (X > xList + 2 + I mod nListCol * 42) and
+    (Y > yList + 5 + I div nListCol * 32) and
+    (X < xList + 3 + 36 + I mod nListCol * 42) and
+    (Y < yList + 6 + 20 + I div nListCol * 32) then
   begin
     if ssShift in Shift then
       HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp,
-        MyData.ImpOrder[ctype, i])
+        MyData.ImpOrder[ctype, I])
     else
     begin
-      dragiix := MyData.ImpOrder[ctype, i];
+      dragiix := MyData.ImpOrder[ctype, I];
       Screen.Cursor := crImpDrag;
       SmartUpdateContent;
     end;
-    exit;
-  end;
-  i := (x - xPool) div 42 + (y - yPool) div 32 * nPoolCol;
-  if (i < nPool) and (x > xPool + 2 + i mod nPoolCol * 42) and
-    (y > yPool + 5 + i div nPoolCol * 32) and
-    (x < xPool + 3 + 36 + i mod nPoolCol * 42) and
-    (y < yPool + 6 + 20 + i div nPoolCol * 32) then
+    Exit;
+  end;
+  I := (X - xPool) div 42 + (Y - yPool) div 32 * nPoolCol;
+  if (I < nPool) and (X > xPool + 2 + I mod nPoolCol * 42) and
+    (Y > yPool + 5 + I div nPoolCol * 32) and
+    (X < xPool + 3 + 36 + I mod nPoolCol * 42) and
+    (Y < yPool + 6 + 20 + I div nPoolCol * 32) then
   begin
     if ssShift in Shift then
-      HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Pooliix[i])
+      HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Pooliix[I])
     else
     begin
-      dragiix := Pooliix[i];
+      dragiix := Pooliix[I];
       Screen.Cursor := crImpDrag;
       SmartUpdateContent;
     end;
-    exit;
-  end;
-  i := (x - xSwitch) div 42;
-  if (i < nCityType) and (x > xSwitch + 2 + i * 42) and
-    (x < xSwitch + 3 + 36 + i * 42) and (y >= ySwitch + 2) and (y < ySwitch + 22)
+    Exit;
+  end;
+  I := (X - xSwitch) div 42;
+  if (I < nCityType) and (X > xSwitch + 2 + I * 42) and
+    (X < xSwitch + 3 + 36 + I * 42) and (Y >= ySwitch + 2) and (Y < ySwitch + 22)
   then
   begin
     SaveType;
-    LoadType(i);
+    LoadType(I);
     SmartUpdateContent;
   end;
@@ -284 +284 @@
 
 procedure TCityTypeDlg.PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-
-  procedure UnList(iix: integer);
+  Shift: TShiftState; X, Y: Integer);
+
+  procedure UnList(iix: Integer);
   var
-    i: integer;
-  begin
-    i := 0;
-    while (MyData.ImpOrder[ctype, i] >= 0) and
-      (MyData.ImpOrder[ctype, i] <> iix) do
-      inc(i);
-    assert(MyData.ImpOrder[ctype, i] = iix);
-    move(MyData.ImpOrder[ctype, i + 1], MyData.ImpOrder[ctype, i], nImp - i);
+    I: Integer;
+  begin
+    I := 0;
+    while (MyData.ImpOrder[ctype, I] >= 0) and
+      (MyData.ImpOrder[ctype, I] <> iix) do
+      Inc(I);
+    Assert(MyData.ImpOrder[ctype, I] = iix);
+    Move(MyData.ImpOrder[ctype, I + 1], MyData.ImpOrder[ctype, I], nImp - I);
     Exclude(listed, iix);
   end;
 
 var
-  i: integer;
-begin
-  x := x - SideFrame;
-  y := y - WideFrame;
+  I: Integer;
+begin
+  X := X - SideFrame;
+  Y := Y - WideFrame;
   if dragiix >= 0 then
   begin
-    if (x >= xList) and (x < xList + nListCol * 42) and (y >= yList) and
-      (y < yList + nListRow * 32) then
+    if (X >= xList) and (X < xList + nListCol * 42) and (Y >= yList) and
+      (Y < yList + nListRow * 32) then
     begin
       if dragiix in listed then
         UnList(dragiix);
-      i := (x - xList) div 42 + (y - yList) div 32 * nListCol;
-      while (i > 0) and (MyData.ImpOrder[ctype, i - 1] < 0) do
-        dec(i);
-      move(MyData.ImpOrder[ctype, i], MyData.ImpOrder[ctype, i + 1],
-        nImp - i - 1);
-      MyData.ImpOrder[ctype, i] := dragiix;
-      include(listed, dragiix);
-      Changed := true;
+      I := (X - xList) div 42 + (Y - yList) div 32 * nListCol;
+      while (I > 0) and (MyData.ImpOrder[ctype, I - 1] < 0) do
+        Dec(I);
+      Move(MyData.ImpOrder[ctype, I], MyData.ImpOrder[ctype, I + 1],
+        nImp - I - 1);
+      MyData.ImpOrder[ctype, I] := dragiix;
+      Include(listed, dragiix);
+      Changed := True;
     end
-    else if (dragiix in listed) and (x >= xPool) and (x < xPool + nPoolCol * 42)
-      and (y >= yPool) and (y < yPool + nPoolRow * 32) then
+    else if (dragiix in listed) and (X >= xPool) and (X < xPool + nPoolCol * 42)
+      and (Y >= yPool) and (Y < yPool + nPoolRow * 32) then
     begin
       UnList(dragiix);
-      Changed := true;
+      Changed := True;
     end;
     dragiix := -1;
@@ -340 +340 @@
 procedure TCityTypeDlg.DeleteBtnClick(Sender: TObject);
 begin
-  fillchar(MyData.ImpOrder[ctype], sizeof(MyData.ImpOrder[ctype]), Byte(-1));
+  FillChar(MyData.ImpOrder[ctype], SizeOf(MyData.ImpOrder[ctype]), Byte(-1));
   listed := [];
-  Changed := true;
+  Changed := True;
   SmartUpdateContent;
 end;

trunk/LocalPlayer/ClientTools.pas

@@ -9 +9 @@
 const
   nOfferedResourceWeights = 6;
-  OfferedResourceWeights: array [0 .. nOfferedResourceWeights - 1] of cardinal =
+  OfferedResourceWeights: array [0 .. nOfferedResourceWeights - 1] of Cardinal =
     (rwOff, rwMaxScience, rwForceScience, rwMaxGrowth, rwForceProd, rwMaxProd);
 
 type
-  TImpOrder = array [0 .. (nImp + 4) div 4 * 4 - 1] of shortint;
-  TEnhancementJobs = array [0 .. 11, 0 .. 7] of byte;
+  TImpOrder = array [0 .. (nImp + 4) div 4 * 4 - 1] of ShortInt;
+  TEnhancementJobs = array [0 .. 11, 0 .. 7] of Byte;
   JobResultSet = set of 0 .. 39;
 
@@ -36 +36 @@
   Server: TServerCall;
   G: TNewGameData;
-  me: integer;
+  Me: Integer;
   MyRO: ^TPlayerContext;
   MyMap: ^TTileList;
@@ -43 +43 @@
   MyModel: ^TModelList;
 
-  AdvValue: array [0 .. nAdv - 1] of integer;
-
-function dLoc(Loc, dx, dy: integer): integer;
-function Distance(Loc0, Loc1: integer): integer;
-function UnrestAtLoc(uix, Loc: integer): boolean;
-function GetMoveAdvice(uix, ToLoc: integer;
-  var MoveAdviceData: TMoveAdviceData): integer;
-function ColorOfHealth(Health: integer): integer;
-function IsMultiPlayerGame: boolean;
-procedure ItsMeAgain(p: integer);
-function GetAge(p: integer): integer;
-function IsCivilReportNew(Enemy: integer): boolean;
-function IsMilReportNew(Enemy: integer): boolean;
-function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
-  gov, size: integer): integer;
-function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
-procedure SumCities(var TaxSum, ScienceSum: integer);
-function JobTest(uix, Job: integer; IgnoreResults: JobResultSet = []): boolean;
-procedure GetUnitInfo(Loc: integer; var uix: integer; var UnitInfo: TUnitInfo);
-procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
-function UnitExhausted(uix: integer): boolean;
-function ModelHash(const ModelInfo: TModelInfo): integer;
-function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
-function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
-procedure DebugMessage(Level: integer; Text: string);
+  AdvValue: array [0 .. nAdv - 1] of Integer;
+
+function dLoc(Loc, dx, dy: Integer): Integer;
+function Distance(Loc0, Loc1: Integer): Integer;
+function UnrestAtLoc(uix, Loc: Integer): Boolean;
+function GetMoveAdvice(uix, ToLoc: Integer;
+  var MoveAdviceData: TMoveAdviceData): Integer;
+function ColorOfHealth(Health: Integer): Integer;
+function IsMultiPlayerGame: Boolean;
+procedure ItsMeAgain(P: Integer);
+function GetAge(P: Integer): Integer;
+function IsCivilReportNew(Enemy: Integer): Boolean;
+function IsMilReportNew(Enemy: Integer): Boolean;
+function CutCityFoodSurplus(FoodSurplus: Integer; IsCityAlive: Boolean;
+  gov, size: Integer): Integer;
+function CityTaxBalance(cix: Integer; const CityReport: TCityReportNew): Integer;
+procedure SumCities(var TaxSum, ScienceSum: Integer);
+function JobTest(uix, Job: Integer; IgnoreResults: JobResultSet = []): Boolean;
+procedure GetUnitInfo(Loc: Integer; var uix: Integer; var UnitInfo: TUnitInfo);
+procedure GetCityInfo(Loc: Integer; var cix: Integer; var CityInfo: TCityInfo);
+function UnitExhausted(uix: Integer): Boolean;
+function ModelHash(const ModelInfo: TModelInfo): Integer;
+function ProcessEnhancement(uix: Integer; const Jobs: TEnhancementJobs): Integer;
+function AutoBuild(cix: Integer; const ImpOrder: TImpOrder): Boolean;
+procedure DebugMessage(Level: Integer; Text: string);
 procedure CityOptimizer_BeginOfTurn;
-procedure CityOptimizer_CityChange(cix: integer);
-procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
-procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
-procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
+procedure CityOptimizer_CityChange(cix: Integer);
+procedure CityOptimizer_TileBecomesAvailable(Loc: Integer);
+procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: Integer);
+procedure CityOptimizer_BeforeRemoveUnit(uix: Integer);
 procedure CityOptimizer_AfterRemoveUnit;
 procedure CityOptimizer_EndOfTurn;
@@ -84 +84 @@
 
 var
-  CityNeedsOptimize: array [0 .. ncmax - 1] of boolean;
-
-function dLoc(Loc, dx, dy: integer): integer;
-var
-  y0: integer;
+  CityNeedsOptimize: array [0 .. ncmax - 1] of Boolean;
+
+function dLoc(Loc, dx, dy: Integer): Integer;
+var
+  y0: Integer;
 begin
   y0 := (Loc + G.lx * 1024) div G.lx - 1024;
@@ -94 +94 @@
 end;
 
-function Distance(Loc0, Loc1: integer): integer;
-var
-  dx, dy: integer;
+function Distance(Loc0, Loc1: Integer): Integer;
+var
+  dx, dy: Integer;
 begin
   Inc(Loc0, G.lx * 1024);
@@ -106 +106 @@
 end;
 
-function UnrestAtLoc(uix, Loc: integer): boolean;
-var
-  uix1: integer;
+function UnrestAtLoc(uix, Loc: Integer): Boolean;
+var
+  uix1: Integer;
 begin
   Result := False;
@@ -114 +114 @@
     case MyRO.Government of
       gRepublic, gFuture:
-        Result := (MyRO.Territory[Loc] >= 0) and (MyRO.Territory[Loc] <> me) and
+        Result := (MyRO.Territory[Loc] >= 0) and (MyRO.Territory[Loc] <> Me) and
           (MyRO.Treaty[MyRO.Territory[Loc]] < trAlliance);
       gDemocracy:
-        Result := (MyRO.Territory[Loc] < 0) or (MyRO.Territory[Loc] <> me) and
+        Result := (MyRO.Territory[Loc] < 0) or (MyRO.Territory[Loc] <> Me) and
           (MyRO.Treaty[MyRO.Territory[Loc]] < trAlliance);
     end;
@@ -127 +127 @@
 end;
 
-function GetMoveAdvice(uix, ToLoc: integer;
-  var MoveAdviceData: TMoveAdviceData): integer;
-var
-  MinEndHealth: integer;
+function GetMoveAdvice(uix, ToLoc: Integer;
+  var MoveAdviceData: TMoveAdviceData): Integer;
+var
+  MinEndHealth: Integer;
 begin
   if MyModel[MyUn[uix].mix].Domain = dGround then
@@ -142 +142 @@
       MoveAdviceData.MoreTurns := 999;
       MoveAdviceData.MaxHostile_MovementLeft := MyUn[uix].Health - MinEndHealth;
-      Result := Server(sGetMoveAdvice, me, uix, MoveAdviceData);
+      Result := Server(sGetMoveAdvice, Me, uix, MoveAdviceData);
       if (MinEndHealth <= 1) or (Result <> eNoWay) then
-        exit;
+        Exit;
     end;
     case MinEndHealth of
@@ -159 +159 @@
 end;
 
-function ColorOfHealth(Health: integer): integer;
-var
-  red, green: integer;
-begin
-  green := 400 * Health div 100;
-  if green > 200 then
-    green := 200;
-  red := 510 * (100 - Health) div 100;
-  if red > 255 then
-    red := 255;
-  Result := green shl 8 + red;
-end;
-
-function IsMultiPlayerGame: boolean;
-var
-  p1: integer;
+function ColorOfHealth(Health: Integer): Integer;
+var
+  Red, Green: Integer;
+begin
+  Green := 400 * Health div 100;
+  if Green > 200 then
+    Green := 200;
+  Red := 510 * (100 - Health) div 100;
+  if Red > 255 then
+    Red := 255;
+  Result := Green shl 8 + Red;
+end;
+
+function IsMultiPlayerGame: Boolean;
+var
+  p1: Integer;
 begin
   Result := False;
@@ -182 +182 @@
 end;
 
-procedure ItsMeAgain(p: integer);
-begin
-  if G.RO[p] <> nil then
-    MyRO := pointer(G.RO[p])
-  else if G.SuperVisorRO[p] <> nil then
-    MyRO := pointer(G.SuperVisorRO[p])
+procedure ItsMeAgain(P: Integer);
+begin
+  if G.RO[P] <> nil then
+    MyRO := Pointer(G.RO[P])
+  else if G.SuperVisorRO[P] <> nil then
+    MyRO := Pointer(G.SuperVisorRO[P])
   else
-    exit;
-  me := p;
-  MyMap := pointer(MyRO.Map);
-  MyUn := pointer(MyRO.Un);
-  MyCity := pointer(MyRO.City);
-  MyModel := pointer(MyRO.Model);
-end;
-
-function GetAge(p: integer): integer;
-var
-  i: integer;
-begin
-  if p = me then begin
+    Exit;
+  Me := P;
+  MyMap := Pointer(MyRO.Map);
+  MyUn := Pointer(MyRO.Un);
+  MyCity := Pointer(MyRO.City);
+  MyModel := Pointer(MyRO.Model);
+end;
+
+function GetAge(P: Integer): Integer;
+var
+  I: Integer;
+begin
+  if P = Me then begin
     Result := 0;
-    for i := 1 to 3 do
-      if MyRO.Tech[AgePreq[i]] >= tsApplicable then
-        Result := i;
+    for I := 1 to 3 do
+      if MyRO.Tech[AgePreq[I]] >= tsApplicable then
+        Result := I;
   end else begin
     Result := 0;
-    for i := 1 to 3 do
-      if MyRO.EnemyReport[p].Tech[AgePreq[i]] >= tsApplicable then
-        Result := i;
-  end;
-end;
-
-function IsCivilReportNew(Enemy: integer): boolean;
-var
-  i: integer;
-begin
-  assert(Enemy <> me);
-  i := MyRO.EnemyReport[Enemy].TurnOfCivilReport;
-  Result := (i = MyRO.Turn) or (i = MyRO.Turn - 1) and (Enemy > me);
-end;
-
-function IsMilReportNew(Enemy: integer): boolean;
-var
-  i: integer;
-begin
-  assert(Enemy <> me);
-  i := MyRO.EnemyReport[Enemy].TurnOfMilReport;
-  Result := (i = MyRO.Turn) or (i = MyRO.Turn - 1) and (Enemy > me);
-end;
-
-function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
-  gov, size: integer): integer;
+    for I := 1 to 3 do
+      if MyRO.EnemyReport[P].Tech[AgePreq[I]] >= tsApplicable then
+        Result := I;
+  end;
+end;
+
+function IsCivilReportNew(Enemy: Integer): Boolean;
+var
+  I: Integer;
+begin
+  Assert(Enemy <> Me);
+  I := MyRO.EnemyReport[Enemy].TurnOfCivilReport;
+  Result := (I = MyRO.Turn) or (I = MyRO.Turn - 1) and (Enemy > Me);
+end;
+
+function IsMilReportNew(Enemy: Integer): Boolean;
+var
+  I: Integer;
+begin
+  Assert(Enemy <> Me);
+  I := MyRO.EnemyReport[Enemy].TurnOfMilReport;
+  Result := (I = MyRO.Turn) or (I = MyRO.Turn - 1) and (Enemy > Me);
+end;
+
+function CutCityFoodSurplus(FoodSurplus: Integer; IsCityAlive: Boolean;
+  gov, size: Integer): Integer;
 begin
   Result := FoodSurplus;
@@ -241 +241 @@
 end;
 
-function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
-var
-  i: integer;
+function CityTaxBalance(cix: Integer; const CityReport: TCityReportNew): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
@@ -258 +258 @@
       Inc(Result, CityReport.FoodSurplus);
   end;
-  for i := nWonder to nImp - 1 do
-    if MyCity[cix].Built[i] > 0 then
-      Dec(Result, Imp[i].Maint);
-end;
-
-procedure SumCities(var TaxSum, ScienceSum: integer);
-var
-  cix: integer;
+  for I := nWonder to nImp - 1 do
+    if MyCity[cix].Built[I] > 0 then
+      Dec(Result, Imp[I].Maint);
+end;
+
+procedure SumCities(var TaxSum, ScienceSum: Integer);
+var
+  cix: Integer;
   CityReport: TCityReportNew;
 begin
@@ -271 +271 @@
   ScienceSum := 0;
   if MyRO.Government = gAnarchy then
-    exit;
+    Exit;
   for cix := 0 to MyRO.nCity - 1 do
     if MyCity[cix].Loc >= 0 then
@@ -278 +278 @@
       CityReport.HypoTaxRate := -1;
       CityReport.HypoLuxuryRate := -1;
-      Server(sGetCityReportNew, me, cix, CityReport);
+      Server(sGetCityReportNew, Me, cix, CityReport);
       if (CityReport.HappinessBalance >= 0) { no disorder } and
         (MyCity[cix].Flags and chCaptured = 0) then // not captured
@@ -286 +286 @@
 end;
 
-function JobTest(uix, Job: integer; IgnoreResults: JobResultSet): boolean;
-var
-  Test: integer;
-begin
-  Test := Server(sStartJob + Job shl 4 - sExecute, me, uix, nil^);
+function JobTest(uix, Job: Integer; IgnoreResults: JobResultSet): Boolean;
+var
+  Test: Integer;
+begin
+  Test := Server(sStartJob + Job shl 4 - sExecute, Me, uix, nil^);
   Result := (Test >= rExecuted) or (Test in IgnoreResults);
 end;
 
-procedure GetUnitInfo(Loc: integer; var uix: integer; var UnitInfo: TUnitInfo);
-var
-  i, Cnt: integer;
+procedure GetUnitInfo(Loc: Integer; var uix: Integer; var UnitInfo: TUnitInfo);
+var
+  I, Cnt: Integer;
 begin
   if MyMap[Loc] and fOwned <> 0 then
   begin
-    Server(sGetDefender, me, Loc, uix);
+    Server(sGetDefender, Me, Loc, uix);
     Cnt := 0;
-    for i := 0 to MyRO.nUn - 1 do
-      if MyUn[i].Loc = Loc then
+    for I := 0 to MyRO.nUn - 1 do
+      if MyUn[I].Loc = Loc then
         Inc(Cnt);
-    MakeUnitInfo(me, MyUn[uix], UnitInfo);
+    MakeUnitInfo(Me, MyUn[uix], UnitInfo);
     if Cnt > 1 then
       UnitInfo.Flags := UnitInfo.Flags or unMulti;
@@ -318 +318 @@
 end;
 
-procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
+procedure GetCityInfo(Loc: Integer; var cix: Integer; var CityInfo: TCityInfo);
 begin
   if MyMap[Loc] and fOwned <> 0 then
@@ -328 +328 @@
     with CityInfo do
     begin
-      Owner := me;
+      Owner := Me;
       ID := MyCity[cix].ID;
       size := MyCity[cix].size;
@@ -356 +356 @@
 end;
 
-function UnitExhausted(uix: integer): boolean;
+function UnitExhausted(uix: Integer): Boolean;
   // check if another move of this unit is still possible
 var
-  dx, dy: integer;
+  dx, dy: Integer;
 begin
   Result := True;
   if (MyUn[uix].Movement > 0) or
-    (MyRO.Wonder[woShinkansen].EffectiveOwner = me) then
+    (MyRO.Wonder[woShinkansen].EffectiveOwner = Me) then
     if (MyUn[uix].Movement >= 100) or
       ((MyModel[MyUn[uix].mix].Kind = mkCaravan) and
@@ -373 +373 @@
           if abs(dx) + abs(dy) = 2 then
             if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and
-              7 shl 7, me, uix, nil^) >= rExecuted then
+              7 shl 7, Me, uix, nil^) >= rExecuted then
               Result := False;
 end;
 
-function ModelHash(const ModelInfo: TModelInfo): integer;
-var
-  i, FeatureCode, Hash1, Hash2, Hash2r, d: cardinal;
+function ModelHash(const ModelInfo: TModelInfo): Integer;
+var
+  I, FeatureCode, Hash1, Hash2, Hash2r, D: Cardinal;
 begin
   with ModelInfo do
     if Kind > mkEnemyDeveloped then
-      Result := integer($C0000000 + Speed div 50 + Kind shl 8)
+      Result := Integer($C0000000 + Speed div 50 + Kind shl 8)
     else
     begin
       FeatureCode := 0;
-      for i := mcFirstNonCap to nFeature - 1 do
-        if 1 shl Domain and Feature[i].Domains <> 0 then
+      for I := mcFirstNonCap to nFeature - 1 do
+        if 1 shl Domain and Feature[I].Domains <> 0 then
         begin
           FeatureCode := FeatureCode * 2;
-          if 1 shl (i - mcFirstNonCap) <> 0 then
+          if 1 shl (I - mcFirstNonCap) <> 0 then
             Inc(FeatureCode);
         end;
@@ -397 +397 @@
         dGround:
         begin
-          assert(FeatureCode < 1 shl 8);
-          assert(Attack < 5113);
-          assert(Defense < 2273);
-          assert(Cost < 1611);
+          Assert(FeatureCode < 1 shl 8);
+          Assert(Attack < 5113);
+          Assert(Defense < 2273);
+          Assert(Cost < 1611);
           Hash1 := (Attack * 2273 + Defense) * 9 + (Speed - 150) div 50;
           Hash2 := FeatureCode * 1611 + Cost;
@@ -406 +406 @@
         dSea:
         begin
-          assert(FeatureCode < 1 shl 9);
-          assert(Attack < 12193);
-          assert(Defense < 6097);
-          assert(Cost < 4381);
+          Assert(FeatureCode < 1 shl 9);
+          Assert(Attack < 12193);
+          Assert(Defense < 6097);
+          Assert(Cost < 4381);
           Hash1 := ((Attack * 6097 + Defense) * 5 +
             (Speed - 350) div 100) * 2;
@@ -419 +419 @@
         dAir:
         begin
-          assert(FeatureCode < 1 shl 5);
-          assert(Attack < 2407);
-          assert(Defense < 1605);
-          assert(Bombs < 4813);
-          assert(Cost < 2089);
+          Assert(FeatureCode < 1 shl 5);
+          Assert(Attack < 2407);
+          Assert(Defense < 1605);
+          Assert(Bombs < 4813);
+          Assert(Cost < 2089);
           Hash1 := (Attack * 1605 + Defense) shl 5 + FeatureCode;
           Hash2 := ((Bombs * 7 + ATrans_Fuel) * 4 + TTrans) * 2089 + Cost;
@@ -429 +429 @@
       end;
       Hash2r := 0;
-      for i := 0 to 7 do
+      for I := 0 to 7 do
       begin
         Hash2r := Hash2r * 13;
-        d := Hash2 div 13;
-        Inc(Hash2r, Hash2 - d * 13);
-        Hash2 := d;
+        D := Hash2 div 13;
+        Inc(Hash2r, Hash2 - D * 13);
+        Hash2 := D;
       end;
-      Result := integer(Domain shl 30 + Hash1 xor Hash2r);
+      Result := Integer(Domain shl 30 + Hash1 xor Hash2r);
     end;
 end;
 
-function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
+function ProcessEnhancement(uix: Integer; const Jobs: TEnhancementJobs): Integer;
   { return values:
     eJobDone - all applicable jobs done
@@ -446 +446 @@
     eDied - job done and died (thurst) }
 var
-  stage, NextJob, Tile: integer;
+  stage, NextJob, Tile: Integer;
   Done: set of jNone .. jPoll;
 begin
@@ -452 +452 @@
   Tile := MyMap[MyUn[uix].Loc];
   if Tile and fRoad <> 0 then
-    include(Done, jRoad);
+    Include(Done, jRoad);
   if Tile and fRR <> 0 then
-    include(Done, jRR);
+    Include(Done, jRR);
   if (Tile and fTerImp = tiIrrigation) or (Tile and fTerImp = tiFarm) then
-    include(Done, jIrr);
+    Include(Done, jIrr);
   if Tile and fTerImp = tiFarm then
-    include(Done, jFarm);
+    Include(Done, jFarm);
   if Tile and fTerImp = tiMine then
-    include(Done, jMine);
+    Include(Done, jMine);
   if Tile and fPoll = 0 then
-    include(Done, jPoll);
+    Include(Done, jPoll);
 
   if MyUn[uix].Job = jNone then
@@ -485 +485 @@
       Break;
     end; // tile enhancement complete
-    Result := Server(sStartJob + NextJob shl 4, me, uix, nil^);
-    include(Done, NextJob);
-  end;
-end;
-
-function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
-var
-  i, NewProject: integer;
+    Result := Server(sStartJob + NextJob shl 4, Me, uix, nil^);
+    Include(Done, NextJob);
+  end;
+end;
+
+function AutoBuild(cix: Integer; const ImpOrder: TImpOrder): Boolean;
+var
+  I, NewProject: Integer;
 begin
   Result := False;
@@ -498 +498 @@
     (MyCity[cix].Flags and chProduction <> 0) then
   begin
-    i := 0;
+    I := 0;
     repeat
-      while (ImpOrder[i] >= 0) and (MyCity[cix].Built[ImpOrder[i]] > 0) do
-        Inc(i);
-      if ImpOrder[i] < 0 then
+      while (ImpOrder[I] >= 0) and (MyCity[cix].Built[ImpOrder[I]] > 0) do
+        Inc(I);
+      if ImpOrder[I] < 0 then
         Break;
-      assert(i < nImp);
-      NewProject := cpImp + ImpOrder[i];
-      if Server(sSetCityProject, me, cix, NewProject) >= rExecuted then
+      Assert(I < nImp);
+      NewProject := cpImp + ImpOrder[I];
+      if Server(sSetCityProject, Me, cix, NewProject) >= rExecuted then
       begin
         Result := True;
@@ -512 +512 @@
         Break;
       end;
-      Inc(i);
+      Inc(I);
     until False;
   end;
@@ -519 +519 @@
 procedure CalculateAdvValues;
 var
-  i, j: integer;
-  known: array [0 .. nAdv - 1] of integer;
-
-  procedure MarkPreqs(i: integer);
-  begin
-    if known[i] = 0 then
+  I, J: Integer;
+  known: array [0 .. nAdv - 1] of Integer;
+
+  procedure MarkPreqs(I: Integer);
+  begin
+    if known[I] = 0 then
     begin
-      known[i] := 1;
-      if (i <> adScience) and (i <> adMassProduction) then
+      known[I] := 1;
+      if (I <> adScience) and (I <> adMassProduction) then
       begin
-        if (AdvPreq[i, 0] >= 0) then
-          MarkPreqs(AdvPreq[i, 0]);
-        if (AdvPreq[i, 1] >= 0) then
-          MarkPreqs(AdvPreq[i, 1]);
+        if (AdvPreq[I, 0] >= 0) then
+          MarkPreqs(AdvPreq[I, 0]);
+        if (AdvPreq[I, 1] >= 0) then
+          MarkPreqs(AdvPreq[I, 1]);
       end;
     end;
@@ -539 +539 @@
 begin
   FillChar(AdvValue, SizeOf(AdvValue), 0);
-  for i := 0 to nAdv - 1 do
+  for I := 0 to nAdv - 1 do
   begin
     FillChar(known, SizeOf(known), 0);
-    MarkPreqs(i);
-    for j := 0 to nAdv - 1 do
-      if known[j] > 0 then
-        Inc(AdvValue[i]);
-    if i in FutureTech then
-      Inc(AdvValue[i], 3000)
+    MarkPreqs(I);
+    for J := 0 to nAdv - 1 do
+      if known[J] > 0 then
+        Inc(AdvValue[I]);
+    if I in FutureTech then
+      Inc(AdvValue[I], 3000)
     else if known[adMassProduction] > 0 then
-      Inc(AdvValue[i], 2000)
+      Inc(AdvValue[I], 2000)
     else if known[adScience] > 0 then
-      Inc(AdvValue[i], 1000);
-  end;
-end;
-
-procedure DebugMessage(Level: integer; Text: string);
-begin
-  Server(sMessage, me, Level, PChar(Text)^);
-end;
-
-function MarkCitiesAround(Loc, cixExcept: integer): boolean;
+      Inc(AdvValue[I], 1000);
+  end;
+end;
+
+procedure DebugMessage(Level: Integer; Text: string);
+begin
+  Server(sMessage, Me, Level, PChar(Text)^);
+end;
+
+function MarkCitiesAround(Loc, cixExcept: Integer): Boolean;
   // return whether a city was marked
 var
-  cix: integer;
+  cix: Integer;
 begin
   Result := False;
@@ -576 +576 @@
 end;
 
-procedure OptimizeCities(CheckOnly: boolean);
-var
-  cix, fix, dx, dy, Loc1, OptiType: integer;
-  Done: boolean;
+procedure OptimizeCities(CheckOnly: Boolean);
+var
+  cix, fix, dx, dy, Loc1, OptiType: Integer;
+  Done: Boolean;
   Advice: TCityTileAdviceData;
 begin
@@ -591 +591 @@
         begin
           Advice.ResourceWeights := OfferedResourceWeights[OptiType];
-          Server(sGetCityTileAdvice, me, cix, Advice);
+          Server(sGetCityTileAdvice, Me, cix, Advice);
           if Advice.Tiles <> MyCity[cix].Tiles then
             if CheckOnly then
@@ -611 +611 @@
                     Done := False;
                 end;
-              Server(sSetCityTiles, me, cix, Advice.Tiles);
+              Server(sSetCityTiles, Me, cix, Advice.Tiles);
             end;
         end;
@@ -621 +621 @@
 procedure CityOptimizer_BeginOfTurn;
 var
-  cix: integer;
+  cix: Integer;
 begin
   FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
@@ -634 +634 @@
 end;
 
-procedure CityOptimizer_CityChange(cix: integer);
+procedure CityOptimizer_CityChange(cix: Integer);
 begin
   if (MyRO.Government <> gAnarchy) and (cix <> -1) and (MyCity[cix].Flags and
@@ -644 +644 @@
 end;
 
-procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
+procedure CityOptimizer_TileBecomesAvailable(Loc: Integer);
 begin
   if (MyRO.Government <> gAnarchy) and MarkCitiesAround(Loc, -1) then
@@ -650 +650 @@
 end;
 
-procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
-var
-  fix, dx, dy, Loc1: integer;
-  Done: boolean;
+procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: Integer);
+var
+  fix, dx, dy, Loc1: Integer;
+  Done: Boolean;
 begin
   if (MyRO.Government <> gAnarchy) and (ReleasedTiles <> 0) then
@@ -672 +672 @@
 end;
 
-procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
-var
-  uix1: integer;
+procedure CityOptimizer_BeforeRemoveUnit(uix: Integer);
+var
+  uix1: Integer;
 begin
   if MyRO.Government <> gAnarchy then
@@ -698 +698 @@
 // all cities should already be optimized here -- only check this
 var
-  cix: integer;
+  cix: Integer;
 begin
 {$IFOPT O-}

trunk/LocalPlayer/Diagram.pas

@@ -19 +19 @@
     procedure ToggleBtnClick(Sender: TObject);
     procedure PlayerClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 
   public
     procedure OffscreenPaint; override;
     procedure ShowNewContent_Charts(NewMode: TWindowMode);
-    procedure ShowNewContent_Ship(NewMode: TWindowMode; p: integer = -1);
+    procedure ShowNewContent_Ship(NewMode: TWindowMode; P: Integer = -1);
 
   private
     Kind: (dkChart, dkShip);
-    Player, Mode: integer;
+    Player, Mode: Integer;
   end;
 
@@ -34 +34 @@
   DiaDlg: TDiaDlg;
 
-procedure PaintColonyShip(canvas: TCanvas; Player, Left, Width, Top: integer);
+procedure PaintColonyShip(Canvas: TCanvas; Player, Left, Width, Top: Integer);
 
 implementation
@@ -45 +45 @@
 const
   Border = 24;
-  RoundPixels: array [0 .. nStat - 1] of integer = (0, 0, 0, 5, 5, 5);
+  RoundPixels: array [0 .. nStat - 1] of Integer = (0, 0, 0, 5, 5, 5);
 
   yArea = 48;
-  xComp: array [0 .. 5] of integer = (-60, -28, 4, 4, 36, 68);
-  yComp: array [0 .. 5] of integer = (-40, -40, -79, -1, -40, -40);
-  xPow: array [0 .. 3] of integer = (-116, -116, -116, -116);
-  yPow: array [0 .. 3] of integer = (-28, 0, -44, 16);
-  xHab: array [0 .. 1] of integer = (23, 23);
-  yHab: array [0 .. 1] of integer = (-81, 1);
-
-procedure PaintColonyShip(canvas: TCanvas; Player, Left, Width, Top: integer);
-var
-  i, x, r, nComp, nPow, nHab: integer;
+  xComp: array [0 .. 5] of Integer = (-60, -28, 4, 4, 36, 68);
+  yComp: array [0 .. 5] of Integer = (-40, -40, -79, -1, -40, -40);
+  xPow: array [0 .. 3] of Integer = (-116, -116, -116, -116);
+  yPow: array [0 .. 3] of Integer = (-28, 0, -44, 16);
+  xHab: array [0 .. 1] of Integer = (23, 23);
+  yHab: array [0 .. 1] of Integer = (-81, 1);
+
+procedure PaintColonyShip(Canvas: TCanvas; Player, Left, Width, Top: Integer);
+var
+  I, X, R, nComp, nPow, nHab: Integer;
 begin
   Canvas.Brush.Color := $000000;
   Canvas.FillRect(Rect(Left, Top, Left + Width, Top + 200));
   Canvas.Brush.Style := bsClear;
-    ScreenTools.Frame(canvas, Left - 1, Top - 1, Left + Width, Top + 200,
+    ScreenTools.Frame(Canvas, Left - 1, Top - 1, Left + Width, Top + 200,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-    RFrame(canvas, Left - 2, Top - 2, Left + Width + 1, Top + 200 + 1,
+    RFrame(Canvas, Left - 2, Top - 2, Left + Width + 1, Top + 200 + 1,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
 
     // stars
     DelphiRandSeed := Player * 11111;
-    for i := 1 to Width - 16 do
+    for I := 1 to Width - 16 do
     begin
-      x := DelphiRandom((Width - 16) * 200);
-      r := DelphiRandom(13) + 28;
-      Canvas.Pixels[x div 200 + 8, x mod 200 + Top] :=
-        (r * r * r * r div 10001) * $10101;
+      X := DelphiRandom((Width - 16) * 200);
+      R := DelphiRandom(13) + 28;
+      Canvas.Pixels[X div 200 + 8, X mod 200 + Top] :=
+        (R * R * R * R div 10001) * $10101;
     end;
 
@@ -86 +86 @@
     if nHab > 2 then
       nHab := 2;
-    for i := 0 to nHab - 1 do
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xHab[i],
-        Top + 100 + yHab[i], 80, 80, 34, 1);
-    for i := 0 to nComp - 1 do
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[i],
-        Top + 100 + yComp[i], 32, 80, 1, 1);
+    for I := 0 to nHab - 1 do
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xHab[I],
+        Top + 100 + yHab[I], 80, 80, 34, 1);
+    for I := 0 to nComp - 1 do
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[I],
+        Top + 100 + yComp[I], 32, 80, 1, 1);
     if nComp > 0 then
-      for i := 3 downto nPow do
-        Sprite(canvas, HGrSystem2, Left + Width div 2 + xPow[i] + 40,
-          Top + 100 + yPow[i], 16, 27, 1, 82);
-    for i := nPow - 1 downto 0 do
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xPow[i],
-        Top + 100 + yPow[i], 56, 28, 58, 82);
+      for I := 3 downto nPow do
+        Sprite(Canvas, HGrSystem2, Left + Width div 2 + xPow[I] + 40,
+          Top + 100 + yPow[I], 16, 27, 1, 82);
+    for I := nPow - 1 downto 0 do
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xPow[I],
+        Top + 100 + yPow[I], 56, 28, 58, 82);
     if (nComp < 3) and (nHab >= 1) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32 - 16,
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32 - 16,
         Top + 100 + 7 + yComp[2], 16, 27, 1, 82);
     if (nComp >= 3) and (nHab < 1) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32,
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[2] + 32,
         Top + 100 + 7 + yComp[2], 16, 27, 18, 82);
     if (nComp < 4) and (nHab >= 2) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32 - 16,
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32 - 16,
         Top + 100 + 46 + yComp[3], 16, 27, 1, 82);
     if (nComp >= 4) and (nHab < 2) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32,
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[3] + 32,
         Top + 100 + 46 + yComp[3], 16, 27, 18, 82);
     if (nComp <> 6) and (nComp <> 2) and not((nComp = 0) and (nPow < 1)) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
         Top + 100 + 7 + yComp[nComp], 16, 27, 18, 82);
     if (nComp <> 6) and (nComp <> 3) and not((nComp = 0) and (nPow < 2)) then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[nComp],
         Top + 100 + 46 + yComp[nComp], 16, 27, 18, 82);
     if nComp = 2 then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[3],
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[3],
         Top + 100 + 7 + yComp[3], 16, 27, 18, 82);
     if nComp = 3 then
-      Sprite(canvas, HGrSystem2, Left + Width div 2 + xComp[4],
+      Sprite(Canvas, HGrSystem2, Left + Width div 2 + xComp[4],
         Top + 100 + 7 + yComp[4], 16, 27, 18, 82);
 end;
@@ -142 +142 @@
 procedure TDiaDlg.OffscreenPaint;
 var
-  p, T, max, x, y, y0, Stop, r, RoundRange, LineStep: integer;
-  s: string;
+  P, T, Max, X, Y, y0, Stop, R, RoundRange, LineStep: Integer;
+  S: string;
   List: ^TChart;
 
-  function Round(T: integer): integer;
+  function Round(T: Integer): Integer;
   var
-    n, i: integer;
+    N, I: Integer;
   begin
     if T < RoundRange then
-      n := T
+      N := T
     else
-      n := RoundRange;
-    result := 0;
-    for i := T - n to T do
-      inc(result, List[i]);
-    result := result div (n + 1);
-  end;
-
-  procedure ShareBar(x, y: integer; Cap: string; val0, val1: integer);
-  begin
-    LoweredTextOut(offscreen.canvas, -1, MainTexture, x - 2, y, Cap);
-    DLine(offscreen.canvas, x - 2, x + 169, y + 16, MainTexture.ColorTextShade,
+      N := RoundRange;
+    Result := 0;
+    for I := T - N to T do
+      Inc(Result, List[I]);
+    Result := Result div (N + 1);
+  end;
+
+  procedure ShareBar(X, Y: Integer; Cap: string; val0, val1: Integer);
+  begin
+    LoweredTextOut(Offscreen.Canvas, -1, MainTexture, X - 2, Y, Cap);
+    DLine(Offscreen.Canvas, X - 2, X + 169, Y + 16, MainTexture.ColorTextShade,
       MainTexture.ColorTextLight);
     if val0 > 0 then
-      s := Format(Phrases.Lookup('SHARE'), [val0, val1])
+      S := Format(Phrases.Lookup('SHARE'), [val0, val1])
     else
-      s := '0';
-    RisedTextOut(offscreen.canvas,
-      x + 170 - BiColorTextWidth(offscreen.canvas, s), y, s);
+      S := '0';
+    RisedTextOut(Offscreen.Canvas,
+      X + 170 - BiColorTextWidth(Offscreen.Canvas, S), Y, S);
   end;
 
@@ -176 +176 @@
   inherited;
   if Kind = dkChart then
-    with offscreen.canvas do
+    with Offscreen.Canvas do
     begin
       Font.Assign(UniFont[ftTiny]);
@@ -186 +186 @@
       GetMem(List, 4 * (MyRO.Turn + 2));
       if Mode = stExplore then
-        max := G.lx * G.ly
+        Max := G.lx * G.ly
       else
       begin
-        max := -1;
-        for p := 0 to nPl - 1 do
-          if (G.Difficulty[p] > 0) and
-            (Server(sGetChart + Mode shl 4, me, p, List^) >= rExecuted) then
+        Max := -1;
+        for P := 0 to nPl - 1 do
+          if (G.Difficulty[P] > 0) and
+            (Server(sGetChart + Mode shl 4, Me, P, List^) >= rExecuted) then
             for T := 0 to MyRO.Turn - 1 do
             begin
-              r := Round(T);
-              if r > max then
-                max := r;
+              R := Round(T);
+              if R > Max then
+                Max := R;
             end;
       end;
@@ -215 +215 @@
       for T := 0 to (MyRO.Turn - 1) div LineStep do
       begin
-        x := Border + (InnerWidth - 2 * Border) * T *
+        X := Border + (InnerWidth - 2 * Border) * T *
           LineStep div (MyRO.Turn - 1);
-        MoveTo(x, Border);
-        LineTo(x, InnerHeight - Border);
-        s := IntToStr(abs(TurnToYear(T * LineStep)));
-        Textout(x - TextWidth(s) div 2, Border - 16, s);
+        MoveTo(X, Border);
+        LineTo(X, InnerHeight - Border);
+        S := IntToStr(abs(TurnToYear(T * LineStep)));
+        Textout(X - TextWidth(S) div 2, Border - 16, S);
       end;
 
       y0 := 0;
-      if max > 0 then
+      if Max > 0 then
       begin
-        for p := 0 to nPl - 1 do
-          if (G.Difficulty[p] > 0) and
-            (Server(sGetChart + Mode shl 4, me, p, List^) >= rExecuted) then
+        for P := 0 to nPl - 1 do
+          if (G.Difficulty[P] > 0) and
+            (Server(sGetChart + Mode shl 4, Me, P, List^) >= rExecuted) then
           begin
-            Pen.Color := Tribe[p].Color;
+            Pen.Color := Tribe[P].Color;
             Stop := MyRO.Turn - 1;
             while (Stop > 0) and (List[Stop] = 0) do
-              dec(Stop);
+              Dec(Stop);
             for T := 0 to Stop do
             begin
-              r := Round(T);
-              x := Border + (InnerWidth - 2 * Border) * T div (MyRO.Turn - 1);
-              y := InnerHeight - Border - (InnerHeight - 2 * Border) *
-                r div max;
+              R := Round(T);
+              X := Border + (InnerWidth - 2 * Border) * T div (MyRO.Turn - 1);
+              Y := InnerHeight - Border - (InnerHeight - 2 * Border) *
+                R div Max;
               if T = 0 then
-                MoveTo(x, y)
+                MoveTo(X, Y)
                 // else if Mode=stTerritory then
                 // begin LineTo(x,y0); LineTo(x,y) end
               else if RoundPixels[Mode] = 0 then
               begin
-                if (y <> y0) or (T = Stop) then
-                  LineTo(x, y)
+                if (Y <> y0) or (T = Stop) then
+                  LineTo(X, Y)
               end
               else
-                LineTo(x, y);
-              y0 := y;
+                LineTo(X, Y);
+              y0 := Y;
             end;
           end;
@@ -258 +258 @@
     end
   else
-    with offscreen.canvas do
+    with Offscreen.Canvas do
     begin
       Font.Assign(UniFont[ftSmall]);
       FillOffscreen(0, 0, InnerWidth, InnerHeight);
 
-      PaintColonyShip(offscreen.canvas, Player, 8, InnerWidth - 16, yArea);
+      PaintColonyShip(Offscreen.Canvas, Player, 8, InnerWidth - 16, yArea);
 
       ShareBar(InnerWidth div 2 - 85, InnerHeight - 62,
@@ -277 +277 @@
 procedure TDiaDlg.FormPaint(Sender: TObject);
 var
-  s: string;
+  S: string;
 begin
   inherited;
-  canvas.Font.Assign(UniFont[ftNormal]);
+  Canvas.Font.Assign(UniFont[ftNormal]);
   if Kind = dkChart then
-    s := Phrases.Lookup('DIAGRAM', Mode)
-  else
-    s := Tribe[Player].TPhrase('SHORTNAME');
-  LoweredTextOut(canvas, -1, MainTexture,
-    (ClientWidth - BiColorTextWidth(canvas, s)) div 2, 31, s);
+    S := Phrases.Lookup('DIAGRAM', Mode)
+  else
+    S := Tribe[Player].TPhrase('SHORTNAME');
+  LoweredTextOut(Canvas, -1, MainTexture,
+    (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, 31, S);
 end;
 
@@ -309 +309 @@
 end;
 
-procedure TDiaDlg.ShowNewContent_Ship(NewMode: TWindowMode; p: integer);
+procedure TDiaDlg.ShowNewContent_Ship(NewMode: TWindowMode; P: Integer);
 begin
   Kind := dkShip;
-  if p < 0 then
-  begin
-    Player := me;
+  if P < 0 then
+  begin
+    Player := Me;
     while MyRO.Ship[Player].Parts[spComp] + MyRO.Ship[Player].Parts[spPow] +
       MyRO.Ship[Player].Parts[spHab] = 0 do
@@ -320 +320 @@
   end
   else
-    Player := p;
+    Player := P;
   ToggleBtn.ButtonIndex := 28;
   ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
@@ -329 +329 @@
 procedure TDiaDlg.ToggleBtnClick(Sender: TObject);
 var
-  p1: integer;
-  m: TMenuItem;
+  p1: Integer;
+  M: TMenuItem;
 begin
   if Kind = dkChart then
@@ -345 +345 @@
         MyRO.Ship[p1].Parts[spHab] > 0 then
       begin
-        m := TMenuItem.Create(Popup);
-        m.RadioItem := true;
-        m.Caption := Tribe[p1].TPhrase('SHORTNAME');
-        m.Tag := p1;
-        m.OnClick := PlayerClick;
+        M := TMenuItem.Create(Popup);
+        M.RadioItem := True;
+        M.Caption := Tribe[p1].TPhrase('SHORTNAME');
+        M.Tag := p1;
+        M.OnClick := PlayerClick;
         if p1 = Player then
-          m.Checked := true;
-        Popup.Items.Add(m);
+          M.Checked := True;
+        Popup.Items.Add(M);
       end;
     Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
@@ -363 +363 @@
 end;
 
-procedure TDiaDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TDiaDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin

trunk/LocalPlayer/Diplomacy.pas

@@ -7 +7 @@
 
 function DipCommandToString(pSender, pTarget, Treaty, OppCommand,
-  Command: integer; const OppOffer, Offer: TOffer): string;
+  Command: Integer; const OppOffer, Offer: TOffer): string;
 
 implementation
@@ -16 +16 @@
 function DipCommandToString;
 
-  function PriceToString(p, Price: integer): string;
+  function PriceToString(P, Price: Integer): string;
   begin
     case Price and opMask of
       opChoose:
-        result := Phrases.Lookup('PRICE_CHOOSE');
+        Result := Phrases.Lookup('PRICE_CHOOSE');
       opCivilReport:
-        result := Tribe[p].TPhrase('PRICE_CIVIL');
+        Result := Tribe[P].TPhrase('PRICE_CIVIL');
       opMilReport:
-        result := Tribe[p].TPhrase('PRICE_MIL');
+        Result := Tribe[P].TPhrase('PRICE_MIL');
       opMap:
-        result := Tribe[p].TPhrase('PRICE_MAP');
+        Result := Tribe[P].TPhrase('PRICE_MAP');
       opTreaty:
         { if Price-opTreaty<Treaty then
           case Treaty of
-          trPeace: result:=Phrases.Lookup('FRENDTREATY_PEACE');
-          trFriendlyContact: result:=Phrases.Lookup('FRENDTREATY_FRIENDLY');
-          trAlliance: result:=Phrases.Lookup('FRENDTREATY_ALLIANCE');
-          end
-          else } result := Phrases.Lookup('TREATY', Price - opTreaty);
+          trPeace: Result:=Phrases.Lookup('FRENDTREATY_PEACE');
+          trFriendlyContact: Result:=Phrases.Lookup('FRENDTREATY_FRIENDLY');
+          trAlliance: Result:=Phrases.Lookup('FRENDTREATY_ALLIANCE');
+          end
+          else } Result := Phrases.Lookup('TREATY', Price - opTreaty);
       opShipParts:
         case Price shr 16 and $F of
           0:
-            result := Format(Phrases.Lookup('PRICE_SHIPCOMP'),
+            Result := Format(Phrases.Lookup('PRICE_SHIPCOMP'),
               [Price and $FFFF]);
           1:
-            result := Format(Phrases.Lookup('PRICE_SHIPPOW'),
+            Result := Format(Phrases.Lookup('PRICE_SHIPPOW'),
               [Price and $FFFF]);
           2:
-            result := Format(Phrases.Lookup('PRICE_SHIPHAB'),
+            Result := Format(Phrases.Lookup('PRICE_SHIPHAB'),
               [Price and $FFFF]);
         end;
       opMoney:
-        result := Format('%d%%c', [Price - opMoney]);
+        Result := Format('%d%%c', [Price - opMoney]);
       opTribute:
-        result := Format(Phrases.Lookup('PRICE_TRIBUTE'), [Price - opTribute]);
+        Result := Format(Phrases.Lookup('PRICE_TRIBUTE'), [Price - opTribute]);
       opTech:
-        result := Phrases.Lookup('ADVANCES', Price - opTech);
+        Result := Phrases.Lookup('ADVANCES', Price - opTech);
       opAllTech:
-        result := Tribe[p].TPhrase('PRICE_ALLTECH');
+        Result := Tribe[P].TPhrase('PRICE_ALLTECH');
       opModel:
-        result := Tribe[p].ModelName[Price - opModel];
+        Result := Tribe[P].ModelName[Price - opModel];
       opAllModel:
-        result := Tribe[p].TPhrase('PRICE_ALLMODEL');
+        Result := Tribe[P].TPhrase('PRICE_ALLMODEL');
       { opCity:
-        result:=Format(TPhrase('PRICE_CITY',p),[CityName(Price-opCity)]); }
+        Result:=Format(TPhrase('PRICE_CITY',P),[CityName(Price-opCity)]); }
     end
   end;
 
 var
-  i: integer;
+  I: Integer;
   sAdd, sDeliver, sCost: string;
-  DoIntro: boolean;
+  DoIntro: Boolean;
 begin
   DoIntro := OppCommand = scDipStart;
@@ -75 +75 @@
         case Treaty of
           trPeace:
-            result := Phrases.Lookup('FRCANCELTREATY_PEACE');
+            Result := Phrases.Lookup('FRCANCELTREATY_PEACE');
           trFriendlyContact:
-            result := Phrases.Lookup('FRCANCELTREATY_FRIENDLY');
+            Result := Phrases.Lookup('FRCANCELTREATY_FRIENDLY');
           trAlliance:
-            result := Phrases.Lookup('FRCANCELTREATY_ALLIANCE');
-        end;
-        DoIntro := false;
+            Result := Phrases.Lookup('FRCANCELTREATY_ALLIANCE');
+        end;
+        DoIntro := False;
       end;
     scDipNotice:
-      result := Phrases.Lookup('FRNOTICE');
+      Result := Phrases.Lookup('FRNOTICE');
     scDipAccept:
       begin
         if (OppOffer.nDeliver + OppOffer.nCost = 1) and
           (OppOffer.Price[0] and opMask = opTreaty) and
-          (integer(OppOffer.Price[0] - opTreaty) > Treaty) then
+          (Integer(OppOffer.Price[0] - opTreaty) > Treaty) then
         // simple treaty offer
           { if OppOffer.Price[0]-opTreaty=trCeaseFire then
-            result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
-            else } result := Tribe[pTarget].TPhrase('FRACCEPTTREATY')
+            Result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
+            else } Result := Tribe[pTarget].TPhrase('FRACCEPTTREATY')
         else if OppOffer.nDeliver = 0 then
-          result := Tribe[pSender].TPhrase('FRACCEPTDEMAND_STRONG')
+          Result := Tribe[pSender].TPhrase('FRACCEPTDEMAND_STRONG')
         else if OppOffer.nCost = 0 then
-          result := Tribe[pSender].TPhrase('FRACCEPTPRESENT')
+          Result := Tribe[pSender].TPhrase('FRACCEPTPRESENT')
         else
-          result := Tribe[pSender].TPhrase('FRACCEPTOFFER');
+          Result := Tribe[pSender].TPhrase('FRACCEPTOFFER');
       end;
     scDipBreak:
       begin
-        result := Tribe[pTarget].TPhrase('FRBREAK');
-        DoIntro := false;
+        Result := Tribe[pTarget].TPhrase('FRBREAK');
+        DoIntro := False;
       end;
     scDipOffer:
       begin
-        result := '';
+        Result := '';
         if (OppCommand = scDipOffer) and
           ((OppOffer.nDeliver > 0) or (OppOffer.nCost > 0)) and
@@ -115 +115 @@
           if (OppOffer.nDeliver + OppOffer.nCost = 1) and
             (OppOffer.Price[0] and opMask = opTreaty) and
-            (integer(OppOffer.Price[0] - opTreaty) > Treaty) then
+            (Integer(OppOffer.Price[0] - opTreaty) > Treaty) then
           // simple treaty offer
-            result := Tribe[pSender].TPhrase('FRNOTACCEPTTREATY') + '\'
+            Result := Tribe[pSender].TPhrase('FRNOTACCEPTTREATY') + '\'
           else if OppOffer.nDeliver = 0 then
-            result := Tribe[pSender].TPhrase('FRNOTACCEPTDEMAND_STRONG') + '\'
+            Result := Tribe[pSender].TPhrase('FRNOTACCEPTDEMAND_STRONG') + '\'
           else if OppOffer.nCost = 0 then
-            result := Tribe[pSender].TPhrase('FRNOTACCEPTPRESENT') + '\';
+            Result := Tribe[pSender].TPhrase('FRNOTACCEPTPRESENT') + '\';
         end;
 
         sDeliver := '';
-        for i := 0 to Offer.nDeliver - 1 do
-        begin
-          sAdd := PriceToString(pSender, Offer.Price[i]);
-          if i = 0 then
+        for I := 0 to Offer.nDeliver - 1 do
+        begin
+          sAdd := PriceToString(pSender, Offer.Price[I]);
+          if I = 0 then
             sDeliver := sAdd
           else
@@ -134 +134 @@
         end;
         sCost := '';
-        for i := 0 to Offer.nCost - 1 do
-        begin
-          sAdd := PriceToString(pTarget, Offer.Price[Offer.nDeliver + i]);
-          if i = 0 then
+        for I := 0 to Offer.nCost - 1 do
+        begin
+          sAdd := PriceToString(pTarget, Offer.Price[Offer.nDeliver + I]);
+          if I = 0 then
             sCost := sAdd
           else
@@ -147 +147 @@
           if (OppCommand = scDipOffer) and
             ((OppOffer.nDeliver = 0) and (OppOffer.nCost = 0)) then
-            result := Tribe[pTarget].TPhrase('FRBYE')
+            Result := Tribe[pTarget].TPhrase('FRBYE')
           else
           begin
-            if (result = '') and (OppCommand = scDipOffer) and
+            if (Result = '') and (OppCommand = scDipOffer) and
               ((OppOffer.nDeliver > 0) or (OppOffer.nCost > 0)) then
             begin
               if (OppOffer.nDeliver = 1) and (OppOffer.Price[0] = opChoose) and
                 not Phrases2FallenBackToEnglish then
-                result := Tribe[pSender].TString
+                Result := Tribe[pSender].TString
                   (Phrases2.Lookup('FRNOTACCEPTANYOFFER')) + ' '
               else if (OppOffer.nCost = 1) and
                 (OppOffer.Price[OppOffer.nDeliver] = opChoose) and not Phrases2FallenBackToEnglish
               then
-                result := Tribe[pSender].TString
+                Result := Tribe[pSender].TString
                   (Phrases2.Lookup('FRNOTACCEPTANYWANT')) + ' '
               else
-                result := Tribe[pSender].TPhrase('FRNOTACCEPTOFFER') + ' ';
+                Result := Tribe[pSender].TPhrase('FRNOTACCEPTOFFER') + ' ';
             end;
-            result := result + Phrases.Lookup('FRDONE');
-            DoIntro := false
+            Result := Result + Phrases.Lookup('FRDONE');
+            DoIntro := False
           end
         end
         else if (Offer.nDeliver + Offer.nCost = 1) and
           (Offer.Price[0] and opMask = opTreaty) and
-          (integer(Offer.Price[0] - opTreaty) > Treaty) then
+          (Integer(Offer.Price[0] - opTreaty) > Treaty) then
         // simple treaty offer
         begin
@@ -177 +177 @@
             // trCeaseFire: result:=result+Tribe[pTarget].TPhrase('FRCEASEFIRE');
             trPeace:
-              result := result + Tribe[pTarget].TPhrase('FRPEACE');
+              Result := Result + Tribe[pTarget].TPhrase('FRPEACE');
             trFriendlyContact:
-              result := result + Tribe[pTarget].TPhrase('FRFRIENDLY');
+              Result := Result + Tribe[pTarget].TPhrase('FRFRIENDLY');
             trAlliance:
-              result := result + Tribe[pTarget].TPhrase('FRALLIANCE');
+              Result := Result + Tribe[pTarget].TPhrase('FRALLIANCE');
           end
         end
@@ -188 +188 @@
           if (Treaty >= trFriendlyContact) and not Phrases2FallenBackToEnglish
           then
-            result := result +
+            Result := Result +
               Format(Tribe[pTarget].TString(Phrases2.Lookup('FRDEMAND_SOFT')
               ), [sCost])
           else
           begin
-            result := result +
+            Result := Result +
               Format(Tribe[pTarget].TPhrase('FRDEMAND_STRONG'), [sCost]);
-            DoIntro := false
+            DoIntro := False
           end
         end
         else if Offer.nCost = 0 then // present
-          result := result + Format(Tribe[pTarget].TPhrase('FRPRESENT'),
+          Result := Result + Format(Tribe[pTarget].TPhrase('FRPRESENT'),
             [sDeliver])
         else if (Offer.nDeliver = 1) and (Offer.Price[0] = opChoose) then
-          result := result + Format(Phrases.Lookup('FRDELCHOICE'), [sCost])
+          Result := Result + Format(Phrases.Lookup('FRDELCHOICE'), [sCost])
         else if (Offer.nCost = 1) and (Offer.Price[Offer.nDeliver] = opChoose)
         then
-          result := result + Format(Phrases.Lookup('FRCOSTCHOICE'), [sDeliver])
+          Result := Result + Format(Phrases.Lookup('FRCOSTCHOICE'), [sDeliver])
         else
-          result := result + Format(Phrases.Lookup('FROFFER'),
+          Result := Result + Format(Phrases.Lookup('FROFFER'),
             [sDeliver, sCost]);
       end;
@@ -213 +213 @@
   if DoIntro then
     if Treaty < trPeace then
-      result := Tribe[pSender].TPhrase('FRSTART_NOTREATY') + ' ' + result
+      Result := Tribe[pSender].TPhrase('FRSTART_NOTREATY') + ' ' + Result
     else
-      result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + result
+      Result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + Result
 end;
 

trunk/LocalPlayer/Draft.pas

@@ -20 +20 @@
     procedure CloseBtnClick(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure OKBtnClick(Sender: TObject);
     procedure PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
   public
     procedure ShowNewContent(NewMode: TWindowMode);
@@ -30 +30 @@
   private
     Domain, MaxLines, Lines, Cut, yDomain, yFeature, yWeight, yTotal, yView,
-      IncCap, DecCap: integer;
-    code: array [0 .. nFeature - 1] of integer;
+      IncCap, DecCap: Integer;
+    Code: array [0 .. nFeature - 1] of Integer;
     Template, Back: TBitmap;
-    function IsFeatureInList(d, i: integer): boolean;
-    procedure SetDomain(d: integer);
+    function IsFeatureInList(D, I: Integer): Boolean;
+    procedure SetDomain(D: Integer);
   end;
 
@@ -108 +108 @@
 procedure TDraftDlg.OffscreenPaint;
 
-  function DomainAvailable(d: integer): boolean;
-  begin
-    result := (upgrade[d, 0].Preq = preNone) or
-      (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable);
+  function DomainAvailable(D: Integer): Boolean;
+  begin
+    Result := (upgrade[D, 0].Preq = preNone) or
+      (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable);
   end;
 
   procedure PaintTotalBars;
   var
-    i, y, dx, num, w: integer;
-    s: string;
-  begin
-    with offscreen.Canvas do
+    I, Y, dx, num, W: Integer;
+    S: string;
+  begin
+    with Offscreen.Canvas do
     begin
       // strength bar
-      y := yTotal;
-      DarkGradient(offscreen.Canvas, xTotal - 6, y + 1, 184, 2);
-      DarkGradient(offscreen.Canvas, xTotal2 + 172, y + 1, 95, 2);
-      RisedTextOut(offscreen.Canvas, xTotal - 2, y,
+      Y := yTotal;
+      DarkGradient(Offscreen.Canvas, xTotal - 6, Y + 1, 184, 2);
+      DarkGradient(Offscreen.Canvas, xTotal2 + 172, Y + 1, 95, 2);
+      RisedTextOut(Offscreen.Canvas, xTotal - 2, Y,
         Phrases.Lookup('UNITSTRENGTH'));
-      RisedTextOut(offscreen.Canvas, xTotal + 112 + 30, y,
+      RisedTextOut(Offscreen.Canvas, xTotal + 112 + 30, Y,
         'x' + IntToStr(MyRO.DevModel.MStrength));
-      RisedTextOut(offscreen.Canvas, xTotal2 + 148 + 30, y, '=');
-      s := IntToStr(MyRO.DevModel.Attack) + '/' +
+      RisedTextOut(Offscreen.Canvas, xTotal2 + 148 + 30, Y, '=');
+      S := IntToStr(MyRO.DevModel.Attack) + '/' +
         IntToStr(MyRO.DevModel.Defense);
-      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
-        BiColorTextWidth(offscreen.Canvas, s), y, s);
+      RisedTextOut(Offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
+        BiColorTextWidth(Offscreen.Canvas, S), Y, S);
 
       // transport bar
       if MyRO.DevModel.MTrans > 0 then
       begin
-        y := yTotal + 19;
-        DarkGradient(offscreen.Canvas, xTotal - 6, y + 1, 184, 1);
-        DarkGradient(offscreen.Canvas, xTotal2 + 172, y + 1, 95, 1);
-        RisedTextOut(offscreen.Canvas, xTotal - 2, y,
+        Y := yTotal + 19;
+        DarkGradient(Offscreen.Canvas, xTotal - 6, Y + 1, 184, 1);
+        DarkGradient(Offscreen.Canvas, xTotal2 + 172, Y + 1, 95, 1);
+        RisedTextOut(Offscreen.Canvas, xTotal - 2, Y,
           Phrases.Lookup('UNITTRANSPORT'));
-        RisedTextOut(offscreen.Canvas, xTotal + 112 + 30, y,
+        RisedTextOut(Offscreen.Canvas, xTotal + 112 + 30, Y,
           'x' + IntToStr(MyRO.DevModel.MTrans));
-        RisedTextOut(offscreen.Canvas, xTotal2 + 148 + 30, y, '=');
+        RisedTextOut(Offscreen.Canvas, xTotal2 + 148 + 30, Y, '=');
 
         Font.Color := $000000;
         dx := -237 - 30;
-        for i := mcFirstNonCap - 1 downto 3 do
-          if i in [mcSeaTrans, mcCarrier, mcAirTrans] then
+        for I := mcFirstNonCap - 1 downto 3 do
+          if I in [mcSeaTrans, mcCarrier, mcAirTrans] then
           begin
-            num := MyRO.DevModel.Cap[i] * MyRO.DevModel.MTrans;
+            num := MyRO.DevModel.Cap[I] * MyRO.DevModel.MTrans;
             if num > 0 then
             begin
-              inc(dx, 15);
+              Inc(dx, 15);
               Brush.Color := $C0C0C0;
-              FrameRect(Rect(xTotal2 - 3 - dx, y + 2,
-                xTotal2 + 11 - dx, y + 16));
+              FrameRect(Rect(xTotal2 - 3 - dx, Y + 2,
+                xTotal2 + 11 - dx, Y + 16));
               Brush.Style := bsClear;
-              Sprite(offscreen, HGrSystem, xTotal2 - 1 - dx, y + 4, 10, 10,
-                66 + i mod 11 * 11, 137 + i div 11 * 11);
+              Sprite(Offscreen, HGrSystem, xTotal2 - 1 - dx, Y + 4, 10, 10,
+                66 + I mod 11 * 11, 137 + I div 11 * 11);
               if num > 1 then
               begin
-                s := IntToStr(num);
-                w := TextWidth(s);
-                inc(dx, w + 1);
+                S := IntToStr(num);
+                W := TextWidth(S);
+                Inc(dx, W + 1);
                 Brush.Color := $FFFFFF;
-                FillRect(Rect(xTotal2 - 3 - dx, y + 2,
-                  xTotal2 + w - 1 - dx, y + 16));
+                FillRect(Rect(xTotal2 - 3 - dx, Y + 2,
+                  xTotal2 + W - 1 - dx, Y + 16));
                 Brush.Style := bsClear;
-                Textout(xTotal2 - 3 - dx + 1, y, s);
+                Textout(xTotal2 - 3 - dx + 1, Y, S);
               end;
             end;
@@ -178 +178 @@
 
       // speed bar
-      y := yTotal + 38;
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
+      Y := yTotal + 38;
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, Y,
         Phrases.Lookup('UNITSPEED'));
-      DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+      DLine(Offscreen.Canvas, xTotal - 2, xTotal + 174, Y + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+      DLine(Offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, Y + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      s := MovementToString(MyRO.DevModel.Speed);
-      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
-        TextWidth(s), y, s);
+      S := MovementToString(MyRO.DevModel.Speed);
+      RisedTextOut(Offscreen.Canvas, xTotal2 + 170 + 64 + 30 -
+        TextWidth(S), Y, S);
 
       // cost bar
-      y := yTotal + 57;
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
+      Y := yTotal + 57;
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, Y,
         Phrases.Lookup('UNITCOST'));
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal + 112 + 30, y,
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal + 112 + 30, Y,
         'x' + IntToStr(MyRO.DevModel.MCost));
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-        xTotal2 + 148 + 30, y, '=');
-      DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+        xTotal2 + 148 + 30, Y, '=');
+      DLine(Offscreen.Canvas, xTotal - 2, xTotal + 174, Y + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+      DLine(Offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, Y + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      s := IntToStr(MyRO.DevModel.Cost);
-      RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
-        TextWidth(s), y, s);
-      Sprite(offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, y + 4, 10,
+      S := IntToStr(MyRO.DevModel.Cost);
+      RisedTextOut(Offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
+        TextWidth(S), Y, S);
+      Sprite(Offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, Y + 4, 10,
         10, 88, 115);
 
-      if G.Difficulty[me] <> 2 then
+      if G.Difficulty[Me] <> 2 then
       begin // corrected cost bar
-        y := yTotal + 76;
-        LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, y,
-          Phrases.Lookup('COSTDIFF' + char(48 + G.Difficulty[me])));
-        LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-          xTotal2 + 148 + 30, y, '=');
-        DLine(offscreen.Canvas, xTotal - 2, xTotal + 174, y + 16,
+        Y := yTotal + 76;
+        LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, Y,
+          Phrases.Lookup('COSTDIFF' + char(48 + G.Difficulty[Me])));
+        LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+          xTotal2 + 148 + 30, Y, '=');
+        DLine(Offscreen.Canvas, xTotal - 2, xTotal + 174, Y + 16,
           MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-        DLine(offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, y + 16,
+        DLine(Offscreen.Canvas, xTotal2 + 176, xTotal2 + 263, Y + 16,
           MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-        s := IntToStr(MyRO.DevModel.Cost * BuildCostMod
-          [G.Difficulty[me]] div 12);
-        RisedTextOut(offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
-          TextWidth(s), y, s);
-        Sprite(offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, y + 4, 10,
+        S := IntToStr(MyRO.DevModel.Cost * BuildCostMod
+          [G.Difficulty[Me]] div 12);
+        RisedTextOut(Offscreen.Canvas, xTotal2 + 170 + 64 + 30 - 12 -
+          TextWidth(S), Y, S);
+        Sprite(Offscreen, HGrSystem, xTotal2 + 170 + 54 + 30, Y + 4, 10,
           10, 88, 115);
       end;
@@ -229 +229 @@
 
 var
-  i, j, x, d, n, TextColor, CapWeight, DomainCount: integer;
+  I, J, X, D, N, TextColor, CapWeight, DomainCount: Integer;
 begin
   inherited;
@@ -253 +253 @@
     Template.Height - 64 - Cut);
 
-  BitBltCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  BitBltCanvas(Offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
     Back.Canvas, 0, 0);
 
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextOut(offscreen.Canvas, 10, 7, Caption);
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextOut(Offscreen.Canvas, 10, 7, Caption);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
   with MyRO.DevModel do
   begin
     DomainCount := 0;
-    for d := 0 to nDomains - 1 do
-      if DomainAvailable(d) then
-        inc(DomainCount);
+    for D := 0 to nDomains - 1 do
+      if DomainAvailable(D) then
+        Inc(DomainCount);
     if DomainCount > 1 then
     begin
-      for d := 0 to nDomains - 1 do
-        if DomainAvailable(d) then
+      for D := 0 to nDomains - 1 do
+        if DomainAvailable(D) then
         begin
-          x := xDomain + d * DomainPitch;
-          if d = Domain then
-            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
+          X := xDomain + D * DomainPitch;
+          if D = Domain then
+            ImageOp_BCC(Offscreen, Templates.Data, X, yDomain, 142, 246 + 37 * D, 36,
               36, 0, $00C0FF)
           else
-            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
+            ImageOp_BCC(Offscreen, Templates.Data, X, yDomain, 142, 246 + 37 * D, 36,
               36, 0, $606060);
         end;
-      Frame(offscreen.Canvas, xDomain - 11, yDomain - 3,
+      Frame(Offscreen.Canvas, xDomain - 11, yDomain - 3,
         xDomain + 2 * DomainPitch + 46, yDomain + 38, $B0B0B0, $FFFFFF);
-      RFrame(offscreen.Canvas, xDomain - 12, yDomain - 4,
+      RFrame(Offscreen.Canvas, xDomain - 12, yDomain - 4,
         xDomain + 2 * DomainPitch + 47, yDomain + 39, $FFFFFF, $B0B0B0);
     end;
@@ -294 +294 @@
 
     // display weight
-    with offscreen.Canvas do
-    begin
-      for i := 0 to MaxWeight - 1 do
-        if i < Weight then
-          ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight),
+    with Offscreen.Canvas do
+    begin
+      for I := 0 to MaxWeight - 1 do
+        if I < Weight then
+          ImageOp_BCC(Offscreen, Templates.Data, Point(xWeight + 20 * I, yWeight),
             WeightOn.BoundsRect, 0, $949494)
         else
-          ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight),
+          ImageOp_BCC(Offscreen, Templates.Data, Point(xWeight + 20 * I, yWeight),
             WeightOff.BoundsRect, 0, $949494);
     end;
 
-    with offscreen.Canvas do
-      for i := 0 to Lines - 1 do
+    with Offscreen.Canvas do
+      for I := 0 to Lines - 1 do
       begin
-        if not(code[i] in AutoFeature) then
+        if not(Code[I] in AutoFeature) then
         begin
           // paint +/- butttons
-          if code[i] < mcFirstNonCap then
+          if Code[I] < mcFirstNonCap then
           begin
-            Dump(offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
-              i, 12, 12, 169, 172);
-            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
-              i, 12, 12, 169, 159);
-            RFrame(offscreen.Canvas, xFeature - (21 + 1),
-              yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
-              yFeature + 2 + LinePitch * i + 12, MainTexture.ColorBevelShade,
+            Dump(Offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
+              I, 12, 12, 169, 172);
+            Dump(Offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              I, 12, 12, 169, 159);
+            RFrame(Offscreen.Canvas, xFeature - (21 + 1),
+              yFeature + 2 + LinePitch * I - 1, xFeature - (21 - 24),
+              yFeature + 2 + LinePitch * I + 12, MainTexture.ColorBevelShade,
               MainTexture.ColorBevelLight);
           end
           else
           begin
-            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
-              i, 12, 12, 169, 185 + 13 * MyRO.DevModel.Cap[code[i]]);
-            RFrame(offscreen.Canvas, xFeature - (9 + 1),
-              yFeature + 2 + LinePitch * i - 1, xFeature - (21 - 24),
-              yFeature + 2 + LinePitch * i + 12, MainTexture.ColorBevelShade,
+            Dump(Offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              I, 12, 12, 169, 185 + 13 * MyRO.DevModel.Cap[Code[I]]);
+            RFrame(Offscreen.Canvas, xFeature - (9 + 1),
+              yFeature + 2 + LinePitch * I - 1, xFeature - (21 - 24),
+              yFeature + 2 + LinePitch * I + 12, MainTexture.ColorBevelShade,
               MainTexture.ColorBevelLight);
           end;
 
           // paint cost
-          LightGradient(offscreen.Canvas, xFeature + 34,
-            yFeature + LinePitch * i, 50, HGrSystem.Data.Canvas.Pixels
+          LightGradient(Offscreen.Canvas, xFeature + 34,
+            yFeature + LinePitch * I, 50, HGrSystem.Data.Canvas.Pixels
             [187, 137]);
-          if (Domain = dGround) and (code[i] = mcDefense) then
+          if (Domain = dGround) and (Code[I] = mcDefense) then
             CapWeight := 2
           else
-            CapWeight := Feature[code[i]].Weight;
-          n := CapWeight + Feature[code[i]].Cost;
-          d := 6;
-          while (n - 1) * d * 2 > 48 - 10 do
-            dec(d);
-          for j := 0 to n - 1 do
-            if j < CapWeight then
-              Sprite(offscreen, HGrSystem, xFeature + 54 + (j * 2 + 1 - n) * d,
-                yFeature + 2 + LinePitch * i + 1, 10, 10, 88, 126)
+            CapWeight := Feature[Code[I]].Weight;
+          N := CapWeight + Feature[Code[I]].Cost;
+          D := 6;
+          while (N - 1) * D * 2 > 48 - 10 do
+            Dec(D);
+          for J := 0 to N - 1 do
+            if J < CapWeight then
+              Sprite(Offscreen, HGrSystem, xFeature + 54 + (J * 2 + 1 - N) * D,
+                yFeature + 2 + LinePitch * I + 1, 10, 10, 88, 126)
             else
-              Sprite(offscreen, HGrSystem, xFeature + 54 + (j * 2 + 1 - n) * d,
-                yFeature + 2 + LinePitch * i + 1, 10, 10, 88, 115);
+              Sprite(Offscreen, HGrSystem, xFeature + 54 + (J * 2 + 1 - N) * D,
+                yFeature + 2 + LinePitch * I + 1, 10, 10, 88, 115);
         end; // if not (code[i] in AutoFeature)
-        DarkGradient(offscreen.Canvas, xFeature + 17,
-          yFeature + LinePitch * i, 16, 1);
-        ScreenTools.Frame(offscreen.Canvas, xFeature + 18, yFeature + 1 + LinePitch * i,
-          xFeature + 20 - 2 + 13, yFeature + 2 + 1 - 2 + 13 + LinePitch * i,
+        DarkGradient(Offscreen.Canvas, xFeature + 17,
+          yFeature + LinePitch * I, 16, 1);
+        ScreenTools.Frame(Offscreen.Canvas, xFeature + 18, yFeature + 1 + LinePitch * I,
+          xFeature + 20 - 2 + 13, yFeature + 2 + 1 - 2 + 13 + LinePitch * I,
           $C0C0C0, $C0C0C0);
-        Sprite(offscreen, HGrSystem, xFeature + 20, yFeature + 2 + 1 + LinePitch
-          * i, 10, 10, 66 + code[i] mod 11 * 11, 137 + code[i] div 11 * 11);
-
-        if MyRO.DevModel.Cap[code[i]] > 0 then
+        Sprite(Offscreen, HGrSystem, xFeature + 20, yFeature + 2 + 1 + LinePitch
+          * I, 10, 10, 66 + Code[I] mod 11 * 11, 137 + Code[I] div 11 * 11);
+
+        if MyRO.DevModel.Cap[Code[I]] > 0 then
           TextColor := MainTexture.ColorLitText
         else
           TextColor := -1;
 
-        if code[i] < mcFirstNonCap then
-          LoweredTextOut(offscreen.Canvas, TextColor, MainTexture, xFeature + 7,
-            yFeature + LinePitch * i - 1, IntToStr(MyRO.DevModel.Cap[code[i]]));
-        LoweredTextOut(offscreen.Canvas, TextColor, MainTexture, xFeature + 88,
-          yFeature + LinePitch * i - 1, Phrases.Lookup('FEATURES', code[i]));
+        if Code[I] < mcFirstNonCap then
+          LoweredTextOut(Offscreen.Canvas, TextColor, MainTexture, xFeature + 7,
+            yFeature + LinePitch * I - 1, IntToStr(MyRO.DevModel.Cap[Code[I]]));
+        LoweredTextOut(Offscreen.Canvas, TextColor, MainTexture, xFeature + 88,
+          yFeature + LinePitch * I - 1, Phrases.Lookup('FEATURES', Code[I]));
       end;
   end;
 
   // free features
-  j := 0;
-  for i := 0 to nFeature - 1 do
-    if (i in AutoFeature) and (1 shl Domain and Feature[i].Domains <> 0) and
-      (Feature[i].Preq <> preNA) and
-      ((Feature[i].Preq = preSun) and (MyRO.Wonder[woSun].EffectiveOwner = me)
-      or (Feature[i].Preq >= 0) and (MyRO.Tech[Feature[i].Preq] >= tsApplicable)
-      ) and not((Feature[i].Preq = adSteamEngine) and
+  J := 0;
+  for I := 0 to nFeature - 1 do
+    if (I in AutoFeature) and (1 shl Domain and Feature[I].Domains <> 0) and
+      (Feature[I].Preq <> preNA) and
+      ((Feature[I].Preq = preSun) and (MyRO.Wonder[woSun].EffectiveOwner = Me)
+      or (Feature[I].Preq >= 0) and (MyRO.Tech[Feature[I].Preq] >= tsApplicable)
+      ) and not((Feature[I].Preq = adSteamEngine) and
       (MyRO.Tech[adNuclearPower] >= tsApplicable)) then
     begin
-      DarkGradient(offscreen.Canvas, xWeight + 4, yWeight + 32 + LinePitch
-        * j, 16, 1);
-      Frame(offscreen.Canvas, xWeight + 5, yWeight + 33 + LinePitch * j,
-        xWeight + 18, yWeight + 47 + LinePitch * j, $C0C0C0, $C0C0C0);
-      Sprite(offscreen, HGrSystem, xWeight + 7, yWeight + 36 + LinePitch * j,
-        10, 10, 66 + i mod 11 * 11, 137 + i div 11 * 11);
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xWeight + 26,
-        yWeight + 31 + LinePitch * j, Phrases.Lookup('FEATURES', i));
-      inc(j);
-    end;
-
-  with Tribe[me].ModelPicture[MyRO.nModel] do
-  begin
-    FrameImage(offscreen.Canvas, BigImp, xView + 4, yView + 4, xSizeBig,
+      DarkGradient(Offscreen.Canvas, xWeight + 4, yWeight + 32 + LinePitch
+        * J, 16, 1);
+      Frame(Offscreen.Canvas, xWeight + 5, yWeight + 33 + LinePitch * J,
+        xWeight + 18, yWeight + 47 + LinePitch * J, $C0C0C0, $C0C0C0);
+      Sprite(Offscreen, HGrSystem, xWeight + 7, yWeight + 36 + LinePitch * J,
+        10, 10, 66 + I mod 11 * 11, 137 + I div 11 * 11);
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xWeight + 26,
+        yWeight + 31 + LinePitch * J, Phrases.Lookup('FEATURES', I));
+      Inc(J);
+    end;
+
+  with Tribe[Me].ModelPicture[MyRO.nModel] do
+  begin
+    FrameImage(Offscreen.Canvas, BigImp, xView + 4, yView + 4, xSizeBig,
       ySizeBig, 0, 0);
-    Sprite(offscreen, HGr, xView, yView, 64, 44, pix mod 10 * 65 + 1,
+    Sprite(Offscreen, HGr, xView, yView, 64, 44, pix mod 10 * 65 + 1,
       pix div 10 * 49 + 1);
   end;
@@ -404 +404 @@
 end;
 
-procedure TDraftDlg.SetDomain(d: integer);
-
-  function Prio(fix: integer): integer;
+procedure TDraftDlg.SetDomain(D: Integer);
+
+  function Prio(fix: Integer): Integer;
   var
-    FeaturePreq: integer;
+    FeaturePreq: Integer;
   begin
     FeaturePreq := Feature[fix].Preq;
-    assert(FeaturePreq <> preNA);
+    Assert(FeaturePreq <> preNA);
     if fix < mcFirstNonCap then
-      result := 10000 + fix
+      Result := 10000 + fix
     else if FeaturePreq = preNone then
-      result := 20000
+      Result := 20000
     else if FeaturePreq < 0 then
-      result := 40000
+      Result := 40000
     else
-      result := 30000 + AdvValue[FeaturePreq];
+      Result := 30000 + AdvValue[FeaturePreq];
     if not(fix in AutoFeature) then
-      inc(result, 90000);
+      Inc(Result, 90000);
   end;
 
 var
-  i, j, x: integer;
-begin
-  Domain := d;
+  I, J, X: Integer;
+begin
+  Domain := D;
   Lines := 0;
-  for i := 0 to nFeature - 1 do
-    if IsFeatureInList(Domain, i) then
-    begin
-      code[Lines] := i;
-      inc(Lines);
+  for I := 0 to nFeature - 1 do
+    if IsFeatureInList(Domain, I) then
+    begin
+      Code[Lines] := I;
+      Inc(Lines);
     end;
   yFeature := yFeature0 + (MaxLines - Lines) * LinePitch div 2;
 
   // sort features
-  for i := 0 to Lines - 2 do
-    for j := i + 1 to Lines - 1 do
-      if Prio(code[i]) > Prio(code[j]) then
+  for I := 0 to Lines - 2 do
+    for J := I + 1 to Lines - 1 do
+      if Prio(Code[I]) > Prio(Code[J]) then
       begin // exchange
-        x := code[i];
-        code[i] := code[j];
-        code[j] := x;
+        X := Code[I];
+        Code[I] := Code[J];
+        Code[J] := X;
       end;
 end;
 
-function TDraftDlg.IsFeatureInList(d, i: integer): boolean;
-begin
-  result := not(i in AutoFeature) and (1 shl d and Feature[i].Domains <> 0) and
-    (Feature[i].Preq <> preNA) and
-    ((Feature[i].Preq = preNone) or (Feature[i].Preq = preSun) and
-    (MyRO.Wonder[woSun].EffectiveOwner = me) or (Feature[i].Preq >= 0) and
-    (MyRO.Tech[Feature[i].Preq] >= tsApplicable));
+function TDraftDlg.IsFeatureInList(D, I: Integer): Boolean;
+begin
+  Result := not(I in AutoFeature) and (1 shl D and Feature[I].Domains <> 0) and
+    (Feature[I].Preq <> preNA) and
+    ((Feature[I].Preq = preNone) or (Feature[I].Preq = preSun) and
+    (MyRO.Wonder[woSun].EffectiveOwner = Me) or (Feature[I].Preq >= 0) and
+    (MyRO.Tech[Feature[I].Preq] >= tsApplicable));
 end;
 
 procedure TDraftDlg.FormShow(Sender: TObject);
 var
-  count, d, i: integer;
+  count, D, I: Integer;
 begin
   Domain := dGround;
   while (Domain < dAir) and (upgrade[Domain, 0].Preq <> preNone) and
     (MyRO.Tech[upgrade[Domain, 0].Preq] < tsApplicable) do
-    inc(Domain);
+    Inc(Domain);
 
   // count max number of features in any domain
   MaxLines := 0;
-  for d := 0 to nDomains - 1 do
-    if (upgrade[d, 0].Preq = preNone) or
-      (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable) then
+  for D := 0 to nDomains - 1 do
+    if (upgrade[D, 0].Preq = preNone) or
+      (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable) then
     begin
       count := 0;
-      for i := 0 to nFeature - 1 do
-        if IsFeatureInList(d, i) then
-          inc(count);
+      for I := 0 to nFeature - 1 do
+        if IsFeatureInList(D, I) then
+          Inc(count);
       if count > MaxLines then
         MaxLines := count;
@@ -493 +493 @@
 
   SetDomain(Domain);
-  Server(sCreateDevModel, me, Domain, nil^);
+  Server(sCreateDevModel, Me, Domain, nil^);
   MyModel[MyRO.nModel] := MyRO.DevModel;
-  InitMyModel(MyRO.nModel, false);
+  InitMyModel(MyRO.nModel, False);
   OffscreenPaint;
   IncCap := -1;
@@ -507 +507 @@
 
 procedure TDraftDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, d: integer;
+  I, D: Integer;
 begin
   if Button = mbLeft then
   begin
-    for d := 0 to nDomains - 1 do
-      if (d <> Domain) and ((upgrade[d, 0].Preq = preNone) or
-        (MyRO.Tech[upgrade[d, 0].Preq] >= tsApplicable)) and
-        (x >= xDomain + d * DomainPitch) and
-        (x < xDomain + d * DomainPitch + 36) and (y >= yDomain) and
-        (y < yDomain + 36) then
+    for D := 0 to nDomains - 1 do
+      if (D <> Domain) and ((upgrade[D, 0].Preq = preNone) or
+        (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable)) and
+        (X >= xDomain + D * DomainPitch) and
+        (X < xDomain + D * DomainPitch + 36) and (Y >= yDomain) and
+        (Y < yDomain + 36) then
       begin
-        SetDomain(d);
-        Server(sCreateDevModel, me, Domain, nil^);
+        SetDomain(D);
+        Server(sCreateDevModel, Me, Domain, nil^);
         MyModel[MyRO.nModel] := MyRO.DevModel;
-        InitMyModel(MyRO.nModel, false);
+        InitMyModel(MyRO.nModel, False);
         SmartUpdateContent;
       end;
 
-    if (y >= yFeature) and (y < yFeature + LinePitch * Lines) then
-    begin
-      i := (y - yFeature) div LinePitch;
-      if (x >= xFeature - 21) and (x < ClientWidth) and (ssShift in Shift) then
-        HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkFeature, code[i])
-      else if not(code[i] in AutoFeature) then
+    if (Y >= yFeature) and (Y < yFeature + LinePitch * Lines) then
+    begin
+      I := (Y - yFeature) div LinePitch;
+      if (X >= xFeature - 21) and (X < ClientWidth) and (ssShift in Shift) then
+        HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkFeature, Code[I])
+      else if not(Code[I] in AutoFeature) then
       begin
-        if (code[i] < mcFirstNonCap) and (x >= xFeature - 21) and
-          (x < xFeature - 21 + 12) then
+        if (Code[I] < mcFirstNonCap) and (X >= xFeature - 21) and
+          (X < xFeature - 21 + 12) then
         begin
-          IncCap := code[i];
-          Dump(offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
-            i, 12, 12, 182, 172);
+          IncCap := Code[I];
+          Dump(Offscreen, HGrSystem, xFeature - 21, yFeature + 2 + LinePitch *
+            I, 12, 12, 182, 172);
           SmartInvalidate;
         end
-        else if (x >= xFeature - 9) and (x < xFeature - 9 + 12) then
+        else if (X >= xFeature - 9) and (X < xFeature - 9 + 12) then
         begin
-          DecCap := code[i];
-          if code[i] < mcFirstNonCap then
-            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
-              i, 12, 12, 182, 159)
+          DecCap := Code[I];
+          if Code[I] < mcFirstNonCap then
+            Dump(Offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              I, 12, 12, 182, 159)
           else
-            Dump(offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
-              i, 12, 12, 182, 185 + 13 * MyRO.DevModel.Cap[code[i]]);
+            Dump(Offscreen, HGrSystem, xFeature - 9, yFeature + 2 + LinePitch *
+              I, 12, 12, 182, 185 + 13 * MyRO.DevModel.Cap[Code[I]]);
           SmartInvalidate;
         end;
@@ -559 +559 @@
 
 procedure TDraftDlg.PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  NewValue: integer;
+  NewValue: Integer;
 begin
   if IncCap >= 0 then
   begin
     NewValue := MyRO.DevModel.Cap[IncCap] + 1;
-    Server(sSetDevModelCap + NewValue shl 4, me, IncCap, nil^);
+    Server(sSetDevModelCap + NewValue shl 4, Me, IncCap, nil^);
     MyModel[MyRO.nModel] := MyRO.DevModel;
-    InitMyModel(MyRO.nModel, false);
+    InitMyModel(MyRO.nModel, False);
     SmartUpdateContent;
     IncCap := -1;
@@ -579 +579 @@
       if DecCap >= mcFirstNonCap then
         NewValue := -NewValue;
-      Server(sSetDevModelCap + NewValue shl 4, me, DecCap, nil^);
+      Server(sSetDevModelCap + NewValue shl 4, Me, DecCap, nil^);
       MyModel[MyRO.nModel] := MyRO.DevModel;
-      InitMyModel(MyRO.nModel, false);
+      InitMyModel(MyRO.nModel, False);
     end;
     SmartUpdateContent;

trunk/LocalPlayer/Enhance.pas

@@ -37 +37 @@
     NoMap: TIsoMap;
   public
-    procedure ShowNewContent(NewMode: TWindowMode; TerrType: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; TerrType: Integer = -1);
   protected
-    Page: integer;
+    Page: Integer;
     procedure OffscreenPaint; override;
   end;
@@ -56 +56 @@
 procedure TEnhanceDlg.FormCreate(Sender: TObject);
 var
-  TerrType: integer;
-  m: TMenuItem;
+  TerrType: Integer;
+  M: TMenuItem;
 begin
   inherited;
@@ -71 +71 @@
     if TerrType <> fJungle then
     begin
-      m := TMenuItem.Create(Popup);
-      m.RadioItem := true;
+      M := TMenuItem.Create(Popup);
+      M.RadioItem := True;
       if TerrType = fGrass then
-        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+        M.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
           [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
           fGrass + 12)])
       else if TerrType = fForest then
-        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+        M.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
           [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
           fJungle)])
       else
-        m.Caption := Phrases.Lookup('TERRAIN', TerrType);
-      m.Tag := TerrType;
-      m.OnClick := TerrClick;
-      Popup.Items.Add(m);
+        M.Caption := Phrases.Lookup('TERRAIN', TerrType);
+      M.Tag := TerrType;
+      M.OnClick := TerrClick;
+      Popup.Items.Add(M);
     end;
 end;
@@ -96 +96 @@
 procedure TEnhanceDlg.FormPaint(Sender: TObject);
 var
-  i: integer;
+  I: Integer;
 begin
   inherited;
@@ -103 +103 @@
   BtnFrame(Canvas, Rect(job3.Left, job3.Top, job9.Left + job9.Width,
     job3.Top + job3.Height), MainTexture);
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonC then
-      BitBltCanvas(Canvas, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
-        HGrSystem.Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
-        1 + Controls[i].Tag div 7 * 9);
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonC then
+      BitBltCanvas(Canvas, Controls[I].Left + 2, Controls[I].Top - 11, 8, 8,
+        HGrSystem.Data.Canvas, 121 + Controls[I].Tag mod 7 * 9,
+        1 + Controls[I].Tag div 7 * 9);
 end;
 
@@ -115 +115 @@
 end;
 
-procedure TEnhanceDlg.ShowNewContent(NewMode: TWindowMode; TerrType: integer);
+procedure TEnhanceDlg.ShowNewContent(NewMode: TWindowMode; TerrType: Integer);
 begin
   if (TerrType < fGrass) or (TerrType > fMountains) then
@@ -126 +126 @@
 procedure TEnhanceDlg.OffscreenPaint;
 var
-  i, stage, TerrType, TileImp, x, EndStage, Cost, LastJob: integer;
-  s: string;
+  I, stage, TerrType, TileImp, X, EndStage, Cost, LastJob: Integer;
+  S: string;
   Done: Set of jNone .. jTrans;
-  TypeChanged: boolean;
+  TypeChanged: Boolean;
 begin
   OffscreenUser := self;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);
 
   EndStage := 0;
   while (EndStage < 5) and (MyData.EnhancementJobs[Page, EndStage] <> jNone) do
-    inc(EndStage);
+    Inc(EndStage);
   with NoMap do
-    x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
+    X := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
 
   TerrType := Page;
@@ -149 +149 @@
     if stage > 0 then
     begin
-      Sprite(offscreen, HGrSystem, x - 10, 66, 14, 14, 80, 1);
+      Sprite(Offscreen, HGrSystem, X - 10, 66, 14, 14, 80, 1);
       case MyData.EnhancementJobs[Page, stage - 1] of
         jRoad:
           begin
-            inc(Cost, Terrain[TerrType].MoveCost * RoadWork);
+            Inc(Cost, Terrain[TerrType].MoveCost * RoadWork);
             TileImp := TileImp or fRoad;
           end;
         jRR:
           begin
-            inc(Cost, Terrain[TerrType].MoveCost * RRWork);
+            Inc(Cost, Terrain[TerrType].MoveCost * RRWork);
             TileImp := TileImp or fRR;
           end;
         jIrr:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork);
             TileImp := TileImp and not fTerImp or tiIrrigation;
           end;
         jFarm:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork * FarmWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork * FarmWork);
             TileImp := TileImp and not fTerImp or tiFarm;
           end;
         jMine:
           begin
-            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            Inc(Cost, Terrain[TerrType].MineAfforestWork);
             TileImp := TileImp and not fTerImp or tiMine;
           end;
         jClear:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork);
             TerrType := Terrain[TerrType].ClearTerrain;
           end;
         jAfforest:
           begin
-            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            Inc(Cost, Terrain[TerrType].MineAfforestWork);
             TerrType := Terrain[TerrType].AfforestTerrain;
           end;
         jTrans:
           begin
-            inc(Cost, Terrain[TerrType].TransWork);
+            Inc(Cost, Terrain[TerrType].TransWork);
             TerrType := Terrain[TerrType].TransTerrain;
           end;
       end;
-      include(Done, MyData.EnhancementJobs[Page, stage - 1]);
+      Include(Done, MyData.EnhancementJobs[Page, stage - 1]);
     end;
 
     with NoMap do begin
       if TerrType < fForest then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + TerrType * (xxt * 2 + 1), 1 + yyt)
       else
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
           (yyt * 3 + 1));
       end;
       if TileImp and fTerImp = tiFarm then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
       else if TileImp and fTerImp = tiIrrigation then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2, 1,
           1 + yyt + 12 * (yyt * 3 + 1));
       if TileImp and fRR <> 0 then
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
       end
       else if TileImp and fRoad <> 0 then
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
       end;
       if TileImp and fTerImp = tiMine then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
-      inc(x, xxt * 2 + 6);
-    end;
-  end;
-
-  for i := 0 to Popup.Items.Count - 1 do
-    if Popup.Items[i].Tag = Page then
-      s := Popup.Items[i].Caption;
+      Inc(X, xxt * 2 + 6);
+    end;
+  end;
+
+  for I := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[I].Tag = Page then
+      S := Popup.Items[I].Caption;
   if Cost > 0 then
-    s := Format(Phrases.Lookup('ENHANCE'), [s, MovementToString(Cost)]);
-  LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-    (InnerWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 12, s);
+    S := Format(Phrases.Lookup('ENHANCE'), [S, MovementToString(Cost)]);
+  LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+    (InnerWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2, 12, S);
 
   if EndStage > 0 then
@@ -289 +289 @@
     (Terrain[TerrType].MineEff > 0);
   job3.Visible := not TypeChanged and (Terrain[TerrType].ClearTerrain >= 0) and
-    ((TerrType <> fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner = me)) or
+    ((TerrType <> fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner = Me)) or
     (LastJob = jClear);
   job6.Visible := not TypeChanged and (Terrain[TerrType].AfforestTerrain >= 0)
@@ -306 +306 @@
 procedure TEnhanceDlg.ToggleBtnClick(Sender: TObject);
 var
-  i: integer;
-begin
-  for i := 0 to Popup.Items.Count - 1 do
-    Popup.Items[i].Checked := Popup.Items[i].Tag = Page;
+  I: Integer;
+begin
+  for I := 0 to Popup.Items.Count - 1 do
+    Popup.Items[I].Checked := Popup.Items[I].Tag = Page;
   Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
 end;
@@ -321 +321 @@
 procedure TEnhanceDlg.JobClick(Sender: TObject);
 var
-  stage, NewJob: integer;
+  stage, NewJob: Integer;
   Done: Set of jNone .. jTrans;
 
-  procedure RemoveJob(j: integer);
+  procedure RemoveJob(J: Integer);
   begin // remove job
     stage := 0;
     while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
     begin
-      if (MyData.EnhancementJobs[Page, stage] = j) or (j = jRoad) and
-        (MyData.EnhancementJobs[Page, stage] = jRR) or (j = jIrr) and
+      if (MyData.EnhancementJobs[Page, stage] = J) or (J = jRoad) and
+        (MyData.EnhancementJobs[Page, stage] = jRR) or (J = jIrr) and
         (MyData.EnhancementJobs[Page, stage] = jFarm) then
       begin
         if stage < 4 then
-          move(MyData.EnhancementJobs[Page, stage + 1],
+          Move(MyData.EnhancementJobs[Page, stage + 1],
             MyData.EnhancementJobs[Page, stage], 4 - stage);
         MyData.EnhancementJobs[Page, 4] := jNone;
       end
       else
-        inc(stage);
+        Inc(stage);
     end;
   end;
@@ -349 +349 @@
   while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
   begin
-    include(Done, MyData.EnhancementJobs[Page, stage]);
-    inc(stage);
+    Include(Done, MyData.EnhancementJobs[Page, stage]);
+    Inc(stage);
   end;
   if NewJob in Done then
@@ -363 +363 @@
     begin
       MyData.EnhancementJobs[Page, stage] := jRoad;
-      inc(stage);
+      Inc(stage);
     end;
     if (NewJob = jFarm) and not(jIrr in Done) then
     begin
       MyData.EnhancementJobs[Page, stage] := jIrr;
-      inc(stage);
+      Inc(stage);
     end;
     MyData.EnhancementJobs[Page, stage] := NewJob;

trunk/LocalPlayer/Help.pas

@@ -41 +41 @@
   THyperText = class(TStringList)
   public
-    procedure AddLine(s: String = ''; Format: integer = 0; Picpix: Integer = 0;
-      LinkCategory: integer = 0; LinkIndex: integer = 0);
+    procedure AddLine(S: String = ''; Format: Integer = 0; Picpix: Integer = 0;
+      LinkCategory: Integer = 0; LinkIndex: Integer = 0);
     procedure LineFeed;
     procedure AppendList(Source: THyperText);
@@ -78 +78 @@
     procedure CloseBtnClick(Sender: TObject);
     procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure BackBtnClick(Sender: TObject);
     procedure TopBtnClick(Sender: TObject);
@@ -104 +104 @@
     NoMap: TIsoMap;
     x0: array [-2..180] of Integer;
-    procedure PaintTerrIcon(x, y, xSrc, ySrc: Integer);
+    procedure PaintTerrIcon(X, Y, xSrc, ySrc: Integer);
     procedure ScrollBarUpdate(Sender: TObject);
-    procedure Line(ca: TCanvas; i: Integer; lit: Boolean);
+    procedure Line(ca: TCanvas; I: Integer; lit: Boolean);
     procedure Prepare(sbPos: Integer = 0);
     procedure ShowNewContentProcExecute(NewMode: TWindowMode; HelpContext: string);
@@ -176 +176 @@
 end;
 
-procedure THyperText.AddLine(s: String; Format: integer; Picpix: integer;
-  LinkCategory: integer; LinkIndex: integer);
+procedure THyperText.AddLine(S: String; Format: Integer; Picpix: Integer;
+  LinkCategory: Integer; LinkIndex: Integer);
 var
   HelpLineInfo: THelpLineInfo;
@@ -187 +187 @@
   HelpLineInfo.Picpix := Picpix;
   HelpLineInfo.Link := LinkCategory shl 8 + LinkIndex;
-  AddObject(s, TObject(HelpLineInfo));
+  AddObject(S, TObject(HelpLineInfo));
 end;
 
@@ -263 +263 @@
 
   nTerrainHelp = 14;
-  TerrainHelp: array [0 .. nTerrainHelp - 1] of integer = (fGrass, fGrass + 12,
+  TerrainHelp: array [0 .. nTerrainHelp - 1] of Integer = (fGrass, fGrass + 12,
     fPrairie, fForest, fJungle, fHills, fMountains, fSwamp, fTundra, fArctic,
     fDesert, 3 * 12 { DeadLands } , fShore, fOcean);
 
   nJobHelp = 8;
-  JobHelp: array [0 .. nJobHelp - 1] of integer = (jRoad, jRR, jCanal, jIrr,
+  JobHelp: array [0 .. nJobHelp - 1] of Integer = (jRoad, jRR, jCanal, jIrr,
     jFarm, jMine, jFort, jBase);
 
@@ -280 +280 @@
   CaptionLeft := BackBtn.Left + BackBtn.Width;
   CaptionRight := SearchBtn.Left;
-  inc(ModalFrameIndent, 29);
+  Inc(ModalFrameIndent, 29);
   MainText := THyperText.Create;
   MainText.OwnsObjects := True;
@@ -356 +356 @@
   if ScrollBar.Process(Msg) then begin
     Sel := -1;
-    SmartUpdateContent(true)
+    SmartUpdateContent(True)
   end;
   }
@@ -364 +364 @@
 begin
   if Sel <> -1 then begin
-    Line(Canvas, Sel, false);
+    Line(Canvas, Sel, False);
     Sel := -1
   end;
@@ -380 +380 @@
 end;
 
-procedure THelpDlg.Line(ca: TCanvas; i: Integer; lit: Boolean);
+procedure THelpDlg.Line(ca: TCanvas; I: Integer; lit: Boolean);
 var
-  TextColor, x, y: Integer;
+  TextColor, X, Y: Integer;
   TextSize: TSize;
-  s: string;
-begin
-  s := MainText[ScrollBar.Position + i];
-  if s = '' then
+  S: string;
+begin
+  S := MainText[ScrollBar.Position + I];
+  if S = '' then
     Exit;
-  x := x0[i];
-  y := 2 + i * 24;
+  X := x0[I];
+  Y := 2 + I * 24;
   if ca = Canvas then
   begin
-    x := x + SideFrame;
-    y := y + WideFrame
-  end;
-  if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format
+    X := X + SideFrame;
+    Y := Y + WideFrame
+  end;
+  if THelpLineInfo(MainText.Objects[ScrollBar.Position + I]).Format
     in [pkCaption, pkBigTer, pkRightIcon, pkBigFeature] then
   begin
     ca.Font.Assign(CaptionFont);
     { ca.brush.color:=CaptionColor;
-      ca.FillRect(rect(x,i*24,x+24,i*24+24));
-      ca.brush.color:=$FFFFFF;
-      ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
+      ca.FillRect(rect(X,I*24,X+24,I*24+24));
+      ca.Brush.Color:=$FFFFFF;
+      ca.FrameRect(rect(X+1,I*24+1,X+24-1,I*24+24-1));
       ca.Brush.Style:=bsClear; }
-    BitBltCanvas(ca, x, y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
+    BitBltCanvas(ca, X, Y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
       146);
-    BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
-      y - 3, s[1]);
-    BiColorTextOut(ca, CaptionColor, $7F007F, x + 24, y - 3, copy(s, 2, 255));
+    BiColorTextOut(ca, $FFFFFF, $7F007F, X + 10 - ca.Textwidth(S[1]) div 2,
+      Y - 3, S[1]);
+    BiColorTextOut(ca, CaptionColor, $7F007F, X + 24, Y - 3, Copy(S, 2, 255));
     ca.Font.Assign(UniFont[ftNormal]);
   end
-  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format = pkSection
+  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + I]).Format = pkSection
   then
   begin
     ca.Font.Assign(CaptionFont);
-    BiColorTextOut(ca, CaptionColor, $7F007F, x, y - 3, s);
+    BiColorTextOut(ca, CaptionColor, $7F007F, X, Y - 3, S);
     ca.Font.Assign(UniFont[ftNormal]);
   end
@@ -426 +426 @@
     if ca = Canvas then
     begin
-      TextSize.cx := BiColorTextWidth(ca, s);
-      TextSize.cy := ca.TextHeight(s);
-      if y + TextSize.cy >= WideFrame + InnerHeight then
-        TextSize.cy := WideFrame + InnerHeight - y;
-      FillSeamless(ca, x, y, TextSize.cx, TextSize.cy, -SideFrame,
+      TextSize.cx := BiColorTextWidth(ca, S);
+      TextSize.cy := ca.TextHeight(S);
+      if Y + TextSize.cy >= WideFrame + InnerHeight then
+        TextSize.cy := WideFrame + InnerHeight - Y;
+      FillSeamless(ca, X, Y, TextSize.cx, TextSize.cy, -SideFrame,
         ScrollBar.Position * 24 - WideFrame, Paper);
     end;
-    BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
+    BiColorTextOut(ca, TextColor, $7F007F, X, Y, S);
     if lit then
       with ca do
@@ -439 +439 @@
         Assert(ca = Canvas);
         Pen.Color := TextColor;
-        MoveTo(x + 1, y + TextSize.cy - 2);
-        LineTo(x + TextSize.cx, y + TextSize.cy - 2);
+        MoveTo(X + 1, Y + TextSize.cy - 2);
+        LineTo(X + TextSize.cx, Y + TextSize.cy - 2);
       end;
     if (Kind = hkMisc) and (no = miscMain) then
@@ -447 +447 @@
 end;
 
-procedure THelpDlg.WaterSign(x0, y0, iix: integer);
+procedure THelpDlg.WaterSign(x0, y0, iix: Integer);
 const
   nHeaven = 28;
   MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
-  Heaven: array [0..nHeaven] of integer;
+  X, Y, dx, dy, xSrc, ySrc, Sum, xx: Integer;
+  Heaven: array [0..nHeaven] of Integer;
   PaintPtr: TPixelPointer;
   CoalPtr: TPixelPointer;
@@ -471 +471 @@
   for dy := -1 to 1 do
     ImpPtr[dy] := PixelPointer(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
-  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
-    if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
+  for Y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
+    if ((ScaleToNative(y0) + Y) >= 0) and ((ScaleToNative(y0) + Y) < ScaleToNative(InnerHeight)) then begin
       for dy := -1 to 1 do
-        if ((Max(y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
-          ImpPtr[dy].SetXY(0, Max(y + ScaleToNative(dy), 0) shr 1);
-      for x := 0 to ScaleToNative(xSizeBig * 2) - 1 do begin
+        if ((Max(Y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(Y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
+          ImpPtr[dy].SetXY(0, Max(Y + ScaleToNative(dy), 0) shr 1);
+      for X := 0 to ScaleToNative(xSizeBig * 2) - 1 do begin
         Sum := 0;
         for dx := -1 to 1 do begin
-          xx := Max((x + ScaleToNative(dx)), 0) shr 1;
+          xx := Max((X + ScaleToNative(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((y + ScaleToNative(dy)) shr 1 < 0) or ((y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
-              ((x + ScaleToNative(dx)) shr 1 < 0) or ((x + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
-              ((y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
+            if ((Y + ScaleToNative(dy)) shr 1 < 0) or ((Y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
+              ((X + ScaleToNative(dx)) shr 1 < 0) or ((X + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
+              ((Y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y + ScaleToNative(dy))) shr 1]) then
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(Y + ScaleToNative(dy))) shr 1]) then
               Sum := Sum + 9 * 255
             else
@@ -510 +510 @@
 end;
 
-procedure THelpDlg.PaintTerrIcon(x, y, xSrc, ySrc: integer);
+procedure THelpDlg.PaintTerrIcon(X, Y, xSrc, ySrc: Integer);
 begin
   with NoMap do begin
-    Frame(OffScreen.Canvas, x - 1, y - 1, x + xSizeBig, y + ySizeBig,
+    Frame(OffScreen.Canvas, X - 1, Y - 1, X + xSizeBig, Y + ySizeBig,
       $000000, $000000);
     if 2 * yyt < 40 then begin
-      Sprite(OffScreen, HGrTerrain, x, y, 56, 2 * yyt, xSrc, ySrc);
-      Sprite(OffScreen, HGrTerrain, x, y + 2 * yyt, 56, 40 - 2 * yyt,
+      Sprite(OffScreen, HGrTerrain, X, Y, 56, 2 * yyt, xSrc, ySrc);
+      Sprite(OffScreen, HGrTerrain, X, Y + 2 * yyt, 56, 40 - 2 * yyt,
         xSrc, ySrc);
     end else
-      Sprite(OffScreen, HGrTerrain, x, y, 56, 40, xSrc, ySrc);
-    Sprite(OffScreen, HGrTerrain, x, y, xxt, yyt, xSrc + xxt, ySrc + yyt);
-    Sprite(OffScreen, HGrTerrain, x, y + yyt, xxt, 40 - yyt, xSrc + xxt, ySrc);
-    Sprite(OffScreen, HGrTerrain, x + xxt, y, 56 - xxt, yyt, xSrc, ySrc + yyt);
-    Sprite(OffScreen, HGrTerrain, x + xxt, y + yyt, 56 - xxt, 40 - yyt,
+      Sprite(OffScreen, HGrTerrain, X, Y, 56, 40, xSrc, ySrc);
+    Sprite(OffScreen, HGrTerrain, X, Y, xxt, yyt, xSrc + xxt, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, X, Y + yyt, xxt, 40 - yyt, xSrc + xxt, ySrc);
+    Sprite(OffScreen, HGrTerrain, X + xxt, Y, 56 - xxt, yyt, xSrc, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, X + xxt, Y + yyt, 56 - xxt, 40 - yyt,
       xSrc, ySrc);
   end;
@@ -531 +531 @@
 procedure THelpDlg.OffscreenPaint;
 var
-  i, j, yl, srcno, ofs, cnt, y: Integer;
-  s: string;
+  I, J, yl, srcno, ofs, cnt, Y: Integer;
+  S: string;
   HelpLineInfo: THelpLineInfo;
 begin
@@ -542 +542 @@
   begin
     Font.Assign(UniFont[ftNormal]);
-    for i := -ScrollBar.Position to InnerHeight div 24 do
-      if ScrollBar.Position + i < MainText.Count then
+    for I := -ScrollBar.Position to InnerHeight div 24 do
+      if ScrollBar.Position + I < MainText.Count then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + I]);
         if HelpLineInfo.Format = pkExternal then
         begin
           yl := ExtPic.Height;
-          if 4 + i * 24 + yl > InnerHeight then
-            yl := InnerHeight - (4 + i * 24);
-          BitBltCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+          if 4 + I * 24 + yl > InnerHeight then
+            yl := InnerHeight - (4 + I * 24);
+          BitBltCanvas(OffScreen.Canvas, 8, 4 + I * 24, ExtPic.Width, yl, ExtPic.Canvas,
             0, 0);
         end;
       end;
-    for i := -2 to InnerHeight div 24 do
-      if (ScrollBar.Position + i >= 0) and (ScrollBar.Position + i < MainText.Count) then
+    for I := -2 to InnerHeight div 24 do
+      if (ScrollBar.Position + I >= 0) and (ScrollBar.Position + I < MainText.Count) then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + I]);
         if HelpLineInfo.Link <> 0 then
         begin
           if (Kind = hkMisc) and (no = miscSearchResult) then
-            Sprite(OffScreen, HGrSystem, 18, 9 + i * 24, 8, 8, 90, 16)
+            Sprite(OffScreen, HGrSystem, 18, 9 + I * 24, 8, 8, 90, 16)
           else if HelpLineInfo.Format in [pkSmallIcon_AsPreq, pkAdvIcon_AsPreq]
           then
-            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 65, 20)
+            Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 65, 20)
           else if HelpLineInfo.Link and (hkCrossLink shl 8) <> 0 then
-            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 80, 1)
+            Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 80, 1)
           else if not((Kind = hkMisc) and (no = miscMain)) then
-            Sprite(OffScreen, HGrSystem, 10, i * 24 + 6, 14, 14, 65, 1);
-          x0[i] := 24;
+            Sprite(OffScreen, HGrSystem, 10, I * 24 + 6, 14, 14, 65, 1);
+          x0[I] := 24;
         end
         else
-          x0[i] := 0;
+          x0[I] := 0;
         case HelpLineInfo.Format of
           pkLogo:
             begin
-              Server(sGetVersion, 0, 0, j);
-              s := Format('%d.%d.%d', [j shr 16 and $FF, j shr 8 and $FF,
-                j and $FF]);
-              PaintLogo(OffScreen.Canvas, (InnerWidth - 122) div 2, i * 24 + 1,
+              Server(sGetVersion, 0, 0, J);
+              S := Format('%d.%d.%d', [J shr 16 and $FF, J shr 8 and $FF,
+                J and $FF]);
+              PaintLogo(OffScreen.Canvas, (InnerWidth - 122) div 2, I * 24 + 1,
                 HGrSystem.Data.Canvas.Pixels[95, 1], $000000);
               Font.Assign(UniFont[ftSmall]);
               BiColorTextOut(OffScreen.Canvas, $000000, $7F007F,
-                (InnerWidth - Textwidth(s)) div 2, i * 24 + 26, s);
+                (InnerWidth - Textwidth(S)) div 2, I * 24 + 26, S);
               Font.Assign(UniFont[ftNormal]);
             end;
           pkSmallIcon, pkSmallIcon_AsPreq:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
               if HelpLineInfo.Picpix = imPalace then
-                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   0 * xSizeSmall, 1 * ySizeSmall)
               else
-                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   HelpLineInfo.Picpix mod 7 * xSizeSmall,
                   (HelpLineInfo.Picpix + SystemIconLines * 7) div 7 *
                   ySizeSmall);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkBigIcon:
             begin
-              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7, 56,
+              FrameImage(OffScreen.Canvas, BigImp, x0[I] + 12, I * 24 - 7, 56,
                 40, HelpLineInfo.Picpix mod 7 * xSizeBig,
                 HelpLineInfo.Picpix div 7 * ySizeBig);
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkSpecialIcon:
@@ -615 +615 @@
                 0:
                   FrameImage(OffScreen.Canvas, HGrSystem2.Data,
-                    12 + x0[i], -7 + i * 24, 56, 40, 137, 127);
+                    12 + x0[I], -7 + I * 24, 56, 40, 137, 127);
                 1:
                   with NoMap do begin
-                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
                       1 + 3 * (xxt * 2 + 1), 1 + yyt);
                     if 2 * yyt < 40 then
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 2 * yyt, 1 + 3 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 1 * (yyt * 3 + 1))
                     else
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i],
-                        -7 + 4 + i * 24 - 4, 56, 40, 1 + 3 * (xxt * 2 + 1) + xxt
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I],
+                        -7 + 4 + I * 24 - 4, 56, 40, 1 + 3 * (xxt * 2 + 1) + xxt
                         - 28, 1 + yyt + 1 * (yyt * 3 + 1) + yyt - 20);
                   end;
                 2:
                   with NoMap do begin
-                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
                       1 + 7 * (xxt * 2 + 1), 1 + yyt + 4 * (yyt * 3 + 1));
                     if 2 * yyt < 40 then
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
                     else
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
                   end;
               end;
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkDomain:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + 36 + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + 36 + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 8 + x0[I], 2 + I * 24, 36, 20,
                 75 + HelpLineInfo.Picpix * 37, 295);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkAdvIcon, pkAdvIcon_AsPreq:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + ySizeSmall + i * 24,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + ySizeSmall + I * 24,
                 $000000, $000000);
               if AdvIcon[HelpLineInfo.Picpix] < 84 then
-                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 7 *
@@ -665 +665 @@
                   7) div 7 * ySizeSmall)
               else
-                Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+                Dump(OffScreen, HGrSystem, 8 + x0[I], 2 + I * 24, 36, 20,
                   1 + (AdvIcon[HelpLineInfo.Picpix] - 84) mod 8 * 37,
                   295 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
-              j := AdvValue[HelpLineInfo.Picpix] div 1000;
-              BitBltCanvas(OffScreen.Canvas, x0[i] + 4, 4 + i * 24, 14, 14,
-                HGrSystem.Mask.Canvas, 127 + j * 15, 85, SRCAND);
-              Sprite(OffScreen, HGrSystem, x0[i] + 3, 3 + i * 24, 14, 14,
-                127 + j * 15, 85);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              J := AdvValue[HelpLineInfo.Picpix] div 1000;
+              BitBltCanvas(OffScreen.Canvas, x0[I] + 4, 4 + I * 24, 14, 14,
+                HGrSystem.Mask.Canvas, 127 + J * 15, 85, SRCAND);
+              Sprite(OffScreen, HGrSystem, x0[I] + 3, 3 + I * 24, 14, 14,
+                127 + J * 15, 85);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkRightIcon:
             begin
               if Imp[HelpLineInfo.Picpix].Kind <> ikWonder then
-                ImpImage(OffScreen.Canvas, InnerWidth - (40 + xSizeBig), i * 24,
+                ImpImage(OffScreen.Canvas, InnerWidth - (40 + xSizeBig), I * 24,
                   HelpLineInfo.Picpix, gDespotism)
               else
-                WaterSign(InnerWidth - (40 + 2 * xSizeBig), i * 24 - 8,
+                WaterSign(InnerWidth - (40 + 2 * xSizeBig), I * 24 - 8,
                   HelpLineInfo.Picpix + 7);
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkIllu:
-            WaterSign(8, i * 24 - 8, HelpLineInfo.Picpix);
+            WaterSign(8, I * 24 - 8, HelpLineInfo.Picpix);
           pkBigFeature:
             begin
               cnt := 0;
-              for j := nDomains - 1 downto 0 do
-                if 1 shl j and Feature[HelpLineInfo.Picpix].Domains <> 0 then
+              for J := nDomains - 1 downto 0 do
+                if 1 shl J and Feature[HelpLineInfo.Picpix].Domains <> 0 then
                 begin
-                  inc(cnt);
+                  Inc(cnt);
                   Dump(OffScreen, HGrSystem, InnerWidth - 38 - 38 * cnt,
-                    i * 24 + 1, 36, 20, 75 + j * 37, 295);
-                  ScreenTools.Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, i * 24,
-                    InnerWidth - 2 - 38 * cnt, i * 24 + 21, $000000, $000000);
+                    I * 24 + 1, 36, 20, 75 + J * 37, 295);
+                  ScreenTools.Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, I * 24,
+                    InnerWidth - 2 - 38 * cnt, I * 24 + 21, $000000, $000000);
                 end;
               DarkGradient(OffScreen.Canvas, InnerWidth - 38 - 38 * cnt,
-                i * 24 + 23, cnt * 38 - 2, 1);
+                I * 24 + 23, cnt * 38 - 2, 1);
               ofs := InnerWidth - (39 + 7) - 19 * cnt;
               with OffScreen.Canvas do
               begin
-                Brush.color := $C0C0C0;
-                FrameRect(Rect(ofs, 1 + 23 + i * 24, ofs + 14,
-                  15 + 23 + i * 24));
+                Brush.Color := $C0C0C0;
+                FrameRect(Rect(ofs, 1 + 23 + I * 24, ofs + 14,
+                  15 + 23 + I * 24));
                 Brush.Style := bsClear;
-                Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + i * 24, 10, 10,
+                Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + I * 24, 10, 10,
                   66 + HelpLineInfo.Picpix mod 11 * 11,
                   137 + HelpLineInfo.Picpix div 11 * 11);
               end;
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkTer, pkBigTer:
             with NoMap do begin
               if HelpLineInfo.Format = pkBigTer then
-                y := i * 24 - 3 + yyt
+                Y := I * 24 - 3 + yyt
               else
-                y := i * 24 + 13;
+                Y := I * 24 + 13;
               if HelpLineInfo.Picpix >= 3 * 12 then
                 srcno := 2 * 9 + 6
@@ -730 +730 @@
               if HelpLineInfo.Format = pkTer then
               begin
-                ofs := x0[i] + 8;
-                x0[i] := 2 * xxt + 8 + ofs;
+                ofs := x0[I] + 8;
+                x0[I] := 2 * xxt + 8 + ofs;
               end
               else
               begin
                 ofs := InnerWidth - (2 * xxt + 38);
-                x0[i] := x0[i] + 8;
+                x0[I] := x0[I] + 8;
               end;
               if srcno >= fJungle then
               begin
-                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, Y - yyt + 2, xxt * 2 - 8,
                   yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
                   3 + yyt + 2 * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3 - 2, 1 + srcno mod 9 * (xxt * 2 + 1),
                   1 + srcno div 9 * (yyt * 3 + 1));
               end
               else
-                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, Y - yyt + 2, xxt * 2 - 8,
                   yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
                   3 + yyt + srcno div 9 * (yyt * 3 + 1));
               if HelpLineInfo.Picpix >= 3 * 12 then { rare resource }
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3, 1 + 8 * (xxt * 2 + 1),
                   1 + (HelpLineInfo.Picpix - 2 * 12) * (yyt * 3 + 1))
@@ -764 +764 @@
                   srcno := 18 + 8 + (HelpLineInfo.Picpix mod 12 - 9) * 18;
                 srcno := srcno + HelpLineInfo.Picpix div 12 * 9;
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3, 1 + srcno mod 9 * (xxt * 2 + 1),
                   1 + srcno div 9 * (yyt * 3 + 1));
@@ -774 +774 @@
               if HelpLineInfo.Picpix = 5 then
               begin // display mine on hills
-                Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, I * 24 + 13 - yyt,
                   xxt * 2 - 8, yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
                   3 + yyt + 2 * (yyt * 3 + 1));
@@ -781 +781 @@
               else
                 srcno := fPrairie; // display on prairie
-              Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+              Sprite(OffScreen, HGrTerrain, ofs + 4, I * 24 + 13 - yyt,
                 xxt * 2 - 8, yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
                 3 + yyt + srcno div 9 * (yyt * 3 + 1));
               if HelpLineInfo.Picpix = 12 then { river }
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - yyt, xxt * 2,
                   yyt * 2, 1 + 5 * (xxt * 2 + 1), 1 + yyt + 13 * (yyt * 3 + 1))
               else if HelpLineInfo.Picpix >= 3 then { improvement 2 }
               begin
                 if HelpLineInfo.Picpix = 6 then
-                  Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                  Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                     xxt * 2, yyt * 3, 1 + 7 * (xxt * 2 + 1),
                     1 + 12 * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + (HelpLineInfo.Picpix - 3) *
                   (xxt * 2 + 1), 1 + 12 * (yyt * 3 + 1))
@@ -799 +799 @@
               else { improvement 1 }
               begin
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + 2 * (xxt * 2 + 1),
                   1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + 5 * (xxt * 2 + 1),
                   1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1))
               end;
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkModel:
             begin
-              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7,
+              FrameImage(OffScreen.Canvas, BigImp, x0[I] + 12, I * 24 - 7,
                 56, 40, 0, 0);
-              Sprite(OffScreen, HGrStdUnits, x0[i] + 8, i * 24 - 11, 64, 44,
+              Sprite(OffScreen, HGrStdUnits, x0[I] + 8, I * 24 - 11, 64, 44,
                 1 + HelpLineInfo.Picpix mod 10 * 65,
                 1 + HelpLineInfo.Picpix div 10 * 49);
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkFeature:
             begin
-              DarkGradient(OffScreen.Canvas, x0[i] + 8 - 1,
-                7 + i * 24 - 3, 16, 1);
-              ScreenTools.Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
-                7 + i * 24 - 2 + 13, $C0C0C0, $C0C0C0);
-              Sprite(OffScreen, HGrSystem, x0[i] + 8 + 2, 7 + i * 24, 10, 10,
+              DarkGradient(OffScreen.Canvas, x0[I] + 8 - 1,
+                7 + I * 24 - 3, 16, 1);
+              ScreenTools.Frame(OffScreen.Canvas, x0[I] + 8, 7 + I * 24 - 2, x0[I] + 8 + 13,
+                7 + I * 24 - 2 + 13, $C0C0C0, $C0C0C0);
+              Sprite(OffScreen, HGrSystem, x0[I] + 8 + 2, 7 + I * 24, 10, 10,
                 66 + HelpLineInfo.Picpix mod 11 * 11,
                 137 + HelpLineInfo.Picpix div 11 * 11);
-              x0[i] := x0[i] + 8 + 8 + 2 + 13;
+              x0[I] := x0[I] + 8 + 8 + 2 + 13;
             end;
           pkExp:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + i * 24, 20 + 12,
-                8 + 11 + i * 24, $000000, $000000);
-              Dump(OffScreen, HGrSystem, 20, 8 - 3 + i * 24, 12, 14,
+              ScreenTools.Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + I * 24, 20 + 12,
+                8 + 11 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 20, 8 - 3 + I * 24, 12, 14,
                 121 + HelpLineInfo.Picpix * 13, 28);
-              x0[i] := 20 + 8 + 11;
+              x0[I] := 20 + 8 + 11;
             end;
           pkAITStat:
             begin
-              Sprite(OffScreen, HGrSystem, 20, 6 + i * 24, 14, 14,
+              Sprite(OffScreen, HGrSystem, 20, 6 + I * 24, 14, 14,
                 1 + HelpLineInfo.Picpix * 15, 316);
-              x0[i] := 20 + 8 + 11;
+              x0[I] := 20 + 8 + 11;
             end;
           pkGov:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24, xSizeSmall,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              BitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24, xSizeSmall,
                 ySizeSmall, SmallImp.Canvas, (HelpLineInfo.Picpix - 1) *
                 xSizeSmall, ySizeSmall);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkDot:
             begin
-              Sprite(OffScreen, HGrSystem, x0[i] + 18, 9 + i * 24, 8,
+              Sprite(OffScreen, HGrSystem, x0[I] + 18, 9 + I * 24, 8,
                 8, 81, 16);
-              x0[i] := 20 + 8 + 4;
+              x0[I] := 20 + 8 + 4;
             end;
           pkNormal_Dot:
-            x0[i] := 20 + 8 + 4;
+            x0[I] := 20 + 8 + 4;
           pkNormal_64:
-            x0[i] := 64 + 8 + 8;
+            x0[I] := 64 + 8 + 8;
         else
-          x0[i] := x0[i] + 8;
+          x0[I] := x0[I] + 8;
         end;
-        Self.Line(OffScreen.Canvas, i, False)
+        Self.Line(OffScreen.Canvas, I, False)
       end;
   end;
@@ -873 +873 @@
 begin
   Sel := -1;
-  SmartUpdateContent(true)
-end;
-
-procedure THelpDlg.Prepare(sbPos: integer = 0);
+  SmartUpdateContent(True)
+end;
+
+procedure THelpDlg.Prepare(sbPos: Integer = 0);
 var
-  i, j, Special, Domain, Headline, TerrType, TerrSubType: integer;
-  s: string;
-  ps: pchar;
+  I, J, Special, Domain, Headline, TerrType, TerrSubType: Integer;
+  S: string;
+  ps: PChar;
   List: THyperText;
   CheckSeeAlso: Boolean;
 
-  procedure AddAdvance(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
-      hkAdv + hkCrossLink, i);
-  end;
-
-  procedure AddPreqAdv(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon_AsPreq, i,
-      hkAdv + hkCrossLink, i);
-  end;
-
-  procedure AddImprovement(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-      hkImp + hkCrossLink, i);
-  end;
-
-  procedure AddPreqImp(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon_AsPreq, i,
-      hkImp + hkCrossLink, i);
-  end;
-
-  procedure AddTerrain(i: integer);
+  procedure AddAdvance(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon, I,
+      hkAdv + hkCrossLink, I);
+  end;
+
+  procedure AddPreqAdv(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon_AsPreq, I,
+      hkAdv + hkCrossLink, I);
+  end;
+
+  procedure AddImprovement(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+      hkImp + hkCrossLink, I);
+  end;
+
+  procedure AddPreqImp(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon_AsPreq, I,
+      hkImp + hkCrossLink, I);
+  end;
+
+  procedure AddTerrain(I: Integer);
   begin
     if MainText.Count > 1 then
@@ -914 +914 @@
       MainText.LineFeed;
     end;
-    MainText.AddLine(Phrases.Lookup('TERRAIN', i), pkTer, i, hkTer, i);
-  end;
-
-  procedure AddFeature(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
-      hkFeature + hkCrossLink, i);
-  end;
-
-  procedure AddModel(i: integer);
+    MainText.AddLine(Phrases.Lookup('TERRAIN', I), pkTer, I, hkTer, I);
+  end;
+
+  procedure AddFeature(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('FEATURES', I), pkFeature, I,
+      hkFeature + hkCrossLink, I);
+  end;
+
+  procedure AddModel(I: Integer);
   var
-    pix: integer;
+    pix: Integer;
     Name: string;
   begin
     if MainText.Count > 1 then
       MainText.LineFeed;
-    FindStdModelPicture(SpecialModelPictureCode[i], pix, Name);
-    MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, i)
+    FindStdModelPicture(SpecialModelPictureCode[I], pix, Name);
+    MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, I)
   end;
 
   procedure AddStandardBlock(Item: string);
   var
-    i: integer;
+    I: Integer;
   begin
     with MainText do
@@ -947 +947 @@
       else if Item = 'TECHFORMULA' then
       begin
-        i := Difficulty;
-        if i = 0 then
-          i := 2;
-        AddLine(Format(HelpText.Lookup('TECHFORMULA'), [TechFormula_M[i],
-          TechFormula_D[i]]))
+        I := Difficulty;
+        if I = 0 then
+          I := 2;
+        AddLine(Format(HelpText.Lookup('TECHFORMULA'), [TechFormula_M[I],
+          TechFormula_D[I]]))
       end
       else if Item = 'EXPERIENCE' then
-        for i := 0 to nExp - 1 do
-          AddLine(Phrases.Lookup('EXPERIENCE', i), pkExp, i)
+        for I := 0 to nExp - 1 do
+          AddLine(Phrases.Lookup('EXPERIENCE', I), pkExp, I)
       else if Item = 'MODERN' then
-        for i := 1 to 3 do
+        for I := 1 to 3 do
         begin
           LineFeed;
-          AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + i), pkTer, 3 * 12 + i);
+          AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + I), pkTer, 3 * 12 + I);
         end
       else if Item = 'SAVED' then
         AddLine(DataDir + 'Saved', pkNormal)
       else if Item = 'AITSTAT' then
-        for i := 0 to 3 do
-          AddLine(Phrases2.Lookup('AITSTAT', i), pkAITStat, i)
+        for I := 0 to 3 do
+          AddLine(Phrases2.Lookup('AITSTAT', I), pkAITStat, I)
     end
   end;
 
-  procedure DecodeItem(s: string; var Category, Index: Integer);
+  procedure DecodeItem(S: string; var Category, Index: Integer);
   var
-    i: Integer;
-  begin
-    if (Length(s) > 0) and (s[1] = ':') then begin
+    I: Integer;
+  begin
+    if (Length(S) > 0) and (S[1] = ':') then begin
       Category := hkMisc;
       Index := 0;
-      for i := 3 to length(s) do
-        Index := Index * 10 + Ord(s[i]) - 48;
-      case s[2] of
+      for I := 3 to Length(S) do
+        Index := Index * 10 + Ord(S[I]) - 48;
+      case S[2] of
         'A': Category := hkAdv;
         'B': Category := hkImp;
@@ -994 +994 @@
     end else begin
       Category := hkText;
-      Index := HelpText.Gethandle(Copy(s, 1, 255));
+      Index := HelpText.Gethandle(Copy(S, 1, 255));
     end;
   end;
 
-  procedure AddTextual(s: string);
+  procedure AddTextual(S: string);
   var
-    i: Integer;
-    p: Integer;
-    l: Integer;
+    I: Integer;
+    P: Integer;
+    L: Integer;
     ofs: Integer;
     CurrentFormat: Integer;
@@ -1015 +1015 @@
     RightMargin := InnerWidth - 16 - GetSystemMetrics(SM_CXVSCROLL);
     FollowFormat := pkNormal;
-    while s <> '' do
+    while S <> '' do
     begin
       Picpix := 0;
       LinkCategory := 0;
       LinkIndex := 0;
-      if s[1] = '$' then
+      if S[1] = '$' then
       begin // window caption
-        p := 1;
+        P := 1;
         repeat
-          inc(p)
-        until (p > Length(s)) or (s[p] = '\');
-        Caption := Copy(s, 2, p - 2);
-        Delete(s, 1, p);
+          Inc(P);
+        until (P > Length(S)) or (S[P] = '\');
+        Caption := Copy(S, 2, P - 2);
+        Delete(S, 1, P);
       end
-      else if s[1] = '&' then
+      else if S[1] = '&' then
       begin // standard block
-        p := 1;
+        P := 1;
         repeat
-          inc(p)
-        until (p > Length(s)) or (s[p] = '\');
-        AddStandardBlock(Copy(s, 2, p - 2));
-        Delete(s, 1, p);
+          Inc(P);
+        until (P > Length(S)) or (S[P] = '\');
+        AddStandardBlock(Copy(S, 2, P - 2));
+        Delete(S, 1, P);
       end
-      else if s[1] = '@' then
+      else if S[1] = '@' then
       begin // image
-        if (Length(s) >= 2) and (s[2] = '@') then
+        if (Length(S) >= 2) and (S[2] = '@') then
         begin // generate from icon
           Picpix := 0;
-          p := 3;
-          while (p <= Length(s)) and (s[p] <> '\') do
+          P := 3;
+          while (P <= Length(S)) and (S[P] <> '\') do
           begin
-            Picpix := Picpix * 10 + Ord(s[p]) - 48;
-            inc(p)
+            Picpix := Picpix * 10 + Ord(S[P]) - 48;
+            Inc(P);
           end;
           if (Picpix < 0) or (Picpix >= nImp) then
@@ -1057 +1057 @@
         else
         begin // external image
-          p := 1;
+          P := 1;
           repeat
-            Inc(p)
-          until (p > Length(s)) or (s[p] = '\');
+            Inc(P);
+          until (P > Length(S)) or (S[P] = '\');
           if LoadGraphicFile(ExtPic, LocalizedFilePath('Help' +
-            DirectorySeparator + Copy(s, 2, p - 2)) + '.png') then
+            DirectorySeparator + Copy(S, 2, P - 2)) + '.png') then
           begin
             MainText.AddLine('', pkExternal);
-            for i := 0 to (ExtPic.Height - 12) div 24 do
+            for I := 0 to (ExtPic.Height - 12) div 24 do
               MainText.LineFeed;
           end;
         end;
-        Delete(s, 1, p);
+        Delete(S, 1, P);
       end
       else
       begin
-        case s[1] of
+        case S[1] of
           ':', ';':
             begin // link
-              p := 1;
+              P := 1;
               repeat
-                inc(p)
-              until (p > Length(s)) or (s[p] = '\') or (s[p] = ' ');
-              DecodeItem(Copy(s, 2, p - 2), LinkCategory, LinkIndex);
+                Inc(P)
+              until (P > Length(S)) or (S[P] = '\') or (S[P] = ' ');
+              DecodeItem(Copy(S, 2, P - 2), LinkCategory, LinkIndex);
               CurrentFormat := 0;
               if (LinkCategory <> hkText) and (LinkIndex < 200) then
@@ -1112 +1112 @@
                     end;
                 end;
-              if s[1] = ':' then
+              if S[1] = ':' then
                 LinkCategory := LinkCategory + hkCrossLink;
-              if (p > Length(s)) or (s[p] = ' ') then
-                Delete(s, 1, p)
+              if (P > Length(S)) or (S[P] = ' ') then
+                Delete(S, 1, P)
               else
-                Delete(s, 1, p - 1)
+                Delete(S, 1, P - 1)
             end;
           '!': // highlited
-            if (Length(s) >= 2) and (s[2] = '!') then
+            if (Length(S) >= 2) and (S[2] = '!') then
             begin
               if MainText.Count > 1 then
@@ -1126 +1126 @@
               FollowFormat := pkCaption;
               CurrentFormat := pkCaption;
-              Delete(s, 1, 2);
+              Delete(S, 1, 2);
             end
             else
@@ -1132 +1132 @@
               FollowFormat := pkSection;
               CurrentFormat := pkSection;
-              Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
           '-':
@@ -1138 +1138 @@
               FollowFormat := pkNormal_Dot;
               CurrentFormat := pkDot;
-              Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
         else
@@ -1147 +1147 @@
         else
           ofs := 8;
-        p := 0;
+        P := 0;
         repeat
           repeat
-            Inc(p)
-          until (p > Length(s)) or (s[p] = ' ') or (s[p] = '\');
-          if (BiColorTextWidth(OffScreen.Canvas, Copy(s, 1, p - 1)) <=
+            Inc(P)
+          until (P > Length(S)) or (S[P] = ' ') or (S[P] = '\');
+          if (BiColorTextWidth(OffScreen.Canvas, Copy(S, 1, P - 1)) <=
             RightMargin - ofs) then
-            l := p - 1
+            L := P - 1
           else
             Break;
-        until (p >= Length(s)) or (s[l + 1] = '\');
-        Text := Copy(s, 1, l);
-        if LinkCategory and $3f = hkInternet then begin
+        until (P >= Length(S)) or (S[L + 1] = '\');
+        Text := Copy(S, 1, L);
+        if LinkCategory and $3F = hkInternet then begin
           if LinkIndex = 1 then Text := AITemplateManual
           else if LinkIndex = 2 then Text := CevoHomepageShort
@@ -1166 +1166 @@
         MainText.AddLine(Text, CurrentFormat, Picpix, LinkCategory,
           LinkIndex);
-        if (l < Length(s)) and (s[l + 1] = '\') then
+        if (L < Length(S)) and (S[L + 1] = '\') then
           FollowFormat := pkNormal;
-        Delete(s, 1, l + 1);
+        Delete(S, 1, L + 1);
       end
     end
@@ -1178 +1178 @@
   end;
 
-  procedure AddModelText(i: Integer);
+  procedure AddModelText(I: Integer);
   var
     pix: Integer;
-    s: string;
+    S: string;
   begin
     with MainText do begin
@@ -1188 +1188 @@
         LineFeed;
       end;
-      FindStdModelPicture(SpecialModelPictureCode[i], pix, s);
-      AddLine(s, pkSection);
-      AddLine(Format(HelpText.Lookup('STRENGTH'), [SpecialModel[i].Attack,
-        SpecialModel[i].Defense]), pkNormal_64);
+      FindStdModelPicture(SpecialModelPictureCode[I], pix, S);
+      AddLine(S, pkSection);
+      AddLine(Format(HelpText.Lookup('STRENGTH'), [SpecialModel[I].Attack,
+        SpecialModel[I].Defense]), pkNormal_64);
       AddLine(Format(HelpText.Lookup('SPEED'),
-        [MovementToString(SpecialModel[i].Speed)]), pkModel, pix);
+        [MovementToString(SpecialModel[I].Speed)]), pkModel, pix);
       if Difficulty = 0 then
-        AddLine(Format(HelpText.Lookup('BUILDCOST'), [SpecialModel[i].Cost]),
+        AddLine(Format(HelpText.Lookup('BUILDCOST'), [SpecialModel[I].Cost]),
           pkNormal_64)
       else
         AddLine(Format(HelpText.Lookup('BUILDCOST'),
-          [SpecialModel[i].Cost * BuildCostMod[Difficulty] div 12]),
+          [SpecialModel[I].Cost * BuildCostMod[Difficulty] div 12]),
           pkNormal_64);
-      s := HelpText.LookupByHandle(hSPECIALMODEL, i);
-      if (s <> '') and (s <> '*') then
-        AddTextual(s);
-      if SpecialModelPreq[i] >= 0 then
-        AddPreqAdv(SpecialModelPreq[i])
-      else if SpecialModelPreq[i] = preLighthouse then
+      S := HelpText.LookupByHandle(hSPECIALMODEL, I);
+      if (S <> '') and (S <> '*') then
+        AddTextual(S);
+      if SpecialModelPreq[I] >= 0 then
+        AddPreqAdv(SpecialModelPreq[I])
+      else if SpecialModelPreq[I] = preLighthouse then
         AddPreqImp(woLighthouse)
-      else if SpecialModelPreq[i] = preBuilder then
+      else if SpecialModelPreq[I] = preBuilder then
         AddPreqImp(woPyramids)
-      else if SpecialModelPreq[i] = preLeo then
+      else if SpecialModelPreq[I] = preLeo then
         AddPreqImp(woLeo);
-      if SpecialModelPreq[i] <> preNone then
+      if SpecialModelPreq[I] <> preNone then
         MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
           [MainText[Count - 1]]);
@@ -1220 +1220 @@
   procedure AddJobList;
   var
-    i, JobCost: Integer;
+    I, JobCost: Integer;
   begin
     with MainText do begin
-      for i := 0 to nJobHelp - 1 do begin
-        if i > 0 then begin
+      for I := 0 to nJobHelp - 1 do begin
+        if I > 0 then begin
           LineFeed;
           LineFeed;
         end;
-        AddLine(Phrases.Lookup('JOBRESULT', JobHelp[i]), pkSection);
+        AddLine(Phrases.Lookup('JOBRESULT', JobHelp[I]), pkSection);
         AddLine;
-        AddLine('', pkTerImp, i);
+        AddLine('', pkTerImp, I);
         AddLine;
-        AddTextual(HelpText.LookupByHandle(hJOBHELP, i));
+        AddTextual(HelpText.LookupByHandle(hJOBHELP, I));
         JobCost := -1;
-        case JobHelp[i] of
+        case JobHelp[I] of
           jCanal: JobCost := CanalWork;
           jFort: JobCost := FortWork;
@@ -1244 +1244 @@
         else
           AddTextual(HelpText.Lookup('JOBCOSTVAR'));
-        if JobPreq[JobHelp[i]] <> preNone then begin
-          AddPreqAdv(JobPreq[JobHelp[i]]);
+        if JobPreq[JobHelp[I]] <> preNone then begin
+          AddPreqAdv(JobPreq[JobHelp[I]]);
           MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
             [MainText[Count - 1]]);
@@ -1255 +1255 @@
   procedure AddGraphicCredits;
   var
-    i: Integer;
-    s: string;
+    I: Integer;
+    S: string;
     sr: TSearchRec;
     List, Plus: TStringList;
@@ -1271 +1271 @@
 
     List.Sort;
-    i := 1;
-    while i < List.Count do
-      if List[i] = List[i - 1] then
-        List.Delete(i)
+    I := 1;
+    while I < List.Count do
+      if List[I] = List[I - 1] then
+        List.Delete(I)
       else
-        Inc(i);
-
-    for i := 0 to List.Count - 1 do begin
-      s := List[i];
-      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+        Inc(I);
+
+    for I := 0 to List.Count - 1 do begin
+      S := List[I];
+      while BiColorTextWidth(OffScreen.Canvas, S) > InnerWidth - 16 -
         GetSystemMetrics(SM_CXVSCROLL) do
-        Delete(s, length(s), 1);
-      MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
@@ -1290 +1290 @@
   procedure AddSoundCredits;
   var
-    i: Integer;
-    s: string;
+    I: Integer;
+    S: string;
     List: TStringList;
   begin
     List := TStringList.Create;
     List.LoadFromFile(GetSoundsDir + DirectorySeparator + 'sound.credits.txt');
-    for i := 0 to List.Count - 1 do begin
-      s := List[i];
-      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+    for I := 0 to List.Count - 1 do begin
+      S := List[I];
+      while BiColorTextWidth(OffScreen.Canvas, S) > InnerWidth - 16 -
         GetSystemMetrics(SM_CXVSCROLL) do
-        Delete(s, length(s), 1);
-      MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
@@ -1349 +1349 @@
                   hkAdv, 200);
                 LineFeed;
-                FindStdModelPicture(SpecialModelPictureCode[6], i, s);
-                AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, i,
+                FindStdModelPicture(SpecialModelPictureCode[6], I, S);
+                AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, I,
                   hkModel, 0);
                 LineFeed;
@@ -1402 +1402 @@
               begin
                 Caption := HelpText.Lookup('HELPTITLE_GOVLIST');
-                for i := 1 to nGov do
+                for I := 1 to nGov do
                 begin
-                  AddLine(Phrases.Lookup('GOVERNMENT', i mod nGov), pkSection);
+                  AddLine(Phrases.Lookup('GOVERNMENT', I mod nGov), pkSection);
                   LineFeed;
-                  if i = nGov then
+                  if I = nGov then
                     AddLine('', pkBigIcon, 7 * SystemIconLines + imPalace)
                   else
-                    AddLine('', pkBigIcon, i + 6);
+                    AddLine('', pkBigIcon, I + 6);
                   LineFeed;
-                  AddTextual(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
-                  if i mod nGov >= 2 then
+                  AddTextual(HelpText.LookupByHandle(hGOVHELP, I mod nGov));
+                  if I mod nGov >= 2 then
                   begin
-                    AddPreqAdv(GovPreq[i mod nGov]);
+                    AddPreqAdv(GovPreq[I mod nGov]);
                     MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
                       [MainText[Count - 1]]);
                   end;
-                  if i < nGov then
+                  if I < nGov then
                   begin
                     LineFeed;
@@ -1440 +1440 @@
           List := THyperText.Create;
           List.OwnsObjects := True;
-          for j := 0 to 3 do
+          for J := 0 to 3 do
           begin
-            if j > 0 then
+            if J > 0 then
             begin
               LineFeed;
               LineFeed;
             end;
-            AddLine(HelpText.Lookup('TECHAGE', j), pkSection);
-            if j = 1 then
+            AddLine(HelpText.Lookup('TECHAGE', J), pkSection);
+            if J = 1 then
               AddLine(Phrases.Lookup('ADVANCES', adScience) + ' ' +
                 HelpText.Lookup('BASETECH'), pkAdvIcon, adScience, hkAdv,
                 adScience);
-            if j = 2 then
+            if J = 2 then
               AddLine(Phrases.Lookup('ADVANCES', adMassProduction) + ' ' +
                 HelpText.Lookup('BASETECH'), pkAdvIcon, adMassProduction, hkAdv,
                 adMassProduction);
             List.Clear;
-            for i := 0 to nAdv - 1 do
-              if (i <> adScience) and (i <> adMassProduction) and
-                (AdvValue[i] div 1000 = j) then
-                List.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
-                  hkAdv, i);
+            for I := 0 to nAdv - 1 do
+              if (I <> adScience) and (I <> adMassProduction) and
+                (AdvValue[I] div 1000 = J) then
+                List.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon, I,
+                  hkAdv, I);
             List.Sort;
             AppendList(List);
@@ -1487 +1487 @@
           else
             NextSection('PREREQ');
-          for i := 0 to 2 do
-            if AdvPreq[no, i] <> preNone then
-              AddPreqAdv(AdvPreq[no, i]);
+          for I := 0 to 2 do
+            if AdvPreq[no, I] <> preNone then
+              AddPreqAdv(AdvPreq[no, I]);
           NextSection('GOVALLOW');
-          for i := 2 to nGov - 1 do
-            if GovPreq[i] = no then
-              AddLine(Phrases.Lookup('GOVERNMENT', i), pkGov, i,
+          for I := 2 to nGov - 1 do
+            if GovPreq[I] = no then
+              AddLine(Phrases.Lookup('GOVERNMENT', I), pkGov, I,
                 hkMisc + hkCrossLink, miscGovList);
           NextSection('BUILDALLOW');
-          for i := 0 to nWonder - 1 do
-            if Imp[i].Preq = no then
-              AddImprovement(i);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq = no) and (Imp[i].Kind <> ikCommon) then
-              AddImprovement(i);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq = no) and (Imp[i].Kind = ikCommon) then
-              AddImprovement(i);
+          for I := 0 to nWonder - 1 do
+            if Imp[I].Preq = no then
+              AddImprovement(I);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq = no) and (Imp[I].Kind <> ikCommon) then
+              AddImprovement(I);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq = no) and (Imp[I].Kind = ikCommon) then
+              AddImprovement(I);
           NextSection('MODELALLOW');
-          for i := 0 to nSpecialModel - 1 do
-            if SpecialModelPreq[i] = no then
-              AddModel(i);
+          for I := 0 to nSpecialModel - 1 do
+            if SpecialModelPreq[I] = no then
+              AddModel(I);
           NextSection('FEATALLOW');
-          for i := 0 to nFeature - 1 do
-            if Feature[i].Preq = no then
-              AddFeature(i);
+          for I := 0 to nFeature - 1 do
+            if Feature[I].Preq = no then
+              AddFeature(I);
           NextSection('FOLLOWADV');
-          for i := 0 to nAdv - 1 do
-            if (AdvPreq[i, 0] = no) or (AdvPreq[i, 1] = no) or
-              (AdvPreq[i, 2] = no) then
-              AddAdvance(i);
+          for I := 0 to nAdv - 1 do
+            if (AdvPreq[I, 0] = no) or (AdvPreq[I, 1] = no) or
+              (AdvPreq[I, 2] = no) then
+              AddAdvance(I);
           NextSection('UPGRADEALLOW');
           for Domain := 0 to nDomains - 1 do
-            for i := 1 to nUpgrade - 1 do
-              if upgrade[Domain, i].Preq = no then
+            for I := 1 to nUpgrade - 1 do
+              if upgrade[Domain, I].Preq = no then
               begin
-                if upgrade[Domain, i].Strength > 0 then
+                if upgrade[Domain, I].Strength > 0 then
                   AddLine(Format(HelpText.Lookup('STRENGTHUP'),
                     [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain,
-                    i].Strength]), pkDomain, Domain);
-                if upgrade[Domain, i].Trans > 0 then
+                    I].Strength]), pkDomain, Domain);
+                if upgrade[Domain, I].Trans > 0 then
                   AddLine(Format(HelpText.Lookup('TRANSUP'),
-                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, i].Trans]
+                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, I].Trans]
                     ), pkDomain, Domain);
                 if no in FutureTech then
                   AddLine(Format(HelpText.Lookup('COSTUP'),
-                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
+                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
                 else
                   AddLine(Format(HelpText.Lookup('COSTMIN'),
-                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
+                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
               end;
           NextSection('EXPIRATION');
-          for i := 0 to nWonder - 1 do
-            if (Imp[i].Preq <> preNA) and (Imp[i].Expiration = no) then
-              AddImprovement(i);
+          for I := 0 to nWonder - 1 do
+            if (Imp[I].Preq <> preNA) and (Imp[I].Expiration = no) then
+              AddImprovement(I);
           NextSection('ADVEFFECT');
-          s := HelpText.LookupByHandle(hADVHELP, no);
-          if s <> '*' then
-            AddTextual(s);
+          S := HelpText.LookupByHandle(hADVHELP, no);
+          if S <> '*' then
+            AddTextual(S);
           NextSection('SEEALSO');
-          CheckSeeAlso := true
+          CheckSeeAlso := True
         end;
 
@@ -1557 +1557 @@
           List := THyperText.Create;
           List.OwnsObjects := True;
-          for i := nWonder to nImp - 1 do
-            if (i <> imTrGoods) and (Imp[i].Preq <> preNA) and
-              (Imp[i].Kind = ikCommon) then
-              List.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon,
-                i, hkImp, i);
+          for I := nWonder to nImp - 1 do
+            if (I <> imTrGoods) and (Imp[I].Preq <> preNA) and
+              (Imp[I].Kind = ikCommon) then
+              List.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon,
+                I, hkImp, I);
           List.Sort;
           AppendList(List);
@@ -1570 +1570 @@
           Caption := HelpText.Lookup('HELPTITLE_UNIQUELIST');
           // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq <> preNA) and
-              ((Imp[i].Kind = ikNatLocal) or (Imp[i].Kind = ikNatGlobal)) then
-              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-                hkImp, i);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq <> preNA) and
+              ((Imp[I].Kind = ikNatLocal) or (Imp[I].Kind = ikNatGlobal)) then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+                hkImp, I);
           { LineFeed;
             LineFeed;
             AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
-            for i:= nWonder to nImp-1 do
-            if (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikShipPart) then
-            AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i); }
+            for I:= nWonder to nImp-1 do
+            if (Imp[I].Preq<>preNA) and (Imp[I].Kind=ikShipPart) then
+            AddLine(Phrases.Lookup('IMPROVEMENTS',I),pkSmallIcon,I,hkImp,I); }
         end
         else if no = 202 then
@@ -1586 +1586 @@
           Caption := HelpText.Lookup('HELPTITLE_WONDERLIST');
           // AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkSection);
-          for i := 0 to nWonder - 1 do
-            if Imp[i].Preq <> preNA then
-              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-                hkImp, i);
+          for I := 0 to nWonder - 1 do
+            if Imp[I].Preq <> preNA then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+                hkImp, I);
         end
         else
@@ -1627 +1627 @@
           NextSection('COSTS');
           if Difficulty = 0 then
-            s := Format(HelpText.Lookup('BUILDCOST'), [Imp[no].Cost])
+            S := Format(HelpText.Lookup('BUILDCOST'), [Imp[no].Cost])
           else
-            s := Format(HelpText.Lookup('BUILDCOST'),
+            S := Format(HelpText.Lookup('BUILDCOST'),
               [Imp[no].Cost * BuildCostMod[Difficulty] div 12]);
-          AddLine(s);
+          AddLine(S);
           if Imp[no].Maint > 0 then
             AddLine(Format(HelpText.Lookup('MAINTCOST'), [Imp[no].Maint]));
-          j := 0;
-          for i := 0 to nImpReplacement - 1 do
-            if ImpReplacement[i].NewImp = no then
-            begin
-              if j = 0 then
+          J := 0;
+          for I := 0 to nImpReplacement - 1 do
+            if ImpReplacement[I].NewImp = no then
+            begin
+              if J = 0 then
               begin
                 NextSection('REPLACE');
                 AddItem('REPLACETEXT');
-                j := 1;
+                J := 1;
               end;
-              AddImprovement(ImpReplacement[i].OldImp);
+              AddImprovement(ImpReplacement[I].OldImp);
             end;
           if Imp[no].Kind = ikShipPart then
@@ -1650 +1650 @@
             LineFeed;
             if no = imShipComp then
-              i := 1
+              I := 1
             else if no = imShipPow then
-              i := 2
+              I := 2
             else { if no=imShipHab then }
-              i := 3;
+              I := 3;
             AddLine(Format(HelpText.Lookup('RAREREQUIRED'),
-              [Phrases.Lookup('TERRAIN', 3 * 12 + i)]), pkTer, 3 * 12 + i);
+              [Phrases.Lookup('TERRAIN', 3 * 12 + I)]), pkTer, 3 * 12 + I);
           end;
           if (no < nWonder) and (Imp[no].Expiration >= 0) then
           begin
             NextSection('EXPIRATION');
-            s := Format(HelpText.Lookup('EXPWITH'),
+            S := Format(HelpText.Lookup('EXPWITH'),
               [Phrases.Lookup('ADVANCES', Imp[no].Expiration)]);
             if no = woPyramids then
-              s := s + ' ' + HelpText.Lookup('EXPSLAVE');
-            AddTextual(s);
+              S := S + ' ' + HelpText.Lookup('EXPSLAVE');
+            AddTextual(S);
           end;
           NextSection('SEEALSO');
           if (no < nWonder) and (Imp[no].Expiration >= 0) then
             AddImprovement(woEiffel);
-          for i := 0 to nImpReplacement - 1 do
-            if ImpReplacement[i].OldImp = no then
-              AddImprovement(ImpReplacement[i].NewImp);
+          for I := 0 to nImpReplacement - 1 do
+            if ImpReplacement[I].OldImp = no then
+              AddImprovement(ImpReplacement[I].NewImp);
           if no = imSupermarket then
             AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
               hkMisc + hkCrossLink, miscJobList);
-          CheckSeeAlso := true;
+          CheckSeeAlso := True;
         end;
 
@@ -1684 +1684 @@
           Caption := HelpText.Lookup('HELPTITLE_TERLIST');
           // AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
-          for i := 0 to nTerrainHelp - 1 do
-            AddTerrain(TerrainHelp[i]);
+          for I := 0 to nTerrainHelp - 1 do
+            AddTerrain(TerrainHelp[I]);
         end
         else
@@ -1746 +1746 @@
             begin
               LineFeed;
-              i := TransTerrain;
-              if (TerrType <> fGrass) and (i <> fGrass) then
-                i := i + TerrSubType * 12;
+              I := TransTerrain;
+              if (TerrType <> fGrass) and (I <> fGrass) then
+                I := I + TerrSubType * 12;
               // trafo to same Special resource group
               AddLine(Format(HelpText.Lookup('TRAFO'),
-                [Phrases.Lookup('TERRAIN', i)]), pkTer, i,
-                hkTer + hkCrossLink, i);
+                [Phrases.Lookup('TERRAIN', I)]), pkTer, I,
+                hkTer + hkCrossLink, I);
               if no = fSwamp + 12 then
               begin
@@ -1760 +1760 @@
                   TransTerrain + 24, hkTer + hkCrossLink, TransTerrain + 24);
               end
-              else if i = fGrass then
+              else if I = fGrass then
               begin
                 LineFeed;
@@ -1790 +1790 @@
                   AddLine(Phrases.Lookup('TERRAIN', no + Special * 12), pkTer,
                     no + Special * 12);
-                  i := FoodRes[Special] - FoodRes[0];
-                  if i <> 0 then
+                  I := FoodRes[Special] - FoodRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALFOOD'), [i]);
-                  i := ProdRes[Special] - ProdRes[0];
-                  if i <> 0 then
+                      Format(HelpText.Lookup('SPECIALFOOD'), [I]);
+                  I := ProdRes[Special] - ProdRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALPROD'), [i]);
-                  i := TradeRes[Special] - TradeRes[0];
-                  if i <> 0 then
+                      Format(HelpText.Lookup('SPECIALPROD'), [I]);
+                  I := TradeRes[Special] - TradeRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALTRADE'), [i]);
+                      Format(HelpText.Lookup('SPECIALTRADE'), [I]);
                 end;
             end;
@@ -1813 +1813 @@
               NextSection('SEEALSO');
               AddImprovement(woGardens);
-              CheckSeeAlso := true
+              CheckSeeAlso := True
             end;
           end;
@@ -1837 +1837 @@
             end;
             List.Clear;
-            for i := 0 to nFeature - 1 do
-              if Feature[i].Preq <> preNA then
+            for I := 0 to nFeature - 1 do
+              if Feature[I].Preq <> preNA then
               begin
-                if i < mcFirstNonCap then
-                  j := 0
-                else if i in AutoFeature then
-                  j := 2
+                if I < mcFirstNonCap then
+                  J := 0
+                else if I in AutoFeature then
+                  J := 2
                 else
-                  j := 1;
-                if j = Special then
-                  List.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
-                    hkFeature, i);
+                  J := 1;
+                if J = Special then
+                  List.AddLine(Phrases.Lookup('FEATURES', I), pkFeature, I,
+                    hkFeature, I);
               end;
             List.Sort;
@@ -1871 +1871 @@
           begin
             NextSection('COSTS');
-            s := IntToStr(Feature[no].Cost);
+            S := IntToStr(Feature[no].Cost);
             if Feature[no].Cost >= 0 then
-              s := '+' + s;
-            AddLine(Format(HelpText.Lookup('COSTBASE'), [s]));
+              S := '+' + S;
+            AddLine(Format(HelpText.Lookup('COSTBASE'), [S]));
             if Feature[no].Weight > 0 then
             begin
@@ -1901 +1901 @@
         begin
           Caption := HelpText.Lookup('HELPTITLE_MODELLIST');
-          for i := 0 to nSpecialModel - 1 do
-            if i <> 2 then
-              AddModelText(i);
+          for I := 0 to nSpecialModel - 1 do
+            if I <> 2 then
+              AddModelText(I);
           LineFeed;
           AddItem('MODELNOTE');
@@ -1910 +1910 @@
     end;
     if CheckSeeAlso then
-      for i := 0 to nSeeAlso - 1 do
-        if (SeeAlso[i].Kind = Kind) and (SeeAlso[i].no = no) then
-          case SeeAlso[i].SeeKind of
-            hkImp: AddImprovement(SeeAlso[i].SeeNo);
-            hkAdv: AddAdvance(SeeAlso[i].SeeNo);
-            hkFeature: AddFeature(SeeAlso[i].SeeNo);
+      for I := 0 to nSeeAlso - 1 do
+        if (SeeAlso[I].Kind = Kind) and (SeeAlso[I].no = no) then
+          case SeeAlso[I].SeeKind of
+            hkImp: AddImprovement(SeeAlso[I].SeeNo);
+            hkAdv: AddAdvance(SeeAlso[I].SeeNo);
+            hkFeature: AddFeature(SeeAlso[I].SeeNo);
           end;
     if (Headline >= 0) and (Count = Headline + 1) then
@@ -1949 +1949 @@
 
 procedure THelpDlg.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
   i0, Sel0: Integer;
 begin
-  y := y - WideFrame;
+  Y := Y - WideFrame;
   i0 := ScrollBar.Position;
   Sel0 := Sel;
-  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
-    (y < InnerHeight) and (y mod 24 >= 8) then
-    Sel := y div 24
+  if (X >= SideFrame) and (X < SideFrame + InnerWidth) and (Y >= 0) and
+    (Y < InnerHeight) and (Y mod 24 >= 8) then
+    Sel := Y div 24
   else
     Sel := -1;
@@ -1974 +1974 @@
 
 procedure THelpDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if Sel >= 0 then
@@ -1987 +1987 @@
       begin
         if (Link >= $8000) and (Link and $3FFF = liInvalid) then
-          exit; // invalid link;
+          Exit; // invalid link;
         if Link >= $8000 then
           ShowNewContent(FWindowMode, hkText, Link and $3FFF)
@@ -2079 +2079 @@
 procedure THelpDlg.Search(SearchString: string);
 var
-  h, i, PrevHandle, PrevIndex, p, RightMargin: Integer;
-  s: string;
+  H, I, PrevHandle, PrevIndex, P, RightMargin: Integer;
+  S: string;
   mADVHELP, mIMPHELP, mFEATUREHELP: set of 0 .. 255;
   bGOVHELP, bSPECIALMODEL, bJOBHELP: Boolean;
@@ -2094 +2094 @@
   // search in generic reference
   SearchString := UpperCase(SearchString);
-  for i := 0 to 35 + 4 do begin
-    s := Phrases.Lookup('TERRAIN', i);
-    if pos(SearchString, UpperCase(s)) > 0 then
-      if i < 36 then
-        SearchResult.AddLine(s + ' ' + HelpText.Lookup('HELPSPEC_TER'),
-          pkNormal, 0, hkTer + hkCrossLink, i)
+  for I := 0 to 35 + 4 do begin
+    S := Phrases.Lookup('TERRAIN', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
+      if I < 36 then
+        SearchResult.AddLine(S + ' ' + HelpText.Lookup('HELPSPEC_TER'),
+          pkNormal, 0, hkTer + hkCrossLink, I)
       else
       begin
@@ -2105 +2105 @@
           HelpText.Lookup('HELPSPEC_TER'), pkNormal, 0,
           hkTer + hkCrossLink, 36);
-        if i > 36 then
+        if I > 36 then
           SearchResult.AddLine(Phrases.Lookup('IMPROVEMENTS',
-            imShipComp + i - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
-            pkNormal, 0, hkImp + hkCrossLink, imShipComp + i - 37);
+            imShipComp + I - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
+            pkNormal, 0, hkImp + hkCrossLink, imShipComp + I - 37);
         Break;
       end;
   end;
-  for i := 0 to nJobHelp - 1 do
-    if pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[i]))) > 0
+  for I := 0 to nJobHelp - 1 do
+    if Pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[I]))) > 0
     then
     begin
@@ -2121 +2121 @@
       Break;
     end;
-  for i := 0 to nAdv - 1 do
-  begin
-    s := Phrases.Lookup('ADVANCES', i);
-    if pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nAdv - 1 do
+  begin
+    S := Phrases.Lookup('ADVANCES', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      if i in FutureTech then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+      if I in FutureTech then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
-      SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i);
-      include(mADVHELP, i);
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+      SearchResult.AddLine(S, pkNormal, 0, hkAdv + hkCrossLink, I);
+      Include(mADVHELP, I);
     end;
   end;
-  for i := 0 to nSpecialModel - 1 do
-  begin
-    FindStdModelPicture(SpecialModelPictureCode[i], h, s);
-    if pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nSpecialModel - 1 do
+  begin
+    FindStdModelPicture(SpecialModelPictureCode[I], H, S);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal, 0,
@@ -2145 +2145 @@
     end;
   end;
-  for i := 0 to nFeature - 1 do
-  begin
-    s := Phrases.Lookup('FEATURES', i);
-    if Pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nFeature - 1 do
+  begin
+    S := Phrases.Lookup('FEATURES', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      if i < mcFirstNonCap then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
-      else if i in AutoFeature then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+      if I < mcFirstNonCap then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+      else if I in AutoFeature then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
-      SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
-      Include(mFEATUREHELP, i);
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+      SearchResult.AddLine(S, pkNormal, 0, hkFeature + hkCrossLink, I);
+      Include(mFEATUREHELP, I);
     end;
   end;
-  for i := 0 to nImp - 1 do
-  begin
-    s := Phrases.Lookup('IMPROVEMENTS', i);
-    if Pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nImp - 1 do
+  begin
+    S := Phrases.Lookup('IMPROVEMENTS', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      case Imp[i].Kind of
+      case Imp[I].Kind of
         ikWonder:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
         ikCommon:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_IMP');
         ikShipPart:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_NAT')
       end;
-      SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i);
-      Include(mIMPHELP, i);
+      SearchResult.AddLine(S, pkNormal, 0, hkImp + hkCrossLink, I);
+      Include(mIMPHELP, I);
     end
   end;
-  for i := 0 to nGov - 1 do
-    if Pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', i))) > 0 then
+  for I := 0 to nGov - 1 do
+    if Pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', I))) > 0 then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
@@ -2189 +2189 @@
 
   // full text search
-  h := -1;
+  H := -1;
   repeat
-    PrevHandle := h;
-    PrevIndex := i;
-    if not HelpText.Search(SearchString, h, i) then
+    PrevHandle := H;
+    PrevIndex := I;
+    if not HelpText.Search(SearchString, H, I) then
       Break;
-    if h = hADVHELP then
+    if H = hADVHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mADVHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mADVHELP) then
       begin
-        s := Phrases.Lookup('ADVANCES', i);
-        if i in FutureTech then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+        S := Phrases.Lookup('ADVANCES', I);
+        if I in FutureTech then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
-        SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i)
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+        SearchResult.AddLine(S, pkNormal, 0, hkAdv + hkCrossLink, I)
       end;
     end
-    else if h = hIMPHELP then
+    else if H = hIMPHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mIMPHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mIMPHELP) then
       begin
-        s := Phrases.Lookup('IMPROVEMENTS', i);
-        case Imp[i].Kind of
+        S := Phrases.Lookup('IMPROVEMENTS', I);
+        case Imp[I].Kind of
           ikWonder:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
           ikCommon:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_IMP');
           ikShipPart:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_NAT')
         end;
-        SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i)
+        SearchResult.AddLine(S, pkNormal, 0, hkImp + hkCrossLink, I)
       end;
     end
-    else if h = hFEATUREHELP then
+    else if H = hFEATUREHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mFEATUREHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mFEATUREHELP) then
       begin
-        s := Phrases.Lookup('FEATURES', i);
-        if i < mcFirstNonCap then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
-        else if i in AutoFeature then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+        S := Phrases.Lookup('FEATURES', I);
+        if I < mcFirstNonCap then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+        else if I in AutoFeature then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
-        SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+        SearchResult.AddLine(S, pkNormal, 0, hkFeature + hkCrossLink, I);
       end;
     end
-    else if h = hGOVHELP then
+    else if H = hGOVHELP then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bGOVHELP then
+      if (I >= 0) and (H <> PrevHandle) and not bGOVHELP then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
           hkMisc + hkCrossLink, miscGovList)
     end
-    else if h = hSPECIALMODEL then
+    else if H = hSPECIALMODEL then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bSPECIALMODEL then
+      if (I >= 0) and (H <> PrevHandle) and not bSPECIALMODEL then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal,
           0, hkModel + hkCrossLink, 0)
     end
-    else if h = hJOBHELP then
+    else if H = hJOBHELP then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bJOBHELP then
+      if (I >= 0) and (H <> PrevHandle) and not bJOBHELP then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
           hkMisc + hkCrossLink, miscJobList)
     end
-    else if { (h<>hMAIN) and } (h <> PrevHandle) then
+    else if { (h<>hMAIN) and } (H <> PrevHandle) then
     begin
-      s := HelpText.LookupByHandle(h);
-      p := Pos('$', s);
-      if p > 0 then
+      S := HelpText.LookupByHandle(H);
+      P := Pos('$', S);
+      if P > 0 then
       begin
-        s := Copy(s, p + 1, maxint);
-        p := Pos('\', s);
-        if p > 0 then
-          s := Copy(s, 1, p - 1);
-        SearchResult.AddLine(s, pkNormal, 0, hkText + hkCrossLink, h);
+        S := Copy(S, P + 1, maxint);
+        P := Pos('\', S);
+        if P > 0 then
+          S := Copy(S, 1, P - 1);
+        SearchResult.AddLine(S, pkNormal, 0, hkText + hkCrossLink, H);
       end;
     end;
@@ -2278 +2278 @@
     RightMargin := InnerWidth - 16 - GetSystemMetrics(SM_CXVSCROLL);
     OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
-    for i := 0 to SearchResult.Count - 1 do
+    for I := 0 to SearchResult.Count - 1 do
     begin
-      while BiColorTextWidth(OffScreen.Canvas, SearchResult[i]) >
+      while BiColorTextWidth(OffScreen.Canvas, SearchResult[I]) >
         RightMargin - 32 do
-        SearchResult[i] := copy(SearchResult[i], 1, length(SearchResult[i]) - 1)
+        SearchResult[I] := Copy(SearchResult[I], 1, Length(SearchResult[I]) - 1)
     end;
   end;

trunk/LocalPlayer/IsoEngine.pas

@@ -13 +13 @@
 
 type
-  TInitEnemyModelEvent = function(emix: integer): boolean;
+  TInitEnemyModelEvent = function(emix: Integer): Boolean;
   TTileSize = (tsSmall, tsMedium, tsBig);
 
@@ -33 +33 @@
       Dirx: array [0..7] of Integer = (1, 2, 1, 0, -1, -2, -1, 0);
       Diry: array [0..7] of Integer = (-1, 0, 1, 2, 1, 0, -1, -2);
-    procedure CityGrid(xm, ym: integer; CityAllowClick: Boolean);
-    function IsShoreTile(Loc: integer): boolean;
+    procedure CityGrid(xm, ym: Integer; CityAllowClick: Boolean);
+    function IsShoreTile(Loc: Integer): Boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
     procedure SetTileSize(AValue: TTileSize);
-    procedure ShadeOutside(x0, y0, Width, Height, xm, ym: integer);
+    procedure ShadeOutside(x0, y0, Width, Height, xm, ym: Integer);
   protected
     FOutput: TBitmap;
@@ -65 +65 @@
     ShowDebug: Boolean;
     FoW: Boolean;
-    function Connection4(Loc, Mask, Value: integer): integer;
-    function Connection8(Loc, Mask: integer): integer;
-    function OceanConnection(Loc: integer): integer;
-    procedure PaintShore(x, y, Loc: integer);
-    procedure PaintTileExtraTerrain(x, y, Loc: integer);
-    procedure PaintTileObjects(x, y, Loc, CityLoc, CityOwner: integer;
-      UseBlink: boolean);
-    procedure PaintGrid(x, y, nx, ny: integer);
-    procedure FillRect(x, y, Width, Height, Color: integer);
-    procedure Textout(x, y, Color: integer; const s: string);
-    procedure Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
-    procedure TSprite(xDst, yDst, grix: integer; PureBlack: boolean = false);
+    function Connection4(Loc, Mask, Value: Integer): Integer;
+    function Connection8(Loc, Mask: Integer): Integer;
+    function OceanConnection(Loc: Integer): Integer;
+    procedure PaintShore(X, Y, Loc: Integer);
+    procedure PaintTileExtraTerrain(X, Y, Loc: Integer);
+    procedure PaintTileObjects(X, Y, Loc, CityLoc, CityOwner: Integer;
+      UseBlink: Boolean);
+    procedure PaintGrid(X, Y, nx, ny: Integer);
+    procedure FillRect(X, Y, Width, Height, Color: Integer);
+    procedure Textout(X, Y, Color: Integer; const S: string);
+    procedure Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
+    procedure TSprite(xDst, yDst, grix: Integer; PureBlack: Boolean = False);
     procedure ApplyTileSize(ATileSize: TTileSize);
   public
@@ -89 +89 @@
     procedure Reset;
     procedure SetOutput(Output: TBitmap);
-    procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
-    procedure Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
-      UseBlink: boolean = false; CityAllowClick: boolean = false);
-    procedure PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
-      Status: integer);
-    procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
-      accessory: boolean = true);
-    procedure BitBltBitmap(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
-      Rop: integer);
+    procedure SetPaintBounds(Left, Top, Right, Bottom: Integer);
+    procedure Paint(X, Y, Loc, nx, ny, CityLoc, CityOwner: Integer;
+      UseBlink: Boolean = False; CityAllowClick: Boolean = False);
+    procedure PaintUnit(X, Y: Integer; const UnitInfo: TUnitInfo;
+      Status: Integer);
+    procedure PaintCity(X, Y: Integer; const CityInfo: TCityInfo;
+      accessory: Boolean = True);
+    procedure BitBltBitmap(Src: TBitmap; X, Y, Width, Height, xSrc, ySrc,
+      Rop: Integer);
     procedure AttackBegin(const ShowMove: TShowMove);
     procedure AttackEffect(const ShowMove: TShowMove);
     procedure AttackEnd;
     procedure ReduceTerrainIconsSize;
-    property AdviceLoc: integer read FAdviceLoc write FAdviceLoc;
+    property AdviceLoc: Integer read FAdviceLoc write FAdviceLoc;
     property TileSize: TTileSize read FTileSize write SetTileSize;
   end;
@@ -127 +127 @@
     (X: 72; Y: 36));
 
-function IsJungle(y: integer): boolean;
+function IsJungle(Y: Integer): Boolean;
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
 
@@ -173 +173 @@
   IsoMapCache: array[TTileSize] of TIsoMapCache;
 
-function IsJungle(y: integer): boolean;
-begin
-  result := (y > (G.ly - 2) div 4) and (G.ly - 1 - y > (G.ly - 2) div 4)
+function IsJungle(Y: Integer): Boolean;
+begin
+  Result := (Y > (G.ly - 2) div 4) and (G.ly - 1 - Y > (G.ly - 2) div 4)
 end;
 
@@ -254 +254 @@
   Mask24.BeginUpdate;
   for ySrc := 0 to TerrainIconLines - 1 do begin
-    for i := 0 to yyt * 3 - 1 do
-      MaskLine[i] := PixelPointer(Mask24, ScaleToNative(0),
-        ScaleToNative(1 + ySrc * (yyt * 3 + 1) + i));
+    for I := 0 to yyt * 3 - 1 do
+      MaskLine[I] := PixelPointer(Mask24, ScaleToNative(0),
+        ScaleToNative(1 + ySrc * (yyt * 3 + 1) + I));
     for xSrc := 0 to TerrainIconCols - 1 do begin
-      i := ySrc * 9 + xSrc;
-      TSpriteSize[i].Left := 0;
+      I := ySrc * 9 + xSrc;
+      TSpriteSize[I].Left := 0;
       repeat
-        Border := true;
-        for y := 0 to yyt * 3 - 1 do begin
-          MaskLine[y].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left));
-          if MaskLine[y].Pixel^.B = 0 then Border := false;
+        Border := True;
+        for Y := 0 to yyt * 3 - 1 do begin
+          MaskLine[Y].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[I].Left));
+          if MaskLine[Y].Pixel^.B = 0 then Border := False;
         end;
-        if Border then Inc(TSpriteSize[i].Left);
-      until not Border or (TSpriteSize[i].Left = xxt * 2 - 1);
-      TSpriteSize[i].Top := 0;
+        if Border then Inc(TSpriteSize[I].Left);
+      until not Border or (TSpriteSize[I].Left = xxt * 2 - 1);
+      TSpriteSize[I].Top := 0;
       repeat
-        Border := true;
-        for x := 0 to xxt * 2 - 1 do begin
-          MaskLine[TSpriteSize[i].Top].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + x));
-          if MaskLine[TSpriteSize[i].Top].Pixel^.B = 0 then Border := false;
+        Border := True;
+        for X := 0 to xxt * 2 - 1 do begin
+          MaskLine[TSpriteSize[I].Top].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + X));
+          if MaskLine[TSpriteSize[I].Top].Pixel^.B = 0 then Border := False;
         end;
-        if Border then inc(TSpriteSize[i].Top);
-      until not Border or (TSpriteSize[i].Top = yyt * 3 - 1);
-      TSpriteSize[i].Right := xxt * 2;
+        if Border then Inc(TSpriteSize[I].Top);
+      until not Border or (TSpriteSize[I].Top = yyt * 3 - 1);
+      TSpriteSize[I].Right := xxt * 2;
       repeat
-        Border := true;
-        for y := 0 to yyt * 3 - 1 do begin
-          MaskLine[y].SetX(ScaleToNative(xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right));
-          if MaskLine[y].Pixel^.B = 0 then Border := false;
+        Border := True;
+        for Y := 0 to yyt * 3 - 1 do begin
+          MaskLine[Y].SetX(ScaleToNative(xSrc * (xxt * 2 + 1) + TSpriteSize[I].Right));
+          if MaskLine[Y].Pixel^.B = 0 then Border := False;
         end;
-        if Border then Dec(TSpriteSize[i].Right);
-      until not Border or (TSpriteSize[i].Right = TSpriteSize[i].Left);
-      TSpriteSize[i].Bottom := yyt * 3;
+        if Border then Dec(TSpriteSize[I].Right);
+      until not Border or (TSpriteSize[I].Right = TSpriteSize[I].Left);
+      TSpriteSize[I].Bottom := yyt * 3;
       repeat
-        Border := true;
-        for x := 0 to xxt * 2 - 1 do begin
-          MaskLine[TSpriteSize[i].Bottom - 1].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + x));
-          if MaskLine[TSpriteSize[i].Bottom - 1].Pixel^.B = 0 then Border := false;
+        Border := True;
+        for X := 0 to xxt * 2 - 1 do begin
+          MaskLine[TSpriteSize[I].Bottom - 1].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + X));
+          if MaskLine[TSpriteSize[I].Bottom - 1].Pixel^.B = 0 then Border := False;
         end;
-        if Border then Dec(TSpriteSize[i].Bottom);
-      until not Border or (TSpriteSize[i].Bottom = TSpriteSize[i].Top);
+        if Border then Dec(TSpriteSize[I].Bottom);
+      until not Border or (TSpriteSize[I].Bottom = TSpriteSize[I].Top);
     end;
   end;
@@ -303 +303 @@
 procedure TIsoMap.ApplyTileSize(ATileSize: TTileSize);
 var
-  x: Integer;
-  y: Integer;
+  X: Integer;
+  Y: Integer;
   xSrc: Integer;
   ySrc: Integer;
@@ -361 +361 @@
     1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 
-  for x := -1 to 6 do begin
-    if x = -1 then begin
+  for X := -1 to 6 do begin
+    if X = -1 then begin
       xSrc := ShoreDither * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
     end
-    else if x = 6 then begin
+    else if X = 6 then begin
       xSrc := 1 + (xxt * 2 + 1) * 2;
       ySrc := 1 + yyt + (yyt * 3 + 1) * 2;
     end else begin
-      xSrc := (x + 2) * (xxt * 2 + 1) + 1;
+      xSrc := (X + 2) * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
     end;
-    for y := -1 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for Y := -1 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc);
-    for y := -2 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+    for Y := -2 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt, xxt,
         yyt, HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt,
         SRCPAINT);
-    for y := -2 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+    for Y := -2 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2) + xxt, (Y + 2) * yyt,
         xxt, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc + yyt,
         SRCPAINT);
-    for y := -2 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+    for Y := -2 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt, xxt,
         yyt, DitherMask.Canvas, xxt, yyt, SRCAND);
-    for y := -2 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+    for Y := -2 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2) + xxt, (Y + 2) * yyt,
         xxt, yyt, DitherMask.Canvas, 0, yyt, SRCAND);
   end;
 
-  for y := -1 to 6 do begin
-    if y = -1 then begin
+  for Y := -1 to 6 do begin
+    if Y = -1 then begin
       xSrc := ShoreDither * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
     end
-    else if y = 6 then begin
+    else if Y = 6 then begin
       xSrc := 1 + 2 * (xxt * 2 + 1);
       ySrc := 1 + yyt + 2 * (yyt * 3 + 1);
     end else begin
-      xSrc := (y + 2) * (xxt * 2 + 1) + 1;
+      xSrc := (Y + 2) * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
     end;
-    for x := -2 to 6 do
-      BitBltCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for X := -2 to 6 do
+      BitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc);
-    BitBltCanvas(LandMore.Canvas, xxt * 2, (y + 2) * yyt, xxt, yyt,
+    BitBltCanvas(LandMore.Canvas, xxt * 2, (Y + 2) * yyt, xxt, yyt,
       HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt, SRCPAINT);
-    for x := 0 to 7 do
-      BitBltCanvas(LandMore.Canvas, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+    for X := 0 to 7 do
+      BitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2) - xxt, (Y + 2) * yyt,
         xxt * 2, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc + yyt,
         SRCPAINT);
-    for x := -2 to 6 do
-      BitBltCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for X := -2 to 6 do
+      BitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, DitherMask.Canvas, 0, 0, SRCAND);
   end;
 
-  for x := 0 to 3 do begin
-    for y := 0 to 3 do begin
-      if (x = 1) and (y = 1) then xSrc := 1
+  for X := 0 to 3 do begin
+    for Y := 0 to 3 do begin
+      if (X = 1) and (Y = 1) then xSrc := 1
       else
-        xSrc := (x mod 2) * (xxt * 2 + 1) + 1;
+        xSrc := (X mod 2) * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
-      if (x >= 1) = (y >= 2) then
-        BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      if (X >= 1) = (Y >= 2) then
+        BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt * 2, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc);
-      if (x >= 1) and ((y < 2) or (x >= 2)) then
+      if (X >= 1) and ((Y < 2) or (X >= 2)) then
       begin
-        BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+        BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
-        BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+        BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
-      BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+      BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
         DitherMask.Canvas, xxt, yyt, SRCAND);
-      BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+      BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
         DitherMask.Canvas, 0, yyt, SRCAND);
     end;
   end;
 
-  for y := 0 to 3 do begin
-    for x := 0 to 3 do begin
-      if (x = 1) and (y = 1) then xSrc := 1
+  for Y := 0 to 3 do begin
+    for X := 0 to 3 do begin
+      if (X = 1) and (Y = 1) then xSrc := 1
       else
-        xSrc := (y mod 2) * (xxt * 2 + 1) + 1;
+        xSrc := (Y mod 2) * (xxt * 2 + 1) + 1;
       ySrc := 1 + yyt;
-      if (x < 1) or (y >= 2) then
-        BitBltCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      if (X < 1) or (Y >= 2) then
+        BitBltCanvas(OceanMore.Canvas, X * (xxt * 2), Y * yyt, xxt * 2, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc);
-      if (x = 1) and (y < 2) or (x >= 2) and (y >= 1) then
+      if (X = 1) and (Y < 2) or (X >= 2) and (Y >= 1) then
       begin
-        BitBltCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+        BitBltCanvas(OceanMore.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
-        BitBltCanvas(OceanMore.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+        BitBltCanvas(OceanMore.Canvas, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
-      BitBltCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      BitBltCanvas(OceanMore.Canvas, X * (xxt * 2), Y * yyt, xxt * 2, yyt,
         DitherMask.Canvas, 0, 0, SRCAND);
     end;
@@ -469 +469 @@
     HGrTerrain.Mask.Canvas, 1, 1 + yyt, SRCPAINT);
 
-  for x := -1 to 6 do
-    for y := -2 to 6 do
-      BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+  for X := -1 to 6 do
+    for Y := -2 to 6 do
+      BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, DitherMask.Canvas, 0, 0, SRCAND);
 
-  for y := -1 to 6 do
-    for x := -2 to 7 do
-      BitBltCanvas(LandMore.Canvas, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+  for Y := -1 to 6 do
+    for X := -2 to 7 do
+      BitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2) - xxt, (Y + 2) * yyt,
         xxt * 2, yyt, DitherMask.Canvas, 0, yyt, SRCAND);
 
@@ -482 +482 @@
     LandMore.Canvas, 0, 0, SRCPAINT);
 
-  for x := 0 to 3 do
-    for y := 0 to 3 do
-      BitBltCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+  for X := 0 to 3 do
+    for Y := 0 to 3 do
+      BitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt * 2, yyt,
         DitherMask.Canvas, 0, 0, SRCAND);
 
-  for y := 0 to 3 do
-    for x := 0 to 4 do
-      BitBltCanvas(OceanMore.Canvas, x * (xxt * 2) - xxt, y * yyt, xxt * 2,
+  for Y := 0 to 3 do
+    for X := 0 to 4 do
+      BitBltCanvas(OceanMore.Canvas, X * (xxt * 2) - xxt, Y * yyt, xxt * 2,
         yyt, DitherMask.Canvas, 0, yyt, SRCAND);
 
@@ -502 +502 @@
     HGrTerrain.Mask.Canvas, 1, 1 + yyt);
 
-  for x := 0 to 6 do
-    BitBltCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), yyt, xxt * 2, yyt,
+  for X := 0 to 6 do
+    BitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), yyt, xxt * 2, yyt,
       DitherMask.Canvas, 0, 0, SRCAND);
   BitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt, DitherMask.Canvas,
     0, 0, DSTINVERT);
 
-  for y := 0 to 6 do
-    BitBltCanvas(LandPatch.Canvas, xxt * 2, (y + 2) * yyt, xxt * 2, yyt,
+  for Y := 0 to 6 do
+    BitBltCanvas(LandPatch.Canvas, xxt * 2, (Y + 2) * yyt, xxt * 2, yyt,
       DitherMask.Canvas, 0, 0, SRCAND);
 
@@ -555 +555 @@
 end;
 
-procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: integer);
+procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: Integer);
 begin
   FLeft := Left;
@@ -563 +563 @@
 end;
 
-procedure TIsoMap.FillRect(x, y, Width, Height, Color: integer);
-begin
-  if x < FLeft then
-  begin
-    Width := Width - (FLeft - x);
-    x := FLeft;
-  end;
-  if y < FTop then
-  begin
-    Height := Height - (FTop - y);
-    y := FTop;
-  end;
-  if x + Width >= FRight then
-    Width := FRight - x;
-  if y + Height >= FBottom then
-    Height := FBottom - y;
+procedure TIsoMap.FillRect(X, Y, Width, Height, Color: Integer);
+begin
+  if X < FLeft then
+  begin
+    Width := Width - (FLeft - X);
+    X := FLeft;
+  end;
+  if Y < FTop then
+  begin
+    Height := Height - (FTop - Y);
+    Y := FTop;
+  end;
+  if X + Width >= FRight then
+    Width := FRight - X;
+  if Y + Height >= FBottom then
+    Height := FBottom - Y;
   if (Width <= 0) or (Height <= 0) then
-    exit;
+    Exit;
 
   FOutput.Canvas.Brush.Color := Color;
-  FOutput.Canvas.FillRect(Rect(x, y, x + Width, y + Height));
+  FOutput.Canvas.FillRect(Rect(X, Y, X + Width, Y + Height));
   FOutput.Canvas.Brush.Style := bsClear;
 end;
 
-procedure TIsoMap.Textout(x, y, Color: integer; const s: string);
+procedure TIsoMap.Textout(X, Y, Color: Integer; const S: string);
 begin
   FOutput.Canvas.Font.Color := Color;
-  FOutput.Canvas.TextRect(Rect(FLeft, FTop, FRight, FBottom), x, y, s)
-end;
-
-procedure TIsoMap.BitBltBitmap(Src: TBitmap; x, y, Width, Height, xSrc, ySrc,
-  Rop: integer);
-begin
-  if x < FLeft then
-  begin
-    Width := Width - (FLeft - x);
-    xSrc := xSrc + (FLeft - x);
-    x := FLeft;
-  end;
-  if y < FTop then
-  begin
-    Height := Height - (FTop - y);
-    ySrc := ySrc + (FTop - y);
-    y := FTop;
-  end;
-  if x + Width >= FRight then
-    Width := FRight - x;
-  if y + Height >= FBottom then
-    Height := FBottom - y;
+  FOutput.Canvas.TextRect(Rect(FLeft, FTop, FRight, FBottom), X, Y, S)
+end;
+
+procedure TIsoMap.BitBltBitmap(Src: TBitmap; X, Y, Width, Height, xSrc, ySrc,
+  Rop: Integer);
+begin
+  if X < FLeft then
+  begin
+    Width := Width - (FLeft - X);
+    xSrc := xSrc + (FLeft - X);
+    X := FLeft;
+  end;
+  if Y < FTop then
+  begin
+    Height := Height - (FTop - Y);
+    ySrc := ySrc + (FTop - Y);
+    Y := FTop;
+  end;
+  if X + Width >= FRight then
+    Width := FRight - X;
+  if Y + Height >= FBottom then
+    Height := FBottom - Y;
   if (Width <= 0) or (Height <= 0) then
-    exit;
-
-  BitBltCanvas(FOutput.Canvas, x, y, Width, Height, Src.Canvas, xSrc, ySrc, Rop);
-end;
-
-procedure TIsoMap.Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+    Exit;
+
+  BitBltCanvas(FOutput.Canvas, X, Y, Width, Height, Src.Canvas, xSrc, ySrc, Rop);
+end;
+
+procedure TIsoMap.Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 begin
   BitBltBitmap(HGr.Mask, xDst, yDst, Width, Height, xGr, yGr, SRCAND);
@@ -624 +624 @@
 end;
 
-procedure TIsoMap.TSprite(xDst, yDst, grix: integer;
-  PureBlack: boolean = false);
+procedure TIsoMap.TSprite(xDst, yDst, grix: Integer;
+  PureBlack: Boolean = False);
 var
   Width: Integer;
   Height: Integer;
   xSrc: Integer;
-  ySrc: integer;
+  ySrc: Integer;
 begin
   Width := TSpriteSize[grix].Right - TSpriteSize[grix].Left;
@@ -653 +653 @@
     Height := FBottom - yDst;
   if (Width <= 0) or (Height <= 0) then
-    exit;
+    Exit;
 
   BitBltCanvas(FOutput.Canvas, xDst, yDst, Width, Height, MaskCanvas, xSrc, ySrc, SRCAND);
@@ -660 +660 @@
 end;
 
-procedure TIsoMap.PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
-  Status: integer);
-var
-  xsh, ysh, xGr, yGr, j, mixShow: integer;
+procedure TIsoMap.PaintUnit(X, Y: Integer; const UnitInfo: TUnitInfo;
+  Status: Integer);
+var
+  xsh, ysh, xGr, yGr, J, mixShow: Integer;
 begin
   with UnitInfo do
-    if (Owner = me) or (emix <> $FFFF) then
+    if (Owner = Me) or (emix <> $FFFF) then
     begin
       if Job = jCity then
@@ -675 +675 @@
         (@OnInitEnemyModel <> nil) then
         if not OnInitEnemyModel(emix) then
-          exit;
+          Exit;
       xsh := Tribe[Owner].ModelPicture[mixShow].xShield;
       ysh := Tribe[Owner].ModelPicture[mixShow].yShield;
 {$IFNDEF SCR} if Status and usStay <> 0 then
-        j := 19
+        J := 19
       else if Status and usRecover <> 0 then
-        j := 16
+        J := 16
       else if Status and (usGoto or usEnhance) = usGoto or usEnhance then
-        j := 18
+        J := 18
       else if Status and usEnhance <> 0 then
-        j := 17
+        J := 17
       else if Status and usGoto <> 0 then
-        j := 20
+        J := 20
       else {$ENDIF} if Job = jCity then
-          j := jNone
+          J := jNone
         else
-          j := Job;
+          J := Job;
       if Flags and unMulti <> 0 then
-        Sprite(Tribe[Owner].symHGr, x + xsh - 1 + 4, y + ysh - 2, 14, 12,
+        Sprite(Tribe[Owner].symHGr, X + xsh - 1 + 4, Y + ysh - 2, 14, 12,
           33 + Tribe[Owner].sympix mod 10 * 65,
           1 + Tribe[Owner].sympix div 10 * 49);
-      Sprite(Tribe[Owner].symHGr, x + xsh - 1, y + ysh - 2, 14, 12,
+      Sprite(Tribe[Owner].symHGr, X + xsh - 1, Y + ysh - 2, 14, 12,
         18 + Tribe[Owner].sympix mod 10 * 65,
         1 + Tribe[Owner].sympix div 10 * 49);
-      FillRect(x + xsh, y + ysh + 5, 1 + Health * 11 div 100, 3,
+      FillRect(X + xsh, Y + ysh + 5, 1 + Health * 11 div 100, 3,
         ColorOfHealth(Health));
-      if j > 0 then
+      if J > 0 then
       begin
-        xGr := 121 + j mod 7 * 9;
-        yGr := 1 + j div 7 * 9;
-        BitBltBitmap(HGrSystem.Mask, x + xsh + 3, y + ysh + 9, 8, 8, xGr,
+        xGr := 121 + J mod 7 * 9;
+        yGr := 1 + J div 7 * 9;
+        BitBltBitmap(HGrSystem.Mask, X + xsh + 3, Y + ysh + 9, 8, 8, xGr,
           yGr, SRCAND);
-        Sprite(HGrSystem, x + xsh + 2, y + ysh + 8, 8, 8, xGr, yGr);
+        Sprite(HGrSystem, X + xsh + 2, Y + ysh + 8, 8, 8, xGr, yGr);
       end;
       with Tribe[Owner].ModelPicture[mixShow] do
-        Sprite(HGr, x, y, 64, 48, pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
+        Sprite(HGr, X, Y, 64, 48, pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
       if Flags and unFortified <> 0 then
       begin
         { DataCanvas:=HGrTerrain.Data.Canvas;
           MaskCanvas:=HGrTerrain.Mask.Canvas;
-          TSprite(x,y+16,12*9+7); }
-        Sprite(HGrStdUnits, x, y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
+          TSprite(X,Y+16,12*9+7); }
+        Sprite(HGrStdUnits, X, Y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
       end;
     end;
 end;
 
-procedure TIsoMap.PaintCity(x, y: integer; const CityInfo: TCityInfo;
-  accessory: boolean);
+procedure TIsoMap.PaintCity(X, Y: Integer; const CityInfo: TCityInfo;
+  accessory: Boolean);
 var
   age: Integer;
@@ -733 +733 @@
   LabelLength: Integer;
   cpic: TCityPicture;
-  s: string;
+  S: string;
 begin
   age := GetAge(CityInfo.Owner);
@@ -752 +752 @@
       (cHGr.Data.Canvas.Pixels[(xGr + 4) * 65, cpix * 49 + 48] = $00FFFF)
     then
-      Sprite(cHGr, x - xxc, y - 2 * yyc, xxc * 2, yyc * 3,
+      Sprite(cHGr, X - xxc, Y - 2 * yyc, xxc * 2, yyc * 3,
         xGr * (xxc * 2 + 1) + 1, 1 + cpix * (yyc * 3 + 1));
     if ciWalled and CityInfo.Flags <> 0 then
-      Sprite(cHGr, x - xxc, y - 2 * yyc, xxc * 2, yyc * 3,
+      Sprite(cHGr, X - xxc, Y - 2 * yyc, xxc * 2, yyc * 3,
         (xGr + 4) * (xxc * 2 + 1) + 1, 1 + cpix * (yyc * 3 + 1));
   end
@@ -761 +761 @@
   begin
     if ciWalled and CityInfo.Flags <> 0 then
-      Sprite(HGrCities, x - xxt, y - 2 * yyt, 2 * xxt, 3 * yyt,
+      Sprite(HGrCities, X - xxt, Y - 2 * yyt, 2 * xxt, 3 * yyt,
         (xGr + 4) * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1))
     else
-      Sprite(HGrCities, x - xxt, y - 2 * yyt, 2 * xxt, 3 * yyt,
+      Sprite(HGrCities, X - xxt, Y - 2 * yyt, 2 * xxt, 3 * yyt,
         xGr * (2 * xxt + 1) + 1, 1 + (age - 2) * (3 * yyt + 1));
   end;
 
   if not accessory then
-    exit;
+    Exit;
 
   { if ciCapital and CityInfo.Flags<>0 then
-    Sprite(Tribe[CityInfo.Owner].symHGr,x+cpic.xf,y-13+cpic.yf,13,14,
+    Sprite(Tribe[CityInfo.Owner].symHGr,X+cpic.xf,Y-13+cpic.yf,13,14,
     1+Tribe[CityInfo.Owner].sympix mod 10 *65,
     1+Tribe[CityInfo.Owner].sympix div 10 *49); {capital -- paint flag }
@@ -781 +781 @@
     begin
       cpic := Tribe[CityInfo.Owner].CityPicture[xGr];
-      xShield := x - xxc + cpic.xShield;
-      yShield := y - 2 * yyc + cpic.yShield;
+      xShield := X - xxc + cpic.xShield;
+      yShield := Y - 2 * yyc + cpic.yShield;
     end
     else
     begin
       cpic := CitiesPictures.Pictures[age, xGr];
-      xShield := x - xxt + cpic.xShield;
-      yShield := y - 2 * yyt + cpic.yShield;
+      xShield := X - xxt + cpic.xShield;
+      yShield := Y - 2 * yyt + cpic.yShield;
     end;
-    s := IntToStr(CityInfo.size);
-    LabelLength := FOutput.Canvas.TextWidth(s);
+    S := IntToStr(CityInfo.size);
+    LabelLength := FOutput.Canvas.TextWidth(S);
     FillRect(xShield, yShield, LabelLength + 4, 16, $000000);
     if MyMap[CityInfo.Loc] and (fUnit or fObserved) = fObserved then
@@ -802 +802 @@
       LabelTextColor := $000000;
     end;
-    Textout(xShield + 2, yShield - 1, LabelTextColor, s);
-  end;
-end;
-
-function PoleTile(Loc: integer): integer;
+    Textout(xShield + 2, yShield - 1, LabelTextColor, S);
+  end;
+end;
+
+function PoleTile(Loc: Integer): Integer;
 begin { virtual pole tile }
-  result := fUNKNOWN;
+  Result := fUNKNOWN;
   if Loc < -2 * G.lx then
   else if Loc < -G.lx then
@@ -815 +815 @@
       (MyMap[dLoc(Loc, -2, 2)] and fTerrain <> fUNKNOWN) and
       (MyMap[dLoc(Loc, 2, 2)] and fTerrain <> fUNKNOWN) then
-      result := fArctic;
+      Result := fArctic;
     if (MyMap[dLoc(Loc, 0, 2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, -2, 2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 2, 2)] and fObserved <> 0) then
-      result := result or fObserved;
+      Result := Result or fObserved;
   end
   else if Loc < 0 then
@@ -825 +825 @@
     if (MyMap[dLoc(Loc, -1, 1)] and fTerrain <> fUNKNOWN) and
       (MyMap[dLoc(Loc, 1, 1)] and fTerrain <> fUNKNOWN) then
-      result := fArctic;
+      Result := fArctic;
     if (MyMap[dLoc(Loc, -1, 1)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 1, 1)] and fObserved <> 0) then
-      result := result or fObserved;
+      Result := Result or fObserved;
   end
   else if Loc < G.lx * (G.ly + 1) then
@@ -834 +834 @@
     if (MyMap[dLoc(Loc, -1, -1)] and fTerrain <> fUNKNOWN) and
       (MyMap[dLoc(Loc, 1, -1)] and fTerrain <> fUNKNOWN) then
-      result := fArctic;
+      Result := fArctic;
     if (MyMap[dLoc(Loc, -1, -1)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 1, -1)] and fObserved <> 0) then
-      result := result or fObserved;
+      Result := Result or fObserved;
   end
   else if Loc < G.lx * (G.ly + 2) then
@@ -844 +844 @@
       (MyMap[dLoc(Loc, -2, -2)] and fTerrain <> fUNKNOWN) and
       (MyMap[dLoc(Loc, 2, -2)] and fTerrain <> fUNKNOWN) then
-      result := fArctic;
+      Result := fArctic;
     if (MyMap[dLoc(Loc, 0, -2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, -2, -2)] and fObserved <> 0) and
       (MyMap[dLoc(Loc, 2, -2)] and fObserved <> 0) then
-      result := result or fObserved;
-  end;
-end;
-
-function TIsoMap.Connection4(Loc, Mask, Value: integer): integer;
-begin
-  result := 0;
+      Result := Result or fObserved;
+  end;
+end;
+
+function TIsoMap.Connection4(Loc, Mask, Value: Integer): Integer;
+begin
+  Result := 0;
   if dLoc(Loc, 1, -1) >= 0 then
   begin
     if MyMap[dLoc(Loc, 1, -1)] and Mask = Cardinal(Value) then
-      inc(result, 1);
+      Inc(Result, 1);
     if MyMap[dLoc(Loc, -1, -1)] and Mask = Cardinal(Value) then
-      inc(result, 8);
+      Inc(Result, 8);
   end;
   if dLoc(Loc, 1, 1) < G.lx * G.ly then
   begin
     if MyMap[dLoc(Loc, 1, 1)] and Mask = Cardinal(Value) then
-      inc(result, 2);
+      Inc(Result, 2);
     if MyMap[dLoc(Loc, -1, 1)] and Mask = Cardinal(Value) then
-      inc(result, 4);
-  end;
-end;
-
-function TIsoMap.Connection8(Loc, Mask: integer): integer;
+      Inc(Result, 4);
+  end;
+end;
+
+function TIsoMap.Connection8(Loc, Mask: Integer): Integer;
 var
   Dir: Integer;
   ConnLoc: Integer;
 begin
-  result := 0;
+  Result := 0;
   for Dir := 0 to 7 do
   begin
@@ -882 +882 @@
     if (ConnLoc >= 0) and (ConnLoc < G.lx * G.ly) and
       (MyMap[ConnLoc] and Mask <> 0) then
-      inc(result, 1 shl Dir);
-  end;
-end;
-
-function TIsoMap.OceanConnection(Loc: integer): integer;
+      Inc(Result, 1 shl Dir);
+  end;
+end;
+
+function TIsoMap.OceanConnection(Loc: Integer): Integer;
 var
   Dir: Integer;
   ConnLoc: Integer;
 begin
-  result := 0;
+  Result := 0;
   for Dir := 0 to 7 do
   begin
@@ -897 +897 @@
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
       ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
-      inc(result, 1 shl Dir);
-  end;
-end;
-
-procedure TIsoMap.PaintShore(x, y, Loc: integer);
+      Inc(Result, 1 shl Dir);
+  end;
+end;
+
+procedure TIsoMap.PaintShore(X, Y, Loc: Integer);
 var
   Conn: Integer;
   Tile: Integer;
 begin
-  if (y <= FTop - yyt * 2) or (y > FBottom) or (x <= FLeft - xxt * 2) or
-    (x > FRight) then
-    exit;
+  if (Y <= FTop - yyt * 2) or (Y > FBottom) or (X <= FLeft - xxt * 2) or
+    (X > FRight) then
+    Exit;
   if (Loc < 0) or (Loc >= G.lx * G.ly) then
-    exit;
+    Exit;
   Tile := MyMap[Loc];
   if Tile and fTerrain >= fGrass then
-    exit;
+    Exit;
   Conn := OceanConnection(Loc);
   if Conn = 0 then
-    exit;
-
-  BitBltBitmap(HGrTerrain.Data, x + xxt div 2, y, xxt, yyt,
+    Exit;
+
+  BitBltBitmap(HGrTerrain.Data, X + xxt div 2, Y, xxt, yyt,
     1 + (Conn shr 6 + Conn and 1 shl 2) * (xxt * 2 + 1),
     1 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
-  BitBltBitmap(HGrTerrain.Data, x + xxt, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(HGrTerrain.Data, X + xxt, Y + yyt div 2, xxt, yyt,
     1 + (Conn and 7) * (xxt * 2 + 1) + xxt,
     1 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
-  BitBltBitmap(HGrTerrain.Data, x + xxt div 2, y + yyt, xxt, yyt,
+  BitBltBitmap(HGrTerrain.Data, X + xxt div 2, Y + yyt, xxt, yyt,
     1 + (Conn shr 2 and 7) * (xxt * 2 + 1) + xxt,
     1 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
-  BitBltBitmap(HGrTerrain.Data, x, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(HGrTerrain.Data, X, Y + yyt div 2, xxt, yyt,
     1 + (Conn shr 4 and 7) * (xxt * 2 + 1),
     1 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
   Conn := Connection4(Loc, fTerrain, fUNKNOWN); { dither to black }
   if Conn and 1 <> 0 then
-    BitBltBitmap(HGrTerrain.Mask, x + xxt, y, xxt, yyt, 1 + 7 * (xxt * 2 + 1) +
+    BitBltBitmap(HGrTerrain.Mask, X + xxt, Y, xxt, yyt, 1 + 7 * (xxt * 2 + 1) +
       xxt, 1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
   if Conn and 2 <> 0 then
-    BitBltBitmap(HGrTerrain.Mask, x + xxt, y + yyt, xxt, yyt,
+    BitBltBitmap(HGrTerrain.Mask, X + xxt, Y + yyt, xxt, yyt,
       1 + 7 * (xxt * 2 + 1) + xxt, 1 + yyt * 2 + 15 * (yyt * 3 + 1), SRCAND);
   if Conn and 4 <> 0 then
-    BitBltBitmap(HGrTerrain.Mask, x, y + yyt, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
+    BitBltBitmap(HGrTerrain.Mask, X, Y + yyt, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
       1 + yyt * 2 + 15 * (yyt * 3 + 1), SRCAND);
   if Conn and 8 <> 0 then
-    BitBltBitmap(HGrTerrain.Mask, x, y, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
+    BitBltBitmap(HGrTerrain.Mask, X, Y, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
       1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 end;
 
-procedure TIsoMap.PaintTileExtraTerrain(x, y, Loc: integer);
-var
-  Dir, Conn, RRConn, yGr, Tile, yLoc: integer;
-begin
-  if (Loc < 0) or (Loc >= G.lx * G.ly) or (y <= -yyt * 2) or
-    (y > FOutput.Height) or (x <= -xxt * 2) or (x > FOutput.Width) then
-    exit;
+procedure TIsoMap.PaintTileExtraTerrain(X, Y, Loc: Integer);
+var
+  Dir, Conn, RRConn, yGr, Tile, yLoc: Integer;
+begin
+  if (Loc < 0) or (Loc >= G.lx * G.ly) or (Y <= -yyt * 2) or
+    (Y > FOutput.Height) or (X <= -xxt * 2) or (X > FOutput.Width) then
+    Exit;
   Tile := MyMap[Loc];
   if Tile and fTerrain = fForest then
@@ -966 +966 @@
     then
       Conn := Conn and not 9; // no connection to north
-    TSprite(x, y, yGr + Conn mod 8 + (Conn div 8) * TerrainIconCols);
+    TSprite(X, Y, yGr + Conn mod 8 + (Conn div 8) * TerrainIconCols);
   end
   else if Tile and fTerrain in [fHills, fMountains, fForest] then
@@ -972 +972 @@
     yGr := 3 + 2 * (Tile and fTerrain - fForest);
     Conn := Connection4(Loc, fTerrain, Tile and fTerrain);
-    TSprite(x, y, Conn mod 8 + (yGr + Conn div 8) * TerrainIconCols);
+    TSprite(X, Y, Conn mod 8 + (yGr + Conn div 8) * TerrainIconCols);
   end
   else if Tile and fDeadLands <> 0 then
-    TSprite(x, y, spRow2);
+    TSprite(X, Y, spRow2);
 
   if ShowObjects then
   begin
     if Tile and fTerImp = tiFarm then
-      TSprite(x, y, spFarmLand)
+      TSprite(X, Y, spFarmLand)
     else if Tile and fTerImp = tiIrrigation then
-      TSprite(x, y, spIrrigation);
+      TSprite(X, Y, spIrrigation);
   end;
   if Tile and fRiver <> 0 then
@@ -989 +989 @@
       Connection4(Loc, fTerrain, fShore) or Connection4(Loc, fTerrain,
       fUNKNOWN);
-    TSprite(x, y, spRiver + Conn mod 8 + (Conn div 8) * TerrainIconCols);
+    TSprite(X, Y, spRiver + Conn mod 8 + (Conn div 8) * TerrainIconCols);
   end;
 
@@ -997 +997 @@
     for Dir := 0 to 3 do
       if Conn and (1 shl Dir) <> 0 then { river mouths }
-        TSprite(x, y, spRiverMouths + Dir);
+        TSprite(X, Y, spRiverMouths + Dir);
     if ShowObjects then
     begin
@@ -1003 +1003 @@
       for Dir := 0 to 7 do
         if Conn and (1 shl Dir) <> 0 then { canal mouths }
-          TSprite(x, y, spCanalMouths + 1 + Dir);
+          TSprite(X, Y, spCanalMouths + 1 + Dir);
     end;
   end;
@@ -1015 +1015 @@
       if Conn = 0 then begin
         if Tile and fCanal <> 0 then
-          TSprite(x, y, spCanal);
+          TSprite(X, Y, spCanal);
       end
       else
         for Dir := 0 to 7 do
           if (1 shl Dir) and Conn <> 0 then
-            TSprite(x, y, spCanal + 1 + Dir);
+            TSprite(X, Y, spCanal + 1 + Dir);
     end;
 
@@ -1032 +1032 @@
       Conn := Connection8(Loc, fRoad or fRR or fCity) and not RRConn;
       if (Conn = 0) and (Tile and (fRR or fCity) = 0) then
-        TSprite(x, y, spRoad)
+        TSprite(X, Y, spRoad)
       else if Conn > 0 then
         for Dir := 0 to 7 do
           if (1 shl Dir) and Conn <> 0 then
-            TSprite(x, y, spRoad + 1 + Dir);
+            TSprite(X, Y, spRoad + 1 + Dir);
     end;
 
     // Paint railroad connections
     if (Tile and fRR <> 0) and (RRConn = 0) then
-      TSprite(x, y, spRailRoad)
+      TSprite(X, Y, spRailRoad)
     else if RRConn > 0 then begin
       for Dir := 0 to 7 do
         if (1 shl Dir) and RRConn <> 0 then
-          TSprite(x, y, spRailRoad + 1 + Dir);
+          TSprite(X, Y, spRailRoad + 1 + Dir);
     end;
   end;
@@ -1051 +1051 @@
 
 // (x,y) is top left pixel of (2*xxt,3*yyt) rectangle
-procedure TIsoMap.PaintTileObjects(x, y, Loc, CityLoc, CityOwner: integer;
-  UseBlink: boolean);
-var
-  p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: integer;
+procedure TIsoMap.PaintTileObjects(X, Y, Loc, CityLoc, CityOwner: Integer;
+  UseBlink: Boolean);
+var
+  p1, p2, uix, cix, dy, Loc1, Tile, Multi, Destination: Integer;
   CityInfo: TCityInfo;
   UnitInfo: TUnitInfo;
-  fog: boolean;
+  fog: Boolean;
   SpecialRow: Integer;
   SpecialCol: Integer;
@@ -1063 +1063 @@
   procedure NameCity;
   var
-    cix, xs, w: integer;
+    cix, xs, W: Integer;
     BehindCityInfo: TCityInfo;
-    s: string;
-    IsCapital: boolean;
+    S: string;
+    IsCapital: Boolean;
   begin
     BehindCityInfo.Loc := Loc - 2 * G.lx;
@@ -1076 +1076 @@
       IsCapital := BehindCityInfo.Flags and ciCapital <> 0;
       { if Showuix and (cix>=0) then s:=IntToStr(cix)
-        else } s := CityName(BehindCityInfo.ID);
-      w := FOutput.Canvas.TextWidth(s);
-      xs := x + xxt - (w + 1) div 2;
+        else } S := CityName(BehindCityInfo.ID);
+      W := FOutput.Canvas.TextWidth(S);
+      xs := X + xxt - (W + 1) div 2;
       if IsCapital then
         FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style + [fsUnderline];
-      Textout(xs + 1, y - 9, $000000, s);
-      Textout(xs, y - 10, $FFFFFF, s);
+      Textout(xs + 1, Y - 9, $000000, S);
+      Textout(xs, Y - 10, $FFFFFF, S);
       if IsCapital then
         FOutput.Canvas.Font.Style := FOutput.Canvas.Font.Style - [fsUnderline];
@@ -1092 +1092 @@
     if ShowObjects and not (moEditMode in MapOptions) and
       (Tile and fCity <> 0) and (CityInfo.Flags and ciSpacePort <> 0) then
-      TSprite(x + xxt, y - 6, spSpacePort);
+      TSprite(X + xxt, Y - 6, spSpacePort);
   end;
 
   procedure PaintBorder;
   var
-    dx, dy: integer;
+    dx, dy: Integer;
   begin
     if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
       (Tile and fTerrain <> fUNKNOWN) then begin
       p1 := MyRO.Territory[Loc];
-      if (p1 >= 0) and (ShowMyBorder or (p1 <> me)) then begin
+      if (p1 >= 0) and (ShowMyBorder or (p1 <> Me)) then begin
         if BordersOK^ and (1 shl p1) = 0 then begin
           UnshareBitmap(Borders);
@@ -1123 +1123 @@
               if p2 <> p1 then
               begin
-                BitBltBitmap(HGrTerrain.Mask, x + dx * xxt, y + dy * yyt, xxt,
+                BitBltBitmap(HGrTerrain.Mask, X + dx * xxt, Y + dy * yyt, xxt,
                   yyt, 1 + 8 * (xxt * 2 + 1) + dx * xxt,
                   1 + yyt + 16 * (yyt * 3 + 1) + dy * yyt, SRCAND);
-                BitBltBitmap(Borders, x + dx * xxt, y + dy * yyt, xxt, yyt, dx * xxt,
+                BitBltBitmap(Borders, X + dx * xxt, Y + dy * yyt, xxt, yyt, dx * xxt,
                   p1 * (yyt * 2) + dy * yyt, SRCPAINT);
               end;
@@ -1143 +1143 @@
     (Tile and fCity <> 0) then
     GetCityInfo(Loc, cix, CityInfo);
-  if (y <= FTop - yyt * 2) or (y > FBottom) or (x <= FLeft - xxt * 2) or
-    (x > FRight) then
+  if (Y <= FTop - yyt * 2) or (Y > FBottom) or (X <= FLeft - xxt * 2) or
+    (X > FRight) then
   begin
     NameCity;
     ShowSpacePort;
-    exit;
+    Exit;
   end;
   if Tile and fTerrain = fUNKNOWN then
@@ -1154 +1154 @@
     NameCity;
     ShowSpacePort;
-    exit;
+    Exit;
   end; { square not discovered }
 
@@ -1161 +1161 @@
 
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
-    TSprite(x, y, spPlain);
+    TSprite(X, Y, spPlain);
 
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Tile and fSpecial <> 0)
@@ -1170 +1170 @@
     SpecialRow := Tile and fSpecial shr 5;
     if SpecialCol < fForest then
-      TSprite(x, y, SpecialCol + SpecialRow * TerrainIconCols)
+      TSprite(X, Y, SpecialCol + SpecialRow * TerrainIconCols)
     else if (SpecialCol = fForest) and IsJungle(dy) then
-      TSprite(x, y, spJungle - 1 + SpecialRow * TerrainIconCols)
+      TSprite(X, Y, spJungle - 1 + SpecialRow * TerrainIconCols)
     else
-      TSprite(x, y, spForest - 1 + ((SpecialCol - fForest) * 2 + SpecialRow) * TerrainIconCols);
+      TSprite(X, Y, spForest - 1 + ((SpecialCol - fForest) * 2 + SpecialRow) * TerrainIconCols);
   end;
 
@@ -1180 +1180 @@
   begin
     if Tile and fTerImp = tiMine then
-      TSprite(x, y, spMine);
+      TSprite(X, Y, spMine);
     if Tile and fTerImp = tiBase then
-      TSprite(x, y, spBase);
+      TSprite(X, Y, spBase);
     if Tile and fPoll <> 0 then
-      TSprite(x, y, spPollution);
+      TSprite(X, Y, spPollution);
     if Tile and fTerImp = tiFort then
     begin
-      TSprite(x, y, spFortBack);
+      TSprite(X, Y, spFortBack);
       if Tile and fObserved = 0 then
-        TSprite(x, y, spFortFront);
+        TSprite(X, Y, spFortFront);
     end;
   end;
   if (Tile and fDeadLands) <> 0 then
-    TSprite(x, y, spMinerals + (Tile shr 25 and 3) * TerrainIconCols);
+    TSprite(X, Y, spMinerals + (Tile shr 25 and 3) * TerrainIconCols);
 
   if moEditMode in MapOptions then
@@ -1205 +1205 @@
   if fog and ShowObjects then
     if Loc < -G.lx then
-      Sprite(HGrTerrain, x, y + yyt, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
+      Sprite(HGrTerrain, X, Y + yyt, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
         1 + yyt * 2 + 15 * (yyt * 3 + 1))
     else if Loc >= G.lx * (G.ly + 1) then
-      Sprite(HGrTerrain, x, y, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
+      Sprite(HGrTerrain, X, Y, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
         1 + yyt + 15 * (yyt * 3 + 1))
     else
-      TSprite(x, y, spGrid, xxt <> 33);
+      TSprite(X, Y, spGrid, xxt <> 33);
 
   if FoW and (Tile and fObserved = 0) then
@@ -1224 +1224 @@
     if (Destination = Loc) and (Destination <> MyUn[UnFocus].Loc) then
       if not UseBlink or BlinkOn then
-        TSprite(x, y, spBlink1)
+        TSprite(X, Y, spBlink1)
       else
-        TSprite(x, y, spBlink2)
+        TSprite(X, Y, spBlink2)
   end;
 {$ENDIF}
@@ -1232 +1232 @@
   begin
     if Tile and fPrefStartPos <> 0 then
-      TSprite(x, y, spPrefStartPos)
+      TSprite(X, Y, spPrefStartPos)
     else if Tile and fStartPos <> 0 then
-      TSprite(x, y, spStartPos);
+      TSprite(X, Y, spStartPos);
   end
   else if ShowObjects then
   begin
     { if (CityLoc<0) and (UnFocus>=0) and (Loc=MyUn[UnFocus].Loc) then
-      if BlinkOn then TSprite(x,y,8+9*0)
-      else TSprite(x,y,8+9*1); }
+      if BlinkOn then TSprite(X,Y,8+9*0)
+      else TSprite(X,Y,8+9*1); }
 
     NameCity;
     ShowSpacePort;
     if Tile and fCity <> 0 then
-      PaintCity(x + xxt, y + yyt, CityInfo, CityOwner < 0);
+      PaintCity(X + xxt, Y + yyt, CityInfo, CityOwner < 0);
 
     if (Tile and fUnit <> 0) and (Loc <> AttLoc) and
@@ -1259 +1259 @@
         UnitInfo.Health := DefHealth;
       if (UnitInfo.Owner <> CityOwner) and
-        not((CityOwner = me) and (MyRO.Treaty[UnitInfo.Owner] = trAlliance))
+        not((CityOwner = Me) and (MyRO.Treaty[UnitInfo.Owner] = trAlliance))
       then
 {$IFNDEF SCR} if (UnFocus >= 0) and (Loc = MyUn[UnFocus].Loc) then { active unit }
         begin
           Multi := UnitInfo.Flags and unMulti;
-          MakeUnitInfo(me, MyUn[UnFocus], UnitInfo);
+          MakeUnitInfo(Me, MyUn[UnFocus], UnitInfo);
           UnitInfo.Flags := UnitInfo.Flags or Multi;
-          PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo,
+          PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo,
             MyUn[UnFocus].Status);
         end
-        else if UnitInfo.Owner = me then
+        else if UnitInfo.Owner = Me then
         begin
           if ClientMode = cMovieTurn then
-            PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo, 0)
+            PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo, 0)
             // status is not set with precise timing during loading
           else
-            PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo,
+            PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo,
               MyUn[uix].Status);
           // if Showuix then Textout(x+16,y+5,$80FF00,IntToStr(uix));
         end
-        else {$ENDIF} PaintUnit(x + (xxt - xxu), y + (yyt - yyu_anchor), UnitInfo, 0);
+        else {$ENDIF} PaintUnit(X + (xxt - xxu), Y + (yyt - yyu_anchor), UnitInfo, 0);
     end
     else if Tile and fHiddenUnit <> 0 then
-      Sprite(HGrStdUnits, x + (xxt - xxu), y + (yyt - yyu_anchor), xxu * 2,
+      Sprite(HGrStdUnits, X + (xxt - xxu), Y + (yyt - yyu_anchor), xxu * 2,
         yyu * 2, 1 + 5 * (xxu * 2 + 1), 1)
     else if Tile and fStealthUnit <> 0 then
-      Sprite(HGrStdUnits, x + (xxt - xxu), y + (yyt - yyu_anchor), xxu * 2,
+      Sprite(HGrStdUnits, X + (xxt - xxu), Y + (yyt - yyu_anchor), xxu * 2,
         yyu * 2, 1 + 5 * (xxu * 2 + 1), 1 + 1 * (yyu * 2 + 1))
   end;
@@ -1291 +1291 @@
   if ShowObjects and (Tile and fTerImp = tiFort) and (Tile and fObserved <> 0)
   then
-    TSprite(x, y, spFortFront);
+    TSprite(X, Y, spFortFront);
 
   if (Loc >= 0) and (Loc < G.lx * G.ly) then
     if ShowLoc then
-      Textout(x + xxt - 16, y + yyt - 9, $FFFF00, IntToStr(Loc))
+      Textout(X + xxt - 16, Y + yyt - 9, $FFFF00, IntToStr(Loc))
     else if ShowDebug and (DebugMap <> nil) and (Loc >= 0) and
       (Loc < G.lx * G.ly) and (DebugMap[Loc] <> 0) then
-      Textout(x + xxt - 16, y + yyt - 9, $00E0FF,
-        IntToStr(integer(DebugMap[Loc])))
-end;
-
-procedure TIsoMap.PaintGrid(x, y, nx, ny: integer);
-
-  procedure ClippedLine(dx0, dy0: integer; mirror: boolean);
+      Textout(X + xxt - 16, Y + yyt - 9, $00E0FF,
+        IntToStr(Integer(DebugMap[Loc])))
+end;
+
+procedure TIsoMap.PaintGrid(X, Y, nx, ny: Integer);
+
+  procedure ClippedLine(dx0, dy0: Integer; mirror: Boolean);
   var
-    x0, x1, dxmin, dymin, dxmax, dymax, n: integer;
+    x0, x1, dxmin, dymin, dxmax, dymax, N: Integer;
   begin
     with FOutput.Canvas do
     begin
-      dxmin := (FLeft - x) div xxt;
-      dymin := (RealTop - y) div yyt;
-      dxmax := (FRight - x - 1) div xxt + 1;
-      dymax := (RealBottom - y - 1) div yyt + 1;
-      n := dymax - dy0;
+      dxmin := (FLeft - X) div xxt;
+      dymin := (RealTop - Y) div yyt;
+      dxmax := (FRight - X - 1) div xxt + 1;
+      dymax := (RealBottom - Y - 1) div yyt + 1;
+      N := dymax - dy0;
       if mirror then
       begin
-        if dx0 - dxmin < n then
-          n := dx0 - dxmin;
+        if dx0 - dxmin < N then
+          N := dx0 - dxmin;
         if dx0 > dxmax then
         begin
-          n := n - (dx0 - dxmax);
+          N := N - (dx0 - dxmax);
           dy0 := dy0 + (dx0 - dxmax);
           dx0 := dxmax
@@ -1327 +1327 @@
         if dy0 < dymin then
         begin
-          n := n - (dymin - dy0);
+          N := N - (dymin - dy0);
           dx0 := dx0 - (dymin - dy0);
           dy0 := dymin
@@ -1334 +1334 @@
       else
       begin
-        if dxmax - dx0 < n then
-          n := dxmax - dx0;
+        if dxmax - dx0 < N then
+          N := dxmax - dx0;
         if dx0 < dxmin then
         begin
-          n := n - (dxmin - dx0);
+          N := N - (dxmin - dx0);
           dy0 := dy0 + (dxmin - dx0);
           dx0 := dxmin
@@ -1344 +1344 @@
         if dy0 < dymin then
         begin
-          n := n - (dymin - dy0);
+          N := N - (dymin - dy0);
           dx0 := dx0 + (dymin - dy0);
           dy0 := dymin
         end;
       end;
-      if n <= 0 then
-        exit;
+      if N <= 0 then
+        Exit;
       if mirror then
       begin
-        x0 := x + dx0 * xxt - 1;
-        x1 := x + (dx0 - n) * xxt - 1;
+        x0 := X + dx0 * xxt - 1;
+        x1 := X + (dx0 - N) * xxt - 1;
       end
       else
       begin
-        x0 := x + dx0 * xxt;
-        x1 := x + (dx0 + n) * xxt;
+        x0 := X + dx0 * xxt;
+        x1 := X + (dx0 + N) * xxt;
       end;
-      moveto(x0, y + dy0 * yyt);
-      lineto(x1, y + (dy0 + n) * yyt);
+      moveto(x0, Y + dy0 * yyt);
+      lineto(x1, Y + (dy0 + N) * yyt);
     end;
   end;
 
 var
-  i: integer;
+  I: Integer;
 begin
   FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
-  for i := 0 to nx div 2 do
-    ClippedLine(i * 2, 0, false);
-  for i := 1 to (nx + 1) div 2 do
-    ClippedLine(i * 2, 0, true);
-  for i := 0 to ny div 2 do
-  begin
-    ClippedLine(0, 2 * i + 2, false);
-    ClippedLine(nx + 1, 2 * i + 1 + nx and 1, true);
-  end;
-end;
-
-function TIsoMap.IsShoreTile(Loc: integer): boolean;
+  for I := 0 to nx div 2 do
+    ClippedLine(I * 2, 0, False);
+  for I := 1 to (nx + 1) div 2 do
+    ClippedLine(I * 2, 0, True);
+  for I := 0 to ny div 2 do
+  begin
+    ClippedLine(0, 2 * I + 2, False);
+    ClippedLine(nx + 1, 2 * I + 1 + nx and 1, True);
+  end;
+end;
+
+function TIsoMap.IsShoreTile(Loc: Integer): Boolean;
 var
   Dir: Integer;
-  ConnLoc: integer;
-begin
-  result := false;
+  ConnLoc: Integer;
+begin
+  Result := False;
   for Dir := 0 to 7 do
   begin
@@ -1392 +1392 @@
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
       ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
-      result := true;
+      Result := True;
   end;
 end;
@@ -1401 +1401 @@
 begin
   for I := 0 to Length - 1 do begin
-    Line^.Pixel^.B := (Line^.Pixel^.B shr 1) and $7f;
-    Line^.Pixel^.G := (Line^.Pixel^.G shr 1) and $7f;
-    Line^.Pixel^.R := (Line^.Pixel^.R shr 1) and $7f;
+    Line^.Pixel^.B := (Line^.Pixel^.B shr 1) and $7F;
+    Line^.Pixel^.G := (Line^.Pixel^.G shr 1) and $7F;
+    Line^.Pixel^.R := (Line^.Pixel^.R shr 1) and $7F;
     Line^.NextPixel;
   end;
@@ -1415 +1415 @@
 end;
 
-procedure TIsoMap.ShadeOutside(x0, y0, Width, Height, xm, ym: integer);
+procedure TIsoMap.ShadeOutside(x0, y0, Width, Height, xm, ym: Integer);
 const
   rShade = 3.75;
 var
-  y, wBright: integer;
-  y_n, w_n: single;
+  Y, wBright: Integer;
+  y_n, w_n: Single;
   Line: TPixelPointer;
 begin
   FOutput.BeginUpdate;
   Line := PixelPointer(FOutput, ScaleToNative(x0), ScaleToNative(y0));
-  for y := 0 to ScaleToNative(Height) - 1 do begin
-    y_n := (ScaleFromNative(y) + y0 - ym) / yyt;
+  for Y := 0 to ScaleToNative(Height) - 1 do begin
+    y_n := (ScaleFromNative(Y) + y0 - ym) / yyt;
     if abs(y_n) < rShade then begin
       // Darken left and right parts of elipsis
@@ -1445 +1445 @@
 end;
 
-procedure TIsoMap.CityGrid(xm, ym: integer; CityAllowClick: Boolean);
-var
-  i: integer;
+procedure TIsoMap.CityGrid(xm, ym: Integer; CityAllowClick: Boolean);
+var
+  I: Integer;
 begin
   with FOutput.Canvas do
@@ -1456 +1456 @@
       pen.Color := $000000;
     pen.Width := 1;
-    for i := 0 to 3 do
+    for I := 0 to 3 do
     begin
-      moveto(xm - xxt * (4 - i), ym + yyt * (1 + i));
-      lineto(xm + xxt * (1 + i), ym - yyt * (4 - i));
-      moveto(xm - xxt * (4 - i), ym - yyt * (1 + i));
-      lineto(xm + xxt * (1 + i), ym + yyt * (4 - i));
+      moveto(xm - xxt * (4 - I), ym + yyt * (1 + I));
+      lineto(xm + xxt * (1 + I), ym - yyt * (4 - I));
+      moveto(xm - xxt * (4 - I), ym - yyt * (1 + I));
+      lineto(xm + xxt * (1 + I), ym + yyt * (4 - I));
     end;
     moveto(xm - xxt * 4, ym + yyt * 1);
@@ -1475 +1475 @@
 end;
 
-procedure TIsoMap.Paint(x, y, Loc, nx, ny, CityLoc, CityOwner: integer;
-  UseBlink: boolean; CityAllowClick: boolean);
-var
-  dx, dy, xm, ym, ALoc, BLoc, ATer, BTer, Aix, bix: integer;
-begin
-  FoW := true;
+procedure TIsoMap.Paint(X, Y, Loc, nx, ny, CityLoc, CityOwner: Integer;
+  UseBlink: Boolean; CityAllowClick: Boolean);
+var
+  dx, dy, xm, ym, ALoc, BLoc, ATer, BTer, Aix, bix: Integer;
+begin
+  FoW := True;
   ShowLoc := moLocCodes in MapOptions;
   ShowDebug := pDebugMap >= 0;
@@ -1486 +1486 @@
   ShowCityNames := ShowObjects and (CityOwner < 0) and
     (moCityNames in MapOptions);
-  ShowBorder := true;
+  ShowBorder := True;
   ShowMyBorder := CityOwner < 0;
   ShowGrWall := (CityOwner < 0) and (moGreatWall in MapOptions);
   if ShowDebug then
-    Server(sGetDebugMap, me, pDebugMap, DebugMap)
+    Server(sGetDebugMap, Me, pDebugMap, DebugMap)
   else
     DebugMap := nil;
   with FOutput.Canvas do
   begin
-    RealTop := y - ((Loc + 12345 * G.lx) div G.lx - 12345) * yyt;
-    RealBottom := y + (G.ly - ((Loc + 12345 * G.lx) div G.lx - 12345) +
+    RealTop := Y - ((Loc + 12345 * G.lx) div G.lx - 12345) * yyt;
+    RealBottom := Y + (G.ly - ((Loc + 12345 * G.lx) div G.lx - 12345) +
       3) * yyt;
     Brush.Color := EmptySpaceColor;
@@ -1573 +1573 @@
                   bix := 0;
                 end;
-              BitBltBitmap(OceanPatch, x + dx * xxt, y + dy * yyt, xxt, yyt,
+              BitBltBitmap(OceanPatch, X + dx * xxt, Y + dy * yyt, xxt, yyt,
                 Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY)
             end
@@ -1621 +1621 @@
                 bix := Aix;
             if Aix = -1 then
-              BitBltBitmap(HGrTerrain.Data, x + dx * xxt, y + dy * yyt, xxt,
+              BitBltBitmap(HGrTerrain.Data, X + dx * xxt, Y + dy * yyt, xxt,
                 yyt, 1 + 6 * (xxt * 2 + 1) + (dx + dy + 1) and 1 * xxt, 1 + yyt,
                 SRCCOPY) // arctic <-> ocean
             else if bix = -1 then
-              BitBltBitmap(HGrTerrain.Data, x + dx * xxt, y + dy * yyt, xxt,
+              BitBltBitmap(HGrTerrain.Data, X + dx * xxt, Y + dy * yyt, xxt,
                 yyt, 1 + 6 * (xxt * 2 + 1) + xxt - (dx + dy + 1) and 1 * xxt,
                 1 + yyt * 2, SRCCOPY) // arctic <-> ocean
             else
-              BitBltBitmap(LandPatch, x + dx * xxt, y + dy * yyt, xxt, yyt,
+              BitBltBitmap(LandPatch, X + dx * xxt, Y + dy * yyt, xxt, yyt,
                 Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY)
           end;
@@ -1639 +1639 @@
     for dx := -1 to nx do
       if (dx + dy) and 1 = 0 then
-        PaintShore(x + xxt * dx, y + yyt + yyt * dy, dLoc(Loc, dx, dy));
+        PaintShore(X + xxt * dx, Y + yyt + yyt * dy, dLoc(Loc, dx, dy));
   for dy := -2 to ny + 1 do
     for dx := -1 to nx do
       if (dx + dy) and 1 = 0 then
-        PaintTileExtraTerrain(x + xxt * dx, y + yyt + yyt * dy,
+        PaintTileExtraTerrain(X + xxt * dx, Y + yyt + yyt * dy,
           dLoc(Loc, dx, dy));
   if CityOwner >= 0 then
@@ -1653 +1653 @@
           ALoc := dLoc(Loc, dx, dy);
           if Distance(ALoc, CityLoc) > 5 then
-            PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy, ALoc, CityLoc,
+            PaintTileObjects(X + xxt * dx, Y + yyt + yyt * dy, ALoc, CityLoc,
               CityOwner, UseBlink);
         end;
@@ -1660 +1660 @@
       * G.lx) mod (2 * G.lx) - G.lx;
     dy := CityLoc div G.lx - (Loc + 666 * G.lx) div G.lx + 666;
-    xm := x + (dx + 1) * xxt;
-    ym := y + (dy + 1) * yyt + yyt;
+    xm := X + (dx + 1) * xxt;
+    ym := Y + (dy + 1) * yyt + yyt;
     ShadeOutside(FLeft, FTop, FRight - FLeft, FBottom - FTop, xm, ym);
     CityGrid(xm, ym, CityAllowClick);
@@ -1670 +1670 @@
           ALoc := dLoc(Loc, dx, dy);
           if Distance(ALoc, CityLoc) <= 5 then
-            PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy, ALoc, CityLoc,
+            PaintTileObjects(X + xxt * dx, Y + yyt + yyt * dy, ALoc, CityLoc,
               CityOwner, UseBlink);
         end;
@@ -1678 +1678 @@
     if ShowLoc or (moEditMode in MapOptions) or
       (moGrid in MapOptions) then
-      PaintGrid(x, y, nx, ny);
+      PaintGrid(X, Y, nx, ny);
     for dy := -2 to ny + 1 do
       for dx := -2 to nx + 1 do
         if (dx + dy) and 1 = 0 then
-          PaintTileObjects(x + xxt * dx, y + yyt + yyt * dy, dLoc(Loc, dx, dy),
+          PaintTileObjects(X + xxt * dx, Y + yyt + yyt * dy, dLoc(Loc, dx, dy),
             CityLoc, CityOwner, UseBlink);
   end;

trunk/LocalPlayer/LocalPlayer.pas

@@ -4 +4 @@
 interface
 
-procedure Client(Command, Player: integer; var Data); stdcall;
-procedure SetAIName(p: integer; Name: string);
+procedure Client(Command, Player: Integer; var Data); stdcall;
+procedure SetAIName(P: Integer; Name: string);
 
 implementation
@@ -14 +14 @@
 
 var
-  FormsCreated: boolean;
+  FormsCreated: Boolean;
 
-procedure Client(Command, Player: integer; var Data);
+procedure Client(Command, Player: Integer; var Data);
 begin
   if not FormsCreated then
   begin
-    FormsCreated := true;
+    FormsCreated := True;
     // TODO: Changing application name in runtime will cause change of Linux XML registry file path
 //    Application.MainForm := MainScreen;
@@ -45 +45 @@
 end;
 
-procedure SetAIName(p: integer; Name: string);
+procedure SetAIName(P: Integer; Name: string);
 begin
-  MainScreen.SetAIName(p, Name);
+  MainScreen.SetAIName(P, Name);
 end;
 
 initialization
 
-FormsCreated := false;
+FormsCreated := False;
 
 end.

trunk/LocalPlayer/MessgEx.pas

@@ -39 +39 @@
     IconKind: TMessageIconKind;
     OpenSound: string;
-    function ShowModal: integer; override;
+    function ShowModal: Integer; override;
     procedure CancelMovie;
   private
-    MovieCancelled: boolean;
-    procedure PaintBook(ca: TCanvas; x, y, clPage, clCover: integer);
+    MovieCancelled: Boolean;
+    procedure PaintBook(ca: TCanvas; X, Y, clPage, clCover: Integer);
     procedure PaintMyArmy;
     procedure PaintEnemyArmy;
@@ -53 +53 @@
 
 procedure SoundMessageEx(SimpleText, SoundItem: string);
-procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
+procedure TribeMessage(P: Integer; SimpleText, SoundItem: string);
 function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
-  : integer;
+  : Integer;
 procedure ContextMessage(SimpleText, SoundItem: string;
-  ContextKind, ContextNo: integer);
+  ContextKind, ContextNo: Integer);
 
 
@@ -81 +81 @@
 procedure TMessgExDlg.FormShow(Sender: TObject);
 var
-  i: integer;
+  I: Integer;
 begin
   if IconKind = mikEnemyArmy then
@@ -150 +150 @@
   end;
 
-  SplitText(true);
+  SplitText(True);
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
   if GameMode = cMovie then
@@ -181 +181 @@
       end;
   end;
-  for i := 0 to ControlCount - 1 do
-    Controls[i].Top := ClientHeight - (34 + Border);
+  for I := 0 to ControlCount - 1 do
+    Controls[I].Top := ClientHeight - (34 + Border);
   if Kind = mkModel then
     EInput.Top := ClientHeight - (76 + Border);
 end;
 
-function TMessgExDlg.ShowModal: integer;
+function TMessgExDlg.ShowModal: Integer;
 var
   Ticks0: TDateTime;
@@ -197 +197 @@
     if not((GameMode = cMovie) and (MovieSpeed = 4)) then
     begin
-      MovieCancelled := false;
+      MovieCancelled := False;
       Show;
       Ticks0 := NowPrecise;
@@ -207 +207 @@
       Hide;
     end;
-    result := mrOk;
+    Result := mrOk;
   end
   else
-    result := inherited;
+    Result := inherited;
   Gtk2Fix;
 end;
@@ -216 +216 @@
 procedure TMessgExDlg.CancelMovie;
 begin
-  MovieCancelled := true;
-end;
-
-procedure TMessgExDlg.PaintBook(ca: TCanvas; x, y, clPage, clCover: integer);
+  MovieCancelled := True;
+end;
+
+procedure TMessgExDlg.PaintBook(ca: TCanvas; X, Y, clPage, clCover: Integer);
 const
   xScrewed = 77;
@@ -228 +228 @@
   TScrewed = array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of Single;
 var
-  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: integer;
+  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: Integer;
   BookRect: TRect;
-  x1, xR, yR, share: single;
+  x1, xR, yR, share: Single;
   Screwed: TScrewed;
   SrcPtr: TPixelPointer;
@@ -284 +284 @@
     BookRect := SmallBook.BoundsRect;
   end;
-  x := x - BookRect.Width div 2;
+  X := X - BookRect.Width div 2;
 
   // paint
   UnshareBitmap(LogoBuffer);
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, X, Y);
 
   if IconIndex >= 0 then
@@ -301 +301 @@
   ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
 
-  BitBltCanvas(ca, x, y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
+  BitBltCanvas(ca, X, Y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -310 +310 @@
 procedure TMessgExDlg.PaintEnemyArmy;
 var
-  emix, ix, iy, x, y, count, UnitsInLine: integer;
+  emix, ix, iy, X, Y, count, UnitsInLine: Integer;
 begin
   ix := 0;
@@ -321 +321 @@
     for count := 0 to LostArmy[emix] - 1 do
     begin
-      x := ClientWidth div 2 + ix * 64 - UnitsInLine * 32;
-      y := 26 + Border + TopSpace + Lines * MessageLineSpacing + iy * 48;
+      X := ClientWidth div 2 + ix * 64 - UnitsInLine * 32;
+      Y := 26 + Border + TopSpace + Lines * MessageLineSpacing + iy * 48;
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        BitBltCanvas(Canvas, x, y, 64, 48, HGr.Mask.Canvas,
+        BitBltCanvas(Canvas, X, Y, 64, 48, HGr.Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        BitBltCanvas(Canvas, x, y, 64, 48, HGr.Data.Canvas,
+        BitBltCanvas(Canvas, X, Y, 64, 48, HGr.Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
 
       // next position
-      inc(ix);
+      Inc(ix);
       if ix = LostUnitsPerLine then
       begin // next line
         ix := 0;
-        inc(iy);
+        Inc(iy);
         if iy = 6 then
-          exit;
+          Exit;
         UnitsInLine := nLostArmy - LostUnitsPerLine * iy;
         if UnitsInLine > LostUnitsPerLine then
@@ -348 +348 @@
 procedure TMessgExDlg.FormPaint(Sender: TObject);
 var
-  p1, clSaveTextLight, clSaveTextShade: integer;
+  p1, clSaveTextLight, clSaveTextShade: Integer;
 begin
   if (IconKind = mikImp) and (IconIndex = 27) then
@@ -394 +394 @@
       end;
     mikModel:
-      with Tribe[me].ModelPicture[IconIndex] do
+      with Tribe[Me].ModelPicture[IconIndex] do
       begin
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
@@ -498 +498 @@
 end;
 
-procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
+procedure TribeMessage(P: Integer; SimpleText, SoundItem: string);
 begin
   with MessgExDlg do
@@ -506 +506 @@
     Kind := mkOk;
     IconKind := mikTribe;
-    IconIndex := p;
+    IconIndex := P;
     ShowModal;
   end;
@@ -512 +512 @@
 
 function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
-  : integer;
+  : Integer;
 begin
   with MessgExDlg do
@@ -520 +520 @@
     Kind := QueryKind;
     ShowModal;
-    result := ModalResult;
+    Result := ModalResult;
   end;
 end;
 
 procedure ContextMessage(SimpleText, SoundItem: string;
-  ContextKind, ContextNo: integer);
+  ContextKind, ContextNo: Integer);
 begin
   with MessgExDlg do

trunk/LocalPlayer/NatStat.pas

@@ -25 +25 @@
     procedure ToggleBtnClick(Sender: TObject);
     procedure PlayerClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDestroy(Sender: TObject);
     procedure ScrollUpBtnClick(Sender: TObject);
@@ -32 +32 @@
   public
     procedure CheckAge;
-    procedure ShowNewContent(NewMode: TWindowMode; p: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; P: Integer = -1);
     procedure EcoChange;
   protected
     procedure OffscreenPaint; override;
   private
-    pView, AgePrepared, LinesDown: integer;
+    pView, AgePrepared, LinesDown: Integer;
     SelfReport, CurrentReport: PEnemyReport;
-    ShowContact, ContactEnabled: boolean;
+    ShowContact, ContactEnabled: Boolean;
     Back, Template: TBitmap;
     ReportText: TStringList;
@@ -114 +114 @@
 procedure TNatStatDlg.FormShow(Sender: TObject);
 begin
-  if pView = me then
+  if pView = Me then
   begin
     SelfReport.TurnOfCivilReport := MyRO.Turn;
     SelfReport.TurnOfMilReport := MyRO.Turn;
-    move(MyRO.Treaty, SelfReport.Treaty, SizeOf(SelfReport.Treaty));
+    Move(MyRO.Treaty, SelfReport.Treaty, SizeOf(SelfReport.Treaty));
     SelfReport.Government := MyRO.Government;
     SelfReport.Money := MyRO.Money;
-    CurrentReport := pointer(SelfReport);
+    CurrentReport := Pointer(SelfReport);
   end
   else
-    CurrentReport := pointer(MyRO.EnemyReport[pView]);
+    CurrentReport := Pointer(MyRO.EnemyReport[pView]);
   if CurrentReport.TurnOfCivilReport >= 0 then
     GenerateReportText;
-  ShowContact := (pView <> me) and (not supervising or (me <> 0));
-  ContactEnabled := ShowContact and not supervising and
+  ShowContact := (pView <> Me) and (not Supervising or (Me <> 0));
+  ContactEnabled := ShowContact and not Supervising and
     (1 shl pView and MyRO.Alive <> 0);
   ContactBtn.Visible := ContactEnabled and (MyRO.Happened and phGameEnd = 0) and
@@ -146 +146 @@
 end;
 
-procedure TNatStatDlg.ShowNewContent(NewMode: TWindowMode; p: integer);
-begin
-  if p < 0 then
+procedure TNatStatDlg.ShowNewContent(NewMode: TWindowMode; P: Integer);
+begin
+  if P < 0 then
     if ClientMode >= scContact then
-      pView := DipMem[me].pContact
+      pView := DipMem[Me].pContact
     else
     begin
@@ -156 +156 @@
       while (pView < nPl) and ((MyRO.Treaty[pView] < trNone) or
         (1 shl pView and MyRO.Alive = 0)) do
-        inc(pView);
+        Inc(pView);
       if pView >= nPl then
-        pView := me;
+        pView := Me;
     end
   else
-    pView := p;
+    pView := P;
   inherited ShowNewContent(NewMode);
 end;
@@ -174 +174 @@
   List: ^TChart;
 
-  function StatText(no: integer): string;
+  function StatText(no: Integer): string;
   var
-    i: integer;
+    I: Integer;
   begin
     if (CurrentReport.TurnOfCivilReport >= 0) and
-      (Server(sGetChart + no shl 4, me, pView, List^) >= rExecuted) then
+      (Server(sGetChart + no shl 4, Me, pView, List^) >= rExecuted) then
     begin
-      i := List[CurrentReport.TurnOfCivilReport];
+      I := List[CurrentReport.TurnOfCivilReport];
       case no of
         stPop:
-          result := Format(Phrases.Lookup('FRSTATPOP'), [i]);
+          Result := Format(Phrases.Lookup('FRSTATPOP'), [I]);
         stTerritory:
-          result := Format(Phrases.Lookup('FRSTATTER'), [i]);
+          Result := Format(Phrases.Lookup('FRSTATTER'), [I]);
         stScience:
-          result := Format(Phrases.Lookup('FRSTATTECH'), [i div nAdv]);
+          Result := Format(Phrases.Lookup('FRSTATTECH'), [I div nAdv]);
         stExplore:
-          result := Format(Phrases.Lookup('FRSTATEXP'),
-            [i * 100 div (G.lx * G.ly)]);
+          Result := Format(Phrases.Lookup('FRSTATEXP'),
+            [I * 100 div (G.lx * G.ly)]);
       end;
     end
@@ -197 +197 @@
 
 var
-  p1, Treaty: integer;
-  s: string;
-  HasContact, ExtinctPart: boolean;
+  p1, Treaty: Integer;
+  S: string;
+  HasContact, ExtinctPart: Boolean;
 begin
   GetMem(List, 4 * (MyRO.Turn + 2));
@@ -208 +208 @@
     (1 shl pView and MyRO.Alive <> 0) then
   begin
-    s := Format(Phrases.Lookup('FROLDCIVILREP'),
+    S := Format(Phrases.Lookup('FROLDCIVILREP'),
       [TurnToString(CurrentReport.TurnOfCivilReport)]);
-    ReportText.Add('C' + s);
+    ReportText.Add('C' + S);
     ReportText.Add('');
   end;
@@ -223 +223 @@
   ReportText.Add('S' + StatText(stScience));
   ReportText.Add('E' + StatText(stExplore));
-  HasContact := false;
+  HasContact := False;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (CurrentReport.Treaty[p1] > trNoContact) then
-      HasContact := true;
+    if (p1 <> Me) and (CurrentReport.Treaty[p1] > trNoContact) then
+      HasContact := True;
   if HasContact then
   begin
     ReportText.Add('');
     ReportText.Add(' ' + Phrases.Lookup('FRRELATIONS'));
-    for ExtinctPart := false to true do
+    for ExtinctPart := False to True do
       for Treaty := trAlliance downto trNone do
         for p1 := 0 to nPl - 1 do
-          if (p1 <> me) and (CurrentReport.Treaty[p1] = Treaty) and
+          if (p1 <> Me) and (CurrentReport.Treaty[p1] = Treaty) and
             ((1 shl p1 and MyRO.Alive = 0) = ExtinctPart) then
           begin
-            s := Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
+            S := Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
             if ExtinctPart then
-              s := '(' + s + ')';
-            ReportText.Add(char(48 + Treaty) + s);
+              S := '(' + S + ')';
+            ReportText.Add(char(48 + Treaty) + S);
           end;
   end;
@@ -250 +250 @@
 procedure TNatStatDlg.OffscreenPaint;
 var
-  i, y: integer;
-  s: string;
-  ps: pchar;
-  Extinct: boolean;
+  I, Y: Integer;
+  S: string;
+  ps: PChar;
+  Extinct: Boolean;
 
 begin
@@ -260 +260 @@
   Extinct := 1 shl pView and MyRO.Alive = 0;
 
-  BitBltCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  BitBltCanvas(Offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
     Back.Canvas, 0, 0);
 
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextout(offscreen.Canvas,
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextout(Offscreen.Canvas,
     40 { (ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2 } ,
     7, Caption);
 
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-
-  with offscreen do
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+
+  with Offscreen do
   begin
     // show leader picture
@@ -276 +276 @@
     if Assigned(Tribe[pView].faceHGr) then
     begin
-      Dump(offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
+      Dump(Offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
         1 + Tribe[pView].facepix mod 10 * 65,
         1 + Tribe[pView].facepix div 10 * 49);
-      frame(offscreen.Canvas, 18 - 1, yIcon - 4 - 1, 18 + 64, yIcon - 4 + 48,
+      frame(Offscreen.Canvas, 18 - 1, yIcon - 4 - 1, 18 + 64, yIcon - 4 + 48,
         $000000, $000000);
     end;
 
-    if (pView = me) or not Extinct then
+    if (pView = Me) or not Extinct then
       LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib,
         Phrases.Lookup('GOVERNMENT', CurrentReport.Government) +
         Phrases.Lookup('FRAND'));
-    if pView = me then
+    if pView = Me then
     begin
       LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 19,
@@ -314 +314 @@
       if MyRO.Treaty[pView] = trNoContact then
       begin
-        s := Phrases.Lookup('FRNOCONTACT');
+        S := Phrases.Lookup('FRNOCONTACT');
         LoweredTextOut(Canvas, -1, MainTexture,
-          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, yRelation + 9, s);
+          (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, yRelation + 9, S);
       end
       else if ShowContact then
@@ -340 +340 @@
         FrameImage(Canvas, BigImp, xIcon, yIcon, xSizeBig, ySizeBig, 0, 200)
         { else if CurrentReport.Government=gAnarchy then
-          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
+          FrameImage(Canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
           ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact))
           else
-          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
+          FrameImage(Canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
           56*(CurrentReport.Government-1),40,
           ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact)) };
@@ -361 +361 @@
       end;
 
-      y := 0;
-      for i := 0 to ReportText.Count - 1 do
-      begin
-        if (i >= LinesDown) and (i < LinesDown + ReportLines) then
+      Y := 0;
+      for I := 0 to ReportText.Count - 1 do
+      begin
+        if (I >= LinesDown) and (I < LinesDown + ReportLines) then
         begin
-          s := ReportText[i];
-          if s <> '' then
+          S := ReportText[I];
+          if S <> '' then
           begin
             // LineType:=s[1];
-            delete(s, 1, 1);
+            Delete(S, 1, 1);
             BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkMisc, cliPaperText],
-              $7F007F, xReport + 8, yReport + LineSpacing * y, s);
+              $7F007F, xReport + 8, yReport + LineSpacing * Y, S);
           end;
-          inc(y);
+          Inc(Y);
         end;
       end;
@@ -380 +380 @@
     else
     begin
-      s := Phrases.Lookup('FRNOCIVILREP');
-      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-        yReport + hReport div 2 - 10, s);
+      S := Phrases.Lookup('FRNOCIVILREP');
+      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+        yReport + hReport div 2 - 10, S);
     end;
 
     if soTellAI in OptionChecked then begin
-      Server(sGetAIInfo, me, pView, ps);
+      Server(sGetAIInfo, Me, pView, ps);
       LoweredTextOut(Canvas, -1, MainTexture, 42, 445, ps);
     end else
@@ -392 +392 @@
         Phrases2.Lookup('MENU_TELLAI'));
   end;
-  ContactBtn.SetBack(offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
+  ContactBtn.SetBack(Offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
@@ -404 +404 @@
 procedure TNatStatDlg.DialogBtnClick(Sender: TObject);
 var
-  ContactResult: integer;
+  ContactResult: Integer;
 begin
   ContactResult := MainScreen.DipCall(scContact + pView shl 4);
@@ -412 +412 @@
       SoundMessage(Phrases.Lookup('FRCOLDWAR'), 'MSG_DEFAULT')
     else if MyRO.Government = gAnarchy then
-      SoundMessage(Tribe[me].TPhrase('FRMYANARCHY'), 'MSG_DEFAULT')
+      SoundMessage(Tribe[Me].TPhrase('FRMYANARCHY'), 'MSG_DEFAULT')
     else if ContactResult = eAnarchy then
       if MyRO.Treaty[pView] >= trPeace then
@@ -428 +428 @@
 procedure TNatStatDlg.ToggleBtnClick(Sender: TObject);
 var
-  p1, StartCount: integer;
-  m: TMenuItem;
-  ExtinctPart: boolean;
+  p1, StartCount: Integer;
+  M: TMenuItem;
+  ExtinctPart: Boolean;
 begin
   EmptyMenu(Popup.Items);
 
   // own nation
-  if G.Difficulty[me] <> 0 then
-  begin
-    m := TMenuItem.Create(Popup);
-    m.RadioItem := true;
-    m.Caption := Tribe[me].TPhrase('TITLE_NATION');
-    m.Tag := me;
-    m.OnClick := PlayerClick;
-    if me = pView then
-      m.Checked := true;
-    Popup.Items.Add(m);
+  if G.Difficulty[Me] <> 0 then
+  begin
+    M := TMenuItem.Create(Popup);
+    M.RadioItem := True;
+    M.Caption := Tribe[Me].TPhrase('TITLE_NATION');
+    M.Tag := Me;
+    M.OnClick := PlayerClick;
+    if Me = pView then
+      M.Checked := True;
+    Popup.Items.Add(M);
   end;
 
   // foreign nations
-  for ExtinctPart := false to true do
+  for ExtinctPart := False to True do
   begin
     StartCount := Popup.Items.Count;
@@ -456 +456 @@
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] >= trNone) then
       begin
-        m := TMenuItem.Create(Popup);
-        m.RadioItem := true;
-        m.Caption := Tribe[p1].TPhrase('TITLE_NATION');
+        M := TMenuItem.Create(Popup);
+        M.RadioItem := True;
+        M.Caption := Tribe[p1].TPhrase('TITLE_NATION');
         if ExtinctPart then
-          m.Caption := '(' + m.Caption + ')';
-        m.Tag := p1;
-        m.OnClick := PlayerClick;
+          M.Caption := '(' + M.Caption + ')';
+        M.Tag := p1;
+        M.OnClick := PlayerClick;
         if p1 = pView then
-          m.Checked := true;
-        Popup.Items.Add(m);
+          M.Checked := True;
+        Popup.Items.Add(M);
       end;
     if (StartCount > 0) and (Popup.Items.Count > StartCount) then
     begin // seperator
-      m := TMenuItem.Create(Popup);
-      m.Caption := '-';
-      Popup.Items.Insert(StartCount, m);
+      M := TMenuItem.Create(Popup);
+      M.Caption := '-';
+      Popup.Items.Insert(StartCount, M);
     end;
   end;
@@ -478 +478 @@
 end;
 
-procedure TNatStatDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TNatStatDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 var
-  i: integer;
+  I: Integer;
 begin
   if Key = VK_F9 then // my key
   begin // toggle nation
-    i := 0;
+    I := 0;
     repeat
       pView := (pView + 1) mod nPl;
-      inc(i);
-    until (i >= nPl) or (1 shl pView and MyRO.Alive <> 0) and
+      Inc(I);
+    until (I >= nPl) or (1 shl pView and MyRO.Alive <> 0) and
       (MyRO.Treaty[pView] >= trNone);
-    if i >= nPl then
-      pView := me;
+    if I >= nPl then
+      pView := Me;
     Tag := pView;
     PlayerClick(self); // no, this is not nice
@@ -502 +502 @@
 procedure TNatStatDlg.EcoChange;
 begin
-  if Visible and (pView = me) then
+  if Visible and (pView = Me) then
   begin
     SelfReport.Government := MyRO.Government;
@@ -514 +514 @@
   if LinesDown > 0 then
   begin
-    dec(LinesDown);
+    Dec(LinesDown);
     SmartUpdateContent;
   end;
@@ -523 +523 @@
   if LinesDown + ReportLines < ReportText.Count then
   begin
-    inc(LinesDown);
+    Inc(LinesDown);
     SmartUpdateContent;
   end;

trunk/LocalPlayer/Nego.pas

@@ -15 +15 @@
 type
   THistory = record
-    n: Integer;
+    N: Integer;
     Text: array[0 .. MaxHistory - 1] of ansistring;
   end;
@@ -59 +59 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure OkBtnClick(Sender: TObject);
     procedure BwdBtnClick(Sender: TObject);
@@ -78 +78 @@
 
   private
-    Page, DipCommand: integer;
+    Page, DipCommand: Integer;
     CurrentOffer: TOffer;
     MyAllowed, OppoAllowed: TPriceSet;
@@ -84 +84 @@
     History: array [0 .. nPl - 1] of THistory;
     RomanFont: TFont;
-    Costs, Delivers: array [0 .. 11] of cardinal;
+    Costs, Delivers: array [0 .. 11] of Cardinal;
     procedure ResetCurrentOffer;
     procedure BuildCurrentOffer;
     procedure FindAllowed;
     procedure SplitText(Text: string; Bounds: TRect);
-    procedure PaintNationPicture(X, Y, p: integer);
+    procedure PaintNationPicture(X, Y, P: Integer);
     procedure SetButtonStates;
   end;
@@ -183 +183 @@
 procedure TNegoDlg.ResetCurrentOffer;
 var
-  i: integer;
+  I: Integer;
 begin
   CurrentOffer.nDeliver := 0;
   CurrentOffer.nCost := 0;
-  for i := 0 to 11 do
-    Costs[i] := $FFFFFFFF;
-  for i := 0 to 11 do
-    Delivers[i] := $FFFFFFFF;
+  for I := 0 to 11 do
+    Costs[I] := $FFFFFFFF;
+  for I := 0 to 11 do
+    Delivers[I] := $FFFFFFFF;
 end;
 
@@ -201 +201 @@
   else
     PassBtn.SmartHint := Phrases.Lookup('BTN_PASS');
-  case MyRO.Treaty[DipMem[me].pContact] of
+  case MyRO.Treaty[DipMem[Me].pContact] of
     trNone:
       begin
@@ -237 +237 @@
 begin
   if ClientMode <> scDipStart then
-    with History[me] do
-    begin
-      if n = MaxHistory then
-      begin
-        move(Text[2], Text[0], (MaxHistory - 2) * sizeof(integer));
-        dec(n, 2);
+    with History[Me] do
+    begin
+      if N = MaxHistory then
+      begin
+        Move(Text[2], Text[0], (MaxHistory - 2) * SizeOf(Integer));
+        Dec(N, 2);
       end;
-      Text[n] := copy(DipCommandToString(DipMem[me].pContact, me,
-        DipMem[me].FormerTreaty, DipMem[me].SentCommand, ClientMode,
-        DipMem[me].SentOffer, ReceivedOffer), 1, 255);
-      inc(n);
+      Text[N] := Copy(DipCommandToString(DipMem[Me].pContact, Me,
+        DipMem[Me].FormerTreaty, DipMem[Me].SentCommand, ClientMode,
+        DipMem[Me].SentOffer, ReceivedOffer), 1, 255);
+      Inc(N);
     end;
-  assert(History[me].n mod 2 = 1);
-
-  Page := History[me].n;
+  Assert(History[Me].N mod 2 = 1);
+
+  Page := History[Me].N;
   FindAllowed;
   ResetCurrentOffer;
@@ -283 +283 @@
 procedure TNegoDlg.SplitText(Text: string; Bounds: TRect);
 var
-  nLines, Line, Start, Stop, OrdinaryStop, Indent, Y: integer;
-  s: string;
-  preview, Dot: boolean;
+  nLines, Line, Start, Stop, OrdinaryStop, Indent, Y: Integer;
+  S: string;
+  preview, Dot: Boolean;
 begin
   nLines := 0;
-  for preview := true downto false do
+  for preview := True downto False do
   begin
     Start := 1;
@@ -295 +295 @@
     while Start < Length(Text) do
     begin
-      Dot := false;
+      Dot := False;
       if (Start = 1) or (Text[Start - 1] = '\') then
         if Text[Start] = '-' then
         begin
           Indent := ListIndent;
-          inc(Start);
+          Inc(Start);
           if Start = Length(Text) then
-            break;
-          Dot := true;
+            Break;
+          Dot := True;
         end
         else
@@ -310 +310 @@
       while (Stop < Length(Text)) and (Text[Stop] <> '\') do
       begin
-        inc(Stop);
+        Inc(Stop);
         if BiColorTextWidth(Offscreen.Canvas,
-          copy(Text, Start, Stop - Start + 1)) > Bounds.Right - Bounds.Left -
+          Copy(Text, Start, Stop - Start + 1)) > Bounds.Right - Bounds.Left -
           PaperBorder_Left - PaperBorder_Right - Indent then
         begin
-          dec(Stop);
-          break
+          Dec(Stop);
+          Break
         end;
       end;
@@ -324 +324 @@
         while (Text[OrdinaryStop + 1] <> ' ') and
           (Text[OrdinaryStop + 1] <> '\') do
-          dec(OrdinaryStop);
+          Dec(OrdinaryStop);
         if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
           Stop := OrdinaryStop
@@ -334 +334 @@
           Sprite(Offscreen, HGrSystem, Bounds.Left + PaperBorder_Left +
             (ListIndent - 14), Y + 7, 8, 8, 90, 16);
-        s := copy(Text, Start, Stop - Start + 1);
+        S := Copy(Text, Start, Stop - Start + 1);
         BiColorTextOut(Offscreen.Canvas, Colors.Canvas.Pixels[clkMisc,
           cliPaperText], $7F007F, Bounds.Left + PaperBorder_Left +
-          Indent, Y, s);
+          Indent, Y, S);
       end;
-      inc(Line);
+      Inc(Line);
       Start := Stop + 2;
     end;
@@ -348 +348 @@
 procedure TNegoDlg.FindAllowed;
 var
-  i: integer;
+  I: Integer;
 begin
   CommandAllowed := [scDipOffer - scDipStart];
   if ClientMode <> scDipBreak then
-    include(CommandAllowed, scDipBreak - scDipStart);
-  if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
-    include(CommandAllowed, scDipCancelTreaty - scDipStart);
-  if (ClientMode = scDipOffer) and (Server(scDipAccept - sExecute, me, 0, nil^)
+    Include(CommandAllowed, scDipBreak - scDipStart);
+  if MyRO.Treaty[DipMem[Me].pContact] >= trPeace then
+    Include(CommandAllowed, scDipCancelTreaty - scDipStart);
+  if (ClientMode = scDipOffer) and (Server(scDipAccept - sExecute, Me, 0, nil^)
     >= rExecuted) then
-    include(CommandAllowed, scDipAccept - scDipStart);
+    Include(CommandAllowed, scDipAccept - scDipStart);
 
   MyAllowed := [opChoose shr 24, opMoney shr 24];
   OppoAllowed := [opChoose shr 24, opMoney shr 24];
-  if not IsCivilReportNew(DipMem[me].pContact) then
+  if not IsCivilReportNew(DipMem[Me].pContact) then
   begin // no up-to-date civil report
     MyAllowed := MyAllowed + [opCivilReport shr 24];
-    for i := 0 to nAdv - 1 do
-      if MyRO.Tech[i] >= tsApplicable then
+    for I := 0 to nAdv - 1 do
+      if MyRO.Tech[I] >= tsApplicable then
       begin
         MyAllowed := MyAllowed + [opAllTech shr 24];
-        break
+        Break
       end;
     OppoAllowed := OppoAllowed + [opCivilReport shr 24, opAllTech shr 24];
@@ -374 +374 @@
   else
   begin // check techs
-    for i := 0 to nAdv - 1 do
-      if not(i in FutureTech) then
-        if (MyRO.Tech[i] < tsSeen) and
-          (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
+    for I := 0 to nAdv - 1 do
+      if not(I in FutureTech) then
+        if (MyRO.Tech[I] < tsSeen) and
+          (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
           OppoAllowed := OppoAllowed + [opAllTech shr 24]
-        else if (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) and
-          (MyRO.Tech[i] >= tsApplicable) then
+        else if (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) and
+          (MyRO.Tech[I] >= tsApplicable) then
           MyAllowed := MyAllowed + [opAllTech shr 24];
   end;
-  if not IsMilReportNew(DipMem[me].pContact) then
+  if not IsMilReportNew(DipMem[Me].pContact) then
   begin // no up-to-date military report
     MyAllowed := MyAllowed + [opMilReport shr 24];
@@ -397 +397 @@
       OppoAllowed := OppoAllowed + [opAllModel shr 24];
   end;
-  if MyRO.Treaty[DipMem[me].pContact] < trAlliance then
+  if MyRO.Treaty[DipMem[Me].pContact] < trAlliance then
   begin
     MyAllowed := MyAllowed + [opTreaty shr 24, opMap shr 24];
@@ -407 +407 @@
     OppoAllowed:=OppoAllowed+[opLowTreaty shr 24];
     end; }
-  for i := 0 to nShipPart - 1 do
-  begin
-    if MyRO.Ship[me].Parts[i] > 0 then
-      include(MyAllowed, opShipParts shr 24);
-    if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
-      include(OppoAllowed, opShipParts shr 24);
-  end;
-  MyAllowed := MyAllowed - DipMem[me].DeliveredPrices *
+  for I := 0 to nShipPart - 1 do
+  begin
+    if MyRO.Ship[Me].Parts[I] > 0 then
+      Include(MyAllowed, opShipParts shr 24);
+    if MyRO.Ship[DipMem[Me].pContact].Parts[I] > 0 then
+      Include(OppoAllowed, opShipParts shr 24);
+  end;
+  MyAllowed := MyAllowed - DipMem[Me].DeliveredPrices *
     [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
     opMilReport shr 24, opMap shr 24];
-  OppoAllowed := OppoAllowed - DipMem[me].ReceivedPrices *
+  OppoAllowed := OppoAllowed - DipMem[Me].ReceivedPrices *
     [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
     opMilReport shr 24, opMap shr 24];
 end;
 
-procedure TNegoDlg.PaintNationPicture(X, Y, p: integer);
+procedure TNegoDlg.PaintNationPicture(X, Y, P: Integer);
 begin
   with Offscreen.Canvas do
   begin
     Pen.Color := $000000;
-    Brush.Color := Tribe[p].Color;
+    Brush.Color := Tribe[P].Color;
     Rectangle(X - 6, Y - 1, X + 70, Y + 49);
     Brush.Color := $000000;
-    Tribe[p].InitAge(GetAge(p));
-    if Assigned(Tribe[p].faceHGr) then
-      Dump(Offscreen, Tribe[p].faceHGr, X, Y, 64, 48,
-        1 + Tribe[p].facepix mod 10 * 65, 1 + Tribe[p].facepix div 10 * 49)
+    Tribe[P].InitAge(GetAge(P));
+    if Assigned(Tribe[P].faceHGr) then
+      Dump(Offscreen, Tribe[P].faceHGr, X, Y, 64, 48,
+        1 + Tribe[P].facepix mod 10 * 65, 1 + Tribe[P].facepix div 10 * 49)
     else
       FillRect(Rect(X, Y, X + 64, Y + 48));
@@ -443 +443 @@
 procedure TNegoDlg.SetButtonStates;
 var
-  cix: integer;
-  IsActionPage: boolean;
-begin
-  IsActionPage := Page = History[me].n;
+  cix: Integer;
+  IsActionPage: Boolean;
+begin
+  IsActionPage := Page = History[Me].N;
 
   AcceptBtn.Possible := IsActionPage and
@@ -483 +483 @@
 procedure TNegoDlg.OffscreenPaint;
 var
-  i, cred: integer;
-  s: string;
-  OkEnabled: boolean;
+  I, cred: Integer;
+  S: string;
+  OkEnabled: Boolean;
 begin
   if (OffscreenUser <> nil) and (OffscreenUser <> self) then
@@ -492 +492 @@
   OffscreenUser := self;
 
-  if (DipCommand >= 0) and (Page = History[me].n) then
-    History[me].Text[History[me].n] :=
-      copy(DipCommandToString(me, DipMem[me].pContact,
-      MyRO.Treaty[DipMem[me].pContact], ClientMode, DipCommand, ReceivedOffer,
+  if (DipCommand >= 0) and (Page = History[Me].N) then
+    History[Me].Text[History[Me].N] :=
+      Copy(DipCommandToString(Me, DipMem[Me].pContact,
+      MyRO.Treaty[DipMem[Me].pContact], ClientMode, DipCommand, ReceivedOffer,
       CurrentOffer), 1, 255);
 
-  FwdBtn.Visible := Page < History[me].n;
+  FwdBtn.Visible := Page < History[Me].N;
   BwdBtn.Visible := Page >= 2;
-  if Page < History[me].n then
-    OkEnabled := false
+  if Page < History[Me].N then
+    OkEnabled := False
   else if DipCommand = scDipOffer then
-    OkEnabled := Server(scDipOffer - sExecute, me, 0, CurrentOffer) >= rExecuted
+    OkEnabled := Server(scDipOffer - sExecute, Me, 0, CurrentOffer) >= rExecuted
   else
     OkEnabled := DipCommand >= 0;
@@ -532 +532 @@
     yPad1 + 41 + 42 * 2, $FFFFFF, $B0B0B0);
 
-  PaintNationPicture(xNationPicture0, yNationPicture, DipMem[me].pContact);
-  PaintNationPicture(xNationPicture1, yNationPicture, me);
-
-  if History[me].Text[Page - 1] <> '' then
+  PaintNationPicture(xNationPicture0, yNationPicture, DipMem[Me].pContact);
+  PaintNationPicture(xNationPicture1, yNationPicture, Me);
+
+  if History[Me].Text[Page - 1] <> '' then
   begin
     FillSeamless(Offscreen.Canvas, xText0, yText0, wText, hText, 0, 0, Paper);
-    i := Page - 1;
-    if History[me].Text[0] = '' then
-      dec(i);
-    if i < 16 then
+    I := Page - 1;
+    if History[Me].Text[0] = '' then
+      Dec(I);
+    if I < 16 then
     begin
       Offscreen.Canvas.Font.Assign(RomanFont);
       Offscreen.Canvas.TextOut
-        (xText0 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-        yText0 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
-        RomanNo[i]);
+        (xText0 + (wText - Offscreen.Canvas.TextWidth(RomanNo[I])) div 2,
+        yText0 + (hText - Offscreen.Canvas.TextHeight(RomanNo[I])) div 2,
+        RomanNo[I]);
     end
   end;
   FillSeamless(Offscreen.Canvas, xText1, yText1, wText, hText, 0, 0, Paper);
-  i := Page;
-  if History[me].Text[0] = '' then
-    dec(i);
-  if i < 16 then
+  I := Page;
+  if History[Me].Text[0] = '' then
+    Dec(I);
+  if I < 16 then
   begin
     Offscreen.Canvas.Font.Assign(RomanFont);
     Offscreen.Canvas.TextOut
-      (xText1 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-      yText1 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
-      RomanNo[i]);
+      (xText1 + (wText - Offscreen.Canvas.TextWidth(RomanNo[I])) div 2,
+      yText1 + (hText - Offscreen.Canvas.TextHeight(RomanNo[I])) div 2,
+      RomanNo[I]);
   end;
   with Offscreen.Canvas do
   begin
     Brush.Color := MainTexture.ColorBevelShade;
-    if History[me].Text[Page - 1] <> '' then
+    if History[Me].Text[Page - 1] <> '' then
     begin
       FillRect(Rect(xText0 + wText, yText0 + PaperShade,
@@ -583 +583 @@
   { if Page=History[me].n then
     begin // show attitude
-    s:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[me].pContact].Attitude);
+    S:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[Me].pContact].Attitude);
     //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
     RisedTextOut(Offscreen.Canvas,xText0+wText div 2-
-    BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
-    s:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[me].pContact]);
+    BiColorTextWidth(Offscreen.Canvas,S) div 2,yAttitude,S);
+    S:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[Me].pContact]);
     //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
     RisedTextOut(Offscreen.Canvas,xText1+wText div 2-
-    BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
+    BiColorTextWidth(Offscreen.Canvas,S) div 2,yAttitude,S);
     end; }
 
-  if History[me].Text[Page - 1] <> '' then
-    SplitText(History[me].Text[Page - 1], Rect(xText0, yText0, xText0 + wText,
+  if History[Me].Text[Page - 1] <> '' then
+    SplitText(History[Me].Text[Page - 1], Rect(xText0, yText0, xText0 + wText,
       yText0 + hText));
-  if (Page < History[me].n) or OkEnabled then
-    SplitText(History[me].Text[Page], Rect(xText1, yText1, xText1 + wText,
+  if (Page < History[Me].N) or OkEnabled then
+    SplitText(History[Me].Text[Page], Rect(xText1, yText1, xText1 + wText,
       yText1 + hText));
 
   // show credibility
   Offscreen.Canvas.Font.Assign(UniFont[ftTiny]);
-  cred := MyRO.EnemyReport[DipMem[me].pContact].Credibility;
+  cred := MyRO.EnemyReport[DipMem[Me].pContact].Credibility;
   case cred of
     0 .. 49:
-      i := 3;
+      I := 3;
     50 .. 90:
-      i := 0;
+      I := 0;
     91 .. 100:
-      i := 1;
-  end;
-  PaintProgressBar(Offscreen.Canvas, i, xCred0, yCred0 + 17, (cred + 2) div 5,
+      I := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, I, xCred0, yCred0 + 17, (cred + 2) div 5,
     0, 20, MainTexture);
-  s := IntToStr(cred);
+  S := IntToStr(cred);
   RisedTextOut(Offscreen.Canvas, xCred0 + 10 -
-    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred0, s);
+    (BiColorTextWidth(Offscreen.Canvas, S) + 1) div 2, yCred0, S);
   case MyRO.Credibility of
     0 .. 49:
-      i := 3;
+      I := 3;
     50 .. 90:
-      i := 0;
+      I := 0;
     91 .. 100:
-      i := 1;
-  end;
-  PaintProgressBar(Offscreen.Canvas, i, xCred1, yCred1 + 17,
+      I := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, I, xCred1, yCred1 + 17,
     (MyRO.Credibility + 2) div 5, 0, 20, MainTexture);
-  s := IntToStr(MyRO.Credibility);
+  S := IntToStr(MyRO.Credibility);
   RisedTextOut(Offscreen.Canvas, xCred1 + 10 -
-    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred1, s);
+    (BiColorTextWidth(Offscreen.Canvas, S) + 1) div 2, yCred1, S);
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
@@ -635 +635 @@
 procedure TNegoDlg.Initiate;
 begin
-  History[me].n := 1;
-  History[me].Text[0] := '';
+  History[Me].N := 1;
+  History[Me].Text[0] := '';
 end;
 
 procedure TNegoDlg.Respond;
 begin
-  History[me].n := 0;
+  History[Me].N := 0;
 end;
 
 procedure TNegoDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[me].pContact)
+    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[Me].pContact)
   else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), me)
+    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), Me)
 end;
 
 procedure TNegoDlg.BwdBtnClick(Sender: TObject);
 begin
-  dec(Page, 2);
+  Dec(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
@@ -664 +664 @@
 procedure TNegoDlg.FwdBtnClick(Sender: TObject);
 begin
-  inc(Page, 2);
+  Inc(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
@@ -671 +671 @@
 procedure TNegoDlg.OkBtnClick(Sender: TObject);
 begin
-  inc(History[me].n);
+  Inc(History[Me].N);
   if DipCommand = scDipOffer then
     MainScreen.OfferCall(CurrentOffer)
@@ -697 +697 @@
 procedure TNegoDlg.BuildCurrentOffer;
 var
-  i: integer;
+  I: Integer;
 begin
   CurrentOffer.nDeliver := 0;
   CurrentOffer.nCost := 0;
-  for i := 0 to 11 do
-    if Delivers[i] <> $FFFFFFFF then
-    begin
-      CurrentOffer.Price[CurrentOffer.nDeliver] := Delivers[i];
-      inc(CurrentOffer.nDeliver);
+  for I := 0 to 11 do
+    if Delivers[I] <> $FFFFFFFF then
+    begin
+      CurrentOffer.Price[CurrentOffer.nDeliver] := Delivers[I];
+      Inc(CurrentOffer.nDeliver);
     end;
-  for i := 0 to 11 do
-    if Costs[i] <> $FFFFFFFF then
+  for I := 0 to 11 do
+    if Costs[I] <> $FFFFFFFF then
     begin
       CurrentOffer.Price[CurrentOffer.nDeliver + CurrentOffer.nCost] :=
-        Costs[i];
-      inc(CurrentOffer.nCost);
+        Costs[I];
+      Inc(CurrentOffer.nCost);
     end;
 end;
@@ -718 +718 @@
 procedure TNegoDlg.WantClick(Sender: TObject);
 var
-  a, i, max: integer;
-  Price: cardinal;
-begin
-  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+  A, I, Max: Integer;
+  Price: Cardinal;
+begin
+  if (Page <> History[Me].N) or (ClientMode = scDipCancelTreaty) or
     (ClientMode = scDipBreak) then
-    exit;
+    Exit;
   if Costs[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
     Price := $FFFFFFFF // toggle off
@@ -731 +731 @@
     begin
       SimpleMessage(Phrases.Lookup('MAX2WANTS'));
-      exit
+      Exit
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
     if not(Price shr 24 in OppoAllowed) then
-      exit;
+      Exit;
     case Price of
       opCivilReport, opMilReport:
-        inc(Price, DipMem[me].pContact shl 16 + MyRO.Turn);
+        Inc(Price, DipMem[Me].pContact shl 16 + MyRO.Turn);
         // !!! choose player and year!
       opMoney:
@@ -747 +747 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
-            exit;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
+            Exit;
+          Inc(Price, A);
         end;
       opShipParts:
@@ -765 +765 @@
               ShowModal;
               if ModalResult <> mrOK then
-                exit
+                Exit
             end;
           ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          inc(Price, ModalSelectDlg.result shl 16);
-          max := MyRO.Ship[DipMem[me].pContact].Parts[ModalSelectDlg.result];
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[DipMem[Me].pContact].Parts[ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -777 +777 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) then
-            exit;
-          if a > max then
-            a := max;
-          if a > MaxShipPartPrice then
-            a := MaxShipPartPrice;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) then
+            Exit;
+          if A > Max then
+            A := Max;
+          if A > MaxShipPartPrice then
+            A := MaxShipPartPrice;
+          Inc(Price, A);
         end;
       opAllTech:
         begin // choose technology
           ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = adAll then
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          if ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
           ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = mixAll then
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          if ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.result].mix;
+            Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.Result].mix;
         end;
       opTreaty:
         begin
-          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+          if MyRO.Treaty[DipMem[Me].pContact] < trPeace then
             Price := opTreaty + trPeace
           else
-            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+            Price := opTreaty + MyRO.Treaty[DipMem[Me].pContact] + 1;
         end;
       { opLowTreaty:
         begin
-        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        if MyRO.Treaty[DipMem[Me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
         end }
     end;
@@ -831 +831 @@
 procedure TNegoDlg.OfferClick(Sender: TObject);
 var
-  a, i, max: integer;
-  Price: cardinal;
-begin
-  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+  A, I, Max: Integer;
+  Price: Cardinal;
+begin
+  if (Page <> History[Me].N) or (ClientMode = scDipCancelTreaty) or
     (ClientMode = scDipBreak) then
-    exit;
+    Exit;
   if Delivers[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
     Price := $FFFFFFFF // toggle off
@@ -844 +844 @@
     begin
       SimpleMessage(Phrases.Lookup('MAX2OFFERS'));
-      exit;
+      Exit;
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
     if not(Price shr 24 in MyAllowed) then
-      exit;
+      Exit;
     case Price of
       opCivilReport, opMilReport:
-        inc(Price, me shl 16 + MyRO.Turn); // !!! choose player and year!
+        Inc(Price, Me shl 16 + MyRO.Turn); // !!! choose player and year!
       opMoney:
         begin // choose amount
@@ -859 +859 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
-            exit;
-          if (Price = opMoney) and (a > MyRO.Money) then
-            a := MyRO.Money;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
+            Exit;
+          if (Price = opMoney) and (A > MyRO.Money) then
+            A := MyRO.Money;
+          Inc(Price, A);
         end;
       opShipParts:
         begin // choose type and number
           ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          inc(Price, ModalSelectDlg.result shl 16);
-          max := MyRO.Ship[me].Parts[ModalSelectDlg.result];
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[Me].Parts[ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -879 +879 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) then
-            exit;
-          if a > max then
-            a := max;
-          if a > MaxShipPartPrice then
-            a := MaxShipPartPrice;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) then
+            Exit;
+          if A > Max then
+            A := Max;
+          if A > MaxShipPartPrice then
+            A := MaxShipPartPrice;
+          Inc(Price, A);
         end;
       opAllTech:
         begin // choose technology
           ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = adAll then
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          if ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
           ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = mixAll then
+          if ModalSelectDlg.Result < 0 then
+            Exit;
+          if ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + ModalSelectDlg.result;
+            Price := OpModel + ModalSelectDlg.Result;
         end;
       opTreaty:
         begin
-          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+          if MyRO.Treaty[DipMem[Me].pContact] < trPeace then
             Price := opTreaty + trPeace
           else
-            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+            Price := opTreaty + MyRO.Treaty[DipMem[Me].pContact] + 1;
         end;
       { opLowTreaty:
         begin
-        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        if MyRO.Treaty[DipMem[Me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
         end }
     end;
@@ -933 +933 @@
 procedure TNegoDlg.FastBtnClick(Sender: TObject);
 var
-  NewCommand: cardinal;
-begin
-  if Page <> History[me].n then
-    exit;
+  NewCommand: Cardinal;
+begin
+  if Page <> History[Me].N then
+    Exit;
   NewCommand := TButtonN(Sender).Tag and $FF + scDipStart;
   if not(NewCommand - scDipStart in CommandAllowed) then
-    exit;
+    Exit;
   if (NewCommand = scDipCancelTreaty) and
-    (MyRO.Turn < MyRO.LastCancelTreaty[DipMem[me].pContact] + CancelTreatyTurns)
+    (MyRO.Turn < MyRO.LastCancelTreaty[DipMem[Me].pContact] + CancelTreatyTurns)
   then
   begin
     SimpleMessage(Phrases.Lookup('CANCELTREATYRUSH'));
-    exit;
+    Exit;
   end;
   if (NewCommand = scDipOffer) and ((ClientMode = scDipCancelTreaty) or

trunk/LocalPlayer/PVSB.pas

@@ -30 +30 @@
     procedure Init(Max, PageSize: Integer);
     procedure SetPos(Pos: Integer);
-    function Process(const Msg: TMessage): boolean;
+    function Process(const Msg: TMessage): Boolean;
     function ProcessMouseWheel(Delta: Integer): Boolean;
-    procedure Show(Visible: boolean);
+    procedure Show(Visible: Boolean);
     procedure EndSB;
     procedure SetBorderSpacing(Top, Right, Bottom: Integer);
@@ -63 +63 @@
 end;
 
-function TPVScrollBar.Process(const Msg: TMessage): boolean;
+function TPVScrollBar.Process(const Msg: TMessage): Boolean;
 var
-  NewPos: integer;
+  NewPos: Integer;
 begin
     if Max < ScrollBar.PageSize then
-      result := false
+      Result := False
     else
     begin
       if (Msg.wParam and $ffff) in [SB_THUMBPOSITION, SB_THUMBTRACK] then
       begin
-        result := ((Msg.wParam shr 16) and $ffff) <> ScrollBar.Position;
+        Result := ((Msg.wParam shr 16) and $ffff) <> ScrollBar.Position;
         ScrollBar.Position := (Msg.wParam shr 16) and $ffff;
       end else begin
@@ -92 +92 @@
         if NewPos > Max - ScrollBar.PageSize + 1 then
           NewPos := Max - ScrollBar.PageSize + 1;
-        result := NewPos <> ScrollBar.Position;
+        Result := NewPos <> ScrollBar.Position;
         if (NewPos <> ScrollBar.Position) or ((Msg.wParam and $ffff) = SB_ENDSCROLL) then
         begin
@@ -103 +103 @@
 function TPVScrollBar.ProcessMouseWheel(Delta: Integer): Boolean;
 var
-  NewPos: integer;
+  NewPos: Integer;
 begin
     if Max < ScrollBar.PageSize then Result := False
@@ -118 +118 @@
 end;
 
-procedure TPVScrollBar.Show(Visible: boolean);
+procedure TPVScrollBar.Show(Visible: Boolean);
 begin
   if not Visible or (Max < ScrollBar.PageSize) then

trunk/LocalPlayer/Rates.pas

@@ -46 +46 @@
 procedure TRatesDlg.OffscreenPaint;
 var
-  p, x, y, current, max, i: integer;
-  s, s1: string;
+  P, X, Y, current, Max, I: Integer;
+  S, s1: string;
 begin
   if (OffscreenUser <> nil) and (OffscreenUser <> self) then
@@ -64 +64 @@
   BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  s := Phrases.Lookup('TITLE_RATES');
+  S := Phrases.Lookup('TITLE_RATES');
   RisedTextOut(Offscreen.Canvas,
-    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s)) div 2 - 1, 7, s);
-
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-    s := Phrases.Lookup('NORATES')
-  else
-    s := Phrases.Lookup('RATES');
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2 - 1, 7, S);
+
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+    S := Phrases.Lookup('NORATES')
+  else
+    S := Phrases.Lookup('RATES');
   Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-  p := pos('\', s);
-  if p = 0 then
-    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-      div 2, 114, s)
-  else
-  begin
-    s1 := copy(s, 1, p - 1);
+  P := Pos('\', S);
+  if P = 0 then
+    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+      div 2, 114, S)
+  else
+  begin
+    s1 := Copy(S, 1, P - 1);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
       114 - MessageLineSpacing div 2, s1);
-    s1 := copy(s, p + 1, 255);
+    s1 := Copy(S, P + 1, 255);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
@@ -90 +90 @@
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
   begin
     GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2, 52, xSizeBig,
-      ySizeBig, Tribe[me].Color);
+      ySizeBig, Tribe[Me].Color);
     BitBltCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
       xSizeBig, ySizeBig, BigImp.Canvas, (woLiberty mod 7) * xSizeBig,
@@ -102 +102 @@
     // ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
 
-    s := Phrases.Lookup('SCIENCE');
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 44, s);
-    s := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 60, s);
+    S := Phrases.Lookup('SCIENCE');
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 44, S);
+    S := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 60, S);
     // PaintProgressBar(Offscreen.Canvas,2,16,81,(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100,0,120,MainTexture);
 
     // reverse progress bar for science
-    x := 16;
-    y := 81;
+    X := 16;
+    Y := 81;
     current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
-    max := 120;
-    Frame(Offscreen.Canvas, x - 1, y - 1, x + max, y + 7, $000000, $000000);
-    RFrame(Offscreen.Canvas, x - 2, y - 2, x + max + 1, y + 8,
+    Max := 120;
+    Frame(Offscreen.Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
+    RFrame(Offscreen.Canvas, X - 2, Y - 2, X + Max + 1, Y + 8,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     with Offscreen.Canvas do
     begin
-      for i := 0 to current div 8 - 1 do
-        BitBltCanvas(Offscreen.Canvas, x + max - 8 - i * 8, y, 8, 7,
+      for I := 0 to current div 8 - 1 do
+        BitBltCanvas(Offscreen.Canvas, X + Max - 8 - I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
-      BitBltCanvas(Offscreen.Canvas, x + max - current, y, current - 8 * (current div 8), 7,
+      BitBltCanvas(Offscreen.Canvas, X + Max - current, Y, current - 8 * (current div 8), 7,
         HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
       Brush.Color := $000000;
-      FillRect(Rect(x, y, x + max - current, y + 7));
+      FillRect(Rect(X, Y, X + Max - current, Y + 7));
       Brush.Style := bsClear;
     end;
 
     RisedTextOut(Offscreen.Canvas, 16 + 160, 44, Phrases.Lookup('LUX'));
-    s := Format('%d%%', [MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, s);
+    S := Format('%d%%', [MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, S);
     PaintProgressBar(Offscreen.Canvas, 5, 16 + 160, 81,
       MyRO.LuxRate * 120 div 100, 0, 120, MainTexture);
@@ -144 +144 @@
     MainTexture.ColorBevelLight);
   RisedTextOut(Offscreen.Canvas, 16 + 80, 164, Phrases.Lookup('TAXRATE'));
-  s := Format('%d%%', [MyRO.TaxRate]);
+  S := Format('%d%%', [MyRO.TaxRate]);
   RisedTextOut(Offscreen.Canvas,
-    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, s);
+    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, S);
   PaintProgressBar(Offscreen.Canvas, 0, 16 + 80, 201,
     MyRO.TaxRate * 120 div 100, 0, 120, MainTexture);
@@ -164 +164 @@
 begin
   Caption := Phrases.Lookup('TITLE_RATES');
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-  begin
-    ScienceBtn.Visible := false;
-    LuxBtn.Visible := false;
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+  begin
+    ScienceBtn.Visible := False;
+    LuxBtn.Visible := False;
   end
   else
   begin
-    ScienceBtn.Visible := true;
-    LuxBtn.Visible := true;
+    ScienceBtn.Visible := True;
+    LuxBtn.Visible := True;
   end;
   OffscreenPaint;
@@ -184 +184 @@
 procedure TRatesDlg.TaxLuxBtnClick(Sender: TObject);
 var
-  NewTax, NewLux: integer;
+  NewTax, NewLux: Integer;
 begin
   NewTax := MyRO.TaxRate div 10;
@@ -191 +191 @@
   begin
     if NewTax < 10 then
-      inc(NewTax);
+      Inc(NewTax);
     if NewTax + NewLux > 10 then
-      dec(NewLux);
+      Dec(NewLux);
   end
   else if (Sender = TaxDownBtn) and (NewTax > 0) then
-    dec(NewTax)
+    Dec(NewTax)
   else if (Sender = ScienceBtn) and (NewLux > 0) then
-    dec(NewLux)
+    Dec(NewLux)
   else if (Sender = LuxBtn) and (NewLux + NewTax < 100) then
-    inc(NewLux);
-  if Server(sSetRates, me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
+    Inc(NewLux);
+  if Server(sSetRates, Me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
   begin
     CityOptimizer_BeginOfTurn;
     SmartUpdateContent;
-    MainScreen.UpdateViews(true);
+    MainScreen.UpdateViews(True);
   end;
 end;

trunk/LocalPlayer/Select.pas

@@ -31 +31 @@
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
     procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormPaint(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure FormShow(Sender: TObject);
     procedure ModeBtnClick(Sender: TObject);
     procedure ToggleBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure PlayerClick(Sender: TObject);
   private
@@ -59 +59 @@
     Lines: array [0 .. MaxLayer - 1] of Integer;
     FirstShrinkedLine: array [0 .. MaxLayer - 1] of Integer;
-    code: array [0 .. MaxLayer - 1, 0 .. 4095] of Integer;
+    Code: array [0 .. MaxLayer - 1, 0 .. 4095] of Integer;
     Column: array [0 .. nPl - 1] of Integer;
     Closable: Boolean;
@@ -66 +66 @@
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
-    procedure line(ca: TCanvas; l: integer; NonText, lit: boolean);
-    function RenameCity(cix: integer): boolean;
-    function RenameModel(mix: integer): boolean;
+    procedure Line(ca: TCanvas; L: Integer; NonText, lit: Boolean);
+    function RenameCity(cix: Integer): Boolean;
+    function RenameModel(mix: Integer): Boolean;
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
-    result: integer;
-    function OnlyChoice(TestKind: TListKind): integer;
+    Result: Integer;
+    function OnlyChoice(TestKind: TListKind): Integer;
     // -2=empty, -1=ambiguous, other=only choice
     procedure OffscreenPaint; override;
     procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
-    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
-    procedure ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
+    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
     procedure EcoChange;
     procedure TechChange;
@@ -135 +135 @@
 procedure TListDlg.CloseBtnClick(Sender: TObject);
 begin
-  Closable := true;
+  Closable := True;
   Close;
 end;
 
-procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
   CanClose := Closable or not(Kind in MustChooseKind);
@@ -149 +149 @@
   if ScrollBar.Process(Msg) then  begin
     Selected := -2;
-    SmartUpdateContent(true);
+    SmartUpdateContent(True);
   end;
   }
@@ -158 +158 @@
   if not Closable and (Selected <> -2) then
   begin
-    line(Canvas, Selected, false, false);
+    Line(Canvas, Selected, False, False);
     Selected := -2;
   end;
@@ -165 +165 @@
 procedure TListDlg.FormPaint(Sender: TObject);
 var
-  s: string;
+  S: string;
 begin
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
   if Selected <> -2 then
-    line(Canvas, Selected, false, true);
-  s := '';
+    Line(Canvas, Selected, False, True);
+  S := '';
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) then
-    s := Format(Phrases.Lookup('TECHFOCUS'),
+    S := Format(Phrases.Lookup('TECHFOCUS'),
       [Phrases.Lookup('ADVANCES', MyData.FarTech)])
   else if Kind = kModels then
-    s := Tribe[me].TPhrase('SHORTNAME')
+    S := Tribe[Me].TPhrase('SHORTNAME')
   else if Kind = kEModels then
-    s := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
+    S := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
       TurnToString(MyRO.EnemyReport[pView].TurnOfMilReport) + ')';
-  if s <> '' then
+  if S <> '' then
     LoweredTextOut(Canvas, -1, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, 31, s);
+      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, 31, S);
   if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and not Phrases2FallenBackToEnglish
   then
   begin
-    s := Phrases2.Lookup('SHIFTCLICK');
+    S := Phrases2.Lookup('SHIFTCLICK');
     LoweredTextOut(Canvas, -2, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, ClientHeight - 29, s);
-  end;
-end;
-
-procedure TListDlg.line(ca: TCanvas; l: integer; NonText, lit: boolean);
+      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, ClientHeight - 29, S);
+  end;
+end;
+
+procedure TListDlg.Line(ca: TCanvas; L: Integer; NonText, lit: Boolean);
 // paint a line
 
-  procedure DisplayProject(x, y, pix: integer);
+  procedure DisplayProject(X, Y, pix: Integer);
   begin
     if pix and (cpType or cpImp) = 0 then
-      with Tribe[me].ModelPicture[pix and cpIndex] do
-        Sprite(offscreen, HGr, x, y, 64, 48, pix mod 10 * 65 + 1,
+      with Tribe[Me].ModelPicture[pix and cpIndex] do
+        Sprite(Offscreen, HGr, X, Y, 64, 48, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1)
     else
     begin
-      Frame(offscreen.Canvas, x + (16 - 1), y + (16 - 2), x + (16 + xSizeSmall),
-        y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
+      Frame(Offscreen.Canvas, X + (16 - 1), Y + (16 - 2), X + (16 + xSizeSmall),
+        Y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
-          BitBltCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          BitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
             ySizeSmall, SmallImp.Canvas, (MyRO.Government - 1) *
             xSizeSmall, ySizeSmall)
         else
-          BitBltCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          BitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
             ySizeSmall, SmallImp.Canvas, pix and cpIndex mod 7 *
             xSizeSmall, (pix and cpIndex + SystemIconLines * 7) div 7 *
             ySizeSmall)
       else
-        BitBltCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+        BitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
           ySizeSmall, SmallImp.Canvas, (3 + pix and cpIndex) *
           xSizeSmall, 0);
@@ -223 +223 @@
   end;
 
-  procedure ReplaceText(x, y, Color: integer; s: string);
+  procedure ReplaceText(X, Y, Color: Integer; S: string);
   var
     TextSize: TSize;
@@ -229 +229 @@
     if ca = Canvas then
     begin
-      TextSize.cx := BiColorTextWidth(ca, s);
-      TextSize.cy := ca.TextHeight(s);
-      if y + TextSize.cy >= TitleHeight + InnerHeight then
-        TextSize.cy := TitleHeight + InnerHeight - y;
-      Fill(ca, x, y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
+      TextSize.cx := BiColorTextWidth(ca, S);
+      TextSize.cy := ca.TextHeight(S);
+      if Y + TextSize.cy >= TitleHeight + InnerHeight then
+        TextSize.cy := TitleHeight + InnerHeight - Y;
+      Fill(ca, X, Y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
         div 2, (Maintexture.Height - ClientHeight) div 2);
     end;
-    LoweredTextOut(ca, Color, MainTexture, x, y, s);
+    LoweredTextOut(ca, Color, MainTexture, X, Y, S);
   end;
 
 var
-  icon, ofs, x, y, y0, lix, i, j, TextColor, Available, first, test,
-    FutureCount, growth, TrueFood, TrueProd: integer;
+  icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, first, Test,
+    FutureCount, growth, TrueFood, TrueProd: Integer;
   CityReport: TCityReportNew;
   mox: ^TModelInfo;
-  s, number: string;
-  CanGrow: boolean;
-begin
-  lix := code[Layer, ScrollBar.Position + l];
-  y0 := 2 + (l + 1) * LineDistance;
-  if ScrollBar.Position + l >= FirstShrinkedLine[Layer] then
-    ofs := (ScrollBar.Position + l - FirstShrinkedLine[Layer]) and 1 * 33
+  S, number: string;
+  CanGrow: Boolean;
+begin
+  lix := Code[Layer, ScrollBar.Position + L];
+  y0 := 2 + (L + 1) * LineDistance;
+  if ScrollBar.Position + L >= FirstShrinkedLine[Layer] then
+    ofs := (ScrollBar.Position + L - FirstShrinkedLine[Layer]) and 1 * 33
   else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
     ofs := 33;
@@ -257 +257 @@
     with MyCity[lix] do
     begin
-      x := 104 - 76;
-      y := y0;
+      X := 104 - 76;
+      Y := y0;
       if ca = Canvas then
       begin
-        x := x + SideFrame;
-        y := y + TitleHeight;
+        X := X + SideFrame;
+        Y := Y + TitleHeight;
       end;
       if lit then
@@ -268 +268 @@
       else
         TextColor := -1;
-      s := CityName(ID);
-      while BiColorTextWidth(ca, s) > CityNameSpace do
-        delete(s, length(s), 1);
-      ReplaceText(x + 15, y, TextColor, s);
+      S := CityName(ID);
+      while BiColorTextWidth(ca, S) > CityNameSpace do
+        Delete(S, Length(S), 1);
+      ReplaceText(X + 15, Y, TextColor, S);
 
       if NonText then
-        with offscreen.Canvas do
+        with Offscreen.Canvas do
         begin // city size
-          brush.Color := $000000;
-          fillrect(rect(x - 4 - 11, y + 1, x - 4 + 13, y + 21));
-          brush.Color := $FFFFFF;
-          fillrect(rect(x - 4 - 12, y, x - 4 + 12, y + 20));
-          brush.style := bsClear;
+          Brush.Color := $000000;
+          FillRect(rect(X - 4 - 11, Y + 1, X - 4 + 13, Y + 21));
+          Brush.Color := $FFFFFF;
+          FillRect(rect(X - 4 - 12, Y, X - 4 + 12, Y + 20));
+          Brush.style := bsClear;
           Font.Color := $000000;
-          s := inttostr(MyCity[lix].Size);
-          TextOut(x - 4 - textwidth(s) div 2, y, s);
+          S := IntToStr(MyCity[lix].Size);
+          TextOut(X - 4 - textwidth(S) div 2, Y, S);
         end;
 
@@ -289 +289 @@
       begin
         first := -1;
-        for j := 0 to nCityEventPriority - 1 do
-          if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
-          begin
-            first := j;
+        for J := 0 to nCityEventPriority - 1 do
+          if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
+          begin
+            first := J;
             Break;
           end;
         if first >= 0 then
         begin
-          i := 0;
-          test := 1;
-          while test < CityEventPriority[first] do
-          begin
-            inc(i);
-            inc(test, test);
-          end;
-          s := CityEventName(i);
+          I := 0;
+          Test := 1;
+          while Test < CityEventPriority[first] do
+          begin
+            Inc(I);
+            Inc(Test, Test);
+          end;
+          S := CityEventName(I);
           { if CityEventPriority[first]=chNoGrowthWarning then
             if Built[imAqueduct]=0 then
-            s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-            else begin s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); i:=17 end; }
-          ReplaceText(x + (CityNameSpace + 4 + 40 + 18 + 8), y, TextColor, s);
+            S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
+            else begin S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); I:=17 end; }
+          ReplaceText(X + (CityNameSpace + 4 + 40 + 18 + 8), Y, TextColor, S);
           if NonText then
           begin
-            Sprite(offscreen, HGrSystem, 105 - 76 + CityNameSpace + 4 + 40,
-              y0 + 1, 18, 18, 1 + i mod 3 * 19, 1 + i div 3 * 19);
-            x := InnerWidth - 26;
-            for j := nCityEventPriority - 1 downto first + 1 do
-              if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
+            Sprite(Offscreen, HGrSystem, 105 - 76 + CityNameSpace + 4 + 40,
+              y0 + 1, 18, 18, 1 + I mod 3 * 19, 1 + I div 3 * 19);
+            X := InnerWidth - 26;
+            for J := nCityEventPriority - 1 downto first + 1 do
+              if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
               begin
-                i := 0;
-                test := 1;
-                while test < CityEventPriority[j] do
+                I := 0;
+                Test := 1;
+                while Test < CityEventPriority[J] do
                 begin
-                  inc(i);
-                  inc(test, test);
+                  Inc(I);
+                  Inc(Test, Test);
                 end;
-                if (CityEventPriority[j] = chNoGrowthWarning) and
+                if (CityEventPriority[J] = chNoGrowthWarning) and
                   (Built[imAqueduct] > 0) then
-                  i := 17;
-                Sprite(offscreen, HGrSystem, x, y0 + 1, 18, 18,
-                  1 + i mod 3 * 19, 1 + i div 3 * 19);
-                dec(x, 20);
+                  I := 17;
+                Sprite(Offscreen, HGrSystem, X, y0 + 1, 18, 18,
+                  1 + I mod 3 * 19, 1 + I div 3 * 19);
+                Dec(X, 20);
               end;
           end;
@@ -340 +340 @@
         CityReport.HypoTaxRate := -1;
         CityReport.HypoLuxuryRate := -1;
-        Server(sGetCityReportNew, me, lix, CityReport);
+        Server(sGetCityReportNew, Me, lix, CityReport);
         TrueFood := Food;
         TrueProd := Prod;
-        if supervising then
+        if Supervising then
         begin // normalize city from after-turn state
-          dec(TrueFood, CityReport.FoodSurplus);
+          Dec(TrueFood, CityReport.FoodSurplus);
           if TrueFood < 0 then
             TrueFood := 0; // shouldn't happen
-          dec(TrueProd, CityReport.Production);
+          Dec(TrueProd, CityReport.Production);
           if TrueProd < 0 then
             TrueProd := 0; // shouldn't happen
         end;
 
-        s := ''; // disorder info
+        S := ''; // disorder info
         if Flags and chCaptured <> 0 then
-          s := Phrases.Lookup('CITYEVENTS', 14)
+          S := Phrases.Lookup('CITYEVENTS', 14)
         else if CityReport.HappinessBalance < 0 then
-          s := Phrases.Lookup('CITYEVENTS', 0);
-        if s <> '' then
+          S := Phrases.Lookup('CITYEVENTS', 0);
+        if S <> '' then
         begin { disorder }
           if NonText then
           begin
-            DarkGradient(offscreen.Canvas, 99 + 31 + CityNameSpace + 4,
+            DarkGradient(Offscreen.Canvas, 99 + 31 + CityNameSpace + 4,
               y0 + 2, 131, 3);
             ca.Font.Assign(UniFont[ftSmall]);
-            RisedTextout(offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
-              y0 + 1, s);
+            RisedTextout(Offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
+              y0 + 1, S);
             ca.Font.Assign(UniFont[ftNormal]);
           end;
@@ -373 +373 @@
         begin
           { s:=IntToStr(CityReport.FoodSurplus);
-            ReplaceText(x+(CityNameSpace+4+48)-BiColorTextWidth(ca,s),y,TextColor,s); }
-          s := inttostr(CityReport.Science);
-          ReplaceText(x + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
-            s), y, TextColor, s);
-          s := inttostr(CityReport.Production);
-          ReplaceText(x + CityNameSpace + 4 + 132 - BiColorTextWidth(ca, s), y,
-            TextColor, s);
+            ReplaceText(X+(CityNameSpace+4+48)-BiColorTextWidth(ca,S),Y,TextColor,S); }
+          S := IntToStr(CityReport.Science);
+          ReplaceText(X + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
+            S), Y, TextColor, S);
+          S := IntToStr(CityReport.Production);
+          ReplaceText(X + CityNameSpace + 4 + 132 - BiColorTextWidth(ca, S), Y,
+            TextColor, S);
           if NonText then
           begin
             // Sprite(offscreen,HGrSystem,x+CityNameSpace+4+333+1,y+6,10,10,66,115);
-            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 48 + 1,
-              y + 6, 10, 10, 77, 126);
-            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 132 + 1, y + 6,
+            Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 370 + 48 + 1,
+              Y + 6, 10, 10, 77, 126);
+            Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 132 + 1, Y + 6,
               10, 10, 88, 115);
           end;
         end;
-        s := inttostr(CityTaxBalance(lix, CityReport));
-        ReplaceText(x + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, s), y,
-          TextColor, s);
+        S := IntToStr(CityTaxBalance(lix, CityReport));
+        ReplaceText(X + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, S), Y,
+          TextColor, S);
         // if Project and (cpImp+cpIndex)<>cpImp+imTrGoods then
         // ReplaceText(x+CityNameSpace+4+333+1,y,TextColor,Format('%d/%d',[TrueProd,CityReport.ProjectCost]));
         if NonText then
         begin
-          Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 1, y + 6,
+          Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 370 + 1, Y + 6,
             10, 10, 132, 115);
 
@@ -404 +404 @@
             ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
             (Size < NeedSewerSize) or (Built[imSewer] = 1));
-          PaintRelativeProgressBar(offscreen.Canvas, 1, x + 15 + CityNameSpace +
-            4, y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
+          PaintRelativeProgressBar(Offscreen.Canvas, 1, X + 15 + CityNameSpace +
+            4, Y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
             (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
             MyRO.Government, Size), CityReport.Storage, CanGrow, MainTexture);
@@ -411 +411 @@
           if Project <> cpImp + imTrGoods then
           begin
-            DisplayProject(ofs + 104 - 76 + x - 28 + CityNameSpace + 4 + 206 -
+            DisplayProject(ofs + 104 - 76 + X - 28 + CityNameSpace + 4 + 206 -
               60, y0 - 15, Project);
 
@@ -419 +419 @@
               (Flags and chCaptured <> 0) then
               growth := 0;
-            PaintRelativeProgressBar(offscreen.Canvas, 4,
-              x + CityNameSpace + 4 + 304 - 60 + 9, y + 7, 68, TrueProd, growth,
-              CityReport.ProjectCost, true, MainTexture);
+            PaintRelativeProgressBar(Offscreen.Canvas, 4,
+              X + CityNameSpace + 4 + 304 - 60 + 9, Y + 7, 68, TrueProd, growth,
+              CityReport.ProjectCost, True, MainTexture);
           end;
         end;
@@ -428 +428 @@
   else if Kind in [kModels, kEModels] then
   begin
-    x := 104;
-    y := y0;
+    X := 104;
+    Y := y0;
     if ca = Canvas then
     begin
-      x := x + SideFrame;
-      y := y + TitleHeight;
+      X := X + SideFrame;
+      Y := Y + TitleHeight;
     end;
     if lit then
@@ -442 +442 @@
     begin
       Available := 0;
-      for j := 0 to MyRO.nUn - 1 do
-        if (MyUn[j].Loc >= 0) and (MyUn[j].mix = lix) then
-          inc(Available);
+      for J := 0 to MyRO.nUn - 1 do
+        if (MyUn[J].Loc >= 0) and (MyUn[J].mix = lix) then
+          Inc(Available);
       if MainScreen.mNames.Checked then
-        s := Tribe[me].ModelName[lix]
+        S := Tribe[Me].ModelName[lix]
       else
-        s := Format(Tribe[me].TPhrase('GENMODEL'), [lix]);
+        S := Format(Tribe[Me].TPhrase('GENMODEL'), [lix]);
       if NonText then
         DisplayProject(8 + ofs, y0 - 15, lix);
@@ -456 +456 @@
       Available := MyRO.EnemyReport[pView].UnCount[lix];
       if MainScreen.mNames.Checked then
-        s := Tribe[pView].ModelName[lix]
+        S := Tribe[pView].ModelName[lix]
       else
-        s := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
+        S := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
       if NonText then
         with Tribe[pView].ModelPicture[lix] do
-          Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
+          Sprite(Offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
     end;
     if Available > 0 then
-      ReplaceText(x + 32 - BiColorTextWidth(ca, inttostr(Available)), y,
-        TextColor, inttostr(Available));
-    ReplaceText(x + 40, y, TextColor, s);
+      ReplaceText(X + 32 - BiColorTextWidth(ca, IntToStr(Available)), Y,
+        TextColor, IntToStr(Available));
+    ReplaceText(X + 40, Y, TextColor, S);
   end
   else
@@ -474 +474 @@
       kAllEModels, kChooseEModel:
         if lix = mixAll then
-          s := Phrases.Lookup('PRICECAT_ALLMODEL')
+          S := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
         begin
@@ -480 +480 @@
           if MainScreen.mNames.Checked then
           begin
-            s := Tribe[mox.Owner].ModelName[mox.mix];
-            if (Kind = kAllEModels) and (code[1, ScrollBar.Position + l] = 0) then
-              s := Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
+            S := Tribe[mox.Owner].ModelName[mox.mix];
+            if (Kind = kAllEModels) and (Code[1, ScrollBar.Position + L] = 0) then
+              S := Format(Tribe[mox.Owner].TPhrase('OWNED'), [S]);
           end
           else
-            s := Format(Tribe[mox.Owner].TPhrase('GENMODEL'), [mox.mix]);
+            S := Format(Tribe[mox.Owner].TPhrase('GENMODEL'), [mox.mix]);
           if NonText then
             with Tribe[mox.Owner].ModelPicture[mox.mix] do
-              Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48,
+              Sprite(Offscreen, HGr, 8 + ofs, y0 - 15, 64, 48,
                 pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
         end;
       kChooseModel:
         if lix = mixAll then
-          s := Phrases.Lookup('PRICECAT_ALLMODEL')
+          S := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
         begin
-          s := Tribe[me].ModelName[lix];
+          S := Tribe[Me].ModelName[lix];
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, lix);
@@ -503 +503 @@
         begin
           if lix and cpType <> 0 then
-            s := Phrases.Lookup('CITYTYPE', lix and cpIndex)
+            S := Phrases.Lookup('CITYTYPE', lix and cpIndex)
           else if lix and cpImp = 0 then
             with MyModel[lix and cpIndex] do
             begin
-              s := Tribe[me].ModelName[lix and cpIndex];
+              S := Tribe[Me].ModelName[lix and cpIndex];
               if lix and cpConscripts <> 0 then
-                s := Format(Phrases.Lookup('CONSCRIPTS'), [s]);
+                S := Format(Phrases.Lookup('CONSCRIPTS'), [S]);
             end
           else
           begin
-            s := Phrases.Lookup('IMPROVEMENTS', lix and cpIndex);
+            S := Phrases.Lookup('IMPROVEMENTS', lix and cpIndex);
             if (Imp[lix and cpIndex].Kind in [ikNatLocal, ikNatGlobal]) and
               (MyRO.NatBuilt[lix and cpIndex] > 0) or
@@ -519 +519 @@
               (MyCity[cixProject].Built[imPower] + MyCity[cixProject].Built
               [imHydro] + MyCity[cixProject].Built[imNuclear] > 0) then
-              s := Format(Phrases.Lookup('NATEXISTS'), [s]);
+              S := Format(Phrases.Lookup('NATEXISTS'), [S]);
           end;
           if NonText then
@@ -527 +527 @@
         begin
           if lix = adAll then
-            s := Phrases.Lookup('PRICECAT_ALLTECH')
+            S := Phrases.Lookup('PRICECAT_ALLTECH')
           else
           begin
             if lix = adNexus then
-              s := Phrases.Lookup('NEXUS')
+              S := Phrases.Lookup('NEXUS')
             else if lix = adNone then
-              s := Phrases.Lookup('NOFARTECH')
+              S := Phrases.Lookup('NOFARTECH')
             else if lix = adMilitary then
-              s := Phrases.Lookup('INITUNIT')
+              S := Phrases.Lookup('INITUNIT')
             else
             begin
-              s := Phrases.Lookup('ADVANCES', lix);
+              S := Phrases.Lookup('ADVANCES', lix);
               if (Kind = kAdvance) and (lix in FutureTech) then
                 if MyRO.Tech[lix] < tsApplicable then
-                  s := s + ' 1'
+                  S := S + ' 1'
                 else
-                  s := s + ' ' + inttostr(MyRO.Tech[lix] + 1);
+                  S := S + ' ' + IntToStr(MyRO.Tech[lix] + 1);
             end;
-            if BiColorTextWidth(ca, s) > TechNameSpace + 8 then
+            if BiColorTextWidth(ca, S) > TechNameSpace + 8 then
             begin
               repeat
-                delete(s, length(s), 1);
-              until BiColorTextWidth(ca, s) <= TechNameSpace + 5;
-              s := s + '.';
+                Delete(S, Length(S), 1);
+              until BiColorTextWidth(ca, S) <= TechNameSpace + 5;
+              S := S + '.';
             end;
 
@@ -557 +557 @@
               if lix = adNexus then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
               end
               else if lix = adNone then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
               end
               else if lix = adMilitary then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
               end
               else
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1,
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1,
                   (8 + 16 + xSizeSmall), y0 + ySizeSmall,
                   MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 if AdvIcon[lix] < 84 then
-                  BitBltCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
+                  BitBltCanvas(Offscreen.Canvas, (8 + 16), y0, xSizeSmall,
                     ySizeSmall, SmallImp.Canvas,
                     (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
@@ -585 +585 @@
                     ySizeSmall)
                 else
-                  Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
+                  Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20,
                     1 + (AdvIcon[lix] - 84) mod 8 * 37,
                     295 + (AdvIcon[lix] - 84) div 8 * 21);
-                j := AdvValue[lix] div 1000;
-                BitBltCanvas(offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
-                  HGrSystem.Mask.Canvas, 127 + j * 15,
+                J := AdvValue[lix] div 1000;
+                BitBltCanvas(Offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                  HGrSystem.Mask.Canvas, 127 + J * 15,
                   85, SRCAND);
-                Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
-                  127 + j * 15, 85);
+                Sprite(Offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
+                  127 + J * 15, 85);
               end;
             end;
@@ -600 +600 @@
           if NonText and (Kind in [kAdvance, kScience]) then
           begin // show research state
-            for j := 0 to nColumn - 1 do
+            for J := 0 to nColumn - 1 do
             begin
               FutureCount := 0;
-              if j = 0 then // own science
+              if J = 0 then // own science
                 if lix = MyRO.ResearchTech then
                 begin
-                  Server(sGetTechCost, me, 0, icon);
+                  Server(sGetTechCost, Me, 0, icon);
                   icon := 4 + MyRO.Research * 4 div icon;
                   if icon > 4 + 3 then
@@ -625 +625 @@
                   icon := -1
               else
-                with MyRO.EnemyReport[Column[j]]^ do // enemy science
-                  if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+                with MyRO.EnemyReport[Column[J]]^ do // enemy science
+                  if (MyRO.Alive and (1 shl Column[J]) <> 0) and
                     (TurnOfCivilReport >= 0) and (lix = ResearchTech) and
                     ((lix = adMilitary) or (lix in FutureTech) or
@@ -649 +649 @@
                     icon := -1;
               if icon >= 0 then
-                Sprite(offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
-                  24 * j, y0 + 3, 14, 14, 67 + icon * 15, 85)
+                Sprite(Offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
+                  24 * J, y0 + 3, 14, 14, 67 + icon * 15, 85)
               else if (Kind = kScience) and (FutureCount > 0) then
               begin
-                number := inttostr(FutureCount);
-                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * j -
+                number := IntToStr(FutureCount);
+                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * J -
                   BiColorTextWidth(ca, number) div 2, y0, number);
               end;
@@ -661 +661 @@
         end; // kAdvance, kScience
       kTribe:
-        s := TribeNames[lix];
+        S := TribeNames[lix];
       kShipPart:
         begin
-          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
-            inttostr(MyRO.Ship[me].Parts[lix]) + ')';
+          S := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            IntToStr(MyRO.Ship[Me].Parts[lix]) + ')';
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
@@ -671 +671 @@
       kEShipPart:
         begin
-          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
-            inttostr(MyRO.Ship[DipMem[me].pContact].Parts[lix]) + ')';
+          S := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            IntToStr(MyRO.Ship[DipMem[Me].pContact].Parts[lix]) + ')';
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
@@ -678 +678 @@
       kGov:
         begin
-          s := Phrases.Lookup('GOVERNMENT', lix);
+          S := Phrases.Lookup('GOVERNMENT', lix);
           if NonText then
           begin
-            Frame(offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
+            Frame(Offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
               MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-            BitBltCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
+            BitBltCanvas(Offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
               (lix - 1) * xSizeSmall, ySizeSmall);
@@ -690 +690 @@
         end;
       kMission:
-        s := Phrases.Lookup('SPYMISSION', lix);
+        S := Phrases.Lookup('SPYMISSION', lix);
     end;
     case Kind of
       kTribe, kMission: // center text
         if Lines[0] > MaxLines then
-          x := (InnerWidth - GetSystemMetrics(SM_CXVSCROLL)) div 2 -
-            BiColorTextWidth(ca, s) div 2
+          X := (InnerWidth - GetSystemMetrics(SM_CXVSCROLL)) div 2 -
+            BiColorTextWidth(ca, S) div 2
         else
-          x := InnerWidth div 2 - BiColorTextWidth(ca, s) div 2;
+          X := InnerWidth div 2 - BiColorTextWidth(ca, S) div 2;
       kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech,
         kStealTech, kGov:
-        x := 104 - 33;
+        X := 104 - 33;
       kAllEModels:
-        x := 104;
+        X := 104;
     else
-      x := 104 + 15;
+      X := 104 + 15;
     end;
-    y := y0;
+    Y := y0;
     if ca = Canvas then
     begin
-      x := x + SideFrame;
-      y := y + TitleHeight;
+      X := X + SideFrame;
+      Y := Y + TitleHeight;
     end;
     if lit then
@@ -718 +718 @@
       TextColor := -1;
     { if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
-      integer(TribeNames.Objects[lix]),s)
-      else } ReplaceText(x, y, TextColor, s);
+      Integer(TribeNames.Objects[lix]),S)
+      else } ReplaceText(X, Y, TextColor, S);
   end;
 end;
@@ -725 +725 @@
 procedure TListDlg.OffscreenPaint;
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   case Kind of
     kCities:
-      Caption := Tribe[me].TPhrase('TITLE_CITIES');
+      Caption := Tribe[Me].TPhrase('TITLE_CITIES');
     kCityEvents:
       Caption := Format(Phrases.Lookup('TITLE_EVENTS'),
@@ -736 +736 @@
 
   inherited;
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);
-  with offscreen.Canvas do
+  with Offscreen.Canvas do
   begin
     if Kind = kScience then
-      for i := 1 to nColumn - 1 do
+      for I := 1 to nColumn - 1 do
       begin
         Pen.Color := $000000;
-        MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i, 0);
-        LineTo(104 - 33 + 15 + TechNameSpace + 24 * i, InnerHeight);
-        MoveTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, 0);
-        LineTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, InnerHeight);
-        if MyRO.EnemyReport[Column[i]].TurnOfCivilReport >= MyRO.Turn - 1 then
-        begin
-          brush.Color := Tribe[Column[i]].Color;
-          fillrect(rect(104 - 33 + 14 + TechNameSpace + 24 * i + 1 * 2, 0,
-            104 - 33 + 17 + TechNameSpace + 24 * i + 8 * 2, InnerHeight));
-          brush.style := bsClear;
+        MoveTo(104 - 33 + 15 + TechNameSpace + 24 * I, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 24 * I, InnerHeight);
+        MoveTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * I, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * I, InnerHeight);
+        if MyRO.EnemyReport[Column[I]].TurnOfCivilReport >= MyRO.Turn - 1 then
+        begin
+          Brush.Color := Tribe[Column[I]].Color;
+          FillRect(rect(104 - 33 + 14 + TechNameSpace + 24 * I + 1 * 2, 0,
+            104 - 33 + 17 + TechNameSpace + 24 * I + 8 * 2, InnerHeight));
+          Brush.style := bsClear;
         end
         else
         begin // colored player columns
-          Pen.Color := Tribe[Column[i]].Color;
-          for j := 1 to 8 do
-          begin
-            MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, 0);
-            LineTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, InnerHeight);
-          end;
-        end;
-      end;
-
-    for i := -1 to DispLines do
-      if (i + ScrollBar.Position >= 0) and (i + ScrollBar.Position < Lines[Layer]) then
-        Self.line(offscreen.Canvas, i, true, false);
+          Pen.Color := Tribe[Column[I]].Color;
+          for J := 1 to 8 do
+          begin
+            MoveTo(104 - 33 + 15 + TechNameSpace + 24 * I + J * 2, 0);
+            LineTo(104 - 33 + 15 + TechNameSpace + 24 * I + J * 2, InnerHeight);
+          end;
+        end;
+      end;
+
+    for I := -1 to DispLines do
+      if (I + ScrollBar.Position >= 0) and (I + ScrollBar.Position < Lines[Layer]) then
+        Self.Line(Offscreen.Canvas, I, True, False);
   end;
   MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);
@@ -774 +774 @@
 
 procedure TListDlg.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  i0, Sel0, iColumn, OldScienceNation, xScreen: integer;
-  s: string;
-begin
-  y := y - TitleHeight;
+  i0, Sel0, iColumn, OldScienceNation, xScreen: Integer;
+  S: string;
+begin
+  Y := Y - TitleHeight;
   i0 := ScrollBar.Position;
   Sel0 := Selected;
-  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
-    (y < InnerHeight) and (y mod LineDistance >= 4) and (y mod LineDistance < 20)
+  if (X >= SideFrame) and (X < SideFrame + InnerWidth) and (Y >= 0) and
+    (Y < InnerHeight) and (Y mod LineDistance >= 4) and (Y mod LineDistance < 20)
   then
-    Selected := y div LineDistance - 1
+    Selected := Y div LineDistance - 1
   else
     Selected := -2;
@@ -794 +794 @@
   begin
     if Sel0 <> -2 then
-      line(Canvas, Sel0, false, false);
+      Line(Canvas, Sel0, False, False);
     if Selected <> -2 then
-      line(Canvas, Selected, false, true);
+      Line(Canvas, Selected, False, True);
   end;
 
@@ -803 +803 @@
     OldScienceNation := ScienceNation;
     ScienceNation := -1;
-    if (x >= SideFrame + (104 - 33 + 15 + TechNameSpace)) and
-      ((x - SideFrame - (104 - 33 + 15 + TechNameSpace)) mod 24 <= 18) and
-      (y >= 0) and (y < InnerHeight) then
+    if (X >= SideFrame + (104 - 33 + 15 + TechNameSpace)) and
+      ((X - SideFrame - (104 - 33 + 15 + TechNameSpace)) mod 24 <= 18) and
+      (Y >= 0) and (Y < InnerHeight) then
     begin
-      iColumn := (x - SideFrame - (104 - 33 + 15 + TechNameSpace)) div 24;
+      iColumn := (X - SideFrame - (104 - 33 + 15 + TechNameSpace)) div 24;
       if (iColumn >= 1) and (iColumn < nColumn) then
         ScienceNation := Column[iColumn];
@@ -818 +818 @@
       if ScienceNation >= 0 then
       begin
-        s := Tribe[ScienceNation].TPhrase('SHORTNAME');
+        S := Tribe[ScienceNation].TPhrase('SHORTNAME');
         if MyRO.Alive and (1 shl ScienceNation) = 0 then
-          s := Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'), [s]) // extinct
+          S := Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'), [S]) // extinct
         else if MyRO.EnemyReport[ScienceNation].TurnOfCivilReport < MyRO.Turn - 1
         then
-          s := s + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
+          S := S + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
             .TurnOfCivilReport) + ')'; // old report
-        xScreen := (ClientWidth - BiColorTextWidth(Canvas, s)) div 2;
+        xScreen := (ClientWidth - BiColorTextWidth(Canvas, S)) div 2;
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
-          ClientHeight - 29, s);
+          ClientHeight - 29, S);
         BitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
           ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
@@ -853 +853 @@
 end;
 
-function TListDlg.RenameCity(cix: integer): boolean;
+function TListDlg.RenameCity(cix: Integer): Boolean;
 var
   CityNameInfo: TCityNameInfo;
@@ -870 +870 @@
         (CityNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
     Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
-      me, 0, CityNameInfo);
+      Me, 0, CityNameInfo);
     if CityDlg.Visible then
     begin
@@ -882 +882 @@
 end;
 
-function TListDlg.RenameModel(mix: integer): boolean;
+function TListDlg.RenameModel(mix: Integer): Boolean;
 var
   ModelNameInfo: TModelNameInfo;
 begin
   InputDlg.Caption := Phrases.Lookup('TITLE_MODELNAME');
-  InputDlg.EInput.Text := Tribe[me].ModelName[mix];
+  InputDlg.EInput.Text := Tribe[Me].ModelName[mix];
   InputDlg.CenterToRect(BoundsRect);
   InputDlg.ShowModal;
   if (InputDlg.ModalResult = mrOK) and (InputDlg.EInput.Text <> '') and
-    (InputDlg.EInput.Text <> Tribe[me].ModelName[mix]) then
+    (InputDlg.EInput.Text <> Tribe[Me].ModelName[mix]) then
   begin
     ModelNameInfo.mix := mix;
@@ -899 +899 @@
         (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
     Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
-      me, 0, ModelNameInfo);
+      Me, 0, ModelNameInfo);
     if UnitStatDlg.Visible then
     begin
@@ -905 +905 @@
       UnitStatDlg.Invalidate;
     end;
-    result := true;
+    Result := True;
   end
   else
-    result := false;
+    Result := False;
 end;
 
 procedure TListDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  lix: integer;
+  lix: Integer;
 begin
   if ScrollBar.Position + Selected >= 0 then
-    lix := code[Layer, ScrollBar.Position + Selected];
+    lix := Code[Layer, ScrollBar.Position + Selected];
   if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
   then
-    include(Shift, ssShift); // don't close list window
+    Include(Shift, ssShift); // don't close list window
   if (ssLeft in Shift) and not(ssShift in Shift) then
   begin
     if Selected <> -2 then
     begin
-      result := lix;
-      Closable := true;
+      Result := lix;
+      Closable := True;
       Close;
     end;
@@ -937 +937 @@
           MainScreen.ZoomToCity(MyCity[lix].Loc);
         kCityEvents:
-          MainScreen.ZoomToCity(MyCity[lix].Loc, false, MyCity[lix].Flags and
+          MainScreen.ZoomToCity(MyCity[lix].Loc, False, MyCity[lix].Flags and
             CityRepMask);
         kModels, kChooseModel:
@@ -944 +944 @@
         kEModels:
           UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-            code[1, ScrollBar.Position + Selected]);
+            Code[1, ScrollBar.Position + Selected]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
@@ -987 +987 @@
 procedure TListDlg.InitLines;
 var
-  required: array [0 .. nAdv - 1] of integer;
-
-  procedure TryAddImpLine(Layer, Project: integer);
-  begin
-    if Server(sSetCityProject - sExecute, me, cixProject, Project) >= rExecuted
+  required: array [0 .. nAdv - 1] of Integer;
+
+  procedure TryAddImpLine(Layer, Project: Integer);
+  begin
+    if Server(sSetCityProject - sExecute, Me, cixProject, Project) >= rExecuted
     then
     begin
-      code[Layer, Lines[Layer]] := Project;
-      inc(Lines[Layer]);
+      Code[Layer, Lines[Layer]] := Project;
+      Inc(Lines[Layer]);
     end;
   end;
@@ -1001 +1001 @@
   procedure SortTechs;
   var
-    i, j, swap: integer;
+    I, J, swap: Integer;
   begin // sort by advancedness
-    for i := 0 to Lines[0] - 2 do
-      if code[0, i] < adMilitary then
-        for j := i + 1 to Lines[0] - 1 do
-          if AdvValue[code[0, i]] * nAdv + code[0, i] < AdvValue[code[0, j]] *
-            nAdv + code[0, j] then
-          begin
-            swap := code[0, i];
-            code[0, i] := code[0, j];
-            code[0, j] := swap;
+    for I := 0 to Lines[0] - 2 do
+      if Code[0, I] < adMilitary then
+        for J := I + 1 to Lines[0] - 1 do
+          if AdvValue[Code[0, I]] * nAdv + Code[0, I] < AdvValue[Code[0, J]] *
+            nAdv + Code[0, J] then
+          begin
+            swap := Code[0, I];
+            Code[0, I] := Code[0, J];
+            Code[0, J] := swap;
           end;
   end;
@@ -1017 +1017 @@
   procedure SortCities;
   var
-    i, j, swap: integer;
-  begin
-    for i := 0 to Lines[0] - 2 do
-      for j := i + 1 to Lines[0] - 1 do
-        if CityName(MyCity[code[0, i]].ID) > CityName(MyCity[code[0, j]].ID)
+    I, J, swap: Integer;
+  begin
+    for I := 0 to Lines[0] - 2 do
+      for J := I + 1 to Lines[0] - 1 do
+        if CityName(MyCity[Code[0, I]].ID) > CityName(MyCity[Code[0, J]].ID)
         then
         begin
-          swap := code[0, i];
-          code[0, i] := code[0, j];
-          code[0, j] := swap;
+          swap := Code[0, I];
+          Code[0, I] := Code[0, J];
+          Code[0, J] := swap;
         end;
   end;
 
   function ModelSortValue(const mi: TModelInfo;
-    MixPlayers: boolean = false): integer;
-  begin
-    result := (mi.Domain + 1) shl 28 - mi.mix;
+    MixPlayers: Boolean = False): Integer;
+  begin
+    Result := (mi.Domain + 1) shl 28 - mi.mix;
     if MixPlayers then
-      dec(result, ModelCode(mi) shl 16);
+      Dec(Result, ModelCode(mi) shl 16);
   end;
 
   procedure SortModels;
   var
-    i, j, swap: integer;
+    I, J, swap: Integer;
   begin // sort by code[2]
-    for i := 0 to Lines[0] - 2 do
-      for j := i + 1 to Lines[0] - 1 do
-        if code[2, i] > code[2, j] then
-        begin
-          swap := code[0, i];
-          code[0, i] := code[0, j];
-          code[0, j] := swap;
-          swap := code[1, i];
-          code[1, i] := code[1, j];
-          code[1, j] := swap;
-          swap := code[2, i];
-          code[2, i] := code[2, j];
-          code[2, j] := swap;
-        end;
-  end;
-
-  procedure MarkPreqs(i: integer);
-  begin
-    required[i] := 1;
-    if MyRO.Tech[i] < tsSeen then
+    for I := 0 to Lines[0] - 2 do
+      for J := I + 1 to Lines[0] - 1 do
+        if Code[2, I] > Code[2, J] then
+        begin
+          swap := Code[0, I];
+          Code[0, I] := Code[0, J];
+          Code[0, J] := swap;
+          swap := Code[1, I];
+          Code[1, I] := Code[1, J];
+          Code[1, J] := swap;
+          swap := Code[2, I];
+          Code[2, I] := Code[2, J];
+          Code[2, J] := swap;
+        end;
+  end;
+
+  procedure MarkPreqs(I: Integer);
+  begin
+    required[I] := 1;
+    if MyRO.Tech[I] < tsSeen then
     begin
-      if (AdvPreq[i, 0] >= 0) then
-        MarkPreqs(AdvPreq[i, 0]);
-      if (AdvPreq[i, 1] >= 0) then
-        MarkPreqs(AdvPreq[i, 1]);
+      if (AdvPreq[I, 0] >= 0) then
+        MarkPreqs(AdvPreq[I, 0]);
+      if (AdvPreq[I, 1] >= 0) then
+        MarkPreqs(AdvPreq[I, 1]);
     end;
   end;
 
 var
-  Loc1, i, j, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: integer;
+  Loc1, I, J, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: Integer;
   mi: TModelInfo;
   PPicture, PTestPicture: ^TModelPicture;
-  ModelOk: array [0 .. 4095] of boolean;
-  ok: boolean;
-begin
-  for i := 0 to MaxLayer - 1 do
-  begin
-    Lines[i] := 0;
-    FirstShrinkedLine[i] := MaxInt;
+  ModelOk: array [0 .. 4095] of Boolean;
+  ok: Boolean;
+begin
+  for I := 0 to MaxLayer - 1 do
+  begin
+    Lines[I] := 0;
+    FirstShrinkedLine[I] := MaxInt;
   end;
   case Kind of
@@ -1086 +1086 @@
       begin
         // improvements
-        code[0, 0] := cpImp + imTrGoods;
+        Code[0, 0] := cpImp + imTrGoods;
         Lines[0] := 1;
-        for i := nWonder to nImp - 1 do
-          if Imp[i].Kind = ikCommon then
-            TryAddImpLine(0, i + cpImp);
-        for i := nWonder to nImp - 1 do
-          if not(Imp[i].Kind in [ikCommon, ikTrGoods]) and
-            ((MyRO.NatBuilt[i] = 0) or (Imp[i].Kind = ikNatLocal)) then
-            TryAddImpLine(0, i + cpImp);
-        for i := 0 to nCityType - 1 do
-          if MyData.ImpOrder[i, 0] >= 0 then
-          begin
-            code[0, Lines[0]] := cpType + i;
-            inc(Lines[0]);
+        for I := nWonder to nImp - 1 do
+          if Imp[I].Kind = ikCommon then
+            TryAddImpLine(0, I + cpImp);
+        for I := nWonder to nImp - 1 do
+          if not(Imp[I].Kind in [ikCommon, ikTrGoods]) and
+            ((MyRO.NatBuilt[I] = 0) or (Imp[I].Kind = ikNatLocal)) then
+            TryAddImpLine(0, I + cpImp);
+        for I := 0 to nCityType - 1 do
+          if MyData.ImpOrder[I, 0] >= 0 then
+          begin
+            Code[0, Lines[0]] := cpType + I;
+            Inc(Lines[0]);
           end;
 
         // wonders
-        for i := 0 to nWonder - 1 do
-          TryAddImpLine(1, i + cpImp);
+        for I := 0 to nWonder - 1 do
+          TryAddImpLine(1, I + cpImp);
 
         // units
-        for i := 0 to MyRO.nModel - 1 do
+        for I := 0 to MyRO.nModel - 1 do
         begin
           { if MyModel[i].Kind=mkSlaves then
-            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=me
-            else } if MyModel[i].Domain = dSea then
-          begin
-            ok := false;
+            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=Me
+            else } if MyModel[I].Domain = dSea then
+          begin
+            ok := False;
             for dx := -2 to 2 do
               for dy := -2 to 2 do
@@ -1122 +1122 @@
                     ((MyMap[Loc1] and fTerrain = fShore) or
                     (MyMap[Loc1] and fCanal > 0)) then
-                    ok := true;
+                    ok := True;
                 end;
           end
           else
-            ok := true;
+            ok := True;
           if ok then
           begin
-            if MyModel[i].Status and msObsolete = 0 then
+            if MyModel[I].Status and msObsolete = 0 then
             begin
-              code[2, Lines[2]] := i;
-              inc(Lines[2]);
+              Code[2, Lines[2]] := I;
+              Inc(Lines[2]);
             end;
-            if MyModel[i].Status and msAllowConscripts <> 0 then
+            if MyModel[I].Status and msAllowConscripts <> 0 then
             begin
-              code[2, Lines[2]] := i + cpConscripts;
-              inc(Lines[2]);
+              Code[2, Lines[2]] := I + cpConscripts;
+              Inc(Lines[2]);
             end;
           end;
@@ -1151 +1151 @@
           MarkPreqs(MyData.FarTech);
         end;
-        for i := 0 to nAdv - 1 do
-          if ((i in FutureTech) or (MyRO.Tech[i] < tsApplicable)) and
-            (Server(sSetResearch - sExecute, me, i, nil^) >= rExecuted) and
-            ((MyData.FarTech = adNone) or (required[i] > 0)) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if ((I in FutureTech) or (MyRO.Tech[I] < tsApplicable)) and
+            (Server(sSetResearch - sExecute, Me, I, nil^) >= rExecuted) and
+            ((MyData.FarTech = adNone) or (required[I] > 0)) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         if Lines[0] = 0 then // no more techs -- offer nexus
         begin
-          code[0, Lines[0]] := adNexus;
-          inc(Lines[0]);
-        end;
-        ok := false;
-        for i := 0 to nDomains - 1 do
-          if (upgrade[i, 0].Preq = preNone) or
-            (MyRO.Tech[upgrade[i, 0].Preq] >= tsApplicable) then
-            ok := true;
+          Code[0, Lines[0]] := adNexus;
+          Inc(Lines[0]);
+        end;
+        ok := False;
+        for I := 0 to nDomains - 1 do
+          if (upgrade[I, 0].Preq = preNone) or
+            (MyRO.Tech[upgrade[I, 0].Preq] >= tsApplicable) then
+            ok := True;
         if ok then { new unit class }
         begin
-          code[0, Lines[0]] := adMilitary;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adMilitary;
+          Inc(Lines[0]);
         end;
       end;
     kFarAdvance:
       begin
-        code[0, Lines[0]] := adNone;
-        inc(Lines[0]);
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
-            ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
-            ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        Code[0, Lines[0]] := adNone;
+        Inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+            ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+            ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
@@ -1192 +1192 @@
     kChooseTech:
       begin
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] >= tsApplicable) and
-            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
+            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := adAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adAll;
+          Inc(Lines[0]);
         end;
       end;
     kChooseETech:
       begin
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] < tsSeen) and
-            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
+            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := adAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adAll;
+          Inc(Lines[0]);
         end;
       end;
     kStealTech:
       begin
-        for i := 0 to nAdv - 1 do
-          if Server(sStealTech - sExecute, me, i, nil^) >= rExecuted then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if Server(sStealTech - sExecute, Me, I, nil^) >= rExecuted then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
@@ -1234 +1234 @@
     kScience:
       begin
-        Column[0] := me;
+        Column[0] := Me;
         nColumn := 1;
         for EnemyType := 0 to 2 do
@@ -1252 +1252 @@
               begin
                 Column[nColumn] := p1;
-                inc(nColumn);
+                Inc(nColumn);
               end;
             end;
-        for i := 0 to nAdv - 1 do
-        begin
-          ok := (MyRO.Tech[i] <> tsNA) or (MyRO.ResearchTech = i);
-          for j := 1 to nColumn - 1 do
-            with MyRO.EnemyReport[Column[j]]^ do
-              if (Tech[i] <> tsNA) or (TurnOfCivilReport >= 0) and
-                (ResearchTech = i) then
-                ok := true;
+        for I := 0 to nAdv - 1 do
+        begin
+          ok := (MyRO.Tech[I] <> tsNA) or (MyRO.ResearchTech = I);
+          for J := 1 to nColumn - 1 do
+            with MyRO.EnemyReport[Column[J]]^ do
+              if (Tech[I] <> tsNA) or (TurnOfCivilReport >= 0) and
+                (ResearchTech = I) then
+                ok := True;
           if ok then
           begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         end;
@@ -1272 +1272 @@
 
         ok := MyRO.ResearchTech = adMilitary;
-        for j := 1 to nColumn - 1 do
-          with MyRO.EnemyReport[Column[j]]^ do
-            if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+        for J := 1 to nColumn - 1 do
+          with MyRO.EnemyReport[Column[J]]^ do
+            if (MyRO.Alive and (1 shl Column[J]) <> 0) and
               (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then
-              ok := true;
+              ok := True;
         if ok then
         begin
-          code[0, Lines[0]] := adMilitary;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adMilitary;
+          Inc(Lines[0]);
         end
       end;
@@ -1286 +1286 @@
       begin
         if ClientMode < scContact then
-          for i := 0 to MyRO.nCity - 1 do
-            if MyCity[i].Loc >= 0 then
+          for I := 0 to MyRO.nCity - 1 do
+            if MyCity[I].Loc >= 0 then
             begin
-              code[0, Lines[0]] := i;
-              inc(Lines[0]);
+              Code[0, Lines[0]] := I;
+              Inc(Lines[0]);
             end;
         SortCities;
@@ -1297 +1297 @@
     kCityEvents:
       begin
-        for i := 0 to MyRO.nCity - 1 do
-          if (MyCity[i].Loc >= 0) and (MyCity[i].Flags and CityRepMask <> 0)
+        for I := 0 to MyRO.nCity - 1 do
+          if (MyCity[I].Loc >= 0) and (MyCity[I].Flags and CityRepMask <> 0)
           then
           begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortCities;
@@ -1309 +1309 @@
     { kChooseECity:
       begin
-      for i:=0 to MyRO.nEnemyCity-1 do
-      if (MyRO.EnemyCity[i].Loc>=0)
-      and (MyRO.EnemyCity[i].owner=DipMem[me].pContact) then
-      begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
+      for I:=0 to MyRO.nEnemyCity-1 do
+      if (MyRO.EnemyCity[I].Loc>=0)
+      and (MyRO.EnemyCity[I].owner=DipMem[Me].pContact) then
+      begin Code[0,Lines[0]]:=I; Inc(Lines[0]); end;
       FirstShrinkedLine:=0
       end; }
@@ -1319 +1319 @@
         for mix := 0 to MyRO.nModel - 1 do
         begin
-          code[0, mix] := mix;
-          MakeModelInfo(me, mix, MyModel[mix], mi);
-          code[2, mix] := ModelSortValue(mi);
+          Code[0, mix] := mix;
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          Code[2, mix] := ModelSortValue(mi);
         end;
         Lines[0] := MyRO.nModel;
@@ -1331 +1331 @@
         for mix := 3 to MyRO.nModel - 1 do
         begin // check if opponent already has this model
-          MakeModelInfo(me, mix, MyModel[mix], mi);
-          ok := true;
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          ok := True;
           for emix := 0 to MyRO.nEnemyModel - 1 do
-            if (MyRO.EnemyModel[emix].Owner = DipMem[me].pContact) and
+            if (MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact) and
               IsSameModel(MyRO.EnemyModel[emix], mi) then
-              ok := false;
+              ok := False;
           if ok then
           begin
-            code[0, Lines[0]] := mix;
-            MakeModelInfo(me, mix, MyModel[mix], mi);
-            code[2, Lines[0]] := ModelSortValue(mi);
-            inc(Lines[0]);
+            Code[0, Lines[0]] := mix;
+            MakeModelInfo(Me, mix, MyModel[mix], mi);
+            Code[2, Lines[0]] := ModelSortValue(mi);
+            Inc(Lines[0]);
           end;
         end;
@@ -1348 +1348 @@
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := mixAll;
-          inc(Lines[0]);;
+          Code[0, Lines[0]] := mixAll;
+          Inc(Lines[0]);;
         end;
         FirstShrinkedLine[0] := 0;
@@ -1356 +1356 @@
       begin
         if MyRO.TestFlags and tfUncover <> 0 then
-          Server(sGetModels, me, 0, nil^);
+          Server(sGetModels, Me, 0, nil^);
         for emix := 0 to MyRO.nEnemyModel - 1 do
-          ModelOk[emix] := MyRO.EnemyModel[emix].Owner = DipMem[me].pContact;
+          ModelOk[emix] := MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact;
         for mix := 0 to MyRO.nModel - 1 do
         begin // don't list models I already have
-          MakeModelInfo(me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
           for emix := 0 to MyRO.nEnemyModel - 1 do
             ModelOk[emix] := ModelOk[emix] and
@@ -1369 +1369 @@
           if ModelOk[emix] then
           begin
-            if not Assigned(Tribe[DipMem[me].pContact].ModelPicture
+            if not Assigned(Tribe[DipMem[Me].pContact].ModelPicture
               [MyRO.EnemyModel[emix].mix].HGr) then
               InitEnemyModel(emix);
-            code[0, Lines[0]] := emix;
-            code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix]);
-            inc(Lines[0]);
+            Code[0, Lines[0]] := emix;
+            Code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix]);
+            Inc(Lines[0]);
           end;
         SortModels;
         // if not IsMilReportNew(DipMem[me].pContact) or (Lines[0]>1) then
         begin
-          code[0, Lines[0]] := mixAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := mixAll;
+          Inc(Lines[0]);
         end;
         FirstShrinkedLine[0] := 0;
@@ -1386 +1386 @@
     kEModels:
       begin
-        for i := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
-        begin
-          code[1, Lines[0]] := MyRO.nEnemyModel - 1;
-          while (code[1, Lines[0]] >= 0) and
-            not((MyRO.EnemyModel[code[1, Lines[0]]].Owner = pView) and
-            (MyRO.EnemyModel[code[1, Lines[0]]].mix = i)) do
-            dec(code[1, Lines[0]]);
-          if not Assigned(Tribe[pView].ModelPicture[i].HGr) then
-            InitEnemyModel(code[1, Lines[0]]);
-          code[0, Lines[0]] := i;
-          code[2, Lines[0]] :=
-            ModelSortValue(MyRO.EnemyModel[code[1, Lines[0]]]);
-          inc(Lines[0]);
+        for I := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
+        begin
+          Code[1, Lines[0]] := MyRO.nEnemyModel - 1;
+          while (Code[1, Lines[0]] >= 0) and
+            not((MyRO.EnemyModel[Code[1, Lines[0]]].Owner = pView) and
+            (MyRO.EnemyModel[Code[1, Lines[0]]].mix = I)) do
+            Dec(Code[1, Lines[0]]);
+          if not Assigned(Tribe[pView].ModelPicture[I].HGr) then
+            InitEnemyModel(Code[1, Lines[0]]);
+          Code[0, Lines[0]] := I;
+          Code[2, Lines[0]] :=
+            ModelSortValue(MyRO.EnemyModel[Code[1, Lines[0]]]);
+          Inc(Lines[0]);
         end;
         SortModels;
@@ -1405 +1405 @@
     kAllEModels:
       begin
-        if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[me] = 0) then
-          Server(sGetModels, me, 0, nil^);
+        if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[Me] = 0) then
+          Server(sGetModels, Me, 0, nil^);
         for emix := 0 to MyRO.nEnemyModel - 1 do
           if (MyRO.EnemyModel[emix].mix >= 3) and
@@ -1416 +1416 @@
             if not Assigned(PPicture.HGr) then
               InitEnemyModel(emix);
-            ok := true;
+            ok := True;
             if MainScreen.mNames.Checked then
-              for j := 0 to Lines[0] - 1 do
+              for J := 0 to Lines[0] - 1 do
               begin
-                PTestPicture := @Tribe[MyRO.EnemyModel[code[0, j]].Owner]
-                  .ModelPicture[MyRO.EnemyModel[code[0, j]].mix];
+                PTestPicture := @Tribe[MyRO.EnemyModel[Code[0, J]].Owner]
+                  .ModelPicture[MyRO.EnemyModel[Code[0, J]].mix];
                 if (PPicture.HGr = PTestPicture.HGr) and
                   (PPicture.pix = PTestPicture.pix) and
                   (ModelHash(MyRO.EnemyModel[emix])
-                  = ModelHash(MyRO.EnemyModel[code[0, j]])) then
+                  = ModelHash(MyRO.EnemyModel[Code[0, J]])) then
                 begin
-                  code[1, j] := 1;
-                  ok := false;
+                  Code[1, J] := 1;
+                  ok := False;
                   Break;
                 end;
@@ -1434 +1434 @@
             if ok then
             begin
-              code[0, Lines[0]] := emix;
-              code[1, Lines[0]] := 0;
-              code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], true);
-              inc(Lines[0]);
+              Code[0, Lines[0]] := emix;
+              Code[1, Lines[0]] := 0;
+              Code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], True);
+              Inc(Lines[0]);
             end;
           end;
@@ -1444 +1444 @@
       end;
     kTribe:
-      for i := 0 to TribeNames.Count - 1 do
-      begin
-        code[0, Lines[0]] := i;
-        inc(Lines[0]);
+      for I := 0 to TribeNames.Count - 1 do
+      begin
+        Code[0, Lines[0]] := I;
+        Inc(Lines[0]);
       end;
     (* kDeliver:
-      if MyRO.Treaty[DipMem[me].pContact]<trAlliance then
+      if MyRO.Treaty[DipMem[Me].pContact]<trAlliance then
       begin // suggest next treaty level
-      code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]+1;
-      inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[me].pContact]=trNone then
+      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]+1;
+      Inc(Lines[0]);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact]=trNone then
       begin // suggest peace
-      code[0,Lines[0]]:=opTreaty+trPeace;
-      inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[me].pContact]>trNone then
+      Code[0,Lines[0]]:=opTreaty+trPeace;
+      Inc(Lines[0]);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact]>trNone then
       begin // suggest next treaty level
-      code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
-      inc(Lines[0]);
+      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
+      Inc(Lines[0]);
       end; *)
     kShipPart:
       begin
         Lines[0] := 0;
-        for i := 0 to nShipPart - 1 do
-          if MyRO.Ship[me].Parts[i] > 0 then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nShipPart - 1 do
+          if MyRO.Ship[Me].Parts[I] > 0 then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
       end;
@@ -1478 +1478 @@
       begin
         Lines[0] := 0;
-        for i := 0 to nShipPart - 1 do
-          if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nShipPart - 1 do
+          if MyRO.Ship[DipMem[Me].pContact].Parts[I] > 0 then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
       end;
     kGov:
-      for i := 1 to nGov - 1 do
-        if (GovPreq[i] <> preNA) and
-          ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable))
+      for I := 1 to nGov - 1 do
+        if (GovPreq[I] <> preNA) and
+          ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable))
         then
         begin
-          code[0, Lines[0]] := i;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := I;
+          Inc(Lines[0]);
         end;
     kMission:
-      for i := 0 to nSpyMission - 1 do
-      begin
-        code[0, Lines[0]] := i;
-        inc(Lines[0]);
+      for I := 0 to nSpyMission - 1 do
+      begin
+        Code[0, Lines[0]] := I;
+        Inc(Lines[0]);
       end;
   end;
@@ -1505 +1505 @@
     if Lines[0] + Lines[1] + Lines[2] <= MaxLines then
     begin
-      for i := 0 to Lines[1] - 1 do // add wonders to first page
-      begin
-        code[0, Lines[0]] := code[1, i];
-        inc(Lines[0]);
+      for I := 0 to Lines[1] - 1 do // add wonders to first page
+      begin
+        Code[0, Lines[0]] := Code[1, I];
+        Inc(Lines[0]);
       end;
       Lines[1] := 0;
       FirstShrinkedLine[0] := Lines[0];
-      for i := 0 to Lines[2] - 1 do // add models to first page
-      begin
-        code[0, Lines[0]] := code[2, i];
-        inc(Lines[0]);
+      for I := 0 to Lines[2] - 1 do // add models to first page
+      begin
+        Code[0, Lines[0]] := Code[2, I];
+        Inc(Lines[0]);
       end;
       Lines[2] := 0;
@@ -1521 +1521 @@
 end;
 
-function TListDlg.OnlyChoice(TestKind: TListKind): integer;
+function TListDlg.OnlyChoice(TestKind: TListKind): Integer;
 begin
   Kind := TestKind;
   InitLines;
   if Lines[0] = 0 then
-    result := -2
+    Result := -2
   else if Lines[0] > 1 then
-    result := -1
+    Result := -1
   else
-    result := code[0, 0];
+    Result := Code[0, 0];
 end;
 
 procedure TListDlg.FormShow(Sender: TObject);
 var
-  i: integer;
-begin
-  result := -1;
-  Closable := false;
+  I: Integer;
+begin
+  Result := -1;
+  Closable := False;
 
   if Kind = kTribe then
@@ -1554 +1554 @@
   InitLines;
 
-  MultiPage := false;
-  for i := 1 to MaxLayer - 1 do
-    if Lines[i] > 0 then
-      MultiPage := true;
+  MultiPage := False;
+  for I := 1 to MaxLayer - 1 do
+    if Lines[I] > 0 then
+      MultiPage := True;
   WideBottom := MultiPage or (Kind = kScience) or
     not Phrases2FallenBackToEnglish and
@@ -1571 +1571 @@
 
   DispLines := Lines[0];
-  for i := 0 to MaxLayer - 1 do
-    if Lines[i] > DispLines then
-      DispLines := Lines[i];
+  for I := 0 to MaxLayer - 1 do
+    if Lines[I] > DispLines then
+      DispLines := Lines[I];
   if WideBottom then
   begin
@@ -1588 +1588 @@
     ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
   end;
-  assert(ClientHeight <= Maintexture.Height);
+  Assert(ClientHeight <= Maintexture.Height);
 
   TechNameSpace := 224;
@@ -1649 +1649 @@
     Layer0Btn.Top := ClientHeight - 31;
     Layer0Btn.Left := ClientWidth div 2 - (12 + 29);
-    Layer0Btn.Down := true;
+    Layer0Btn.Down := True;
     Layer1Btn.Top := ClientHeight - 31;
     Layer1Btn.Left := ClientWidth div 2 - (12 - 29);
-    Layer1Btn.Down := false;
+    Layer1Btn.Down := False;
     Layer2Btn.Top := ClientHeight - 31;
     Layer2Btn.Left := ClientWidth div 2 - 12;
-    Layer2Btn.Down := false;
+    Layer2Btn.Down := False;
   end;
 
@@ -1668 +1668 @@
 procedure TListDlg.ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
 var
-  i: integer;
-  ShowFocus, forceclose: boolean;
+  I: Integer;
+  ShowFocus, forceclose: Boolean;
 begin
   forceclose := (ListKind <> Kind) and
@@ -1733 +1733 @@
   if Kind = kAdvance then // show focus button?
     if MyData.FarTech <> adNone then
-      ShowFocus := true
+      ShowFocus := True
     else
     begin
-      ShowFocus := false;
-      for i := 0 to nAdv - 1 do
-        if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
-          ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
-          ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
-          (Server(sSetResearch - sExecute, me, i, nil^) < rExecuted) then
-          ShowFocus := true;
+      ShowFocus := False;
+      for I := 0 to nAdv - 1 do
+        if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+          ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+          ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
+          (Server(sSetResearch - sExecute, Me, I, nil^) < rExecuted) then
+          ShowFocus := True;
     end;
-  ToggleBtn.Visible := (Kind = kCities) and not supervising or (Kind = kAdvance)
+  ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)
     and ShowFocus or (Kind = kModels) or (Kind = kEModels);
   CloseBtn.Visible := not(Kind in MustChooseKind);
@@ -1751 +1751 @@
 end;
 
-procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
+procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
 begin
   cixProject := cix;
@@ -1757 +1757 @@
 end;
 
-procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
-begin
-  pView := p;
-  if p = me then
+procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
+begin
+  pView := P;
+  if P = Me then
     ShowNewContent(NewMode, kModels)
   else
@@ -1768 +1768 @@
 procedure TListDlg.PlayerClick(Sender: TObject);
 begin
-  if TComponent(Sender).Tag = me then
+  if TComponent(Sender).Tag = Me then
     Kind := kModels
   else
@@ -1796 +1796 @@
 procedure TListDlg.ToggleBtnClick(Sender: TObject);
 var
-  p1: integer;
-  m: TMenuItem;
+  p1: Integer;
+  M: TMenuItem;
 begin
   case Kind of
     kAdvance:
       begin
-        result := adFar;
-        Closable := true;
+        Result := adFar;
+        Closable := True;
         Close;
       end;
@@ -1818 +1818 @@
       begin
         EmptyMenu(Popup.Items);
-        if G.Difficulty[me] > 0 then
-        begin
-          m := TMenuItem.Create(Popup);
-          m.RadioItem := true;
-          m.Caption := Tribe[me].TPhrase('SHORTNAME');
-          m.Tag := me;
-          m.OnClick := PlayerClick;
+        if G.Difficulty[Me] > 0 then
+        begin
+          M := TMenuItem.Create(Popup);
+          M.RadioItem := True;
+          M.Caption := Tribe[Me].TPhrase('SHORTNAME');
+          M.Tag := Me;
+          M.OnClick := PlayerClick;
           if Kind = kModels then
-            m.Checked := true;
-          Popup.Items.Add(m);
+            M.Checked := True;
+          Popup.Items.Add(M);
         end;
         for p1 := 0 to nPl - 1 do
-          if (p1 <> me) and (MyRO.EnemyReport[p1] <> nil) and
+          if (p1 <> Me) and (MyRO.EnemyReport[p1] <> nil) and
             (MyRO.EnemyReport[p1].TurnOfMilReport >= 0) then
           begin
-            m := TMenuItem.Create(Popup);
-            m.RadioItem := true;
-            m.Caption := Tribe[p1].TPhrase('SHORTNAME');
-            m.Tag := p1;
-            m.OnClick := PlayerClick;
+            M := TMenuItem.Create(Popup);
+            M.RadioItem := True;
+            M.Caption := Tribe[p1].TPhrase('SHORTNAME');
+            M.Tag := p1;
+            M.OnClick := PlayerClick;
             if (Kind = kEModels) and (p1 = pView) then
-              m.Checked := true;
-            Popup.Items.Add(m);
+              M.Checked := True;
+            Popup.Items.Add(M);
           end;
         Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top +
@@ -1848 +1848 @@
 end;
 
-procedure TListDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TListDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -1894 +1894 @@
 begin
   Selected := -2;
-  SmartUpdateContent(true);
+  SmartUpdateContent(True);
 end;
 

trunk/LocalPlayer/TechTree.pas

@@ -55 +55 @@
   yLegendPitch = 32;
 
-function min(a, b: Integer): Integer;
-begin
-  if a < b then
-    result := a
+function Min(A, B: Integer): Integer;
+begin
+  if A < B then
+    Result := A
   else
-    result := b;
-end;
-
-function max(a, b: Integer): Integer;
-begin
-  if a > b then
-    result := a
+    Result := B;
+end;
+
+function Max(A, B: Integer): Integer;
+begin
+  if A > B then
+    Result := A
   else
-    result := b;
+    Result := B;
 end;
 
@@ -84 +84 @@
 procedure TTechTreeDlg.FormPaint(Sender: TObject);
 var
-  X, w: Integer;
+  X, W: Integer;
 begin
   with Canvas do begin
     // black border
-    brush.color := $000000;
-    fillrect(rect(0, 0, BlackBorder, ClientHeight));
-    fillrect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
-    fillrect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
-    fillrect(rect(BlackBorder, ClientHeight - BlackBorder,
+    Brush.Color := $000000;
+    FillRect(rect(0, 0, BlackBorder, ClientHeight));
+    FillRect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
+    FillRect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
+    FillRect(rect(BlackBorder, ClientHeight - BlackBorder,
       ClientWidth - BlackBorder, ClientHeight));
 
     // texturize empty space
-    brush.color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     if xOffset > 0 then
       FillRectSeamless(Canvas, BlackBorder, BlackBorder, BlackBorder + xOffset,
@@ -105 +105 @@
         ClientWidth - BlackBorder, ClientHeight - BlackBorder,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
-    X := max(BlackBorder, BlackBorder + xOffset);
-    w := min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
+    X := Max(BlackBorder, BlackBorder + xOffset);
+    W := Min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
     if yOffset > 0 then
-      FillRectSeamless(Canvas, X, BlackBorder, w, BlackBorder + yOffset,
+      FillRectSeamless(Canvas, X, BlackBorder, W, BlackBorder + yOffset,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
     if yOffset + Image.height < ClientHeight - 2 * BlackBorder then
-      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, w,
+      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, W,
         ClientHeight - BlackBorder, -BlackBorder - xOffset,
         -BlackBorder - yOffset, Paper);
   end;
-  BitBltCanvas(Canvas, max(BlackBorder, BlackBorder + xOffset),
-    max(BlackBorder, BlackBorder + yOffset),
-    min(Image.width, min(Image.width + xOffset,
-    min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
-    ), min(Image.height, min(Image.height + yOffset,
-    min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
-    yOffset))), Image.Canvas, max(0, -xOffset),
-    max(0, -yOffset));
+  BitBltCanvas(Canvas, Max(BlackBorder, BlackBorder + xOffset),
+    Max(BlackBorder, BlackBorder + yOffset),
+    Min(Image.width, Min(Image.width + xOffset,
+    Min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
+    ), Min(Image.height, Min(Image.height + yOffset,
+    Min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
+    yOffset))), Image.Canvas, Max(0, -xOffset),
+    Max(0, -yOffset));
 end;
 
@@ -128 +128 @@
 var
   X, Y, ad: Integer;
-  s: string;
+  S: string;
   NewWidth: Integer;
   NewHeight: Integer;
@@ -142 +142 @@
       // write advance names
       Font.Assign(UniFont[ftSmall]);
-      Font.color := clBlack;
-      brush.Style := bsClear;
+      Font.Color := clBlack;
+      Brush.Style := bsClear;
       for X := 0 to (Image.width - xStart) div xPitch do
         for Y := 0 to (Image.height - yStart) div yPitch do
@@ -150 +150 @@
           if ad and $FFFF00 = 0 then
           begin
-            s := Phrases.Lookup('ADVANCES', ad);
-            while TextWidth(s) > 112 do
-              Delete(s, Length(s), 1);
-            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
+            S := Phrases.Lookup('ADVANCES', ad);
+            while TextWidth(S) > 112 do
+              Delete(S, Length(S), 1);
+            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, S);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
               := TransparentColor2;
@@ -191 +191 @@
   if Button = mbLeft then
   begin
-    dragging := true;
+    dragging := True;
     xDown := X;
     yDown := Y;
@@ -200 +200 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  dragging := false;
+  dragging := False;
 end;
 

trunk/LocalPlayer/Term.pas

@@ -232 +232 @@
     procedure Timer1Timer(Sender: TObject);
     procedure MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure EOTClick(Sender: TObject);
     procedure PanelBoxMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+      Shift: TShiftState; X, Y: Integer);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure mDisbandOrUtilizeClick(Sender: TObject);
     procedure FormResize(Sender: TObject);
     procedure PanelBtnClick(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure Toggle(Sender: TObject);
     procedure PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure mShowClick(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormPaint(Sender: TObject);
     procedure mRepClicked(Sender: TObject);
@@ -263 +263 @@
     procedure mNamesClick(Sender: TObject);
     procedure MapBtnClick(Sender: TObject);
-    procedure FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CreateUnitClick(Sender: TObject);
     procedure mSoundOffClick(Sender: TObject);
@@ -324 +324 @@
     NoMap: TIsoMap;
     NoMapPanel: TIsoMap;
-    function ChooseUnusedTribe: integer;
+    function ChooseUnusedTribe: Integer;
     function DoJob(j0: Integer): Integer;
     procedure GetTribeList;
     procedure InitModule;
     procedure DoneModule;
-    procedure InitTurn(NewPlayer: integer);
+    procedure InitTurn(NewPlayer: Integer);
     procedure SaveMenuItemsState;
     procedure ScrollBarUpdate(Sender: TObject);
@@ -341 +341 @@
     procedure FocusNextUnit(Dir: Integer = 1);
     procedure NextUnit(NearLoc: Integer; AutoTurn: Boolean);
-    procedure Scroll(dx, dy: integer);
-    procedure SetMapPos(Loc: integer; MapPos: TPoint);
-    procedure Centre(Loc: integer);
-    procedure SetTroopLoc(Loc: integer);
-    procedure ProcessRect(x0, y0, nx, ny, Options: integer);
-    procedure PaintLoc(Loc: integer; Radius: integer = 0);
-    procedure PaintLoc_BeforeMove(FromLoc: integer);
-    procedure PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle = pltsNormal);
-    procedure PaintBufferToScreen(xMap, yMap, width, height: integer);
+    procedure Scroll(dx, dy: Integer);
+    procedure SetMapPos(Loc: Integer; MapPos: TPoint);
+    procedure Centre(Loc: Integer);
+    procedure SetTroopLoc(Loc: Integer);
+    procedure ProcessRect(x0, y0, nx, ny, Options: Integer);
+    procedure PaintLoc(Loc: Integer; Radius: Integer = 0);
+    procedure PaintLoc_BeforeMove(FromLoc: Integer);
+    procedure PaintLocTemp(Loc: Integer; Style: TPaintLocTempStyle = pltsNormal);
+    procedure PaintBufferToScreen(xMap, yMap, width, height: Integer);
     procedure PaintDestination;
-    procedure SetUnFocus(uix: integer);
-    function MoveUnit(dx, dy: integer; Options: integer = 0): integer;
-    procedure MoveToLoc(Loc: integer; CheckSuicide: boolean);
-    procedure MoveOnScreen(ShowMove: TShowMove; Step0, Step1, nStep: integer;
-      Restore: boolean = true);
-    procedure FocusOnLoc(Loc: integer; Options: integer = 0);
-    function EndTurn(WasSkipped: boolean = false): boolean;
+    procedure SetUnFocus(uix: Integer);
+    function MoveUnit(dx, dy: Integer; Options: Integer = 0): Integer;
+    procedure MoveToLoc(Loc: Integer; CheckSuicide: Boolean);
+    procedure MoveOnScreen(ShowMove: TShowMove; Step0, Step1, nStep: Integer;
+      Restore: Boolean = True);
+    procedure FocusOnLoc(Loc: Integer; Options: Integer = 0);
+    function EndTurn(WasSkipped: Boolean = False): Boolean;
     procedure EndNego;
-    function IsPanelPixel(x, y: integer): boolean;
+    function IsPanelPixel(X, Y: Integer): Boolean;
     procedure InitPopup(Popup: TPopupMenu);
     procedure SetMapOptions;
@@ -365 +365 @@
     procedure CheckTerrainBtnVisible;
     procedure RememberPeaceViolation;
-    procedure SetDebugMap(p: integer);
-    procedure SetViewpoint(p: integer);
-    function LocationOfScreenPixel(x, y: integer): Integer;
+    procedure SetDebugMap(P: Integer);
+    procedure SetViewpoint(P: Integer);
+    function LocationOfScreenPixel(X, Y: Integer): Integer;
     function GetCenterLoc: Integer;
     procedure SetTileSizeCenter(TileSize: TTileSize);
     procedure SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
-    procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure RectInvalidate(Left, Top, Rigth, Bottom: Integer);
     procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
-    procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: Integer);
     procedure LoadSettings;
     procedure SaveSettings;
@@ -381 +381 @@
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
-    procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
+    procedure PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
   public
     UsedOffscreenWidth: Integer;
@@ -387 +387 @@
     Offscreen: TBitmap;
     OffscreenUser: TForm;
-    procedure Client(Command, NewPlayer: integer; var Data);
-    procedure SetAIName(p: integer; Name: string);
-    function ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-      ShowEvent: integer = 0): boolean;
-    procedure CityClosed(Activateuix: integer; StepFocus: boolean = false;
-      SelectFocus: boolean = false);
-    function DipCall(Command: integer): integer;
-    function OfferCall(var Offer: TOffer): integer;
-    procedure UpdateViews(UpdateCityScreen: boolean = false);
-    function ContactRefused(p: integer; Item: String): boolean;
+    procedure Client(Command, NewPlayer: Integer; var Data);
+    procedure SetAIName(P: Integer; Name: string);
+    function ZoomToCity(Loc: Integer; NextUnitOnClose: Boolean = False;
+      ShowEvent: Integer = 0): Boolean;
+    procedure CityClosed(Activateuix: Integer; StepFocus: Boolean = False;
+      SelectFocus: Boolean = False);
+    function DipCall(Command: Integer): Integer;
+    function OfferCall(var Offer: TOffer): Integer;
+    procedure UpdateViews(UpdateCityScreen: Boolean = False);
+    function ContactRefused(P: Integer; Item: String): Boolean;
   end;
 
@@ -407 +407 @@
 
   TTribeInfo = record
-    trix: integer;
+    trix: Integer;
     FileName: ShortString;
     function GetCommandDataSize: Byte;
@@ -415 +415 @@
 
   TCityNameInfo = record
-    ID: integer;
+    ID: Integer;
     NewName: ShortString;
     function GetCommandDataSize: Byte;
@@ -423 +423 @@
 
   TModelNameInfo = record
-    mix: integer;
+    mix: Integer;
     NewName: ShortString;
     function GetCommandDataSize: Byte;
@@ -472 +472 @@
   usToldNoReturn = $100;
   usPersistent = usStay or usGoto or usEnhance or usRecover or
-    integer($FFFF0000);
+    Integer($FFFF0000);
 
   { model status flags }
@@ -486 +486 @@
   adNexus = $803;
 
-  SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of integer = (10,
+  SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of Integer = (10,
     11, 40, 41, 21, 30, { 50,51, } 64, 74, { 71, } 73);
 
@@ -499 +499 @@
 
   nCityEventPriority = 16;
-  CityEventPriority: array [0 .. nCityEventPriority - 1] of integer =
+  CityEventPriority: array [0 .. nCityEventPriority - 1] of Integer =
     (chDisorder, chImprovementLost, chUnitLost, chAllImpsMade, chProduction,
     chOldWonder, chNoSettlerProd, chPopDecrease, chProductionSabotaged,
@@ -574 +574 @@
   DipMem: array [0 .. nPl - 1] of TDipMem;
 
-function CityEventName(i: integer): string;
-function RoughCredibility(Credibility: integer): integer;
-
-function InitEnemyModel(emix: integer): boolean;
+function CityEventName(I: Integer): string;
+function RoughCredibility(Credibility: Integer): Integer;
+
+function InitEnemyModel(emix: Integer): Boolean;
 procedure InitAllEnemyModels;
-procedure InitMyModel(mix: integer; final: boolean);
-
-procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer = -1;
-  IsControl: boolean = false);
+procedure InitMyModel(mix: Integer; final: Boolean);
+
+procedure ImpImage(ca: TCanvas; X, Y, iix: Integer; Government: Integer = -1;
+  IsControl: Boolean = False);
 procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
 function AlignUp(Value, Alignment: Integer): Integer;
@@ -610 +610 @@
   MoveTime = 300; // {time for moving a unit in ms}
   WaitAfterShowMove = 32;
-  FastScrolling = false; // causes problems with overlapping windows
+  FastScrolling = False; // causes problems with overlapping windows
 
   nBrushTypes = 26;
@@ -648 +648 @@
   CurrentMoveInfo: TCurrentMoveInfo;
 
-function CityEventName(i: integer): string;
-begin
-  if i = 14 then // chAllImpsMade
+function CityEventName(I: Integer): string;
+begin
+  if I = 14 then // chAllImpsMade
     if not Phrases2FallenBackToEnglish then
-      result := Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
+      Result := Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
     else
-      result := Phrases.Lookup('CITYEVENTS', 1)
+      Result := Phrases.Lookup('CITYEVENTS', 1)
   else
-    result := Phrases.Lookup('CITYEVENTS', i);
+    Result := Phrases.Lookup('CITYEVENTS', I);
 end;
 
@@ -666 +666 @@
   TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
-  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch: Integer;
+  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, X, Y, C, ch: Integer;
   xdivider, ydivider: Integer;
   Resampled: ^TBuffer;
@@ -682 +682 @@
       PixelPtr := PixelPointer(BigImp, ScaleToNative(ix * xSizeBig),
         ScaleToNative(Cut + iy * ySizeBig));
-      for y := 0 to ScaleToNative(ySizeBig - 2 * Cut) - 1 do begin
-        ydivider := (ScaleFromNative(y) * ySizeSmall div (ySizeBig - 2 * Cut) + 1) *
-          (ySizeBig - 2 * Cut) - ScaleFromNative(y) * ySizeSmall;
+      for Y := 0 to ScaleToNative(ySizeBig - 2 * Cut) - 1 do begin
+        ydivider := (ScaleFromNative(Y) * ySizeSmall div (ySizeBig - 2 * Cut) + 1) *
+          (ySizeBig - 2 * Cut) - ScaleFromNative(Y) * ySizeSmall;
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        for x := 0 to ScaleToNative(xSizeBig) - 1 do begin
-          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(x) *
-            xSizeSmall div xSizeBig + ScaleFromNative(y) *
+        for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
+          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(X) *
+            xSizeSmall div xSizeBig + ScaleFromNative(Y) *
             ySizeSmall div (ySizeBig - 2 * Cut) * nx;
-          xdivider := (ScaleFromNative(x) * xSizeSmall div xSizeBig + 1) *
-            xSizeBig - ScaleFromNative(x) * xSizeSmall;
+          xdivider := (ScaleFromNative(X) * xSizeSmall div xSizeBig + 1) *
+            xSizeBig - ScaleFromNative(X) * xSizeSmall;
           if xdivider > xSizeSmall then
             xdivider := xSizeSmall;
           for ch := 0 to 2 do begin
-            c := PixelPtr.Pixel^.Planes[ch];
-            Inc(Resampled[ir, ch], c * xdivider * ydivider);
+            C := PixelPtr.Pixel^.Planes[ch];
+            Inc(Resampled[ir, ch], C * xdivider * ydivider);
             if xdivider < xSizeSmall then
-              Inc(Resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + 1, ch], C * (xSizeSmall - xdivider) *
                 ydivider);
             if ydivider < ySizeSmall then
               Inc(Resampled[ir + nx, ch],
-                c * xdivider * (ySizeSmall - ydivider));
+                C * xdivider * (ySizeSmall - ydivider));
             if (xdivider < xSizeSmall) and (ydivider < ySizeSmall) then
-              Inc(Resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + nx + 1, ch], C * (xSizeSmall - xdivider) *
                 (ySizeSmall - ydivider));
           end;
@@ -719 +719 @@
   SmallImp.BeginUpdate;
   PixelPtr := PixelPointer(SmallImp);
-  for y := 0 to ScaleToNative(ny) - 1 do begin
-    for x := 0 to ScaleToNative(nx) - 1 do begin
+  for Y := 0 to ScaleToNative(ny) - 1 do begin
+    for X := 0 to ScaleToNative(nx) - 1 do begin
       for ch := 0 to 2 do begin
         Sum := 0;
         Cnt := 0;
         for dy := -1 to 1 do
-          if ((dy >= 0) or (ScaleFromNative(y) mod ySizeSmall > 0)) and
-            ((dy <= 0) or (ScaleFromNative(y) mod ySizeSmall < ySizeSmall - 1)) then
+          if ((dy >= 0) or (ScaleFromNative(Y) mod ySizeSmall > 0)) and
+            ((dy <= 0) or (ScaleFromNative(Y) mod ySizeSmall < ySizeSmall - 1)) then
             for dx := -1 to 1 do
-              if ((dx >= 0) or (ScaleFromNative(x) mod xSizeSmall > 0)) and
-                ((dx <= 0) or (ScaleFromNative(x) mod xSizeSmall < xSizeSmall - 1)) then
+              if ((dx >= 0) or (ScaleFromNative(X) mod xSizeSmall > 0)) and
+                ((dx <= 0) or (ScaleFromNative(X) mod xSizeSmall < xSizeSmall - 1)) then
               begin
-                Inc(Sum, Resampled[ScaleFromNative(x) + dx + nx * (ScaleFromNative(y) + dy), ch]);
+                Inc(Sum, Resampled[ScaleFromNative(X) + dx + nx * (ScaleFromNative(Y) + dy), ch]);
                 Inc(Cnt);
               end;
-        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(x) + nx * ScaleFromNative(y), ch] - Sum *
+        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(X) + nx * ScaleFromNative(Y), ch] - Sum *
           Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * Cut));
         if Sum < 0 then Sum := 0;
@@ -748 +748 @@
 end;
 
-procedure ImpImage(ca: TCanvas; x, y, iix: integer; Government: integer;
-  IsControl: boolean);
+procedure ImpImage(ca: TCanvas; X, Y, iix: Integer; Government: Integer;
+  IsControl: Boolean);
 begin
   if Government < 0 then
@@ -755 +755 @@
   if (iix = imPalace) and (Government <> gAnarchy) then
     iix := Government - 8;
-  FrameImage(ca, BigImp, x, y, xSizeBig, ySizeBig, (iix + SystemIconLines * 7)
+  FrameImage(ca, BigImp, X, Y, xSizeBig, ySizeBig, (iix + SystemIconLines * 7)
     mod 7 * xSizeBig, (iix + SystemIconLines * 7) div 7 * ySizeBig, IsControl);
 end;
@@ -778 +778 @@
 { *** tribe management procedures *** }
 
-function RoughCredibility(Credibility: integer): integer;
+function RoughCredibility(Credibility: Integer): Integer;
 begin
   case Credibility of
     0 .. 69:
-      result := 0;
+      Result := 0;
     70 .. 89:
-      result := 1;
+      Result := 1;
     90 .. 99:
-      result := 2;
+      Result := 2;
     100:
-      result := 3;
-  end;
-end;
-
-procedure ChooseModelPicture(p, mix, code, Hash, Turn: integer;
-  ForceNew, final: boolean);
+      Result := 3;
+  end;
+end;
+
+procedure ChooseModelPicture(P, mix, Code, Hash, Turn: Integer;
+  ForceNew, final: Boolean);
 var
-  i: integer;
+  I: Integer;
   Picture: TModelPictureInfo;
-  IsNew: boolean;
-begin
-  Picture.trix := p;
+  IsNew: Boolean;
+begin
+  Picture.trix := P;
   Picture.mix := mix;
-  if code = 74 then
+  if Code = 74 then
   begin // use correct pictures for slaves
-    if Tribe[p].mixSlaves < 0 then
-      if not TribeOriginal[p] then
-        Tribe[p].mixSlaves := mix
+    if Tribe[P].mixSlaves < 0 then
+      if not TribeOriginal[P] then
+        Tribe[P].mixSlaves := mix
       else
       begin
-        i := mix + p shl 16;
-        Server(cSetSlaveIndex, 0, 0, i);
+        I := mix + P shl 16;
+        Server(cSetSlaveIndex, 0, 0, I);
       end;
     if ToldSlavery = 1 then
@@ -817 +817 @@
     Picture.Hash := 0;
     Picture.GrName := 'StdUnits.png';
-    IsNew := true;
+    IsNew := True;
   end
   else
   begin
     Picture.Hash := Hash;
-    IsNew := Tribe[p].ChooseModelPicture(Picture, code, Turn, ForceNew);
+    IsNew := Tribe[P].ChooseModelPicture(Picture, Code, Turn, ForceNew);
   end;
   if final then
-    if not TribeOriginal[p] then
-      Tribe[p].SetModelPicture(Picture, IsNew)
+    if not TribeOriginal[P] then
+      Tribe[P].SetModelPicture(Picture, IsNew)
     else if IsNew then
       Server(CommandWithData(cSetNewModelPicture, Picture.GetCommandDataSize),
@@ -834 +834 @@
         0, 0, Picture)
   else
-    with Tribe[p].ModelPicture[mix] do
+    with Tribe[P].ModelPicture[mix] do
     begin
       HGr := LoadGraphicSet(Picture.GrName);
@@ -841 +841 @@
 end;
 
-function InitEnemyModel(emix: integer): boolean;
+function InitEnemyModel(emix: Integer): Boolean;
 begin
   if GameMode = cMovie then
   begin
-    result := false;
-    exit;
+    Result := False;
+    Exit;
   end;
   with MyRO.EnemyModel[emix] do
     ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
-      ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
-  result := true;
+      ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, False, True);
+  Result := True;
 end;
 
 procedure InitAllEnemyModels;
 var
-  emix: integer;
+  emix: Integer;
 begin
   for emix := 0 to MyRO.nEnemyModel - 1 do
@@ -864 +864 @@
 end;
 
-procedure InitMyModel(mix: integer; final: boolean);
+procedure InitMyModel(mix: Integer; final: Boolean);
 var
   mi: TModelInfo;
 begin
   if (GameMode = cMovie) and (MyModel[mix].Kind < $08) then
-    exit;
+    Exit;
   // don't exit for special units because cSetModelPicture comes after TellNewModels
-  MakeModelInfo(me, mix, MyModel[mix], mi);
-  ChooseModelPicture(me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
-    false, final);
-end;
-
-function AttackSound(code: integer): string;
-begin
-  result := 'ATTACK_' + char(48 + code div 100 mod 10) +
-    char(48 + code div 10 mod 10) + char(48 + code mod 10);
-end;
-
-procedure CheckToldNoReturn(uix: integer);
+  MakeModelInfo(Me, mix, MyModel[mix], mi);
+  ChooseModelPicture(Me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
+    False, final);
+end;
+
+function AttackSound(Code: Integer): string;
+begin
+  Result := 'ATTACK_' + char(48 + Code div 100 mod 10) +
+    char(48 + Code div 10 mod 10) + char(48 + Code mod 10);
+end;
+
+procedure CheckToldNoReturn(uix: Integer);
 // check whether aircraft survived low-fuel warning
 begin
-  assert(not supervising);
+  Assert(not Supervising);
   with MyUn[uix] do
     if (Status and usToldNoReturn <> 0) and
@@ -893 +893 @@
 end;
 
-function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
+function CreateTribe(P: Integer; FileName: string; Original: Boolean): Boolean;
 begin
   FileName := LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
@@ -903 +903 @@
   end;
 
-  TribeOriginal[p] := Original;
-  Tribe[p] := TTribe.Create(FileName);
-  with Tribe[p] do
+  TribeOriginal[P] := Original;
+  Tribe[P] := TTribe.Create(FileName);
+  with Tribe[P] do
   begin
     if (GameMode = cNewGame) or not Original then
     begin
-      Term.ChooseModelPicture(p, 0, 010, 1, 0, true, true);
-      Term.ChooseModelPicture(p, 1, 040, 1, 0, true, true);
-      Term.ChooseModelPicture(p, 2, 041, 1, 0, true, true);
-      Term.ChooseModelPicture(p, -1, 017, 1, 0, true, true);
-    end;
-    DipMem[p].pContact := -1;
-  end;
-  result := true;
+      Term.ChooseModelPicture(P, 0, 010, 1, 0, True, True);
+      Term.ChooseModelPicture(P, 1, 040, 1, 0, True, True);
+      Term.ChooseModelPicture(P, 2, 041, 1, 0, True, True);
+      Term.ChooseModelPicture(P, -1, 017, 1, 0, True, True);
+    end;
+    DipMem[P].pContact := -1;
+  end;
+  Result := True;
 end;
 
 procedure TellNewContacts;
 var
-  p1: integer;
-begin
-  if not supervising then
+  p1: Integer;
+begin
+  if not Supervising then
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and MyData.ToldContact = 0) and
+      if (p1 <> Me) and (1 shl p1 and MyData.ToldContact = 0) and
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] > trNoContact) then
       begin
@@ -935 +935 @@
 procedure TellNewModels;
 var
-  mix: integer;
+  mix: Integer;
   ModelNameInfo: TModelNameInfo;
 begin
-  if supervising then
-    exit;
-  with Tribe[me] do
+  if Supervising then
+    Exit;
+  with Tribe[Me] do
     while MyData.ToldModels < MyRO.nModel do
     begin { new Unit class available }
@@ -951 +951 @@
       end;
       if not Assigned(ModelPicture[MyData.ToldModels].HGr) then
-        InitMyModel(MyData.ToldModels, true);
+        InitMyModel(MyData.ToldModels, True);
       { only run if no researched model }
       with MessgExDlg do
@@ -983 +983 @@
              (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
           Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
-            me, 0, ModelNameInfo);
+            Me, 0, ModelNameInfo);
         end;
       end;
@@ -992 +992 @@
             MyModel[mix].Status := MyModel[mix].Status or msObsolete;
       end;
-      inc(MyData.ToldModels);
+      Inc(MyData.ToldModels);
     end;
 end;
@@ -1017 +1017 @@
 end;
 
-procedure TMainScreen.PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
-
-  procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
+procedure TMainScreen.PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
+
+  procedure TSprite(xDst, yDst, xSrc, ySrc: Integer);
   begin
     with NoMapPanel do
-      Sprite(dst, HGrTerrain, x + xDst, y + yDst, xxt * 2, yyt * 3,
+      Sprite(dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
         1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
   end;
 
-  procedure TSprite4(xSrc, ySrc: integer);
+  procedure TSprite4(xSrc, ySrc: Integer);
   begin
     with NoMapPanel do begin
-      Sprite(dst, HGrTerrain, x + xxt, y + yyt + 2, xxt * 2, yyt * 2 - 2,
+      Sprite(dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + 4, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + xxt * 2, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + xxt, y + yyt * 3, xxt * 2, yyt * 2 - 2,
+      Sprite(dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
     end;
@@ -1041 +1041 @@
 
 var
-  cix, ySrc, Tile: integer;
+  cix, ySrc, Tile: Integer;
 begin
   with NoMapPanel do begin
@@ -1055 +1055 @@
         cix := MyRO.nCity - 1;
         while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-          dec(cix);
-        assert(cix >= 0);
+          Dec(cix);
+        Assert(cix >= 0);
         if MyCity[cix].Built[imSupermarket] > 0 then
           Tile := Tile or tiFarm
@@ -1147 +1147 @@
 end;
 
-function ChooseResearch: boolean;
+function ChooseResearch: Boolean;
 var
-  ChosenResearch: integer;
+  ChosenResearch: Integer;
 begin
   if (MyData.FarTech <> adNone) and (MyRO.Tech[MyData.FarTech] >= tsApplicable)
@@ -1158 +1158 @@
     repeat
       ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
-      if ModalSelectDlg.result < 0 then
-      begin
-        result := false;
-        exit;
-      end;
-      ChosenResearch := ModalSelectDlg.result;
+      if ModalSelectDlg.Result < 0 then
+      begin
+        Result := False;
+        Exit;
+      end;
+      ChosenResearch := ModalSelectDlg.Result;
       if ChosenResearch = adMilitary then
       begin
         DraftDlg.ShowNewContent(wmModal);
         if DraftDlg.ModalResult <> mrOK then
-          Tribe[me].ModelPicture[MyRO.nModel].HGr := nil;
+          Tribe[Me].ModelPicture[MyRO.nModel].HGr := nil;
       end;
     until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
 
     if ChosenResearch = adMilitary then
-      InitMyModel(MyRO.nModel, true)
+      InitMyModel(MyRO.nModel, True)
     else if ChosenResearch = adFar then
     begin
       ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
-      if ModalSelectDlg.result >= 0 then
-        if (ModalSelectDlg.result = adNone) or
-          (Server(sSetResearch - sExecute, me, ModalSelectDlg.result, nil^) <
+      if ModalSelectDlg.Result >= 0 then
+        if (ModalSelectDlg.Result = adNone) or
+          (Server(sSetResearch - sExecute, Me, ModalSelectDlg.Result, nil^) <
           rExecuted) then
-          MyData.FarTech := ModalSelectDlg.result
+          MyData.FarTech := ModalSelectDlg.Result
         else
         begin
-          ChosenResearch := ModalSelectDlg.result;
+          ChosenResearch := ModalSelectDlg.Result;
           // can be researched immediately
           MyData.FarTech := adNone;
@@ -1193 +1193 @@
     MyData.FarTech := adNexus
   else
-    Server(sSetResearch, me, ChosenResearch, nil^);
+    Server(sSetResearch, Me, ChosenResearch, nil^);
   ListDlg.TechChange;
-  result := true;
+  Result := True;
 end;
 
@@ -1223 +1223 @@
 (* ** client function handling ** *)
 
-function TMainScreen.DipCall(Command: integer): integer;
+function TMainScreen.DipCall(Command: Integer): Integer;
 var
-  i: integer;
-  IsTreatyDeal: boolean;
-begin
-  result := Server(Command, me, 0, nil^);
-  if result >= rExecuted then
+  I: Integer;
+  IsTreatyDeal: Boolean;
+begin
+  Result := Server(Command, Me, 0, nil^);
+  if Result >= rExecuted then
   begin
     if Command and $FF0F = scContact then
     begin
-      DipMem[me].pContact := Command shr 4 and $F;
+      DipMem[Me].pContact := Command shr 4 and $F;
       NegoDlg.Initiate;
-      DipMem[me].DeliveredPrices := [];
-      DipMem[me].ReceivedPrices := [];
-    end;
-
-    DipMem[me].SentCommand := Command;
-    DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
+      DipMem[Me].DeliveredPrices := [];
+      DipMem[Me].ReceivedPrices := [];
+    end;
+
+    DipMem[Me].SentCommand := Command;
+    DipMem[Me].FormerTreaty := MyRO.Treaty[DipMem[Me].pContact];
     if Command = scDipCancelTreaty then
       Play('CANCELTREATY')
     else if Command = scDipAccept then
     begin // remember delivered and received prices
-      for i := 0 to ReceivedOffer.nDeliver - 1 do
-        include(DipMem[me].ReceivedPrices, ReceivedOffer.Price[i] shr 24);
-      for i := 0 to ReceivedOffer.nCost - 1 do
-        include(DipMem[me].DeliveredPrices,
-          ReceivedOffer.Price[ReceivedOffer.nDeliver + i] shr 24);
-      IsTreatyDeal := false;
-      for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-        if ReceivedOffer.Price[i] and opMask = opTreaty then
-          IsTreatyDeal := true;
+      for I := 0 to ReceivedOffer.nDeliver - 1 do
+        Include(DipMem[Me].ReceivedPrices, ReceivedOffer.Price[I] shr 24);
+      for I := 0 to ReceivedOffer.nCost - 1 do
+        Include(DipMem[Me].DeliveredPrices,
+          ReceivedOffer.Price[ReceivedOffer.nDeliver + I] shr 24);
+      IsTreatyDeal := False;
+      for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+        if ReceivedOffer.Price[I] and opMask = opTreaty then
+          IsTreatyDeal := True;
       if IsTreatyDeal then
         Play('NEWTREATY')
@@ -1260 +1260 @@
     end;
     CityDlg.CloseAction := None;
-    if G.RO[DipMem[me].pContact] <> nil then
+    if G.RO[DipMem[Me].pContact] <> nil then
     begin // close windows for next player
       ApplyToVisibleForms(faClose);
@@ -1274 +1274 @@
 end;
 
-function TMainScreen.OfferCall(var Offer: TOffer): integer;
-begin
-  result := Server(scDipOffer, me, 0, Offer);
-  if result >= rExecuted then
-  begin
-    DipMem[me].SentCommand := scDipOffer;
-    DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
-    DipMem[me].SentOffer := Offer;
+function TMainScreen.OfferCall(var Offer: TOffer): Integer;
+begin
+  Result := Server(scDipOffer, Me, 0, Offer);
+  if Result >= rExecuted then
+  begin
+    DipMem[Me].SentCommand := scDipOffer;
+    DipMem[Me].FormerTreaty := MyRO.Treaty[DipMem[Me].pContact];
+    DipMem[Me].SentOffer := Offer;
     CityDlg.CloseAction := None;
-    if G.RO[DipMem[me].pContact] <> nil then
+    if G.RO[DipMem[Me].pContact] <> nil then
     begin // close windows for next player
       ApplyToVisibleForms(faClose);
@@ -1297 +1297 @@
 end;
 
-procedure TMainScreen.SetUnFocus(uix: integer);
+procedure TMainScreen.SetUnFocus(uix: Integer);
 var
-  Loc0: integer;
-begin
-  assert(not((uix >= 0) and supervising));
+  Loc0: Integer;
+begin
+  Assert(not((uix >= 0) and Supervising));
   if uix <> UnFocus then
   begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     if uix >= 0 then
       UnStartLoc := MyUn[uix].Loc;
-    BlinkON := false;
+    BlinkON := False;
     BlinkTime := -1;
     if UnFocus >= 0 then
@@ -1328 +1328 @@
 procedure TMainScreen.CheckTerrainBtnVisible;
 var
-  Tile: integer;
+  Tile: Integer;
   mox: ^TModel;
 begin
@@ -1340 +1340 @@
   end
   else
-    TerrainBtn.Visible := false;
+    TerrainBtn.Visible := False;
 end;
 
@@ -1348 +1348 @@
   begin
     MovieSpeed1Btn.Down := MovieSpeed = 1;
-    MovieSpeed1Btn.Visible := true;
+    MovieSpeed1Btn.Visible := True;
     MovieSpeed2Btn.Down := MovieSpeed = 2;
-    MovieSpeed2Btn.Visible := true;
+    MovieSpeed2Btn.Visible := True;
     MovieSpeed3Btn.Down := MovieSpeed = 3;
-    MovieSpeed3Btn.Visible := true;
+    MovieSpeed3Btn.Visible := True;
     MovieSpeed4Btn.Down := MovieSpeed = 4;
-    MovieSpeed4Btn.Visible := true;
+    MovieSpeed4Btn.Visible := True;
   end
   else
   begin
-    MovieSpeed1Btn.Visible := false;
-    MovieSpeed2Btn.Visible := false;
-    MovieSpeed3Btn.Visible := false;
-    MovieSpeed4Btn.Visible := false;
+    MovieSpeed1Btn.Visible := False;
+    MovieSpeed2Btn.Visible := False;
+    MovieSpeed3Btn.Visible := False;
+    MovieSpeed4Btn.Visible := False;
   end;
 end;
@@ -1375 +1375 @@
 end;
 
-procedure TMainScreen.UpdateViews(UpdateCityScreen: boolean);
+procedure TMainScreen.UpdateViews(UpdateCityScreen: Boolean);
 begin
   SumCities(TaxSum, ScienceSum);
@@ -1385 +1385 @@
 end;
 
-procedure TMainScreen.SetAIName(p: integer; Name: string);
+procedure TMainScreen.SetAIName(P: Integer; Name: string);
 begin
   if Name = '' then
   begin
-    if AILogo[p] <> nil then
-    begin
-      FreeAndNil(AILogo[p]);
+    if AILogo[P] <> nil then
+    begin
+      FreeAndNil(AILogo[P]);
     end;
   end
   else
   begin
-    if AILogo[p] = nil then
-      AILogo[p] := TBitmap.Create;
-    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', [gfNoError]) then
-    begin
-      FreeAndNil(AILogo[p]);
-    end;
-  end;
-end;
-
-function TMainScreen.ContactRefused(p: integer; Item: String): boolean;
+    if AILogo[P] = nil then
+      AILogo[P] := TBitmap.Create;
+    if not LoadGraphicFile(AILogo[P], HomeDir + Name + '.png', [gfNoError]) then
+    begin
+      FreeAndNil(AILogo[P]);
+    end;
+  end;
+end;
+
+function TMainScreen.ContactRefused(P: Integer; Item: String): Boolean;
 // return whether treaty was cancelled
 var
-  s: string;
-begin
-  assert(MyRO.Treaty[p] >= trPeace);
-  s := Tribe[p].TPhrase(Item);
-  if MyRO.Turn < MyRO.LastCancelTreaty[p] + CancelTreatyTurns then
-  begin
-    SimpleMessage(s);
-    result := false;
+  S: string;
+begin
+  Assert(MyRO.Treaty[P] >= trPeace);
+  S := Tribe[P].TPhrase(Item);
+  if MyRO.Turn < MyRO.LastCancelTreaty[P] + CancelTreatyTurns then
+  begin
+    SimpleMessage(S);
+    Result := False;
   end
   else
   begin
-    case MyRO.Treaty[p] of
+    case MyRO.Treaty[P] of
       trPeace:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_PEACE');
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_PEACE');
       trFriendlyContact:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
       trAlliance:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
-    end;
-    result := SimpleQuery(mkYesNo, s, 'NEGO_REJECTED') = mrOK;
-    if result then
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
+    end;
+    Result := SimpleQuery(mkYesNo, S, 'NEGO_REJECTED') = mrOK;
+    if Result then
     begin
       Play('CANCELTREATY');
-      Server(sCancelTreaty, me, 0, nil^);
-      if MyRO.Treaty[p] = trNone then
+      Server(sCancelTreaty, Me, 0, nil^);
+      if MyRO.Treaty[P] = trNone then
         CityOptimizer_BeginOfTurn;
       // peace treaty was cancelled -- use formerly forbidden tiles
-      MapValid := false;
+      MapValid := False;
       PaintAllMaps;
     end;
@@ -1443 +1443 @@
 procedure TMainScreen.RememberPeaceViolation;
 var
-  uix, p1: integer;
+  uix, p1: Integer;
 begin
   MyData.PeaceEvaHappened := 0;
@@ -1451 +1451 @@
       begin
         p1 := MyRO.Territory[Loc];
-        if (p1 <> me) and (p1 >= 0) and
+        if (p1 <> Me) and (p1 >= 0) and
           (MyRO.Turn = MyRO.EvaStart[p1] + (PeaceEvaTurns - 1)) then
           MyData.PeaceEvaHappened := MyData.PeaceEvaHappened or (1 shl p1);
@@ -1489 +1489 @@
 
 var
-  i, cix, mix: integer;
-  need: boolean;
+  I, cix, mix: Integer;
+  need: Boolean;
   mi: TModelInfo;
 begin
   if (sbStart in Check) and not (sbStart in SoundPreloadDone) then begin
-    for i := 0 to nStartBlock - 1 do
-      PreparePlay(StartBlock[i]);
+    for I := 0 to nStartBlock - 1 do
+      PreparePlay(StartBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbStart];
   end;
   if (sbWonder in Check) and not (sbWonder in SoundPreloadDone) then begin
-    need := false;
-    for i := 0 to nWonder - 1 do
-      if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
-        need := true;
+    need := False;
+    for I := 0 to nWonder - 1 do
+      if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
+        need := True;
     if need then begin
-      for i := 0 to nWonderBlock - 1 do
-        PreparePlay(WonderBlock[i]);
+      for I := 0 to nWonderBlock - 1 do
+        PreparePlay(WonderBlock[I]);
       SoundPreloadDone := SoundPreloadDone + [sbWonder];
     end;
@@ -1511 +1511 @@
   if ((sbScience in Check) and not (sbScience in SoundPreloadDone)) and
     (MyRO.Tech[adScience] >= tsApplicable) then begin
-    for i := 0 to nScienceBlock - 1 do
-      PreparePlay(ScienceBlock[i]);
+    for I := 0 to nScienceBlock - 1 do
+      PreparePlay(ScienceBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbScience];
   end;
   if ((sbContact in Check) and not (sbContact in SoundPreloadDone)) and
     (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then begin
-    for i := 0 to nContactBlock - 1 do
-      PreparePlay(ContactBlock[i]);
+    for I := 0 to nContactBlock - 1 do
+      PreparePlay(ContactBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbContact];
   end;
@@ -1529 +1529 @@
       with MyCity[cix] do
         if (Loc >= 0) and (Flags and CityRepMask <> 0) then
-          for i := 0 to 12 do
-            if 1 shl i and Flags and CityRepMask <> 0 then
-              PreparePlay(CityEventSoundItem[i]);
+          for I := 0 to 12 do
+            if 1 shl I and Flags and CityRepMask <> 0 then
+              PreparePlay(CityEventSoundItem[I]);
     for mix := 0 to MyRO.nModel - 1 do
       with MyModel[mix] do
         if Attack > 0 then
         begin
-          MakeModelInfo(me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
           PreparePlay(AttackSound(ModelCode(mi)));
         end;
@@ -1547 +1547 @@
   Color: TColor;
   Name: string;
-  ok: boolean;
+  ok: Boolean;
 begin
   UnusedTribeFiles.Clear;
@@ -1567 +1567 @@
 end;
 
-function TMainScreen.ChooseUnusedTribe: integer;
+function TMainScreen.ChooseUnusedTribe: Integer;
 var
-  i: Integer;
-  j: Integer;
+  I: Integer;
+  J: Integer;
   ColorDistance: Integer;
   BestColorDistance: Integer;
@@ -1576 +1576 @@
   CountBest: Integer;
 begin
-  assert(UnusedTribeFiles.Count > 0);
-  result := -1;
+  Assert(UnusedTribeFiles.Count > 0);
+  Result := -1;
   BestColorDistance := -1;
-  for j := 0 to UnusedTribeFiles.Count - 1 do
+  for J := 0 to UnusedTribeFiles.Count - 1 do
   begin
     ColorDistance := 250; // consider differences more than this infinite
-    for i := 0 to nPl - 1 do
-      if Tribe[i] <> nil then
-      begin
-        TestColorDistance := abs(integer(UnusedTribeFiles.Objects[j])
-          shr 16 and $FF - Tribe[i].Color shr 16 and $FF) +
-          abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and
-          $FF - Tribe[i].Color shr 8 and $FF) * 3 +
-          abs(integer(UnusedTribeFiles.Objects[j]) and
-          $FF - Tribe[i].Color and $FF) * 2;
+    for I := 0 to nPl - 1 do
+      if Tribe[I] <> nil then
+      begin
+        TestColorDistance := abs(Integer(UnusedTribeFiles.Objects[J])
+          shr 16 and $FF - Tribe[I].Color shr 16 and $FF) +
+          abs(Integer(UnusedTribeFiles.Objects[J]) shr 8 and
+          $FF - Tribe[I].Color shr 8 and $FF) * 3 +
+          abs(Integer(UnusedTribeFiles.Objects[J]) and
+          $FF - Tribe[I].Color and $FF) * 2;
         if TestColorDistance < ColorDistance then
           ColorDistance := TestColorDistance;
@@ -1601 +1601 @@
     if ColorDistance = BestColorDistance then
     begin
-      inc(CountBest);
+      Inc(CountBest);
       if DelphiRandom(CountBest) = 0 then
-        result := j;
+        Result := J;
     end;
   end;
@@ -1610 +1610 @@
 procedure TMainScreen.ShowEnemyShipChange(ShowShipChange: TShowShipChange);
 var
-  i, TestCost, MostCost: integer;
-  Ship1Plus, Ship2Plus: boolean;
+  I, TestCost, MostCost: Integer;
+  Ship1Plus, Ship2Plus: Boolean;
 begin
   with ShowShipChange, MessgExDlg do
@@ -1634 +1634 @@
         begin
           OpenSound := 'SHIP_TRADED';
-          Ship1Plus := false;
-          Ship2Plus := false;
-          for i := 0 to nShipPart - 1 do
+          Ship1Plus := False;
+          Ship2Plus := False;
+          for I := 0 to nShipPart - 1 do
           begin
-            if Ship1Change[i] > 0 then
-              Ship1Plus := true;
-            if Ship2Change[i] > 0 then
-              Ship2Plus := true;
+            if Ship1Change[I] > 0 then
+              Ship1Plus := True;
+            if Ship2Change[I] > 0 then
+              Ship2Plus := True;
           end;
           if Ship1Plus and Ship2Plus then
@@ -1668 +1668 @@
     begin
       MostCost := 0;
-      for i := 0 to nShipPart - 1 do
-      begin
-        TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
+      for I := 0 to nShipPart - 1 do
+      begin
+        TestCost := abs(Ship1Change[I]) * Imp[imShipComp + I].Cost;
         if TestCost > MostCost then
         begin
           MostCost := TestCost;
-          IconIndex := imShipComp + i;
+          IconIndex := imShipComp + I;
         end;
       end;
@@ -1686 +1686 @@
 procedure TMainScreen.InitModule;
 var
-  i, j, Domain: integer;
+  I, J, Domain: Integer;
 begin
   { search icons for advances: }
-  for i := 0 to nAdv - 1 do
-    if i in FutureTech then
-      AdvIcon[i] := 96 + i - futResearchTechnology
+  for I := 0 to nAdv - 1 do
+    if I in FutureTech then
+      AdvIcon[I] := 96 + I - futResearchTechnology
     else
     begin
-      AdvIcon[i] := -1;
+      AdvIcon[I] := -1;
       for Domain := 0 to nDomains - 1 do
-        for j := 0 to nUpgrade - 1 do
-          if upgrade[Domain, j].Preq = i then
-            if AdvIcon[i] >= 0 then
-              AdvIcon[i] := 85
+        for J := 0 to nUpgrade - 1 do
+          if upgrade[Domain, J].Preq = I then
+            if AdvIcon[I] >= 0 then
+              AdvIcon[I] := 85
             else
-              AdvIcon[i] := 86 + Domain;
-      for j := 0 to nFeature - 1 do
-        if Feature[j].Preq = i then
+              AdvIcon[I] := 86 + Domain;
+      for J := 0 to nFeature - 1 do
+        if Feature[J].Preq = I then
           for Domain := 0 to nDomains - 1 do
-            if 1 shl Domain and Feature[j].Domains <> 0 then
-              if (AdvIcon[i] >= 0) and (AdvIcon[i] <> 86 + Domain) then
-                AdvIcon[i] := 85
+            if 1 shl Domain and Feature[J].Domains <> 0 then
+              if (AdvIcon[I] >= 0) and (AdvIcon[I] <> 86 + Domain) then
+                AdvIcon[I] := 85
               else
-                AdvIcon[i] := 86 + Domain;
-      for j := nWonder to nImp - 1 do
-        if Imp[j].Preq = i then
-          AdvIcon[i] := j;
-      for j := nWonder to nImp - 1 do
-        if (Imp[j].Preq = i) and (Imp[j].Kind <> ikCommon) then
-          AdvIcon[i] := j;
-      for j := 0 to nJob - 1 do
-        if i = JobPreq[j] then
-          AdvIcon[i] := 84;
-      for j := 0 to nWonder - 1 do
-        if Imp[j].Preq = i then
-          AdvIcon[i] := j;
-      if AdvIcon[i] < 0 then
-        if AdvValue[i] < 1000 then
-          AdvIcon[i] := -7
+                AdvIcon[I] := 86 + Domain;
+      for J := nWonder to nImp - 1 do
+        if Imp[J].Preq = I then
+          AdvIcon[I] := J;
+      for J := nWonder to nImp - 1 do
+        if (Imp[J].Preq = I) and (Imp[J].Kind <> ikCommon) then
+          AdvIcon[I] := J;
+      for J := 0 to nJob - 1 do
+        if I = JobPreq[J] then
+          AdvIcon[I] := 84;
+      for J := 0 to nWonder - 1 do
+        if Imp[J].Preq = I then
+          AdvIcon[I] := J;
+      if AdvIcon[I] < 0 then
+        if AdvValue[I] < 1000 then
+          AdvIcon[I] := -7
         else
-          AdvIcon[i] := 24 + AdvValue[i] div 1000;
-      for j := 2 to nGov - 1 do
-        if GovPreq[j] = i then
-          AdvIcon[i] := j - 8;
+          AdvIcon[I] := 24 + AdvValue[I] div 1000;
+      for J := 2 to nGov - 1 do
+        if GovPreq[J] = I then
+          AdvIcon[I] := J - 8;
     end;
   AdvIcon[adConscription] := 86 + dGround;
 
   UnusedTribeFiles := tstringlist.Create;
-  UnusedTribeFiles.Sorted := true;
+  UnusedTribeFiles.Sorted := True;
   TribeNames := tstringlist.Create;
 
   IsoEngine.Init(InitEnemyModel);
   // non-default tile size is missing a file, switch to default
-  MainMap.SetOutput(offscreen);
+  MainMap.SetOutput(Offscreen);
 
   HGrStdUnits := LoadGraphicSet('StdUnits.png');
@@ -1746 +1746 @@
   InitSmallImp;
   SoundPreloadDone := [];
-  StartRunning := false;
-  StayOnTop_Ensured := false;
+  StartRunning := False;
+  StayOnTop_Ensured := False;
 
   sb := TPVScrollbar.Create(Self);
@@ -1761 +1761 @@
 end;
 
-procedure TMainScreen.InitTurn(NewPlayer: integer);
+procedure TMainScreen.InitTurn(NewPlayer: Integer);
 const
   nAdvBookIcon = 16;
   AdvBookIcon: array [0 .. nAdvBookIcon - 1] of record Adv,
-    Icon: integer end = ((Adv: adPolyTheism; Icon: woZeus),
+    Icon: Integer end = ((Adv: adPolyTheism; Icon: woZeus),
     (Adv: adBronzeWorking; Icon: woColossus), (Adv: adMapMaking;
     Icon: woLighthouse), (Adv: adPoetry; Icon: imTheater), (Adv: adMonotheism;
@@ -1777 +1777 @@
   sbAll = [sbStart, sbWonder, sbScience, sbContact, sbTurn];
 var
-  p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
+  p1, I, ad, uix, cix, MoveOptions, MoveResult, Loc1,
     NewAgeCenterTo, Winners, NewGovAvailable, dx,
-    dy: integer;
+    dy: Integer;
   MoveAdviceData: TMoveAdviceData;
   Picture: TModelPictureInfo;
-  s, Item, Item2: string;
+  S, Item, Item2: string;
   UpdatePanel, OwnWonder, ok, Stop, ShowCityList, WondersOnly,
-    AllowCityScreen: boolean;
-begin
-  if IsMultiPlayerGame and (NewPlayer <> me) then
-  begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
-    EOT.Visible := false;
-  end;
-  if IsMultiPlayerGame and (NewPlayer <> me) and
+    AllowCityScreen: Boolean;
+begin
+  if IsMultiPlayerGame and (NewPlayer <> Me) then
+  begin
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
+    EOT.Visible := False;
+  end;
+  if IsMultiPlayerGame and (NewPlayer <> Me) and
     (G.RO[0].Happened and phShipComplete = 0) then
   begin // inter player screen
-    for i := 0 to ControlCount - 1 do
-      if Controls[i] is TButtonC then
-        Controls[i].Visible := false;
-    me := -1;
+    for I := 0 to ControlCount - 1 do
+      if Controls[I] is TButtonC then
+        Controls[I].Visible := False;
+    Me := -1;
     MainTexture.Age := -1;
     with Panel.Canvas do
@@ -1815 +1815 @@
     Invalidate;
 
-    s := TurnToString(G.RO[0].Turn);
-    if supervising then
-      SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [s]))
+    S := TurnToString(G.RO[0].Turn);
+    if Supervising then
+      SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [S]))
     else
-      SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [s]));
-  end;
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonC then
-      Controls[i].Visible := true;
+      SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [S]));
+  end;
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonC then
+      Controls[I].Visible := True;
 
   ItsMeAgain(NewPlayer);
   MyData := G.RO[NewPlayer].Data;
-  if not supervising then
+  if not Supervising then
     SoundPreload(sbAll);
-  if (me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
+  if (Me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
     Invalidate; // colorize empty space
 
-  if not supervising then
+  if not Supervising then
   begin
 
@@ -1842 +1842 @@
       else }
     begin
-      Age := GetAge(me);
+      Age := GetAge(Me);
       if MainTexture.Age <> Age then begin
         MainTexture.Age := Age;
@@ -1869 +1869 @@
   NatStatDlg.CheckAge;
   UnitStatDlg.CheckAge;
-  HelpDlg.Difficulty := G.Difficulty[me];
+  HelpDlg.Difficulty := G.Difficulty[Me];
 
   UnFocus := -1;
   MarkCityLoc := -1;
-  BlinkON := false;
+  BlinkON := False;
   BlinkTime := -1;
-  Tracking := false;
-  TurnComplete := false;
+  Tracking := False;
+  TurnComplete := False;
 
   if (ToldSlavery < 0) or
@@ -1896 +1896 @@
           Hash := 0;
           GrName := 'StdUnits.png';
-          Tribe[p1].SetModelPicture(Picture, true);
+          Tribe[p1].SetModelPicture(Picture, True);
         end;
   end;
 
-  if not supervising and (ClientMode = cTurn) then
+  if not Supervising and (ClientMode = cTurn) then
   begin
     for cix := 0 to MyRO.nCity - 1 do
@@ -1915 +1915 @@
   if ClientMode = cMovieTurn then
   begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.Hint := Phrases.Lookup('BTN_STOP');
-    EOT.Visible := true;
+    EOT.Visible := True;
   end
   else if ClientMode < scContact then
@@ -1926 +1926 @@
     UnitBtn.Visible := UnFocus >= 0;
     CheckTerrainBtnVisible;
-    TurnComplete := supervising;
+    TurnComplete := Supervising;
     EOT.Hint := Phrases.Lookup('BTN_ENDTURN');
-    EOT.Visible := Server(sTurn - sExecute, me, 0, nil^) >= rExecuted;
+    EOT.Visible := Server(sTurn - sExecute, Me, 0, nil^) >= rExecuted;
   end
   else
   begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.Hint := Phrases.Lookup('BTN_NEGO');
-    EOT.Visible := true;
+    EOT.Visible := True;
   end;
   SetTroopLoc(-1);
-  MapValid := false;
+  MapValid := False;
   NewAgeCenterTo := 0;
-  if ((MyRO.Turn = 0) and not supervising or IsMultiPlayerGame or
+  if ((MyRO.Turn = 0) and not Supervising or IsMultiPlayerGame or
     (ClientMode = cResume)) and (MyRO.nCity > 0) then
   begin
@@ -1986 +1986 @@
         begin
           OpenSound := 'MSG_GAMEOVER';
-          MessgText := Tribe[me].TPhrase('GAMEOVER');
+          MessgText := Tribe[Me].TPhrase('GAMEOVER');
           IconKind := mikBigIcon;
           IconIndex := 8;
@@ -1997 +1997 @@
             begin
               Winners := Winners or 1 shl p1;
-              for i := 0 to nShipPart - 1 do
-                if MyRO.Ship[p1].Parts[i] < ShipNeed[i] then
+              for I := 0 to nShipPart - 1 do
+                if MyRO.Ship[p1].Parts[I] < ShipNeed[I] then
                   Winners := Winners and not(1 shl p1);
             end;
-          assert(Winners <> 0);
-          if Winners and (1 shl me) <> 0 then
+          Assert(Winners <> 0);
+          if Winners and (1 shl Me) <> 0 then
           begin
-            s := '';
+            S := '';
             for p1 := 0 to nPl - 1 do
-              if (p1 <> me) and (1 shl p1 and Winners <> 0) then
-                if s = '' then
-                  s := Tribe[p1].TPhrase('SHORTNAME')
+              if (p1 <> Me) and (1 shl p1 and Winners <> 0) then
+                if S = '' then
+                  S := Tribe[p1].TPhrase('SHORTNAME')
                 else
-                  s := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
-                    [s, Tribe[p1].TPhrase('SHORTNAME')]);
+                  S := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
+                    [S, Tribe[p1].TPhrase('SHORTNAME')]);
 
             OpenSound := 'MSG_YOUWIN';
-            MessgText := Tribe[me].TPhrase('MYSPACESHIP');
-            if s <> '' then
+            MessgText := Tribe[Me].TPhrase('MYSPACESHIP');
+            if S <> '' then
               MessgText := MessgText + '\' +
-                Format(Phrases.Lookup('SHAREDWIN'), [s]);
+                Format(Phrases.Lookup('SHAREDWIN'), [S]);
             IconKind := mikBigIcon;
             IconIndex := 9;
@@ -2023 +2023 @@
           else
           begin
-            assert(me = 0);
+            Assert(Me = 0);
             OpenSound := 'MSG_GAMEOVER';
             MessgText := '';
@@ -2035 +2035 @@
         else { if MyRO.Happened and fTimeUp<>0 then }
         begin
-          assert(me = 0);
+          Assert(Me = 0);
           OpenSound := 'MSG_GAMEOVER';
-          if not supervising then
-            MessgText := Tribe[me].TPhrase('TIMEUP')
+          if not Supervising then
+            MessgText := Tribe[Me].TPhrase('TIMEUP')
           else
             MessgText := Phrases.Lookup('TIMEUPSUPER');
@@ -2050 +2050 @@
           p1 := 0;
           while (p1 < nPl - 1) and (Winners and (1 shl p1) = 0) do
-            inc(p1);
+            Inc(p1);
           if MyRO.Happened and phShipComplete = 0 then
             DiaDlg.ShowNewContent_Charts(wmModal);
         end;
-        TurnComplete := true;
-        exit;
-      end;
-    if not supervising and (1 shl me and MyRO.Alive = 0) then
-    begin
-      TurnComplete := true;
-      exit;
+        TurnComplete := True;
+        Exit;
+      end;
+    if not Supervising and (1 shl Me and MyRO.Alive = 0) then
+    begin
+      TurnComplete := True;
+      Exit;
     end;
 
     if (ClientMode = cContinue) and
-      (DipMem[me].SentCommand and $FF0F = scContact) then
+      (DipMem[Me].SentCommand and $FF0F = scContact) then
       // contact was refused
-      if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
-        ContactRefused(DipMem[me].pContact, 'FRREJECTED')
+      if MyRO.Treaty[DipMem[Me].pContact] >= trPeace then
+        ContactRefused(DipMem[Me].pContact, 'FRREJECTED')
       else
-        SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),
+        SoundMessage(Tribe[DipMem[Me].pContact].TPhrase('FRREJECTED'),
           'NEGO_REJECTED');
 
-    if not supervising and (Age > MyData.ToldAge) and
+    if not Supervising and (Age > MyData.ToldAge) and
       ((Age > 0) or (ClientMode <> cMovieTurn)) then
       with MessgExDlg do
@@ -2080 +2080 @@
           if Phrases2FallenBackToEnglish then
           begin
-            s := Tribe[me].TPhrase('AGE0');
+            S := Tribe[Me].TPhrase('AGE0');
             MessgText :=
-              Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)]);
+              Format(S, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)]);
           end
           else
           begin
-            s := Tribe[me].TString(Phrases2.Lookup('AGE0'));
-            MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+            S := Tribe[Me].TString(Phrases2.Lookup('AGE0'));
+            MessgText := Format(S, [TurnToString(MyRO.Turn)]);
           end;
         end
         else
         begin
-          s := Tribe[me].TPhrase('AGE' + char(48 + Age));
-          MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+          S := Tribe[Me].TPhrase('AGE' + char(48 + Age));
+          MessgText := Format(S, [TurnToString(MyRO.Turn)]);
         end;
         IconKind := mikAge;
@@ -2115 +2115 @@
           begin
             OpenSound := 'MSG_EXTINCT';
-            s := Tribe[p1].TPhrase('EXTINCT');
-            MessgText := Format(s, [TurnToString(MyRO.Turn)]);
-            if MyRO.Alive = 1 shl me then
+            S := Tribe[p1].TPhrase('EXTINCT');
+            MessgText := Format(S, [TurnToString(MyRO.Turn)]);
+            if MyRO.Alive = 1 shl Me then
               MessgText := MessgText + Phrases.Lookup('EXTINCTALL');
             Kind := mkOk;
@@ -2124 +2124 @@
             ShowModal;
           end;
-      if (ClientMode <> cMovieTurn) and not supervising then
+      if (ClientMode <> cMovieTurn) and not Supervising then
         DiaDlg.ShowNewContent_Charts(wmModal);
     end;
 
     // tell changes of own credibility
-    if not supervising then
+    if not Supervising then
     begin
       if RoughCredibility(MyRO.Credibility) <>
@@ -2136 +2136 @@
         if RoughCredibility(MyRO.Credibility) >
           RoughCredibility(MyData.ToldOwnCredibility) then
-          s := Phrases.Lookup('CREDUP')
+          S := Phrases.Lookup('CREDUP')
         else
-          s := Phrases.Lookup('CREDDOWN');
-        TribeMessage(me, Format(s, [Phrases.Lookup('CREDIBILITY',
+          S := Phrases.Lookup('CREDDOWN');
+        TribeMessage(Me, Format(S, [Phrases.Lookup('CREDIBILITY',
           RoughCredibility(MyRO.Credibility))]), '');
       end;
@@ -2145 +2145 @@
     end;
 
-    for i := 0 to nWonder - 1 do
-    begin
-      OwnWonder := false;
+    for I := 0 to nWonder - 1 do
+    begin
+      OwnWonder := False;
       for cix := 0 to MyRO.nCity - 1 do
-        if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[i].CityID)
+        if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[I].CityID)
         then
-          OwnWonder := true;
-      if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
-      begin
-        if MyRO.Wonder[i].CityID = WonderDestroyed then
+          OwnWonder := True;
+      if MyRO.Wonder[I].CityID <> MyData.ToldWonders[I].CityID then
+      begin
+        if MyRO.Wonder[I].CityID = WonderDestroyed then
           with MessgExDlg do
           begin { tell about destroyed wonders }
             OpenSound := 'WONDER_DESTROYED';
             MessgText := Format(Phrases.Lookup('WONDERDEST'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
           end
         else
         begin
-          if i = woManhattan then
-            if MyRO.Wonder[i].EffectiveOwner > me then
+          if I = woManhattan then
+            if MyRO.Wonder[I].EffectiveOwner > Me then
               MyData.ColdWarStart := MyRO.Turn - 1
             else
@@ -2177 +2177 @@
             with MessgExDlg do
             begin { tell about newly built wonders }
-              if i = woManhattan then
+              if I = woManhattan then
               begin
                 OpenSound := 'MSG_COLDWAR';
-                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR');
+                S := Tribe[MyRO.Wonder[I].EffectiveOwner].TPhrase('COLDWAR');
               end
-              else if MyRO.Wonder[i].EffectiveOwner >= 0 then
+              else if MyRO.Wonder[I].EffectiveOwner >= 0 then
               begin
                 OpenSound := 'WONDER_BUILT';
-                s := Tribe[MyRO.Wonder[i].EffectiveOwner]
+                S := Tribe[MyRO.Wonder[I].EffectiveOwner]
                   .TPhrase('WONDERBUILT');
               end
@@ -2191 +2191 @@
               begin
                 OpenSound := 'MSG_DEFAULT';
-                s := Phrases.Lookup('WONDERBUILTEXP');
+                S := Phrases.Lookup('WONDERBUILTEXP');
                 // already expired when built
               end;
-              MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
-                CityName(MyRO.Wonder[i].CityID)]);
+              MessgText := Format(S, [Phrases.Lookup('IMPROVEMENTS', I),
+                CityName(MyRO.Wonder[I].CityID)]);
               Kind := mkOkHelp;
               HelpKind := hkImp;
-              HelpNo := i;
+              HelpNo := I;
               IconKind := mikImp;
-              IconIndex := i;
+              IconIndex := I;
               ShowModal;
             end;
         end;
       end
-      else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
-        .EffectiveOwner) and (MyRO.Wonder[i].CityID > WonderDestroyed) then
-        if MyRO.Wonder[i].EffectiveOwner < 0 then
+      else if (MyRO.Wonder[I].EffectiveOwner <> MyData.ToldWonders[I]
+        .EffectiveOwner) and (MyRO.Wonder[I].CityID > WonderDestroyed) then
+        if MyRO.Wonder[I].EffectiveOwner < 0 then
         begin
-          if i <> woMIR then
+          if I <> woMIR then
             with MessgExDlg do
             begin { tell about expired wonders }
               OpenSound := 'WONDER_EXPIRED';
               MessgText := Format(Phrases.Lookup('WONDEREXP'),
-                [Phrases.Lookup('IMPROVEMENTS', i),
-                CityName(MyRO.Wonder[i].CityID)]);
+                [Phrases.Lookup('IMPROVEMENTS', I),
+                CityName(MyRO.Wonder[I].CityID)]);
               Kind := mkOkHelp;
               HelpKind := hkImp;
-              HelpNo := i;
+              HelpNo := I;
               IconKind := mikImp;
-              IconIndex := i;
+              IconIndex := I;
               ShowModal;
             end;
         end
-        else if (MyData.ToldWonders[i].EffectiveOwner >= 0) and not OwnWonder
+        else if (MyData.ToldWonders[I].EffectiveOwner >= 0) and not OwnWonder
         then
           with MessgExDlg do
           begin { tell about capture of wonders }
             OpenSound := 'WONDER_CAPTURED';
-            s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('WONDERCAPT');
-            MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
-              CityName(MyRO.Wonder[i].CityID)]);
+            S := Tribe[MyRO.Wonder[I].EffectiveOwner].TPhrase('WONDERCAPT');
+            MessgText := Format(S, [Phrases.Lookup('IMPROVEMENTS', I),
+              CityName(MyRO.Wonder[I].CityID)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
           end;
@@ -2250 +2250 @@
   end; // ClientMode<>cResume
   MyData.ToldAlive := MyRO.Alive;
-  move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
+  Move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
 
   NewGovAvailable := -1;
@@ -2274 +2274 @@
           IconKind := mikBook;
           IconIndex := -1;
-          for i := 0 to nAdvBookIcon - 1 do
-            if AdvBookIcon[i].Adv = ad then
-              IconIndex := AdvBookIcon[i].Icon;
+          for I := 0 to nAdvBookIcon - 1 do
+            if AdvBookIcon[I].Adv = ad then
+              IconIndex := AdvBookIcon[I].Icon;
           ShowModal;
           MyData.ToldTech[ad] := MyRO.Tech[ad];
-          for i := gMonarchy to nGov - 1 do
-            if GovPreq[i] = ad then
-              NewGovAvailable := i;
+          for I := gMonarchy to nGov - 1 do
+            if GovPreq[I] = ad then
+              NewGovAvailable := I;
         end;
   end;
 
-  ShowCityList := false;
+  ShowCityList := False;
   if ClientMode = cTurn then
   begin
@@ -2291 +2291 @@
       ChooseResearch;
 
-    UpdatePanel := false;
+    UpdatePanel := False;
     if MyRO.Happened and phChangeGov <> 0 then
     begin
       ModalSelectDlg.ShowNewContent(wmModal, kGov);
       Play('NEWGOV');
-      Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+      Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
       CityOptimizer_BeginOfTurn;
-      UpdatePanel := true;
+      UpdatePanel := True;
     end;
   end; // ClientMode=cTurn
 
-  if not supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
+  if not Supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
   then
     for cix := 0 to MyRO.nCity - 1 do
@@ -2312 +2312 @@
   begin
     // tell what happened in cities
-    for WondersOnly := true downto false do
+    for WondersOnly := True downto False do
       for cix := 0 to MyRO.nCity - 1 do
         with MyCity[cix] do
@@ -2323 +2323 @@
               begin { tell about newly built wonder }
                 OpenSound := 'WONDER_BUILT';
-                s := Tribe[me].TPhrase('WONDERBUILTOWN');
+                S := Tribe[Me].TPhrase('WONDERBUILTOWN');
                 MessgText :=
-                  Format(s, [Phrases.Lookup('IMPROVEMENTS',
+                  Format(S, [Phrases.Lookup('IMPROVEMENTS',
                   Project0 and cpIndex), CityName(ID)]);
                 Kind := mkOkHelp;
@@ -2334 +2334 @@
                 ShowModal;
               end;
-            if not supervising and (ClientMode = cTurn) then
+            if not Supervising and (ClientMode = cTurn) then
             begin
-              AllowCityScreen := true;
+              AllowCityScreen := True;
               if (Status and 7 <> 0) and
                 (Project and (cpImp + cpIndex) = cpImp + imTrGoods) then
@@ -2342 +2342 @@
                 begin
                   if AutoBuild(cix, MyData.ImpOrder[Status and 7 - 1]) then
-                    AllowCityScreen := false
+                    AllowCityScreen := False
                   else if Flags and chProduction <> 0 then
                     Flags := (Flags and not chProduction) or chAllImpsMade
@@ -2370 +2370 @@
                   CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
                     Flags and CityRepMask);
-                  UpdatePanel := true;
+                  UpdatePanel := True;
                 end;
               end
@@ -2376 +2376 @@
               begin
                 if Flags and CityRepMask <> 0 then
-                  ShowCityList := true;
+                  ShowCityList := True;
               end;
             end;
@@ -2396 +2396 @@
         begin
           Play('REVOLUTION');
-          Server(sRevolution, me, 0, nil^);
+          Server(sRevolution, Me, 0, nil^);
         end;
       end;
@@ -2430 +2430 @@
     Application.ProcessMessages;
 
-    if not supervising then
+    if not Supervising then
       for uix := 0 to MyRO.nUn - 1 do
         with MyUn[uix] do
@@ -2458 +2458 @@
               begin // !!! Shinkansen
                 MoveResult := eOK;
-                ok := true;
-                for i := 0 to MoveAdviceData.nStep - 1 do
+                ok := True;
+                for I := 0 to MoveAdviceData.nStep - 1 do
                 begin
-                  Loc1 := dLoc(Loc, MoveAdviceData.dx[i],
-                    MoveAdviceData.dy[i]);
+                  Loc1 := dLoc(Loc, MoveAdviceData.dx[I],
+                    MoveAdviceData.dy[I]);
                   if (MyMap[Loc1] and (fCity or fOwned) = fCity)
                   // don't capture cities during auto move
@@ -2468 +2468 @@
                   // don't attack during auto move
                   begin
-                    ok := false;
+                    ok := False;
                     Break
                   end
@@ -2475 +2475 @@
                     if (Loc1 = MoveAdviceData.ToLoc) or
                       (MoveAdviceData.ToLoc = maNextCity) and
-                      (MyMap[dLoc(Loc, MoveAdviceData.dx[i],
-                      MoveAdviceData.dy[i])] and fCity <> 0) then
+                      (MyMap[dLoc(Loc, MoveAdviceData.dx[I],
+                      MoveAdviceData.dy[I])] and fCity <> 0) then
                       MoveOptions := muAutoNoWait
                     else
                       MoveOptions := 0;
-                    MoveResult := MoveUnit(MoveAdviceData.dx[i],
-                      MoveAdviceData.dy[i], MoveOptions);
+                    MoveResult := MoveUnit(MoveAdviceData.dx[I],
+                      MoveAdviceData.dy[I], MoveOptions);
                     if (MoveResult < rExecuted) or (MoveResult = eEnemySpotted)
                     then
                     begin
-                      ok := false;
+                      ok := False;
                       Break
                     end;
@@ -2497 +2497 @@
               begin
                 MoveResult := eOK;
-                Stop := true;
+                Stop := True;
               end;
 
@@ -2520 +2520 @@
   end; // ClientMode=cTurn
 
-  HaveStrategyAdvice := false;
+  HaveStrategyAdvice := False;
   // (GameMode<>cMovie) and not supervising
   // and AdvisorDlg.HaveStrategyAdvice;
-  GoOnPhase := true;
-  if supervising or (GameMode = cMovie) then
+  GoOnPhase := True;
+  if Supervising or (GameMode = cMovie) then
   begin
     SetTroopLoc(-1);
@@ -2539 +2539 @@
       SetUnFocus(-1)
     else
-      NextUnit(-1, false);
+      NextUnit(-1, False);
     if UnFocus < 0 then
     begin
@@ -2556 +2556 @@
 end;
 
-procedure TMainScreen.Client(Command, NewPlayer: integer; var Data);
+procedure TMainScreen.Client(Command, NewPlayer: Integer; var Data);
 var
-  i, j, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: integer;
+  I, J, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: Integer;
   Color: TColor;
-  Name, s: string;
+  Name, S: string;
   TribeInfo: TTribeInfo;
   mi: TModelInfo;
-  SkipTurn, IsAlpine, IsTreatyDeal: boolean;
+  SkipTurn, IsAlpine, IsTreatyDeal: Boolean;
 begin
   case Command of
     cTurn, cResume, cContinue, cMovieTurn, scContact, scDipStart .. scDipBreak:
       begin
-        supervising := G.Difficulty[NewPlayer] = 0;
+        Supervising := G.Difficulty[NewPlayer] = 0;
         ArrangeMidPanel;
       end
@@ -2574 +2574 @@
   case Command of
     cDebugMessage:
-      LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(@Data));
+      LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(@Data));
 
     cShowNego:
       with TShowNegoData(Data) do
       begin
-        s := Format('P%d to P%d: ', [pSender, pTarget]);
+        S := Format('P%d to P%d: ', [pSender, pTarget]);
         if (Action = scDipOffer) and (Offer.nDeliver + Offer.nCost > 0) then
         begin
-          s := s + 'Offer ';
-          for i := 0 to Offer.nDeliver + Offer.nCost - 1 do
+          S := S + 'Offer ';
+          for I := 0 to Offer.nDeliver + Offer.nCost - 1 do
           begin
-            if i = Offer.nDeliver then
-              s := s + ' for '
-            else if i > 0 then
-              s := s + '+';
-            case Offer.Price[i] and opMask of
+            if I = Offer.nDeliver then
+              S := S + ' for '
+            else if I > 0 then
+              S := S + '+';
+            case Offer.Price[I] and opMask of
               opChoose:
-                s := s + 'Price of choice';
+                S := S + 'Price of choice';
               opCivilReport:
-                s := s + 'State report';
+                S := S + 'State report';
               opMilReport:
-                s := s + 'Military report';
+                S := S + 'Military report';
               opMap:
-                s := s + 'Map';
+                S := S + 'Map';
               opTreaty:
-                s := s + 'Treaty';
+                S := S + 'Treaty';
               opShipParts:
-                s := s + 'Ship part';
+                S := S + 'Ship part';
               opMoney:
-                s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o';
+                S := S + IntToStr(Offer.Price[I] and $FFFFFF) + 'o';
               opTribute:
-                s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o tribute';
+                S := S + IntToStr(Offer.Price[I] and $FFFFFF) + 'o tribute';
               opTech:
-                s := s + Phrases.Lookup('ADVANCES', Offer.Price[i] and $FFFFFF);
+                S := S + Phrases.Lookup('ADVANCES', Offer.Price[I] and $FFFFFF);
               opAllTech:
-                s := s + 'All advances';
+                S := S + 'All advances';
               opModel:
-                s := s + Tribe[pSender].ModelName[Offer.Price[i] and $FFFFFF];
+                S := S + Tribe[pSender].ModelName[Offer.Price[I] and $FFFFFF];
               opAllModel:
-                s := s + 'All models';
+                S := S + 'All models';
             end;
           end;
-          LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(S));
         end
         else if Action = scDipAccept then
         begin
-          s := s + '--- ACCEPTED! ---';
-          LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          S := S + '--- ACCEPTED! ---';
+          LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(S));
         end;
       end;
@@ -2657 +2657 @@
           AdvisorDlg.NewGame(Data); }
         GenerateNames := mNames.Checked;
-        GameOK := true;
+        GameOK := True;
         G := TNewGameData(Data);
-        me := -1;
+        Me := -1;
         pLogo := -1;
         ClientMode := -1;
         SetMapOptions;
         MainMap.pDebugMap := -1;
-        idle := false;
+        Idle := False;
         FillChar(Jump, SizeOf(Jump), 0);
         if StartRunning then
@@ -2687 +2687 @@
               ToldContact := 0;
               ToldOwnCredibility := InitialCredibility;
-              for i := 0 to nPl - 1 do
-                if G.Difficulty[i] > 0 then
-                  inc(ToldAlive, 1 shl i);
+              for I := 0 to nPl - 1 do
+                if G.Difficulty[I] > 0 then
+                  Inc(ToldAlive, 1 shl I);
               PeaceEvaHappened := 0;
-              for i := 0 to nWonder - 1 do
-                with ToldWonders[i] do
+              for I := 0 to nWonder - 1 do
+                with ToldWonders[I] do
                 begin
                   CityID := -1;
@@ -2719 +2719 @@
         Age := 0;
         MovieSpeed := 1;
-        LogDlg.mSlot.Visible := true;
+        LogDlg.mSlot.Visible := True;
         LogDlg.Host := self;
         HelpDlg.ClearHistory;
@@ -2725 +2725 @@
 
         MiniMap.Size := Point(G.lx, G.ly);
-        for i := 0 to nPl - 1 do
+        for I := 0 to nPl - 1 do
         begin
-          Tribe[i] := nil;
-          TribeOriginal[i] := false;
+          Tribe[I] := nil;
+          TribeOriginal[I] := False;
         end;
         ToldSlavery := -1;
-        RepaintOnResize := false;
-        Closable := false;
-        FirstMovieTurn := true;
+        RepaintOnResize := False;
+        Closable := False;
+        FirstMovieTurn := True;
 
         MenuArea.Visible := GameMode <> cMovie;
@@ -2744 +2744 @@
       if NewPlayer = 0 then
       begin
-        i := 0;
+        I := 0;
         for p1 := 0 to nPl - 1 do
           if (G.Difficulty[p1] > 0) and (Tribe[p1] = nil) then
-            inc(i);
-        if i > UnusedTribeFiles.Count then
+            Inc(I);
+        if I > UnusedTribeFiles.Count then
         begin
-          GameOK := false;
+          GameOK := False;
           SimpleMessage(Phrases.Lookup('TOOFEWTRIBES'));
         end
@@ -2761 +2761 @@
               TribeInfo.trix := p1;
               TribeNames.Clear;
-              for j := 0 to UnusedTribeFiles.Count - 1 do
+              for J := 0 to UnusedTribeFiles.Count - 1 do
               begin
-                GetTribeInfo(UnusedTribeFiles[j], Name, Color);
+                GetTribeInfo(UnusedTribeFiles[J], Name, Color);
                 TribeNames.AddObject(Name, TObject(Color));
               end;
-              assert(TribeNames.Count > 0);
+              Assert(TribeNames.Count > 0);
               ModalSelectDlg.ShowNewContent(wmModal, kTribe);
               Application.ProcessMessages;
-              TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.result];
-              UnusedTribeFiles.Delete(ModalSelectDlg.result);
+              TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.Result];
+              UnusedTribeFiles.Delete(ModalSelectDlg.Result);
 
               if GameMode = cLoadGame then
-                CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                CreateTribe(TribeInfo.trix, TribeInfo.FileName, False)
               else
                 Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
@@ -2783 +2783 @@
             then
             begin // autoselect enemy tribes
-              j := ChooseUnusedTribe;
-              TribeInfo.FileName := UnusedTribeFiles[j];
-              UnusedTribeFiles.Delete(j);
+              J := ChooseUnusedTribe;
+              TribeInfo.FileName := UnusedTribeFiles[J];
+              UnusedTribeFiles.Delete(J);
               TribeInfo.trix := p1;
               if GameMode = cLoadGame then
-                CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                CreateTribe(TribeInfo.trix, TribeInfo.FileName, False)
               else
                 Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
@@ -2808 +2808 @@
           LogDlg.Close;
         LogDlg.List.Clear;
-        StartRunning := not idle and (Jump[0] > 0); // AI called Reload
-        me := -1;
-        idle := false;
+        StartRunning := not Idle and (Jump[0] > 0); // AI called Reload
+        Me := -1;
+        Idle := False;
         ClientMode := -1;
-        UnitInfoBtn.Visible := false;
-        UnitBtn.Visible := false;
-        TerrainBtn.Visible := false;
-        MovieSpeed1Btn.Visible := false;
-        MovieSpeed2Btn.Visible := false;
-        MovieSpeed3Btn.Visible := false;
-        MovieSpeed4Btn.Visible := false;
-        EOT.Visible := false;
-        for i := 0 to ControlCount - 1 do
-          if Controls[i] is TButtonC then
-            Controls[i].Visible := false;
+        UnitInfoBtn.Visible := False;
+        UnitBtn.Visible := False;
+        TerrainBtn.Visible := False;
+        MovieSpeed1Btn.Visible := False;
+        MovieSpeed2Btn.Visible := False;
+        MovieSpeed3Btn.Visible := False;
+        MovieSpeed4Btn.Visible := False;
+        EOT.Visible := False;
+        for I := 0 to ControlCount - 1 do
+          if Controls[I] is TButtonC then
+            Controls[I].Visible := False;
         sb.Init(0, 1);
         for p1 := 0 to nPl - 1 do
@@ -2828 +2828 @@
             FreeAndNil(Tribe[p1]);
         Tribes.Done;
-        RepaintOnResize := false;
-        Closable := true;
+        RepaintOnResize := False;
+        Closable := True;
         Close;
         { if (GameMode=cNewGame) or (GameMode=cLoadGame) then
@@ -2852 +2852 @@
         Show;
         Update;
-        RepaintOnResize := true;
+        RepaintOnResize := True;
         xw := 0;
         yw := ywcenter;
         if not StayOnTop_Ensured then
         begin
-          StayOnTop_Ensured := true;
+          StayOnTop_Ensured := True;
           CityDlg.StayOnTop_Workaround;
           CityTypeDlg.StayOnTop_Workaround;
@@ -2876 +2876 @@
     cShowTurnChange:
       begin
-        if integer(Data) >= 0 then
+        if Integer(Data) >= 0 then
         begin
-          pLogo := integer(Data);
+          pLogo := Integer(Data);
           if G.RO[pLogo] = nil then
           begin
@@ -2905 +2905 @@
               ItsMeAgain(p1);
               for mix := 0 to MyRO.nModel - 1 do
-                if not Assigned(Tribe[me].ModelPicture[mix].HGr) then
-                  InitMyModel(mix, true);
+                if not Assigned(Tribe[Me].ModelPicture[mix].HGr) then
+                  InitMyModel(mix, True);
             end;
-          me := -1;
+          Me := -1;
         end;
 
@@ -2917 +2917 @@
             Jump[pTurn] := 0
           else
-            dec(Jump[pTurn]);
+            Dec(Jump[pTurn]);
         SkipTurn := Jump[pTurn] > 0;
         if SkipTurn then
@@ -2926 +2926 @@
           MiniMapPaint;
           InitAllEnemyModels; // necessary for correct replay
-          if not EndTurn(true) then
-            SkipTurn := false;
+          if not EndTurn(True) then
+            SkipTurn := False;
         end;
         if not SkipTurn then
@@ -2934 +2934 @@
             NegoDlg.Visible then
             NegoDlg.Close;
-          skipped := false; // always show my moves during my turn
-          idle := true;
+          skipped := False; // always show my moves during my turn
+          Idle := True;
           InitTurn(NewPlayer);
-          DipMem[me].pContact := -1;
-          (* if (me=0) and (MyRO.Alive and (1 shl me)=0)} then
+          DipMem[Me].pContact := -1;
+          (* if (Me=0) and (MyRO.Alive and (1 shl Me)=0)} then
             begin
             if SimpleQuery(Phrases.Lookup('RESIGN'))=mrIgnore then
-            Server(sResign,me,0,nil^)
-            else Server(sBreak,me,0,nil^)
+            Server(sResign,Me,0,nil^)
+            else Server(sBreak,Me,0,nil^)
             end
             else Play('TURNSTART'); *)
@@ -2953 +2953 @@
         pTurn := NewPlayer;
         pLogo := -1;
-        skipped := false; // always show my moves during my turn
-        idle := true;
+        skipped := False; // always show my moves during my turn
+        Idle := True;
         if FirstMovieTurn then
         begin
           CheckMovieSpeedBtnState;
-          FirstMovieTurn := false;
+          FirstMovieTurn := False;
         end;
         InitTurn(NewPlayer);
@@ -2975 +2975 @@
         pTurn := -1;
         pLogo := -1;
-        MapValid := false;
+        MapValid := False;
         ClientMode := -1;
-        idle := false;
-        skipped := false;
+        Idle := False;
+        skipped := False;
       end;
 
@@ -2988 +2988 @@
         ItsMeAgain(0);
         MyData := nil;
-        UnitInfoBtn.Visible := false;
-        UnitBtn.Visible := false;
-        TerrainBtn.Visible := false;
-        MovieSpeed1Btn.Visible := false;
-        MovieSpeed2Btn.Visible := false;
-        MovieSpeed3Btn.Visible := false;
-        MovieSpeed4Btn.Visible := false;
-        EOT.Visible := false;
+        UnitInfoBtn.Visible := False;
+        UnitBtn.Visible := False;
+        TerrainBtn.Visible := False;
+        MovieSpeed1Btn.Visible := False;
+        MovieSpeed2Btn.Visible := False;
+        MovieSpeed3Btn.Visible := False;
+        MovieSpeed4Btn.Visible := False;
+        EOT.Visible := False;
         HelpDlg.Difficulty := 0;
         BrushType := fGrass;
         BrushLoc := -1;
-        Edited := false;
+        Edited := False;
         UnFocus := -1;
         MarkCityLoc := -1;
-        Tracking := false;
-        TurnComplete := false;
-        MapValid := false;
+        Tracking := False;
+        TurnComplete := False;
+        MapValid := False;
         FormResize(nil); // calculate geometrics and paint all
         SetTroopLoc(-1);
-        idle := true;
+        Idle := True;
       end;
 
@@ -3017 +3017 @@
     scContact:
       begin
-        DipMem[NewPlayer].pContact := integer(Data);
+        DipMem[NewPlayer].pContact := Integer(Data);
         if Jump[NewPlayer] > 0 then
           DipCall(scReject)
@@ -3024 +3024 @@
           ClientMode := Command;
           InitTurn(NewPlayer);
-          MyData.ToldContact := MyData.ToldContact or (1 shl integer(Data));
+          MyData.ToldContact := MyData.ToldContact or (1 shl Integer(Data));
           // don't tell about new nation when already contacted by them
           with MessgExDlg do
           begin
-            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[integer(Data)
+            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[Integer(Data)
               ].Attitude);
-            MessgText := Tribe[integer(Data)].TPhrase('FRCONTACT');
+            MessgText := Tribe[Integer(Data)].TPhrase('FRCONTACT');
             Kind := mkYesNo;
             IconKind := mikTribe;
-            IconIndex := integer(Data);
+            IconIndex := Integer(Data);
             ShowModal;
             if ModalResult = mrOK then
             begin
               NegoDlg.Respond;
-              DipMem[me].DeliveredPrices := [];
-              DipMem[me].ReceivedPrices := [];
+              DipMem[Me].DeliveredPrices := [];
+              DipMem[Me].ReceivedPrices := [];
               DipCall(scDipStart);
             end
@@ -3067 +3067 @@
         else if Command = scDipAccept then
         begin // remember delivered and received prices
-          for i := 0 to DipMem[me].SentOffer.nDeliver - 1 do
-            include(DipMem[me].DeliveredPrices,
-              DipMem[me].SentOffer.Price[i] shr 24);
-          for i := 0 to DipMem[me].SentOffer.nCost - 1 do
-            include(DipMem[me].ReceivedPrices,
-              DipMem[me].SentOffer.Price[DipMem[me].SentOffer.nDeliver +
-              i] shr 24);
-          IsTreatyDeal := false;
-          for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-            if DipMem[me].SentOffer.Price[i] and opMask = opTreaty then
-              IsTreatyDeal := true;
+          for I := 0 to DipMem[Me].SentOffer.nDeliver - 1 do
+            Include(DipMem[Me].DeliveredPrices,
+              DipMem[Me].SentOffer.Price[I] shr 24);
+          for I := 0 to DipMem[Me].SentOffer.nCost - 1 do
+            Include(DipMem[Me].ReceivedPrices,
+              DipMem[Me].SentOffer.Price[DipMem[Me].SentOffer.nDeliver +
+              I] shr 24);
+          IsTreatyDeal := False;
+          for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+            if DipMem[Me].SentOffer.Price[I] and opMask = opTreaty then
+              IsTreatyDeal := True;
           if IsTreatyDeal then
             Play('NEWTREATY')
@@ -3084 +3084 @@
         end;
         NegoDlg.Start;
-        idle := true;
+        Idle := True;
       end;
 
@@ -3090 +3090 @@
       if not IsMultiPlayerGame then
       begin
-        case G.RO[NewPlayer].Treaty[integer(Data)] of
+        case G.RO[NewPlayer].Treaty[Integer(Data)] of
           trPeace:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_PEACE');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_PEACE');
           trFriendlyContact:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
           trAlliance:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
         end;
-        TribeMessage(integer(Data), s, 'CANCELTREATY');
+        TribeMessage(Integer(Data), S, 'CANCELTREATY');
       end;
 
     cShowCancelTreatyByAlliance:
-      if idle and (NewPlayer = me) then
-        TribeMessage(integer(Data), Tribe[integer(Data)
+      if Idle and (NewPlayer = Me) then
+        TribeMessage(Integer(Data), Tribe[Integer(Data)
           ].TPhrase('FRENEMYALLIANCE'), 'CANCELTREATY');
 
     cShowSupportAllianceAgainst:
       if not IsMultiPlayerGame and (Jump[0] = 0) then
-        TribeMessage(integer(Data) and $F, Tribe[integer(Data) and $F]
-          .TPhrase('FRMYALLIANCE1') + ' ' + Tribe[integer(Data) shr 4]
+        TribeMessage(Integer(Data) and $F, Tribe[Integer(Data) and $F]
+          .TPhrase('FRMYALLIANCE1') + ' ' + Tribe[Integer(Data) shr 4]
           .TPhrase('FRMYALLIANCE2'), 'CANCELTREATY');
 
     cShowPeaceViolation:
       if not IsMultiPlayerGame and (Jump[0] = 0) then
-        TribeMessage(integer(Data),
-          Format(Tribe[integer(Data)].TPhrase('EVIOLATION'),
+        TribeMessage(Integer(Data),
+          Format(Tribe[Integer(Data)].TPhrase('EVIOLATION'),
           [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
 
@@ -3122 +3122 @@
 
     cShowUnitChanged, cShowCityChanged, cShowAfterMove, cShowAfterAttack:
-      if (idle and (NewPlayer = me) or not idle and not skipped) and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           Application.ProcessMessages;
         if Command = cShowCityChanged then
         begin
-          CurrentMoveInfo.DoShow := false;
-          if idle then
-            CurrentMoveInfo.DoShow := true
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
+            CurrentMoveInfo.DoShow := True
           else if CurrentMoveInfo.IsAlly then
             CurrentMoveInfo.DoShow := not mAlNoMoves.Checked
@@ -3140 +3140 @@
         else if Command = cShowUnitChanged then
         begin
-          CurrentMoveInfo.DoShow := false;
-          if idle then
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
             CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked
           else if CurrentMoveInfo.IsAlly then
@@ -3155 +3155 @@
         begin
           if Command = cShowCityChanged then
-            MapValid := false;
-          FocusOnLoc(integer(Data), flImmUpdate);
+            MapValid := False;
+          FocusOnLoc(Integer(Data), flImmUpdate);
           // OldUnFocus:=UnFocus;
           // UnFocus:=-1;
           if Command = cShowAfterMove then
-            PaintLoc(integer(Data), CurrentMoveInfo.AfterMovePaintRadius)
+            PaintLoc(Integer(Data), CurrentMoveInfo.AfterMovePaintRadius)
             // show discovered areas
           else
-            PaintLoc(integer(Data), 1);
+            PaintLoc(Integer(Data), 1);
           // UnFocus:=OldUnFocus;
           if (Command = cShowAfterAttack) and
@@ -3173 +3173 @@
             Update; // remove message box from screen
           end
-          else if not idle then
+          else if not Idle then
             if Command = cShowCityChanged then
               Sleep(MoveTime * WaitAfterShowMove div 16)
             else if (Command = cShowUnitChanged) and
-              (MyMap[integer(Data)] and fUnit <> 0) then
+              (MyMap[Integer(Data)] and fUnit <> 0) then
               Sleep(MoveTime * WaitAfterShowMove div 32)
         end // if CurrentMoveInfo.DoShow
         else
-          MapValid := false;
+          MapValid := False;
       end;
 
     cShowMoving, cShowCapturing:
-      if (idle and (NewPlayer = me) or not idle and not skipped and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           Application.ProcessMessages;
         with TShowMove(Data) do
         begin
-          CurrentMoveInfo.DoShow := false;
-          if not idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
+          CurrentMoveInfo.DoShow := False;
+          if not Idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
             InitEnemyModel(emix);
 
           ToLoc := dLoc(FromLoc, dx, dy);
-          if idle then
+          if Idle then
           begin // own unit -- make discovered land visible
-            assert(Owner = me); // no foreign moves during my turn!
+            Assert(Owner = Me); // no foreign moves during my turn!
             CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked or
               (Command = cShowCapturing);
@@ -3234 +3234 @@
                 else
                   CurrentMoveInfo.AfterMovePaintRadius := 1;
-                if (MyRO.Wonder[woShinkansen].EffectiveOwner = me) and
+                if (MyRO.Wonder[woShinkansen].EffectiveOwner = Me) and
                   (Domain = dGround) and
                   (MyMap[FromLoc] and (fRR or fCity) <> 0) and
@@ -3249 +3249 @@
             CurrentMoveInfo.IsAlly := MyRO.Treaty[Owner] = trAlliance;
             if GameMode = cMovie then
-              CurrentMoveInfo.DoShow := true
+              CurrentMoveInfo.DoShow := True
             else if CurrentMoveInfo.IsAlly then
               CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and
@@ -3265 +3265 @@
                   cix := MyRO.nCity - 1;
                   while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-                    dec(cix);
-                  s := CityName(MyCity[cix].ID);
+                    Dec(cix);
+                  S := CityName(MyCity[cix].ID);
                 end
                 else
@@ -3272 +3272 @@
                   ecix := MyRO.nEnemyCity - 1;
                   while (ecix >= 0) and (MyRO.EnemyCity[ecix].Loc <> ToLoc) do
-                    dec(ecix);
-                  s := CityName(MyRO.EnemyCity[ecix].ID);
+                    Dec(ecix);
+                  S := CityName(MyRO.EnemyCity[ecix].ID);
                 end;
                 TribeMessage(Owner, Format(Tribe[Owner].TPhrase('CAPTURE'),
-                  [s]), '');
+                  [S]), '');
                 Update; // remove message box from screen
               end;
@@ -3361 +3361 @@
           end // if CurrentMoveInfo.DoShow
           else
-            MapValid := false;
+            MapValid := False;
         end;
       end;
 
     cShowAttacking:
-      if (idle and (NewPlayer = me) or not idle and not skipped and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           Application.ProcessMessages;
         with TShowMove(Data) do
         begin
           CurrentMoveInfo.AfterAttackExpeller := -1;
-          CurrentMoveInfo.DoShow := false;
-          if idle then
-            CurrentMoveInfo.DoShow := true // own unit -- always show attacks
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
+            CurrentMoveInfo.DoShow := True // own unit -- always show attacks
           else
           begin
@@ -3398 +3398 @@
               cix := MyRO.nCity - 1;
               while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-                dec(cix);
+                Dec(cix);
               if MyCity[cix].Status and csToldBombard = 0 then
               begin
-                if not supervising then
+                if not Supervising then
                   MyCity[cix].Status := MyCity[cix].Status or csToldBombard;
-                s := CityName(MyCity[cix].ID);
+                S := CityName(MyCity[cix].ID);
                 SoundMessageEx(Format(Tribe[Owner].TPhrase('BOMBARD'),
-                  [s]), '');
+                  [S]), '');
                 Update; // remove message box from screen
               end;
@@ -3414 +3414 @@
             if Flags and umExpelling <> 0 then
               Play('MOVE_EXPEL')
-            else if Owner = me then
+            else if Owner = Me then
             begin
-              MakeModelInfo(me, mix, MyModel[mix], mi);
+              MakeModelInfo(Me, mix, MyModel[mix], mi);
               Play(AttackSound(ModelCode(mi)));
             end
@@ -3441 +3441 @@
               MoveOnScreen(TShowMove(Data), 10, 0, 16);
             end
-            else if not idle then
+            else if not Idle then
               Sleep(MoveTime div 2);
             MainMap.AttackEnd;
           end // if CurrentMoveInfo.DoShow
           else
-            MapValid := false;
+            MapValid := False;
         end;
       end;
@@ -3455 +3455 @@
       else
       begin
-        s := Phrases.Lookup('FOREIGNINFO');
+        S := Phrases.Lookup('FOREIGNINFO');
         for p1 := 0 to nPl - 1 do
           if 3 shl (p1 * 2) and Cardinal(Data) <> 0 then
-            s := s + '\' + Tribe[p1].TPhrase('SHORTNAME');
-        SoundMessageEx(s, '');
+            S := S + '\' + Tribe[p1].TPhrase('SHORTNAME');
+        SoundMessageEx(S, '');
       end;
 
@@ -3471 +3471 @@
         begin
           MessgText := Format(Phrases.Lookup('GRLIB_GENERAL'),
-            [Phrases.Lookup('ADVANCES', integer(Data))]);
+            [Phrases.Lookup('ADVANCES', Integer(Data))]);
           OpenSound := 'NEWADVANCE_GRLIB';
           Kind := mkOk;
@@ -3481 +3481 @@
     cRefreshDebugMap:
       begin
-        if integer(Data) = MainMap.pDebugMap then
+        if Integer(Data) = MainMap.pDebugMap then
         begin
-          MapValid := false;
+          MapValid := False;
           MainOffscreenPaint;
           Update;
@@ -3494 +3494 @@
         cSetTribe:
           with TTribeInfo(Data) do begin
-            i := UnusedTribeFiles.Count - 1;
-            while (i >= 0) and
-              (AnsiCompareFileName(UnusedTribeFiles[i], FileName) <> 0) do
-              dec(i);
-            if i >= 0 then
-              UnusedTribeFiles.Delete(i);
-            CreateTribe(trix, FileName, true);
+            I := UnusedTribeFiles.Count - 1;
+            while (I >= 0) and
+              (AnsiCompareFileName(UnusedTribeFiles[I], FileName) <> 0) do
+              Dec(I);
+            if I >= 0 then
+              UnusedTribeFiles.Delete(I);
+            CreateTribe(trix, FileName, True);
           end;
         cSetNewModelPicture:
@@ -3511 +3511 @@
               (TModelPictureInfo(Data), False);
         cSetSlaveIndex:
-          Tribe[integer(Data) shr 16].mixSlaves := integer(Data) and $FFFF;
+          Tribe[Integer(Data) shr 16].mixSlaves := Integer(Data) and $FFFF;
         cSetCityName:
           with TCityNameInfo(Data) do
@@ -3528 +3528 @@
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   NoMap := TIsoMap.Create;
@@ -3570 +3570 @@
 
   // tag-controlled language
-  for i := 0 to ComponentCount - 1 do
-    if Components[i].Tag and $FF <> 0 then
-      if Components[i] is TMenuItem then begin
-        TMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
-          -1 + Components[i].Tag and $FF);
-        for j := 0 to Length(SaveOption) - 1 do
-          if Components[i].Tag and $FF = SaveOption[j] then
-            TMenuItem(Components[i]).Checked := TSaveOption(j) in OptionChecked;
+  for I := 0 to ComponentCount - 1 do
+    if Components[I].Tag and $FF <> 0 then
+      if Components[I] is TMenuItem then begin
+        TMenuItem(Components[I]).Caption := Phrases.Lookup('CONTROLS',
+          -1 + Components[I].Tag and $FF);
+        for J := 0 to Length(SaveOption) - 1 do
+          if Components[I].Tag and $FF = SaveOption[J] then
+            TMenuItem(Components[I]).Checked := TSaveOption(J) in OptionChecked;
       end else
-      if Components[i] is TButtonBase then begin
-        TButtonBase(Components[i]).Hint := Phrases.Lookup('CONTROLS',
-          -1 + Components[i].Tag and $FF);
-        if (Components[i] is TButtonC) and
-          (TButtonC(Components[i]).ButtonIndex <> 1) then
-          TButtonC(Components[i]).ButtonIndex :=
-            Integer(MapOptionChecked) shr (Components[i].Tag shr 8) and 1 + 2
+      if Components[I] is TButtonBase then begin
+        TButtonBase(Components[I]).Hint := Phrases.Lookup('CONTROLS',
+          -1 + Components[I].Tag and $FF);
+        if (Components[I] is TButtonC) and
+          (TButtonC(Components[I]).ButtonIndex <> 1) then
+          TButtonC(Components[I]).ButtonIndex :=
+            Integer(MapOptionChecked) shr (Components[I].Tag shr 8) and 1 + 2
       end;
 
@@ -3598 +3598 @@
     ManagementArea.Hint := Phrases2.Lookup('BTN_MANAGE');
   end;
-  for i := 0 to mRep.Count - 1 do
-  begin
-    j := mRep[i].Tag shr 8;
-    mRep[i].Caption := CityEventName(j);
-    mRep[i].Checked := CityRepMask and (1 shl j) <> 0;
+  for I := 0 to mRep.Count - 1 do
+  begin
+    J := mRep[I].Tag shr 8;
+    mRep[I].Caption := CityEventName(J);
+    mRep[I].Checked := CityRepMask and (1 shl J) <> 0;
   end;
 
@@ -3621 +3621 @@
     else Buffer.height := 3 * ySizeBig;
   Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
-  for i := 0 to nPl - 1 do
-    AILogo[i] := nil;
+  for I := 0 to nPl - 1 do
+    AILogo[I] := nil;
   Canvas.Font.Assign(UniFont[ftSmall]);
   InitButtons;
@@ -3639 +3639 @@
   FreeAndNil(Panel);
   for I := 0 to nPl - 1 do
-    if AILogo[i] <> nil then
+    if AILogo[I] <> nil then
       FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
@@ -3699 +3699 @@
     Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
     if Job > jNone then
-      Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
   end;
 end;
@@ -3725 +3725 @@
       if DoJob(jCity) = eCity then
       begin
-        MapValid := false;
+        MapValid := False;
         PaintAll;
-        ZoomToCity(Loc0, true, chFounded);
+        ZoomToCity(Loc0, True, chFounded);
       end;
     end else begin
       CityOptimizer_BeforeRemoveUnit(UnFocus);
-      ServerResult := Server(sAddToCity, me, UnFocus, nil^);
+      ServerResult := Server(sAddToCity, Me, UnFocus, nil^);
       if ServerResult >= rExecuted then
       begin
         cix := MyRO.nCity - 1;
         while (cix >= 0) and (MyCity[cix].Loc <> Loc0) do
-          dec(cix);
-        assert(cix >= 0);
+          Dec(cix);
+        Assert(cix >= 0);
         CityOptimizer_CityChange(cix);
         CityOptimizer_AfterRemoveUnit; // does nothing here
         SetTroopLoc(Loc0);
-        UpdateViews(true);
-        DestinationMarkON := false;
+        UpdateViews(True);
+        DestinationMarkON := False;
         PaintDestination;
         UnFocus := -1;
         PaintLoc(Loc0);
-        NextUnit(UnStartLoc, true);
+        NextUnit(UnStartLoc, True);
       end
       else if ServerResult = eMaxSize then
@@ -3829 +3829 @@
       Destination := Status shr 16;
     Status := Status and not(usStay or usRecover) or usWaiting;
-    MoveToLoc(Destination, true);
+    MoveToLoc(Destination, True);
   end;
 end;
@@ -3850 +3850 @@
     begin
       cixOldHome := Home;
-      if Server(sSetUnitHome, me, UnFocus, nil^) >= rExecuted then
+      if Server(sSetUnitHome, Me, UnFocus, nil^) >= rExecuted then
       begin
         CityOptimizer_CityChange(cixOldHome);
         CityOptimizer_CityChange(Home);
-        UpdateViews(true);
+        UpdateViews(True);
       end
       else
@@ -3862 +3862 @@
     begin
       Status := Status and not(usStay or usRecover or usEnhance);
-      MoveToLoc(maNextCity, true);
+      MoveToLoc(maNextCity, True);
     end;
   end;
@@ -3882 +3882 @@
 procedure TMainScreen.mJumpClick(Sender: TObject);
 begin
-  if supervising then
+  if Supervising then
     Jump[0] := 20
   else
-    Jump[me] := 20;
-  EndTurn(true);
+    Jump[Me] := 20;
+  EndTurn(True);
 end;
 
@@ -3895 +3895 @@
   if UnFocus >= 0 then
   with MyUn[UnFocus] do begin
-    i := Server(sLoadUnit, me, UnFocus, nil^);
-    if i >= rExecuted then
+    I := Server(sLoadUnit, Me, UnFocus, nil^);
+    if I >= rExecuted then
     begin
       if MyModel[mix].Domain = dAir then
@@ -3902 +3902 @@
       else
         Play('MOVE_LOAD');
-      DestinationMarkON := false;
+      DestinationMarkON := False;
       PaintDestination;
       Status := Status and ($FFFF - usWaiting - usStay - usRecover - usGoto - usEnhance);
-      NextUnit(UnStartLoc, true);
+      NextUnit(UnStartLoc, True);
     end
-    else if i = eNoTime_Load then
+    else if I = eNoTime_Load then
       if MyModel[mix].Domain = dAir then
         SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
@@ -3942 +3942 @@
   with MyUn[UnFocus] do begin
     Status := Status and not usWaiting;
-    NextUnit(UnStartLoc, true);
+    NextUnit(UnStartLoc, True);
   end;
 end;
@@ -3971 +3971 @@
   if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
       = mrOK) then begin
-    Server(sRandomMap, me, 0, nil^);
-    Edited := true;
-    MapValid := false;
+    Server(sRandomMap, Me, 0, nil^);
+    Edited := True;
+    MapValid := False;
     PaintAllMaps;
   end;
@@ -3982 +3982 @@
   if UnFocus >= 0 then
   with MyUn[UnFocus] do begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     Status := Status and ($FFFF - usStay - usGoto - usEnhance) or usRecover;
     if Job > jNone then
-      Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-    NextUnit(UnStartLoc, true);
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+    NextUnit(UnStartLoc, True);
   end;
 end;
@@ -3999 +3999 @@
       QueryText := Phrases.Lookup('MAP_CLOSE');
       case SimpleQuery(mkYesNoCancel, QueryText, '') of
-        mrIgnore: Server(sAbandonMap, me, 0, nil^);
-        mrOK: Server(sSaveMap, me, 0, nil^);
+        mrIgnore: Server(sAbandonMap, Me, 0, nil^);
+        mrOK: Server(sSaveMap, Me, 0, nil^);
       end;
     end else
-      Server(sAbandonMap, me, 0, nil^);
+      Server(sAbandonMap, Me, 0, nil^);
   end else begin
     if Server(sGetGameChanged, 0, 0, nil^) = eOK then begin
@@ -4022 +4022 @@
   I: Integer;
 begin
-  AltGovs := false;
-    for i := 2 to nGov - 1 do
-      if (GovPreq[i] <> preNA) and
-        ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable)) then
-        AltGovs := true;
+  AltGovs := False;
+    for I := 2 to nGov - 1 do
+      if (GovPreq[I] <> preNA) and
+        ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable)) then
+        AltGovs := True;
 
     if not AltGovs then
@@ -4032 +4032 @@
     else
     begin
-      RevolutionChanged := false;
+      RevolutionChanged := False;
       if MyRO.Happened and phChangeGov <> 0 then
       begin
         ModalSelectDlg.ShowNewContent(wmModal, kGov);
-        if ModalSelectDlg.result >= 0 then
+        if ModalSelectDlg.Result >= 0 then
         begin
           Play('NEWGOV');
-          Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+          Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
           CityOptimizer_BeginOfTurn;
-          RevolutionChanged := true;
+          RevolutionChanged := True;
         end;
       end
@@ -4047 +4047 @@
       with MessgExDlg do
       begin // revolution!
-        MessgExDlg.MessgText := Tribe[me].TPhrase('REVOLUTION');
+        MessgExDlg.MessgText := Tribe[Me].TPhrase('REVOLUTION');
         MessgExDlg.Kind := mkYesNo;
         MessgExDlg.IconKind := mikPureIcon;
@@ -4055 +4055 @@
         begin
           Play('REVOLUTION');
-          Server(sRevolution, me, 0, nil^);
-          RevolutionChanged := true;
+          Server(sRevolution, Me, 0, nil^);
+          RevolutionChanged := True;
           if NatStatDlg.Visible then
             NatStatDlg.Close;
@@ -4064 +4064 @@
       end;
       if RevolutionChanged then
-        UpdateViews(true);
+        UpdateViews(True);
     end;
 end;
@@ -4084 +4084 @@
 procedure TMainScreen.mRunClick(Sender: TObject);
 begin
-  if supervising then
+  if Supervising then
     Jump[0] := 999999
   else
-    Jump[me] := 999999;
-  EndTurn(true);
+    Jump[Me] := 999999;
+  EndTurn(True);
 end;
 
@@ -4100 +4100 @@
   if UnFocus >= 0 then
     with TUn(MyUn[UnFocus]) do
-      Server(sSelectTransport, me, UnFocus, nil^);
+      Server(sSelectTransport, Me, UnFocus, nil^);
 end;
 
@@ -4112 +4112 @@
   if UnFocus >= 0 then
   with TUn(MyUn[UnFocus]) do begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     Status := Status and ($FFFF - usRecover - usGoto - usEnhance) or usStay;
     if Job > jNone then
-      Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-    NextUnit(UnStartLoc, true);
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+    NextUnit(UnStartLoc, True);
   end;
 end;
@@ -4137 +4137 @@
   I: Integer;
 begin
-  if G.Difficulty[me] > 0 then
-    ListDlg.ShowNewContent_MilReport(wmPersistent, me)
+  if G.Difficulty[Me] > 0 then
+    ListDlg.ShowNewContent_MilReport(wmPersistent, Me)
   else
   begin
-    i := 1;
-    while (i < nPl) and (1 shl i and MyRO.Alive = 0) do
-      inc(i);
-    if i < nPl then
-      ListDlg.ShowNewContent_MilReport(wmPersistent, i);
+    I := 1;
+    while (I < nPl) and (1 shl I and MyRO.Alive = 0) do
+      Inc(I);
+    if I < nPl then
+      ListDlg.ShowNewContent_MilReport(wmPersistent, I);
   end;
 end;
@@ -4160 +4160 @@
     if Master >= 0 then begin
       OldMaster := Master;
-      i := Server(sUnloadUnit, me, UnFocus, nil^);
-      if i >= rExecuted then
+      I := Server(sUnloadUnit, Me, UnFocus, nil^);
+      if I >= rExecuted then
       begin
         if MyModel[mix].Domain = dAir then
@@ -4173 +4173 @@
         Status := Status and not usWaiting;
         if MyModel[mix].Domain <> dAir then
-          NextUnit(Loc, true)
+          NextUnit(Loc, True)
         else
           PanelPaint;
       end
-      else if i = eNoTime_Load then
+      else if I = eNoTime_Load then
         if MyModel[mix].Domain = dAir then
           SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
@@ -4186 +4186 @@
       NewFocus := -1;
       uix := UnFocus;
-      for i := 1 to MyRO.nUn - 1 do
+      for I := 1 to MyRO.nUn - 1 do
       begin
         uix := (uix + MyRO.nUn - 1) mod MyRO.nUn;
         if (MyUn[uix].Master = UnFocus) and
-          (MyUn[uix].Movement = integer(MyModel[MyUn[uix].mix].speed)) then
+          (MyUn[uix].Movement = Integer(MyModel[MyUn[uix].mix].speed)) then
         begin
           MyUn[uix].Status := MyUn[uix].Status or usWaiting;
@@ -4210 +4210 @@
   if UnFocus >= 0 then
   with MyUn[UnFocus] do begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
   end;
-  NextUnit(-1, false);
+  NextUnit(-1, False);
 end;
 
@@ -4229 +4229 @@
 procedure TMainScreen.FormResize(Sender: TObject);
 var
-  MiniFrame, MaxMapWidth: integer;
+  MiniFrame, MaxMapWidth: Integer;
 begin
   SmallScreen := ClientWidth < 1024;
@@ -4307 +4307 @@
   begin
     RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
-    MapValid := false;
+    MapValid := False;
     PaintAll;
   end;
 end;
 
-procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
   CanClose := Closable;
-  if not Closable and idle and (me = 0) and (ClientMode < scContact) then
+  if not Closable and Idle and (Me = 0) and (ClientMode < scContact) then
     mResign.Click;
 end;
@@ -4337 +4337 @@
   begin
     MessgExDlg.CancelMovie;
-    Server(sBreak, me, 0, nil^);
+    Server(sBreak, Me, 0, nil^);
   end
   else if ClientMode < 0 then
-    skipped := true
+    skipped := True
   else if ClientMode >= scContact then
     NegoDlg.ShowNewContent(wmPersistent)
@@ -4346 +4346 @@
   begin
     Jump[pTurn] := 0;
-    StartRunning := false;
+    StartRunning := False;
   end
   else
@@ -4359 +4359 @@
   else
   with MainMap do begin
-    if supervising then
+    if Supervising then
       xTerrain := xMidPanel + 2 * xxt + 14
     else if ClientWidth < 1280 then
@@ -4366 +4366 @@
       xTerrain := ClientWidth div 2;
     xTroop := xTerrain + 2 * xxt + 12;
-    if SmallScreen and not supervising then
+    if SmallScreen and not Supervising then
       xTroop := xRightPanel + 10 - 3 * 66 -
         GetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
@@ -4375 +4375 @@
 end;
 
-function TMainScreen.EndTurn(WasSkipped: boolean): boolean;
-
-  function IsResourceUnused(cix, NeedFood, NeedProd: integer): boolean;
+function TMainScreen.EndTurn(WasSkipped: Boolean): Boolean;
+
+  function IsResourceUnused(cix, NeedFood, NeedProd: Integer): Boolean;
   var
-    dx, dy, fix: integer;
+    dx, dy, fix: Integer;
     CityAreaInfo: TCityAreaInfo;
     TileInfo: TTileInfo;
   begin
-    Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+    Server(sGetCityAreaInfo, Me, cix, CityAreaInfo);
     for dy := -3 to 3 do
       for dx := -3 to 3 do
@@ -4393 +4393 @@
           begin
             TileInfo.ExplCity := cix;
-            Server(sGetHypoCityTileInfo, me, dLoc(MyCity[cix].Loc, dx, dy),
+            Server(sGetHypoCityTileInfo, Me, dLoc(MyCity[cix].Loc, dx, dy),
               TileInfo);
             if (TileInfo.Food >= NeedFood) and (TileInfo.Prod >= NeedProd) then
             begin
-              result := true;
-              exit
+              Result := True;
+              Exit
             end;
           end
         end;
-    result := false;
+    Result := False;
   end;
 
 var
-  p1, uix, cix, CenterLoc: integer;
+  p1, uix, cix, CenterLoc: Integer;
   MsgItem: string;
   CityReport: TCityReport;
   PlaneReturnData: TPlaneReturnData;
-  Zoom: boolean;
-begin
-  result := false;
+  Zoom: Boolean;
+begin
+  Result := False;
   if ClientMode >= scDipOffer then
     Exit;
 
-  if supervising and (me <> 0) then begin
+  if Supervising and (Me <> 0) then begin
     ApplyToVisibleForms(faClose);
     ItsMeAgain(0);
@@ -4435 +4435 @@
           PlaneReturnData.Loc := Loc;
           PlaneReturnData.Movement := 0; // end turn without further movement?
-          if Server(sGetPlaneReturn, me, uix, PlaneReturnData) = eNoWay then
+          if Server(sGetPlaneReturn, Me, uix, PlaneReturnData) = eNoWay then
           begin
             CenterLoc := Loc + G.lx * 6;
             // centering the unit itself would make it covered by the query dialog
             while CenterLoc >= G.lx * G.ly do
-              dec(CenterLoc, G.lx * 2);
+              Dec(CenterLoc, G.lx * 2);
             Centre(CenterLoc);
             SetTroopLoc(-1);
@@ -4455 +4455 @@
               SetTroopLoc(Loc);
               PanelPaint;
-              exit;
+              Exit;
             end;
             MyUn[uix].Status := MyUn[uix].Status or usToldNoReturn;
@@ -4461 +4461 @@
         end;
 
-    if not supervising and (MyRO.TestFlags and tfImmImprove = 0) and
+    if not Supervising and (MyRO.TestFlags and tfImmImprove = 0) and
       (MyRO.Government <> gAnarchy) and (MyRO.Money + TaxSum < 0) and
       (MyRO.TaxRate < 100) then // low funds!
@@ -4473 +4473 @@
         ShowModal;
         if ModalResult <> mrOK then
-          exit;
+          Exit;
       end;
 
@@ -4481 +4481 @@
           if (Loc >= 0) and (Flags and chCaptured = 0) then
           begin
-            Zoom := false;
+            Zoom := False;
             CityReport.HypoTiles := -1;
             CityReport.HypoTax := -1;
             CityReport.HypoLux := -1;
-            Server(sGetCityReport, me, cix, CityReport);
+            Server(sGetCityReport, Me, cix, CityReport);
 
             if (CityReport.Working - CityReport.Happy > Size shr 1) and
@@ -4576 +4576 @@
     else
       EOT.Hint := Phrases.Lookup('BTN_SKIP');
-    result := true;
+    Result := True;
     SetTroopLoc(-1);
     pTurn := -1;
     pLogo := -1;
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.ButtonIndex := eotCancel;
-    EOT.Visible := true;
-    MapValid := false;
+    EOT.Visible := True;
+    MapValid := False;
     PanelPaint;
     Update;
     ClientMode := -1;
-    idle := false;
+    Idle := False;
     skipped := WasSkipped;
     for p1 := 1 to nPl - 1 do
       if G.RO[p1] <> nil then
-        skipped := true; // don't show enemy moves in hotseat mode
+        skipped := True; // don't show enemy moves in hotseat mode
   end
   else
@@ -4603 +4603 @@
   if NegoDlg.Visible then
     NegoDlg.Close;
-  HaveStrategyAdvice := false;
+  HaveStrategyAdvice := False;
   // AdvisorDlg.HaveStrategyAdvice;
   // negotiation might have changed advices
   EOT.ButtonIndex := eotCancel;
-  EOT.Visible := true;
+  EOT.Visible := True;
   PanelPaint;
   Update;
   ClientMode := -1;
-  idle := false;
-end;
-
-procedure TMainScreen.ProcessRect(x0, y0, nx, ny, Options: integer);
+  Idle := False;
+end;
+
+procedure TMainScreen.ProcessRect(x0, y0, nx, ny, Options: Integer);
 var
-  xs, ys, xl, yl: integer;
+  xs, ys, xl, yl: Integer;
 begin
   with MainMap do begin
@@ -4625 +4625 @@
     while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
       abs(2 * xs + xl - MapWidth) do
-        inc(xs, G.lx * (xxt * 2));
+        Inc(xs, G.lx * (xxt * 2));
     ys := (y0 - yw) * yyt - yyt;
     if xs + xl > MapWidth then
@@ -4632 +4632 @@
       yl := MapHeight - ys;
     if (xl <= 0) or (yl <= 0) then
-      exit;
+      Exit;
     if Options and prPaint <> 0 then begin
       if Options and prAutoBounds <> 0 then
@@ -4644 +4644 @@
 end;
 
-procedure TMainScreen.PaintLoc(Loc: integer; Radius: integer = 0);
+procedure TMainScreen.PaintLoc(Loc: Integer; Radius: Integer = 0);
 var
-  yLoc, x0: integer;
+  yLoc, x0: Integer;
 begin
   if MapValid then begin
     yLoc := (Loc + G.lx * 1024) div G.lx - 1024;
     x0 := (Loc + (yLoc and 1 - 2 * Radius + G.lx * 1024) div 2) mod G.lx;
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+    Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     ProcessRect(x0, yLoc - 2 * Radius, 4 * Radius + 1, 4 * Radius + 1,
       prPaint or prAutoBounds or prInvalidate);
@@ -4658 +4658 @@
 end;
 
-procedure TMainScreen.PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle);
+procedure TMainScreen.PaintLocTemp(Loc: Integer; Style: TPaintLocTempStyle);
 var
-  y0, x0, xMap, yMap: integer;
+  y0, x0, xMap, yMap: Integer;
 begin
   with NoMap do begin
     if not MapValid then
-      exit;
+      Exit;
     Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
     y0 := Loc div G.lx;
@@ -4672 +4672 @@
     while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
       abs(2 * xMap + 2 * xxt - MapWidth) do
-      inc(xMap, G.lx * (xxt * 2));
+      Inc(xMap, G.lx * (xxt * 2));
     yMap := (y0 - yw) * yyt - yyt;
     NoMap.SetOutput(Buffer);
@@ -4684 +4684 @@
 // panel protusions are added
 // NoMap must be set to buffer and bounds before
-procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: integer);
+procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: Integer);
 begin
   if xMap + width > MapWidth then
@@ -4692 +4692 @@
   if (width <= 0) or (height <= 0) or (width + xMap <= 0) or (height + yMap <= 0)
   then
-    exit;
+    Exit;
 
   NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap, xMidPanel,
@@ -4719 +4719 @@
 end;
 
-procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: integer);
+procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: Integer);
 var
-  yLoc, x0: integer;
+  yLoc, x0: Integer;
 begin
   if MapValid then
@@ -4727 +4727 @@
     yLoc := (FromLoc + G.lx * 1024) div G.lx - 1024;
     x0 := (FromLoc + (yLoc and 1 + G.lx * 1024) div 2) mod G.lx;
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+    Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     ProcessRect(x0, yLoc, 1, 1, prPaint or prAutoBounds);
   end
@@ -4734 +4734 @@
 procedure TMainScreen.PaintDestination;
 var
-  Destination: integer;
+  Destination: Integer;
 begin
   if (UnFocus >= 0) and (MyUn[UnFocus].Status and usGoto <> 0) then
@@ -4755 +4755 @@
 procedure TMainScreen.MainOffscreenPaint;
 var
-  ProcessOptions: integer;
+  ProcessOptions: Integer;
   rec: TRect;
-  DoInvalidate: boolean;
-begin
-  if me < 0 then
-    with offscreen.Canvas do
+  DoInvalidate: Boolean;
+begin
+  if Me < 0 then
+    with Offscreen.Canvas do
     begin
       Brush.Color := $000000;
@@ -4766 +4766 @@
       Brush.Style := bsClear;
       OffscreenUser := self;
-      exit;
+      Exit;
     end;
 
@@ -4777 +4777 @@
     if MapValid and (xwd = xw) and (ywd = yw) then
       MainMap.SetPaintBounds(0, 0, UsedOffscreenWidth, UsedOffscreenHeight);
-    MapValid := false;
+    MapValid := False;
     OffscreenUser := self;
   end;
@@ -4790 +4790 @@
       (ywd - yw > MapHeight div yyt) then
     begin
-      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
       ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
         prPaint or prInvalidate);
     end else begin
       if (xwd = xw) and (ywd = yw) then
-        exit; { map window not moved }
-      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+        Exit; { map window not moved }
+      Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
       rec := Rect(0, 0, MapWidth, MapHeight);
 {$IFDEF WINDOWS}
-      ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+      ScrollDC(Offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
 {$ENDIF}
 {$IFDEF UNIX}
-      ScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+      ScrollDC(Offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
 {$ENDIF}
-      for DoInvalidate := false to FastScrolling do begin
+      for DoInvalidate := False to FastScrolling do begin
         if DoInvalidate then begin
           rec.Bottom := MapHeight - overlap;
@@ -4863 +4863 @@
   xwd := xw;
   ywd := yw;
-  MapValid := true;
+  MapValid := True;
 end;
 
@@ -4920 +4920 @@
   function MovementToString(var Un: TUn): string;
   begin
-    result := ScreenTools.MovementToString(Un.Movement);
+    Result := ScreenTools.MovementToString(Un.Movement);
     if Un.Master >= 0 then
-      result := '(' + result + ')'
+      Result := '(' + Result + ')'
     else if (MyModel[Un.mix].Domain = dAir) and
       (MyModel[Un.mix].Kind <> mkSpecial_Glider) then
-      result := Format('%s(%d)', [result, Un.Fuel]);
+      Result := Format('%s(%d)', [Result, Un.Fuel]);
   end;
 
 var
-  i, uix, uixDefender, x, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
+  I, uix, uixDefender, X, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
     mixShow, xTreasurySection, xResearchSection, JobFocus, TrueMoney,
-    TrueResearch: integer;
+    TrueResearch: Integer;
   Tile: Cardinal;
-  s: string;
+  S: string;
   unx: TUn;
   UnitInfo: TUnitInfo;
   JobProgressData: TJobProgressData;
-  Prio: boolean;
+  Prio: Boolean;
 begin
   if not Assigned(MyRO) then Exit;
@@ -5014 +5014 @@
     CopyMiniToPanel;
     if ClientMode <> cEditMap then // MapBtn icons
-      for i := 0 to 5 do
-        if i <> 3 then
-          Dump(Panel, HGrSystem, xMini + G.lx - 42 + 16 * i, PanelHeight - 26,
-            8, 8, 121 + i * 9, 61);
+      for I := 0 to 5 do
+        if I <> 3 then
+          Dump(Panel, HGrSystem, xMini + G.lx - 42 + 16 * I, PanelHeight - 26,
+            8, 8, 121 + I * 9, 61);
 
     if ClientMode = cEditMap then
     begin
-      for i := 0 to TrRow - 1 do
-        trix[i] := -1;
+      for I := 0 to TrRow - 1 do
+        trix[I] := -1;
       Count := 0;
-      for i := 0 to nBrushTypes - 1 do
+      for I := 0 to nBrushTypes - 1 do
       begin // display terrain types
         if (Count >= TrRow * sb.Position) and (Count < TrRow * (sb.Position + 1))
         then
         begin
-          trix[Count - TrRow * sb.Position] := BrushTypes[i];
-          x := (Count - TrRow * sb.Position) * TrPitch;
+          trix[Count - TrRow * sb.Position] := BrushTypes[I];
+          X := (Count - TrRow * sb.Position) * TrPitch;
           xSrcBase := -1;
-          case BrushTypes[i] of
+          case BrushTypes[I] of
             0 .. 8:
               begin
-                xSrc := BrushTypes[i];
+                xSrc := BrushTypes[I];
                 ySrc := 0
               end;
@@ -5043 +5043 @@
                 ySrcBase := 2;
                 xSrc := 0;
-                ySrc := 2 * integer(BrushTypes[i]) - 15
+                ySrc := 2 * Integer(BrushTypes[I]) - 15
               end;
             fRiver:
@@ -5076 +5076 @@
                 ySrcBase := 2;
                 xSrc := 8;
-                ySrc := 12 + BrushTypes[i] shr 25;
+                ySrc := 12 + BrushTypes[I] shr 25;
               end;
             tiIrrigation, tiFarm, tiMine, tiBase:
               begin
-                xSrc := BrushTypes[i] shr 12 - 1;
+                xSrc := BrushTypes[I] shr 12 - 1;
                 ySrc := 12
               end;
@@ -5103 +5103 @@
           with MainMap do begin
             if xSrcBase >= 0 then
-              Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+              Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
                 yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
                 1 + ySrcBase * (yyt * 3 + 1));
-            Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+            Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
               yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
-            if BrushTypes[i] = BrushType then begin
-              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + x,
-                yTroop + 7 - yyt div 2, xTroop + 2 * xxt + x,
+            if BrushTypes[I] = BrushType then begin
+              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + X,
+                yTroop + 7 - yyt div 2, xTroop + 2 * xxt + X,
                 yTroop + 2 * yyt + 11, $000000, $000000);
-              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x,
-                yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + x,
+              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + X,
+                yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + X,
                 yTroop + 2 * yyt + 10, MainTexture.ColorMark, MainTexture.ColorMark);
             end;
           end;
         end;
-        inc(Count)
+        Inc(Count)
       end;
       case BrushType of
         fDesert, fPrairie, fTundra, fArctic, fSwamp, fHills, fMountains:
-          s := Phrases.Lookup('TERRAIN', BrushType);
+          S := Phrases.Lookup('TERRAIN', BrushType);
         fShore:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fOcean), Phrases.Lookup('TERRAIN',
             fShore)]);
         fGrass:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
             fGrass + 12)]);
         fForest:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
             fJungle)]);
         fRiver:
-          s := Phrases.Lookup('RIVER');
+          S := Phrases.Lookup('RIVER');
         fDeadLands, fDeadLands or fCobalt, fDeadLands or fUranium,
           fDeadLands or fMercury:
-          s := Phrases.Lookup('TERRAIN', 3 * 12 + BrushType shr 25);
+          S := Phrases.Lookup('TERRAIN', 3 * 12 + BrushType shr 25);
         fPrefStartPos:
-          s := Phrases.Lookup('MAP_PREFSTART');
+          S := Phrases.Lookup('MAP_PREFSTART');
         fStartPos:
-          s := Phrases.Lookup('MAP_START');
+          S := Phrases.Lookup('MAP_START');
         fPoll:
-          s := Phrases.Lookup('POLL');
+          S := Phrases.Lookup('POLL');
       else // terrain improvements
         begin
           case BrushType of
             fRoad:
-              i := 1;
+              I := 1;
             fRR:
-              i := 2;
+              I := 2;
             tiIrrigation:
-              i := 4;
+              I := 4;
             tiFarm:
-              i := 5;
+              I := 5;
             tiMine:
-              i := 7;
+              I := 7;
             fCanal:
-              i := 8;
+              I := 8;
             tiFort:
-              i := 10;
+              I := 10;
             tiBase:
-              i := 12;
+              I := 12;
           end;
-          s := Phrases.Lookup('JOBRESULT', i);
+          S := Phrases.Lookup('JOBRESULT', I);
         end
       end;
       LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 1,
-        PanelHeight - 19, s);
+        PanelHeight - 19, S);
     end
     else if TroopLoc >= 0 then
@@ -5183 +5183 @@
           else
             mixShow := mix;
-          with Tribe[me].ModelPicture[mixShow] do
+          with Tribe[Me].ModelPicture[mixShow] do
           begin
             Sprite(Panel, HGr, xMidPanel + 7 + 12, yTroop + 1, 64, 48,
@@ -5193 +5193 @@
 
           MakeBlue(Panel, xMidPanel + 7 + 12 + 10, yTroop - 13, 44, 12);
-          s := MovementToString(MyUn[UnFocus]);
+          S := MovementToString(MyUn[UnFocus]);
           RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
-            BiColorTextWidth(Panel.Canvas, s) div 2, yTroop - 16, s);
-
-          s := IntToStr(Health) + '%';
+            BiColorTextWidth(Panel.Canvas, S) div 2, yTroop - 16, S);
+
+          S := IntToStr(Health) + '%';
           LightGradient(Panel.Canvas, xMidPanel + 7 + 12 + 7, PanelHeight - 22,
             (Health + 1) div 2, (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
@@ -5204 +5204 @@
               div 2, PanelHeight - 22, 50 - (Health + 1) div 2, $000000);
           RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
-            BiColorTextWidth(Panel.Canvas, s) div 2, PanelHeight - 23, s);
+            BiColorTextWidth(Panel.Canvas, S) div 2, PanelHeight - 23, S);
 
           FrameImage(Panel.Canvas, HGrSystem.Data,
@@ -5210 +5210 @@
             121 + Exp div ExpCost * 13, 28);
           if Job = jCity then
-            s := Tribe[me].ModelName[-1]
+            S := Tribe[Me].ModelName[-1]
           else
-            s := Tribe[me].ModelName[mix];
+            S := Tribe[Me].ModelName[mix];
           if Home >= 0 then
           begin
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
-              xMidPanel + 7 + xUnitText + 18, yTroop + 5, s);
+              xMidPanel + 7 + xUnitText + 18, yTroop + 5, S);
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
               xMidPanel + 7 + xUnitText + 18, yTroop + 21,
@@ -5223 +5223 @@
           else
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
-              xMidPanel + 7 + xUnitText + 18, yTroop + 13, s);
+              xMidPanel + 7 + xUnitText + 18, yTroop + 13, S);
         end;
 
       if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> TroopLoc) then
       begin // divide panel
-        if SmallScreen and not supervising then
-          x := xTroop - 8
+        if SmallScreen and not Supervising then
+          X := xTroop - 8
         else
-          x := xTroop - 152;
+          X := xTroop - 152;
         Pen.Color := MainTexture.ColorBevelShade;
-        MoveTo(x - 1, PanelHeight - MidPanelHeight + 2);
-        LineTo(x - 1, PanelHeight);
+        MoveTo(X - 1, PanelHeight - MidPanelHeight + 2);
+        LineTo(X - 1, PanelHeight);
         Pen.Color := MainTexture.ColorBevelLight;
-        MoveTo(x, PanelHeight - MidPanelHeight + 2);
-        LineTo(x, PanelHeight);
-      end;
-
-      for i := 0 to 23 do
-        trix[i] := -1;
+        MoveTo(X, PanelHeight - MidPanelHeight + 2);
+        LineTo(X, PanelHeight);
+      end;
+
+      for I := 0 to 23 do
+        trix[I] := -1;
       if MyMap[TroopLoc] and fUnit <> 0 then
       begin
@@ -5251 +5251 @@
             LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 10,
               PanelHeight - 24, Phrases.Lookup('PRESENT'));
-            Server(sGetDefender, me, TroopLoc, uixDefender);
+            Server(sGetDefender, Me, TroopLoc, uixDefender);
             Count := 0;
-            for Prio := true downto false do
+            for Prio := True downto False do
               for uix := 0 to MyRO.nUn - 1 do
                 if (uix = uixDefender) = Prio then
@@ -5264 +5264 @@
                     begin
                       trix[Count - TrRow * sb.Position] := uix;
-                      MakeUnitInfo(me, unx, UnitInfo);
-                      x := (Count - TrRow * sb.Position) * TrPitch;
+                      MakeUnitInfo(Me, unx, UnitInfo);
+                      X := (Count - TrRow * sb.Position) * TrPitch;
                       if uix = UnFocus then
                       begin
-                        ScreenTools.Frame(Panel.Canvas, xTroop + 4 + x,
-                          yTroop + 3, xTroop + 64 + x, yTroop + 47,
+                        ScreenTools.Frame(Panel.Canvas, xTroop + 4 + X,
+                          yTroop + 3, xTroop + 64 + X, yTroop + 47,
                           $000000, $000000);
-                        ScreenTools.Frame(Panel.Canvas, xTroop + 3 + x,
-                          yTroop + 2, xTroop + 63 + x, yTroop + 46,
+                        ScreenTools.Frame(Panel.Canvas, xTroop + 3 + X,
+                          yTroop + 2, xTroop + 63 + X, yTroop + 46,
                           MainTexture.ColorMark, MainTexture.ColorMark);
                       end
                       else if (unx.Master >= 0) and (unx.Master = UnFocus) then
                       begin
-                        CFrame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
-                          xTroop + 64 + x, yTroop + 47, 8, $000000);
-                        CFrame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
-                          xTroop + 63 + x, yTroop + 46, 8, MainTexture.ColorMark);
+                        CFrame(Panel.Canvas, xTroop + 4 + X, yTroop + 3,
+                          xTroop + 64 + X, yTroop + 47, 8, $000000);
+                        CFrame(Panel.Canvas, xTroop + 3 + X, yTroop + 2,
+                          xTroop + 63 + X, yTroop + 46, 8, MainTexture.ColorMark);
                       end;
                       NoMapPanel.SetOutput(Panel);
-                      NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1, UnitInfo,
+                      NoMapPanel.PaintUnit(xTroop + 2 + X, yTroop + 1, UnitInfo,
                         unx.Status);
                       if (ClientMode < scContact) and
@@ -5289 +5289 @@
                         (unx.Status and (usStay or usRecover or usGoto) <> 0))
                       then
-                        Sprite(Panel, HGrSystem, xTroop + 2 + 60 - 20 + x,
+                        Sprite(Panel, HGrSystem, xTroop + 2 + 60 - 20 + X,
                           yTroop + 35, 20, 20, 81, 25);
 
-                      if not supervising then
+                      if not Supervising then
                       begin
-                        MakeBlue(Panel, xTroop + 2 + 10 + x,
+                        MakeBlue(Panel, xTroop + 2 + 10 + X,
                           yTroop - 13, 44, 12);
-                        s := MovementToString(unx);
+                        S := MovementToString(unx);
                         RisedTextOut(Panel.Canvas,
-                          xTroop + x + 34 - BiColorTextWidth(Panel.Canvas, s)
-                          div 2, yTroop - 16, s);
+                          xTroop + X + 34 - BiColorTextWidth(Panel.Canvas, S)
+                          div 2, yTroop - 16, S);
                       end;
                     end;
-                    inc(Count)
+                    Inc(Count)
                   end;
                 end; // for uix:=0 to MyRO.nUn-1
-            assert(Count = TrCnt);
+            Assert(Count = TrCnt);
           end;
         end
@@ -5312 +5312 @@
           LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 8,
             PanelHeight - 24, Phrases.Lookup('PRESENT'));
-          Server(sGetUnits, me, TroopLoc, Count);
-          for i := 0 to Count - 1 do
-            if (i >= TrRow * sb.Position) and (i < TrRow * (sb.Position + 1)) then
+          Server(sGetUnits, Me, TroopLoc, Count);
+          for I := 0 to Count - 1 do
+            if (I >= TrRow * sb.Position) and (I < TrRow * (sb.Position + 1)) then
             begin // display enemy units
-              trix[i - TrRow * sb.Position] := i;
-              x := (i - TrRow * sb.Position) * TrPitch;
+              trix[I - TrRow * sb.Position] := I;
+              X := (I - TrRow * sb.Position) * TrPitch;
               NoMapPanel.SetOutput(Panel);
-              NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1,
-                MyRO.EnemyUn[MyRO.nEnemyUn + i], 0);
+              NoMapPanel.PaintUnit(xTroop + 2 + X, yTroop + 1,
+                MyRO.EnemyUn[MyRO.nEnemyUn + I], 0);
             end;
         end;
       end;
-      if not SmallScreen or supervising then
+      if not SmallScreen or Supervising then
       begin // show terrain and improvements
         with NoMapPanel do
@@ -5330 +5330 @@
         if (UnFocus >= 0) and (MyUn[UnFocus].Job <> jNone) then begin
           JobFocus := MyUn[UnFocus].Job;
-          Server(sGetJobProgress, me, MyUn[UnFocus].Loc, JobProgressData);
+          Server(sGetJobProgress, Me, MyUn[UnFocus].Loc, JobProgressData);
           MakeBlue(Panel, xTerrain - 72, 148 - 17, 144, 31);
           PaintRelativeProgressBar(Panel.Canvas, 3, xTerrain - 68, 148 + 3, 63,
             JobProgressData[JobFocus].Done,
             JobProgressData[JobFocus].NextTurnPlus,
-            JobProgressData[JobFocus].Required, true, MainTexture);
-          s := Format('%s/%s',
+            JobProgressData[JobFocus].Required, True, MainTexture);
+          S := Format('%s/%s',
             [ScreenTools.MovementToString(JobProgressData[JobFocus].Done),
             ScreenTools.MovementToString(JobProgressData[JobFocus].Required)]);
-          RisedTextOut(Panel.Canvas, xTerrain + 6, 148 - 3, s);
+          RisedTextOut(Panel.Canvas, xTerrain + 6, 148 - 3, S);
           Tile := MyMap[MyUn[UnFocus].Loc];
           if (JobFocus = jRoad) and (Tile and fRiver <> 0) then
@@ -5354 +5354 @@
               JobFocus := nJob + 4
           end;
-          s := Phrases.Lookup('JOBRESULT', JobFocus);
+          S := Phrases.Lookup('JOBRESULT', JobFocus);
           RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas,
-            s) div 2, 148 - 19, s);
+            S) div 2, 148 - 19, S);
         end;
         if MyMap[TroopLoc] and (fTerrain or fSpecial) = fGrass or fSpecial1 then
-          s := Phrases.Lookup('TERRAIN', fGrass + 12)
+          S := Phrases.Lookup('TERRAIN', fGrass + 12)
         else if MyMap[TroopLoc] and fDeadLands <> 0 then
-          s := Phrases.Lookup('TERRAIN', 3 * 12)
+          S := Phrases.Lookup('TERRAIN', 3 * 12)
         else if (MyMap[TroopLoc] and fTerrain = fForest) and
           IsJungle(TroopLoc div G.lx) then
-          s := Phrases.Lookup('TERRAIN', fJungle)
+          S := Phrases.Lookup('TERRAIN', fJungle)
         else
-          s := Phrases.Lookup('TERRAIN', MyMap[TroopLoc] and fTerrain);
-        RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas, s)
-          div 2, 99, s);
+          S := Phrases.Lookup('TERRAIN', MyMap[TroopLoc] and fTerrain);
+        RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas, S)
+          div 2, 99, S);
       end;
 
@@ -5379 +5379 @@
   end;
 
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonB then
-      with TButtonB(Controls[i]) do
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonB then
+      with TButtonB(Controls[I]) do
       begin
         if Visible then
@@ -5397 +5397 @@
   if ClientMode <> cEditMap then
   begin
-    for i := 0 to ControlCount - 1 do
-      if Controls[i] is TButtonC then
-        with TButtonC(Controls[i]) do
+    for I := 0 to ControlCount - 1 do
+      if Controls[I] is TButtonC then
+        with TButtonC(Controls[I]) do
         begin
           Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
@@ -5439 +5439 @@
     TrueMoney := MyRO.Money;
     TrueResearch := MyRO.Research;
-    if supervising then
+    if Supervising then
     begin // normalize values from after-turn state
-      dec(TrueMoney, TaxSum);
+      Dec(TrueMoney, TaxSum);
       if TrueMoney < 0 then
         TrueMoney := 0; // shouldn't happen
-      dec(TrueResearch, ScienceSum);
+      Dec(TrueResearch, ScienceSum);
       if TrueResearch < 0 then
         TrueResearch := 0; // shouldn't happen
@@ -5452 +5452 @@
     ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 8, 1), TreasuryIcon.BoundsRect,
       $40A040, $4030C0);
-    s := IntToStr(TrueMoney);
+    S := IntToStr(TrueMoney);
     LoweredTextOut(TopBar.Canvas, -1, MainTexture, xTreasurySection + 48, 0,
-      s + '%c');
+      S + '%c');
     if MyRO.Government <> gAnarchy then
     begin
@@ -5460 +5460 @@
         $0000C0, $0080C0);
       if TaxSum >= 0 then
-        s := Format(Phrases.Lookup('MONEYGAINPOS'), [TaxSum])
+        S := Format(Phrases.Lookup('MONEYGAINPOS'), [TaxSum])
       else
-        s := Format(Phrases.Lookup('MONEYGAINNEG'), [TaxSum]);
+        S := Format(Phrases.Lookup('MONEYGAINNEG'), [TaxSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xTreasurySection + 48 +
-        15, 18, s);
+        15, 18, S);
     end;
 
@@ -5484 +5484 @@
       else
         CostFactor := 2;
-      Server(sGetTechCost, me, 0, i);
+      Server(sGetTechCost, Me, 0, I);
       CostFactor := CostFactor * 22; // length of progress bar
       PaintRelativeProgressBar(TopBar.Canvas, 2, xResearchSection + 48 + 1, 26,
-        CostFactor, TrueResearch, ScienceSum, i, true, MainTexture);
+        CostFactor, TrueResearch, ScienceSum, I, True, MainTexture);
 
       if MyRO.ResearchTech < 0 then
-        s := Phrases.Lookup('SCIENCE')
+        S := Phrases.Lookup('SCIENCE')
       else if MyRO.ResearchTech = adMilitary then
-        s := Phrases.Lookup('INITUNIT')
+        S := Phrases.Lookup('INITUNIT')
       else
       begin
-        s := Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
+        S := Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
         if MyRO.ResearchTech in FutureTech then
           if MyRO.Tech[MyRO.ResearchTech] >= 1 then
-            s := s + ' ' + IntToStr(MyRO.Tech[MyRO.ResearchTech] + 1)
+            S := S + ' ' + IntToStr(MyRO.Tech[MyRO.ResearchTech] + 1)
           else
-            s := s + ' 1';
+            S := S + ' 1';
       end;
       if ScienceSum > 0 then
       begin
         { j:=(i-MyRO.Research-1) div ScienceSum +1;
-          if j<1 then j:=1;
-          if j>1 then
-          s:=Format(Phrases.Lookup('TECHWAIT'),[s,j]); }
+          if J<1 then J:=1;
+          if J>1 then
+          S:=Format(Phrases.Lookup('TECHWAIT'),[S,J]); }
         LoweredTextOut(TopBar.Canvas, -1, MainTexture,
-          xResearchSection + 48, 0, s);
+          xResearchSection + 48, 0, S);
       end
       else
         LoweredTextOut(TopBar.Canvas, -1, MainTexture,
-          xResearchSection + 48, 0, s);
+          xResearchSection + 48, 0, S);
     end
     else
@@ -5521 +5521 @@
       ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11,
         22), ChangeIcon.BoundsRect, $0000C0, $0080C0);
-      s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
+      S := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
-        CostFactor + 26, 18, s);
+        CostFactor + 26, 18, S);
     end;
   end;
@@ -5529 +5529 @@
   begin
     TopBar.Canvas.Font.Assign(UniFont[ftCaption]);
-    s := TurnToString(MyRO.Turn);
+    S := TurnToString(MyRO.Turn);
     RisedTextOut(TopBar.Canvas,
-      40 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, s))
-      div 2, 6, s);
+      40 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, S))
+      div 2, 6, S);
     TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
   end;
@@ -5540 +5540 @@
 procedure TMainScreen.FocusNextUnit(Dir: Integer);
 var
-  i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
 begin
   if ClientMode >= scContact then
@@ -5547 +5547 @@
   PaintDestination;
   NewFocus := -1;
-  for i := 1 to MyRO.nUn do begin
-    uix := (UnFocus + i * Dir + MyRO.nUn) mod MyRO.nUn;
+  for I := 1 to MyRO.nUn do begin
+    uix := (UnFocus + I * Dir + MyRO.nUn) mod MyRO.nUn;
     if (MyUn[uix].Loc >= 0) and (MyUn[uix].Status and usStay = 0) then begin
       NewFocus := uix;
@@ -5561 +5561 @@
 end;
 
-procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
+procedure TMainScreen.FocusOnLoc(Loc: Integer; Options: Integer = 0);
 var
-  dx: integer;
-  Outside, Changed: boolean;
+  dx: Integer;
+  Outside, Changed: Boolean;
 begin
   with MainMap do begin
@@ -5572 +5572 @@
       (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
   end;
-  Changed := true;
+  Changed := True;
   if Outside then begin
     Centre(Loc);
@@ -5580 +5580 @@
     PaintAllMaps
   else
-    Changed := false;
+    Changed := False;
   if Options and flRepaintPanel <> 0 then
     PanelPaint;
@@ -5590 +5590 @@
 var
   Dist, TestDist: Single;
-  i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
   GotoOnly: Boolean;
 begin
@@ -5600 +5600 @@
   for GotoOnly := GoOnPhase downto False do begin
     NewFocus := -1;
-    for i := 1 to MyRO.nUn do begin
-      uix := (UnFocus + i) mod MyRO.nUn;
+    for I := 1 to MyRO.nUn do begin
+      uix := (UnFocus + I) mod MyRO.nUn;
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].Job = jNone) and
         (MyUn[uix].Status and (usStay or usRecover or usWaiting) = usWaiting)
@@ -5640 +5640 @@
 end;
 
-procedure TMainScreen.Scroll(dx, dy: integer);
+procedure TMainScreen.Scroll(dx, dy: Integer);
 begin
   xw := (xw + G.lx + dx) mod G.lx;
@@ -5664 +5664 @@
 procedure TMainScreen.Timer1Timer(Sender: TObject);
 var
-  dx, dy, ScrollSpeed: integer;
-begin
-  if idle and (me >= 0) and (GameMode <> cMovie) then
+  dx, dy, ScrollSpeed: Integer;
+begin
+  if Idle and (Me >= 0) and (GameMode <> cMovie) then
     if (fsModal in Screen.ActiveForm.FormState) or
       (Screen.ActiveForm is TBufferedDrawDlg) and
@@ -5674 +5674 @@
       if not BlinkON then
       begin
-        BlinkON := true;
+        BlinkON := True;
         if UnFocus >= 0 then
           PaintLocTemp(MyUn[UnFocus].Loc)
-        else if TurnComplete and not supervising then
+        else if TurnComplete and not Supervising then
           EOT.SetButtonIndexFast(eotBlinkOn);
       end;
@@ -5689 +5689 @@
         dx := 0;
         dy := 0;
-        if Mouse.CursorPos.y < Screen.height - PanelHeight then
-          if Mouse.CursorPos.x = 0 then
+        if Mouse.CursorPos.Y < Screen.height - PanelHeight then
+          if Mouse.CursorPos.X = 0 then
             dx := -ScrollSpeed // scroll left
-          else if Mouse.CursorPos.x = Screen.width - 1 then
+          else if Mouse.CursorPos.X = Screen.width - 1 then
             dx := ScrollSpeed; // scroll right
-        if Mouse.CursorPos.y = 0 then
+        if Mouse.CursorPos.Y = 0 then
           dy := -ScrollSpeed // scroll up
-        else if (Mouse.CursorPos.y = Screen.height - 1) and
-          (Mouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
-          (Mouse.CursorPos.x < xRightPanel + 10 - 8) then
+        else if (Mouse.CursorPos.Y = Screen.height - 1) and
+          (Mouse.CursorPos.X >= TerrainBtn.Left + TerrainBtn.width) and
+          (Mouse.CursorPos.X < xRightPanel + 10 - 8) then
           dy := ScrollSpeed; // scroll down
         if (dx <> 0) or (dy <> 0) then
@@ -5711 +5711 @@
       BlinkTime := (BlinkTime + 1) mod (BlinkOnTime + BlinkOffTime);
       BlinkON := BlinkTime >= BlinkOffTime;
-      DestinationMarkON := true;
+      DestinationMarkON := True;
       if UnFocus >= 0 then
       begin
@@ -5722 +5722 @@
         end;
       end
-      else if TurnComplete and not supervising then
+      else if TurnComplete and not Supervising then
       begin
         if BlinkTime = 0 then
@@ -5732 +5732 @@
 end;
 
-procedure TMainScreen.SetMapPos(Loc: integer; MapPos: TPoint);
+procedure TMainScreen.SetMapPos(Loc: Integer; MapPos: TPoint);
 begin
   with MainMap do begin
@@ -5750 +5750 @@
 end;
 
-procedure TMainScreen.Centre(Loc: integer);
+procedure TMainScreen.Centre(Loc: Integer);
 begin
   SetMapPos(Loc, Point(MapWidth div 2, MapHeight div 2));
 end;
 
-function TMainScreen.ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-  ShowEvent: integer = 0): boolean;
-begin
-  result := MyMap[Loc] and (fOwned or fSpiedOut) <> 0;
-  if result then
+function TMainScreen.ZoomToCity(Loc: Integer; NextUnitOnClose: Boolean = False;
+  ShowEvent: Integer = 0): Boolean;
+begin
+  Result := MyMap[Loc] and (fOwned or fSpiedOut) <> 0;
+  if Result then
     with CityDlg do
     begin
@@ -5785 +5785 @@
 end;
 
-function TMainScreen.LocationOfScreenPixel(x, y: integer): Integer;
+function TMainScreen.LocationOfScreenPixel(X, Y: Integer): Integer;
 var
-  qx, qy: integer;
+  qx, qy: Integer;
 begin
   with MainMap do begin
-    qx := (x * (yyt * 2) + y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
-    qy := (y * (xxt * 2) - x * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
+    qx := (X * (yyt * 2) + Y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
+    qy := (Y * (xxt * 2) - X * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
       div (xxt * yyt * 4) - 999;
     Result := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx *
@@ -5805 +5805 @@
 
 procedure TMainScreen.MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, uix, emix, p1, dx, dy, MouseLoc: integer;
+  I, uix, emix, p1, dx, dy, MouseLoc: Integer;
   EditTileData: TEditTileData;
-  m, m2: TMenuItem;
+  M, m2: TMenuItem;
   MoveAdviceData: TMoveAdviceData;
-  DoCenter: boolean;
+  DoCenter: Boolean;
 begin
   if GameMode = cMovie then
-    exit;
+    Exit;
 
   if CityDlg.Visible then
@@ -5820 +5820 @@
   if UnitStatDlg.Visible then
     UnitStatDlg.Close;
-  MouseLoc := LocationOfScreenPixel(x, y);
+  MouseLoc := LocationOfScreenPixel(X, Y);
   if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
-    exit;
+    Exit;
   if (Button = mbLeft) and not(ssShift in Shift) then
   begin
-    DoCenter := true;
+    DoCenter := True;
     if ClientMode = cEditMap then
     begin
-      DoCenter := false;
+      DoCenter := False;
       EditTileData.Loc := MouseLoc;
       if ssCtrl in Shift then // toggle special resource
@@ -5866 +5866 @@
       else
         EditTileData.NewTile := MyMap[MouseLoc] xor BrushType;
-      Server(sEditTile, me, 0, EditTileData);
-      Edited := true;
+      Server(sEditTile, Me, 0, EditTileData);
+      Edited := True;
       BrushLoc := MouseLoc;
       PaintLoc(MouseLoc, 2);
@@ -5893 +5893 @@
       begin
         ZoomToCity(MouseLoc);
-        DoCenter := false;
+        DoCenter := False;
       end
       else
       begin
         UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
-        DoCenter := false;
+        DoCenter := False;
       end;
     end
@@ -5904 +5904 @@
       if MyMap[MouseLoc] and fOwned <> 0 then
       begin
-        DoCenter := false;
-        if not supervising and (ClientMode < scContact) then
+        DoCenter := False;
+        if not Supervising and (ClientMode < scContact) then
         begin // not in negotiation mode
           if (UnFocus >= 0) and (MyUn[UnFocus].Loc = MouseLoc) then
           begin // rotate
             uix := (UnFocus + 1) mod MyRO.nUn;
-            i := MyRO.nUn - 1;
-            while i > 0 do
+            I := MyRO.nUn - 1;
+            while I > 0 do
             begin
               if (MyUn[uix].Loc = MouseLoc) and (MyUn[uix].Job = jNone) and
@@ -5917 +5917 @@
                 usWaiting) = usWaiting) then
                 Break;
-              dec(i);
+              Dec(I);
               uix := (uix + 1) mod MyRO.nUn;
             end;
-            if i = 0 then
+            if I = 0 then
               uix := UnFocus;
           end
           else
-            Server(sGetDefender, me, MouseLoc, uix);
+            Server(sGetDefender, Me, MouseLoc, uix);
           if uix <> UnFocus then
             SetUnFocus(uix);
-          TurnComplete := false;
+          TurnComplete := False;
           EOT.ButtonIndex := eotGray;
         end;
@@ -5935 +5935 @@
       else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift) then
       begin
-        DoCenter := false;
+        DoCenter := False;
         SetTroopLoc(MouseLoc);
         PanelPaint;
@@ -5941 +5941 @@
       else
       begin
-        DoCenter := false;
+        DoCenter := False;
         UnitStatDlg.ShowNewContent_EnemyLoc(wmPersistent, MouseLoc);
       end;
@@ -5953 +5953 @@
     not(ssShift in Shift) then
   begin
-    if supervising then
+    if Supervising then
     begin
       EditLoc := MouseLoc;
-      Server(sGetModels, me, 0, nil^);
+      Server(sGetModels, Me, 0, nil^);
       EmptyMenu(mCreateUnit);
       for p1 := 0 to nPl - 1 do
         if 1 shl p1 and MyRO.Alive <> 0 then
         begin
-          m := TMenuItem.Create(mCreateUnit);
-          m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+          M := TMenuItem.Create(mCreateUnit);
+          M.Caption := Tribe[p1].TPhrase('SHORTNAME');
           for emix := MyRO.nEnemyModel - 1 downto 0 do
             if (MyRO.EnemyModel[emix].Owner = p1) and
-              (Server(sCreateUnit - sExecute + p1 shl 4, me,
+              (Server(sCreateUnit - sExecute + p1 shl 4, Me,
               MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
             begin
               if not Assigned(Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr) then
                 InitEnemyModel(emix);
-              m2 := TMenuItem.Create(m);
+              m2 := TMenuItem.Create(M);
               m2.Caption := Tribe[p1].ModelName[MyRO.EnemyModel[emix].mix];
               m2.Tag := p1 shl 16 + MyRO.EnemyModel[emix].mix;
               m2.OnClick := CreateUnitClick;
-              m.Add(m2);
+              M.Add(m2);
             end;
-          m.Visible := m.Count > 0;
-          mCreateUnit.Add(m);
+          M.Visible := M.Count > 0;
+          mCreateUnit.Add(M);
         end;
       if FullScreen then
-        EditPopup.Popup(Left + x, Top + y)
+        EditPopup.Popup(Left + X, Top + Y)
       else
-        EditPopup.Popup(Left + x + 4,
-          Top + y + GetSystemMetrics(SM_CYCAPTION) + 4);
+        EditPopup.Popup(Left + X + 4,
+          Top + Y + GetSystemMetrics(SM_CYCAPTION) + 4);
     end
     else if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> MouseLoc) then
@@ -5994 +5994 @@
         if abs(dx) + abs(dy) < 3 then
         begin
-          DestinationMarkON := false;
+          DestinationMarkON := False;
           PaintDestination;
           Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance)
@@ -6007 +6007 @@
             with MyUn[UnFocus], BattleDlg.Forecast do
             begin
-              pAtt := me;
+              pAtt := Me;
               mixAtt := mix;
               HealthAtt := Health;
@@ -6014 +6014 @@
             end;
             BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-            if (Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast)
+            if (Server(sGetBattleForecastEx, Me, MouseLoc, BattleDlg.Forecast)
               >= rExecuted) and (BattleDlg.Forecast.EndHealthAtt <= 0) then
             begin
               BattleDlg.uix := UnFocus;
               BattleDlg.ToLoc := MouseLoc;
-              BattleDlg.IsSuicideQuery := true;
+              BattleDlg.IsSuicideQuery := True;
               BattleDlg.ShowModal;
               if BattleDlg.ModalResult <> mrOK then
-                exit;
+                Exit;
             end;
           end;
-          DestinationMarkON := false;
+          DestinationMarkON := False;
           PaintDestination;
           Status := Status and not(usStay or usRecover or usEnhance) or
             usWaiting;
-          MoveToLoc(MouseLoc, false); { goto }
+          MoveToLoc(MouseLoc, False); { goto }
         end;
       end;
@@ -6036 +6036 @@
     (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
   begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     MyUn[UnFocus].Status := MyUn[UnFocus].Status and
@@ -6042 +6042 @@
     uix := UnFocus;
     if MouseLoc <> MyUn[uix].Loc then
-      MoveToLoc(MouseLoc, true); { goto }
+      MoveToLoc(MouseLoc, True); { goto }
     if (UnFocus = uix) and (MyUn[uix].Loc = MouseLoc) then
       mEnhance.Click;
@@ -6055 +6055 @@
     with MyUn[UnFocus], BattleDlg.Forecast do
     begin
-      pAtt := me;
+      pAtt := Me;
       mixAtt := mix;
       HealthAtt := Health;
@@ -6062 +6062 @@
     end;
     BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-    if Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast) >= rExecuted
+    if Server(sGetBattleForecastEx, Me, MouseLoc, BattleDlg.Forecast) >= rExecuted
     then
     begin
       BattleDlg.uix := UnFocus;
       BattleDlg.ToLoc := MouseLoc;
-      BattleDlg.Left := x - BattleDlg.width div 2;
+      BattleDlg.Left := X - BattleDlg.width div 2;
       if BattleDlg.Left < 0 then
         BattleDlg.Left := 0
       else if BattleDlg.Left + BattleDlg.width > Screen.width then
         BattleDlg.Left := Screen.width - BattleDlg.width;
-      BattleDlg.Top := y - BattleDlg.height div 2;
+      BattleDlg.Top := Y - BattleDlg.height div 2;
       if BattleDlg.Top < 0 then
         BattleDlg.Top := 0
       else if BattleDlg.Top + BattleDlg.height > Screen.height then
         BattleDlg.Top := Screen.height - BattleDlg.height;
-      BattleDlg.IsSuicideQuery := false;
+      BattleDlg.IsSuicideQuery := False;
       BattleDlg.Show;
     end;
@@ -6083 +6083 @@
 end;
 
-function TMainScreen.MoveUnit(dx, dy: integer; Options: integer): integer;
+function TMainScreen.MoveUnit(dx, dy: Integer; Options: Integer): Integer;
 // move focused unit to adjacent tile
 var
-  i, cix, uix, euix, FromLoc, ToLoc, DirCode, UnFocus0, Defender, Mission, p1,
-    NewTiles, cixChanged: integer;
+  I, cix, uix, euix, FromLoc, ToLoc, DirCode, UnFocus0, Defender, Mission, p1,
+    NewTiles, cixChanged: Integer;
   OldToTile: Cardinal;
   CityCaptured, IsAttack, OldUnrest, NewUnrest, NeedEcoUpdate, NeedRepaintPanel,
-    ToTransport, ToShip: boolean;
+    ToTransport, ToShip: Boolean;
   PlaneReturnData: TPlaneReturnData;
   QueryItem: string;
 begin
-  result := eInvalid;
+  Result := eInvalid;
   UnFocus0 := UnFocus;
   FromLoc := MyUn[UnFocus].Loc;
@@ -6100 +6100 @@
   if (ToLoc < 0) or (ToLoc >= G.lx * G.ly) then
   begin
-    result := eInvalid;
-    exit;
+    Result := eInvalid;
+    Exit;
   end;
   if MyMap[ToLoc] and fStealthUnit <> 0 then
   begin
     SoundMessage(Phrases.Lookup('ATTACKSTEALTH'), '');
-    exit;
+    Exit;
   end;
   if MyMap[ToLoc] and fHiddenUnit <> 0 then
   begin
     SoundMessage(Phrases.Lookup('ATTACKSUB'), '');
-    exit;
+    Exit;
   end;
 
@@ -6121 +6121 @@
     begin
       SoundMessage(Phrases.Lookup('NOATTACKER'), '');
-      exit;
+      Exit;
     end;
     euix := MyRO.nEnemyUn - 1;
     while (euix >= 0) and (MyRO.EnemyUn[euix].Loc <> ToLoc) do
-      dec(euix);
+      Dec(euix);
   end;
 
   DirCode := dx and 7 shl 4 + dy and 7 shl 7;
-  result := Server(sMoveUnit - sExecute + DirCode, me, UnFocus, nil^);
-  if (result < rExecuted) and (MyUn[UnFocus].Job > jNone) then
-    Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-  if (result < rExecuted) and (result <> eNoTime_Move) then
-  begin
-    case result of
+  Result := Server(sMoveUnit - sExecute + DirCode, Me, UnFocus, nil^);
+  if (Result < rExecuted) and (MyUn[UnFocus].Job > jNone) then
+    Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+  if (Result < rExecuted) and (Result <> eNoTime_Move) then
+  begin
+    case Result of
       eNoTime_Load:
         if MyModel[MyUn[UnFocus].mix].Domain = dAir then
@@ -6170 +6170 @@
             (MyMap[ToLoc] and (fUnit or fOwned) = fUnit or fOwned) then
           begin // false load attempt
-            ToShip := false;
-            ToTransport := false;
+            ToShip := False;
+            ToTransport := False;
             for uix := 0 to MyRO.nUn - 1 do
               if (MyUn[uix].Loc = ToLoc) and
                 (MyModel[MyUn[uix].mix].Domain = dSea) then
               begin
-                ToShip := true;
+                ToShip := True;
                 if MyModel[MyUn[uix].mix].Cap[mcSeaTrans] > 0 then
-                  ToTransport := true;
+                  ToTransport := True;
               end;
             if ToTransport then
@@ -6193 +6193 @@
       Play('NOMOVE_DEFAULT');
     end;
-    exit;
-  end;
-
-  if ((result = eWon) or (result = eLost) or (result = eBloody)) and
+    Exit;
+  end;
+
+  if ((Result = eWon) or (Result = eLost) or (Result = eBloody)) and
     (MyUn[UnFocus].Movement < 100) and
     (MyModel[MyUn[UnFocus].mix].Cap[mcWill] = 0) then
@@ -6203 +6203 @@
       [MyUn[UnFocus].Movement]), 'NOMOVE_TIME') <> mrOK then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end;
     Update; // remove message box from screen
   end;
 
-  OldUnrest := false;
-  NewUnrest := false;
-  if (result >= rExecuted) and (result and rUnitRemoved = 0) and
+  OldUnrest := False;
+  NewUnrest := False;
+  if (Result >= rExecuted) and (Result and rUnitRemoved = 0) and
     (MyMap[ToLoc] and (fUnit or fOwned) <> fUnit) then
   begin
@@ -6221 +6221 @@
       begin
         QueryItem := 'UNREST_NOTOWN';
-        p1 := me;
+        p1 := Me;
       end
       else
@@ -6238 +6238 @@
         if ModalResult <> mrOK then
         begin
-          result := eInvalid;
-          exit;
+          Result := eInvalid;
+          Exit;
         end;
       end;
@@ -6246 +6246 @@
   end;
 
-  if (result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
+  if (Result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
     (MyUn[UnFocus].Status and usToldNoReturn = 0) then
   begin // can plane return?
@@ -6266 +6266 @@
         PlaneReturnData.Movement := MyUn[UnFocus].Movement - 150;
     end;
-    if Server(sGetPlaneReturn, me, UnFocus, PlaneReturnData) = eNoWay then
+    if Server(sGetPlaneReturn, Me, UnFocus, PlaneReturnData) = eNoWay then
     begin
       if MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_Glider then
@@ -6275 +6275 @@
         <> mrOK then
       begin
-        result := eInvalid;
-        exit;
+        Result := eInvalid;
+        Exit;
       end;
       Update; // remove message box from screen
@@ -6283 +6283 @@
   end;
 
-  if result = eMissionDone then
+  if Result = eMissionDone then
   begin
     ModalSelectDlg.ShowNewContent(wmModal, kMission);
     Update; // dialog still on screen
-    Mission := ModalSelectDlg.result;
+    Mission := ModalSelectDlg.Result;
     if Mission < 0 then
-      exit;
-    Server(sSetSpyMission + Mission shl 4, me, 0, nil^);
-  end;
-
-  CityCaptured := false;
-  if result = eNoTime_Move then
+      Exit;
+    Server(sSetSpyMission + Mission shl 4, Me, 0, nil^);
+  end;
+
+  CityCaptured := False;
+  if Result = eNoTime_Move then
     Play('NOMOVE_TIME')
   else
   begin
-    NeedEcoUpdate := false;
-    DestinationMarkON := false;
+    NeedEcoUpdate := False;
+    DestinationMarkON := False;
     PaintDestination;
-    if result and rUnitRemoved <> 0 then
+    if Result and rUnitRemoved <> 0 then
       CityOptimizer_BeforeRemoveUnit(UnFocus);
-    IsAttack := (result = eBombarded) or (result <> eMissionDone) and
+    IsAttack := (Result = eBombarded) or (Result <> eMissionDone) and
       (MyMap[ToLoc] and (fUnit or fOwned) = fUnit);
     if not IsAttack then
@@ -6309 +6309 @@
       cix := MyRO.nCity - 1; { look for own city at dest location }
       while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-        dec(cix);
-      if (result <> eMissionDone) and (MyMap[ToLoc] and fCity <> 0) and (cix < 0)
+        Dec(cix);
+      if (Result <> eMissionDone) and (MyMap[ToLoc] and fCity <> 0) and (cix < 0)
       then
-        CityCaptured := true;
-      result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
-      case result of
+        CityCaptured := True;
+      Result := Server(sMoveUnit + DirCode, Me, UnFocus, nil^);
+      case Result of
         eHiddenUnit:
           begin
@@ -6332 +6332 @@
         rExecuted .. maxint:
           begin
-            if result and rUnitRemoved <> 0 then
+            if Result and rUnitRemoved <> 0 then
               UnFocus := -1 // unit died
             else
             begin
-              assert(UnFocus >= 0);
+              Assert(UnFocus >= 0);
               MyUn[UnFocus].Status := MyUn[UnFocus].Status and
                 not(usStay or usRecover);
@@ -6346 +6346 @@
               begin // borders have moved, unrest might have changed in any city
                 CityOptimizer_BeginOfTurn;
-                NeedEcoUpdate := true;
+                NeedEcoUpdate := True;
               end
               else
@@ -6356 +6356 @@
                     if MyUn[uix].Master = UnFocus then
                       CityOptimizer_CityChange(MyUn[uix].Home);
-                  NeedEcoUpdate := true;
+                  NeedEcoUpdate := True;
                 end;
                 if (MyRO.Government = gDespotism) and
@@ -6366 +6366 @@
                     while (cixChanged >= 0) and
                       (MyCity[cixChanged].Loc <> FromLoc) do
-                      dec(cixChanged);
-                    assert(cixChanged >= 0);
+                      Dec(cixChanged);
+                    Assert(cixChanged >= 0);
                     if cixChanged >= 0 then
                     begin
                       CityOptimizer_CityChange(cixChanged);
-                      NeedEcoUpdate := true;
+                      NeedEcoUpdate := True;
                     end;
                   end;
@@ -6379 +6379 @@
                     while (cixChanged >= 0) and
                       (MyCity[cixChanged].Loc <> ToLoc) do
-                      dec(cixChanged);
-                    assert(cixChanged >= 0);
+                      Dec(cixChanged);
+                    Assert(cixChanged >= 0);
                     if cixChanged >= 0 then
                     begin
                       CityOptimizer_CityChange(cixChanged);
-                      NeedEcoUpdate := true;
+                      NeedEcoUpdate := True;
                     end;
                   end;
@@ -6392 +6392 @@
           end;
       else
-        assert(false);
+        Assert(False);
       end;
       SetTroopLoc(ToLoc);
@@ -6398 +6398 @@
     else
     begin { enemy unit -- attack }
-      if result = eBombarded then
+      if Result = eBombarded then
         Defender := MyRO.Territory[ToLoc]
       else
@@ -6405 +6405 @@
         if SimpleQuery(mkYesNo,Phrases.Lookup('FRCANCELQUERY_CEASEFIRE'),
         'MSG_DEFAULT')<>mrOK then
-        exit; }
-      if (Options and muNoSuicideCheck = 0) and (result and rUnitRemoved <> 0)
-        and (result <> eMissionDone) then
+        Exit; }
+      if (Options and muNoSuicideCheck = 0) and (Result and rUnitRemoved <> 0)
+        and (Result <> eMissionDone) then
       begin // suicide query
         with MyUn[UnFocus], BattleDlg.Forecast do
         begin
-          pAtt := me;
+          pAtt := Me;
           mixAtt := mix;
           HealthAtt := Health;
@@ -6418 +6418 @@
         end;
         BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-        Server(sGetBattleForecastEx, me, ToLoc, BattleDlg.Forecast);
+        Server(sGetBattleForecastEx, Me, ToLoc, BattleDlg.Forecast);
         BattleDlg.uix := UnFocus;
         BattleDlg.ToLoc := ToLoc;
-        BattleDlg.IsSuicideQuery := true;
+        BattleDlg.IsSuicideQuery := True;
         BattleDlg.ShowModal;
         if BattleDlg.ModalResult <> mrOK then
-          exit;
+          Exit;
       end;
 
       cixChanged := -1;
-      if (result and rUnitRemoved <> 0) and (MyRO.Government = gDespotism) and
+      if (Result and rUnitRemoved <> 0) and (MyRO.Government = gDespotism) and
         (MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_TownGuard) and
         (MyMap[FromLoc] and fCity <> 0) then
@@ -6434 +6434 @@
         cixChanged := MyRO.nCity - 1;
         while (cixChanged >= 0) and (MyCity[cixChanged].Loc <> FromLoc) do
-          dec(cixChanged);
-        assert(cixChanged >= 0);
-      end;
-
-      for i := 0 to MyRO.nEnemyModel - 1 do
-        LostArmy[i] := MyRO.EnemyModel[i].Lost;
+          Dec(cixChanged);
+        Assert(cixChanged >= 0);
+      end;
+
+      for I := 0 to MyRO.nEnemyModel - 1 do
+        LostArmy[I] := MyRO.EnemyModel[I].Lost;
       OldToTile := MyMap[ToLoc];
-      result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
+      Result := Server(sMoveUnit + DirCode, Me, UnFocus, nil^);
       nLostArmy := 0;
-      for i := 0 to MyRO.nEnemyModel - 1 do
-      begin
-        LostArmy[i] := MyRO.EnemyModel[i].Lost - LostArmy[i];
-        inc(nLostArmy, LostArmy[i]);
-      end;
-      if result and rUnitRemoved <> 0 then
+      for I := 0 to MyRO.nEnemyModel - 1 do
+      begin
+        LostArmy[I] := MyRO.EnemyModel[I].Lost - LostArmy[I];
+        Inc(nLostArmy, LostArmy[I]);
+      end;
+      if Result and rUnitRemoved <> 0 then
       begin
         UnFocus := -1;
@@ -6457 +6457 @@
       begin // city was destroyed, borders have moved, unrest might have changed in any city
         CityOptimizer_BeginOfTurn;
-        NeedEcoUpdate := true;
+        NeedEcoUpdate := True;
       end
       else
@@ -6464 +6464 @@
         begin
           CityOptimizer_CityChange(cixChanged);
-          NeedEcoUpdate := true;
+          NeedEcoUpdate := True;
         end;
-        if (result = eWon) or (result = eBloody) or (result = eExpelled) then
+        if (Result = eWon) or (Result = eBloody) or (Result = eExpelled) then
         begin
           CityOptimizer_TileBecomesAvailable(ToLoc);
-          NeedEcoUpdate := true;
+          NeedEcoUpdate := True;
         end;
       end;
@@ -6484 +6484 @@
       end;
     end;
-    if result and rUnitRemoved <> 0 then
+    if Result and rUnitRemoved <> 0 then
     begin
       CityOptimizer_AfterRemoveUnit;
       ListDlg.RemoveUnit;
-      NeedEcoUpdate := true;
+      NeedEcoUpdate := True;
     end;
     if NeedEcoUpdate then
     begin
-      UpdateViews(true);
+      UpdateViews(True);
       Update;
     end;
   end;
 
-  if result = eMissionDone then
+  if Result = eMissionDone then
   begin
     p1 := MyRO.Territory[ToLoc];
@@ -6503 +6503 @@
       smStealMap:
         begin
-          MapValid := false;
+          MapValid := False;
           PaintAllMaps
         end;
@@ -6516 +6516 @@
     CheckToldNoReturn(UnFocus);
 
-  NeedRepaintPanel := false;
-  if result >= rExecuted then
+  NeedRepaintPanel := False;
+  if Result >= rExecuted then
   begin
     if CityCaptured and (MyMap[ToLoc] and fCity = 0) then
     begin // city destroyed
-      for i := 0 to nWonder - 1 do { tell about destroyed wonders }
-        if (MyRO.Wonder[i].CityID = WonderDestroyed) and (MyData.ToldWonders[i].CityID <> WonderDestroyed)
+      for I := 0 to nWonder - 1 do { tell about destroyed wonders }
+        if (MyRO.Wonder[I].CityID = WonderDestroyed) and (MyData.ToldWonders[I].CityID <> WonderDestroyed)
         then
           with MessgExDlg do
           begin
             if WondersDlg.Visible then
-              WondersDlg.SmartUpdateContent(false);
+              WondersDlg.SmartUpdateContent(False);
             OpenSound := 'WONDER_DESTROYED';
             MessgText := Format(Phrases.Lookup('WONDERDEST'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
-            MyData.ToldWonders[i] := MyRO.Wonder[i];
+            MyData.ToldWonders[I] := MyRO.Wonder[I];
           end;
     end;
@@ -6543 +6543 @@
     begin // city captured
       ListDlg.AddCity;
-      for i := 0 to nWonder - 1 do { tell about capture of wonders }
-        if MyRO.City[MyRO.nCity - 1].Built[i] > 0 then
+      for I := 0 to nWonder - 1 do { tell about capture of wonders }
+        if MyRO.City[MyRO.nCity - 1].Built[I] > 0 then
           with MessgExDlg do
           begin
             if WondersDlg.Visible then
-              WondersDlg.SmartUpdateContent(false);
+              WondersDlg.SmartUpdateContent(False);
             OpenSound := 'WONDER_CAPTURED';
-            MessgText := Format(Tribe[me].TPhrase('WONDERCAPTOWN'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+            MessgText := Format(Tribe[Me].TPhrase('WONDERCAPTOWN'),
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
-            MyData.ToldWonders[i] := MyRO.Wonder[i];
+            MyData.ToldWonders[I] := MyRO.Wonder[I];
           end;
 
@@ -6564 +6564 @@
       begin { Temple of Zeus -- choose advance to steal }
         ModalSelectDlg.ShowNewContent(wmModal, kStealTech);
-        Server(sStealTech, me, ModalSelectDlg.result, nil^);
+        Server(sStealTech, Me, ModalSelectDlg.Result, nil^);
       end;
       TellNewModels;
@@ -6570 +6570 @@
       cix := MyRO.nCity - 1;
       while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-        dec(cix);
-      assert(cix >= 0);
+        Dec(cix);
+      Assert(cix >= 0);
       MyCity[cix].Status := MyCity[cix].Status and not csResourceWeightsMask or
         (3 shl 4);
       // captured city, set to maximum growth
       NewTiles := 1 shl 13; { exploit central tile only }
-      Server(sSetCityTiles, me, cix, NewTiles);
+      Server(sSetCityTiles, Me, cix, NewTiles);
     end
     else
-      NeedRepaintPanel := true;
+      NeedRepaintPanel := True;
   end;
   TellNewContacts;
@@ -6593 +6593 @@
   if Options and (muAutoNoWait or muAutoNext) <> 0 then
   begin
-    if (UnFocus >= 0) and ((result = eNoTime_Move) or UnitExhausted(UnFocus) or
+    if (UnFocus >= 0) and ((Result = eNoTime_Move) or UnitExhausted(UnFocus) or
       (MyUn[UnFocus].Master >= 0) or (MyModel[MyUn[UnFocus].mix].Domain = dAir)
       and ((MyMap[MyUn[UnFocus].Loc] and fCity <> 0)
@@ -6607 +6607 @@
         end
         else
-          NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
     end
     else if (UnFocus < 0) and (Options and muAutoNext <> 0) then
-      NextUnit(UnStartLoc, result <> eMissionDone);
+      NextUnit(UnStartLoc, Result <> eMissionDone);
   end;
 
@@ -6618 +6618 @@
     else
     begin
-      assert(result <> eMissionDone);
+      Assert(Result <> eMissionDone);
       CheckTerrainBtnVisible;
       FocusOnLoc(ToLoc, flRepaintPanel or flImmUpdate);
     end;
 
-  if (result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
+  if (Result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
   then
     ZoomToCity(ToLoc, UnFocus < 0, chCaptured); // show captured city
@@ -6629 +6629 @@
 
 procedure TMainScreen.MoveOnScreen(ShowMove: TShowMove;
-  Step0, Step1, nStep: integer; Restore: boolean = true);
+  Step0, Step1, nStep: Integer; Restore: Boolean = True);
 var
   ToLoc, xFromLoc, yFromLoc, xToLoc, yToLoc, xFrom, yFrom, xTo, yTo, xMin, yMin,
-    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: integer;
+    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: Integer;
   UnitInfo: TUnitInfo;
   Ticks0, Ticks: TDateTime;
 begin
-  Timer1.Enabled := false;
+  Timer1.Enabled := False;
   Ticks0 := NowPrecise;
   with ShowMove do
@@ -6645 +6645 @@
     UnitInfo.Job := jNone;
     UnitInfo.Flags := Flags;
-    if Owner <> me then
+    if Owner <> Me then
       UnitInfo.emix := emix;
 
@@ -6664 +6664 @@
         * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
         * 2 + dx * xxt - MapWidth) do
-        dec(xw1, G.lx);
+        Dec(xw1, G.lx);
 
       xTo := (xToLoc - xw1) * (xxt * 2) + yToLoc and 1 * xxt + (xxt - xxu);
@@ -6684 +6684 @@
         yRange := yFrom - yTo;
       end;
-      inc(xRange, xxt * 2);
-      inc(yRange, yyt * 3);
+      Inc(xRange, xxt * 2);
+      Inc(yRange, yyt * 3);
     end;
 
@@ -6694 +6694 @@
     begin
       BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
-        offscreen.Canvas, xMin, yMin);
+        Offscreen.Canvas, xMin, yMin);
       if Step1 <> Step0 then
       begin
@@ -6723 +6723 @@
           < MoveTime) then
         begin
-          if not idle or (GameMode = cMovie) then
+          if not Idle or (GameMode = cMovie) then
             Application.ProcessMessages;
           Sleep(1);
-          inc(SliceCount)
+          Inc(SliceCount)
         end;
         Ticks := NowPrecise;
@@ -6735 +6735 @@
   if Restore then
   begin
-    BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange, offscreen.Canvas, xMin, yMin);
+    BitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange, Offscreen.Canvas, xMin, yMin);
     PaintBufferToScreen(xMin, yMin, xRange, yRange);
   end;
   BlinkTime := -1;
-  Timer1.Enabled := true;
-end;
-
-procedure TMainScreen.MoveToLoc(Loc: integer; CheckSuicide: boolean);
+  Timer1.Enabled := True;
+end;
+
+procedure TMainScreen.MoveToLoc(Loc: Integer; CheckSuicide: Boolean);
 // path finder: move focused unit to loc, start multi-turn goto if too far
 var
-  uix, i, MoveOptions, NextLoc, MoveResult: integer;
+  uix, I, MoveOptions, NextLoc, MoveResult: Integer;
   MoveAdviceData: TMoveAdviceData;
   StopReason: (None, Arrived, Dead, NoTime, EnemySpotted, MoveError);
 begin
   if MyUn[UnFocus].Job > jNone then
-    Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+    Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
   if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) >= rExecuted then
   begin
@@ -6756 +6756 @@
     StopReason := None;
     repeat
-      for i := 0 to MoveAdviceData.nStep - 1 do
-      begin
-        if i = MoveAdviceData.nStep - 1 then
+      for I := 0 to MoveAdviceData.nStep - 1 do
+      begin
+        if I = MoveAdviceData.nStep - 1 then
           MoveOptions := muAutoNext
         else
           MoveOptions := 0;
-        NextLoc := dLoc(MyUn[uix].Loc, MoveAdviceData.dx[i],
-          MoveAdviceData.dy[i]);
+        NextLoc := dLoc(MyUn[uix].Loc, MoveAdviceData.dx[I],
+          MoveAdviceData.dy[I]);
         if (NextLoc = Loc) or (Loc = maNextCity) and
           (MyMap[NextLoc] and fCity <> 0) then
@@ -6769 +6769 @@
         if not CheckSuicide and (NextLoc = Loc) then
           MoveOptions := MoveOptions or muNoSuicideCheck;
-        MoveResult := MoveUnit(MoveAdviceData.dx[i], MoveAdviceData.dy[i],
+        MoveResult := MoveUnit(MoveAdviceData.dx[I], MoveAdviceData.dy[I],
           MoveOptions);
         if MoveResult < rExecuted then
@@ -6781 +6781 @@
       end;
       if (StopReason = None) and ((MoveAdviceData.nStep < 25) or
-        (MyRO.Wonder[woShinkansen].EffectiveOwner <> me)) then
+        (MyRO.Wonder[woShinkansen].EffectiveOwner <> Me)) then
         StopReason := NoTime;
       if StopReason <> None then
@@ -6787 +6787 @@
       if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) < rExecuted then
       begin
-        assert(false);
+        Assert(False);
         Break;
       end;
-    until false;
+    until False;
 
     case StopReason of
       None:
-        assert(false);
+        Assert(False);
       Arrived:
         MyUn[uix].Status := MyUn[uix].Status and ($FFFF - usGoto);
       Dead:
         if UnFocus < 0 then
-          NextUnit(UnStartLoc, false);
+          NextUnit(UnStartLoc, False);
     else
       begin // multi-turn goto
@@ -6812 +6812 @@
         begin
           MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
-          NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
         end;
       end;
@@ -6820 +6820 @@
 
 procedure TMainScreen.PanelBoxMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, xMouse, MouseLoc, p1: integer;
+  I, xMouse, MouseLoc, p1: Integer;
 begin
   if GameMode = cMovie then
-    exit;
+    Exit;
 
   if Button = mbLeft then
   begin
-    if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx) and
-      (y < yMini + 2 + G.ly) then
+    if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
+      (Y < yMini + 2 + G.ly) then
       if ssShift in Shift then
       begin
         with MainMap do
-          xMouse := (xwMini + (x - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
+          xMouse := (xwMini + (X - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
             div 2) mod G.lx;
-        MouseLoc := xMouse + G.lx * (y - (yMini + 2));
+        MouseLoc := xMouse + G.lx * (Y - (yMini + 2));
         if MyMap[MouseLoc] and fTerrain <> fUNKNOWN then
         begin
           p1 := MyRO.Territory[MouseLoc];
-          if (p1 = me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
+          if (p1 = Me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
             NatStatDlg.ShowNewContent(wmPersistent, p1);
         end;
@@ -6850 +6850 @@
         if UnitStatDlg.Visible then
           UnitStatDlg.Close;
-        Tracking := true;
-        PanelBoxMouseMove(Sender, Shift + [ssLeft], x, y);
+        Tracking := True;
+        PanelBoxMouseMove(Sender, Shift + [ssLeft], X, Y);
       end
-    else if (ClientMode <> cEditMap) and (x >= ClientWidth - xPalace) and
-      (y >= yPalace) and (x < ClientWidth - xPalace + xSizeBig) and
-      (y < yPalace + ySizeBig) then
+    else if (ClientMode <> cEditMap) and (X >= ClientWidth - xPalace) and
+      (Y >= yPalace) and (X < ClientWidth - xPalace + xSizeBig) and
+      (Y < yPalace + ySizeBig) then
     begin
       InitPopup(StatPopup);
@@ -6866 +6866 @@
           GetSystemMetrics(SM_CYCAPTION) + 3)
     end
-    (* else if (x>=xAdvisor-3) and (y>=yAdvisor-3)
-      and (x<xAdvisor+16+3) and (y<yAdvisor+16+3) and HaveStrategyAdvice then
+    (* else if (X>=xAdvisor-3) and (Y>=yAdvisor-3)
+      and (X<xAdvisor+16+3) and (Y<yAdvisor+16+3) and HaveStrategyAdvice then
       AdviceBtnClick *)
-    else if (x >= xTroop + 1) and (y >= yTroop + 1) and
-      (x < xTroop + TrRow * TrPitch) and (y <= yTroop + 55) then
-    begin
-      i := (x - xTroop - 1) div TrPitch;
-      if trix[i] >= 0 then
+    else if (X >= xTroop + 1) and (Y >= yTroop + 1) and
+      (X < xTroop + TrRow * TrPitch) and (Y <= yTroop + 55) then
+    begin
+      I := (X - xTroop - 1) div TrPitch;
+      if trix[I] >= 0 then
         if ClientMode = cEditMap then
         begin
-          BrushType := trix[i];
+          BrushType := trix[I];
           PanelPaint
         end
@@ -6884 +6884 @@
             if ssShift in Shift then
               UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
-                MyUn[trix[i]].mix)
-            else if not supervising and (ClientMode < scContact) and
-              (x - xTroop - 1 - i * TrPitch >= 60 - 20) and (y >= yTroop + 35)
-              and ((MyUn[trix[i]].Job > jNone) or (MyUn[trix[i]].Status and
+                MyUn[trix[I]].mix)
+            else if not Supervising and (ClientMode < scContact) and
+              (X - xTroop - 1 - I * TrPitch >= 60 - 20) and (Y >= yTroop + 35)
+              and ((MyUn[trix[I]].Job > jNone) or (MyUn[trix[I]].Status and
               (usStay or usRecover or usGoto) <> 0)) then
             begin // wake up
-              MyUn[trix[i]].Status := MyUn[trix[i]].Status and
+              MyUn[trix[I]].Status := MyUn[trix[I]].Status and
                 ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
-              if MyUn[trix[i]].Job > jNone then
-                Server(sStartJob + jNone shl 4, me, trix[i], nil^);
+              if MyUn[trix[I]].Job > jNone then
+                Server(sStartJob + jNone shl 4, Me, trix[I], nil^);
               if (UnFocus < 0) and not CityDlg.Visible then
               begin
-                SetUnFocus(trix[i]);
-                SetTroopLoc(MyUn[trix[i]].Loc);
+                SetUnFocus(trix[I]);
+                SetTroopLoc(MyUn[trix[I]].Loc);
                 FocusOnLoc(TroopLoc, flRepaintPanel)
               end
@@ -6903 +6903 @@
               begin
                 if CityDlg.Visible and (CityDlg.RestoreUnFocus < 0) then
-                  CityDlg.RestoreUnFocus := trix[i];
+                  CityDlg.RestoreUnFocus := trix[I];
                 PanelPaint;
               end
@@ -6909 +6909 @@
             else if (ClientMode < scContact) then
             begin
-              if supervising then
-                UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[i])
+              if Supervising then
+                UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[I])
               else if CityDlg.Visible then
               begin
@@ -6916 +6916 @@
                 CityDlg.Close;
                 SumCities(TaxSum, ScienceSum);
-                SetUnFocus(trix[i]);
+                SetUnFocus(trix[I]);
               end
               else
               begin
-                DestinationMarkON := false;
+                DestinationMarkON := False;
                 PaintDestination;
-                UnFocus := trix[i];
+                UnFocus := trix[I];
                 UnStartLoc := TroopLoc;
                 BlinkTime := 0;
-                BlinkON := false;
+                BlinkON := False;
                 PaintLoc(TroopLoc);
               end;
               if UnFocus >= 0 then
               begin
-                UnitInfoBtn.Visible := true;
-                UnitBtn.Visible := true;
-                TurnComplete := false;
+                UnitInfoBtn.Visible := True;
+                UnitBtn.Visible := True;
+                TurnComplete := False;
                 EOT.ButtonIndex := eotGray;
               end;
@@ -6939 +6939 @@
             end;
           end
-          else if Server(sGetUnits, me, TroopLoc, TrCnt) >= rExecuted then
+          else if Server(sGetUnits, Me, TroopLoc, TrCnt) >= rExecuted then
             if ssShift in Shift then
               UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-                MyRO.EnemyUn[MyRO.nEnemyUn + trix[i]].emix) // model info
+                MyRO.EnemyUn[MyRO.nEnemyUn + trix[I]].emix) // model info
             else
               UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
-                MyRO.nEnemyUn + trix[i]); // unit info
-    end;
-  end;
-end;
-
-procedure TMainScreen.SetTroopLoc(Loc: integer);
+                MyRO.nEnemyUn + trix[I]); // unit info
+    end;
+  end;
+end;
+
+procedure TMainScreen.SetTroopLoc(Loc: Integer);
 var
-  trixFocus, uix, uixDefender: integer;
-  Prio: boolean;
+  trixFocus, uix, uixDefender: Integer;
+  Prio: Boolean;
 begin
   TroopLoc := Loc;
@@ -6965 +6965 @@
     if MyMap[Loc] and fOwned <> 0 then
     begin // count own units here
-      Server(sGetDefender, me, TroopLoc, uixDefender);
-      for Prio := true downto false do
+      Server(sGetDefender, Me, TroopLoc, uixDefender);
+      for Prio := True downto False do
         for uix := 0 to MyRO.nUn - 1 do
           if ((uix = uixDefender) = Prio) and (MyUn[uix].Loc = Loc) then
@@ -6972 +6972 @@
             if uix = UnFocus then
               trixFocus := TrCnt;
-            inc(TrCnt);
+            Inc(TrCnt);
           end;
     end
     else // count enemy units here
-      Server(sGetUnits, me, Loc, TrCnt);
+      Server(sGetUnits, Me, Loc, TrCnt);
   if TrCnt = 0 then
     sb.Init(0, 1)
@@ -6987 +6987 @@
 end;
 
-(* procedure TMainScreen.ShowMoveHint(ToLoc: integer; Force: boolean = false);
+(* procedure TMainScreen.ShowMoveHint(ToLoc: Integer; Force: Boolean = False);
   var
-  Step,Loc,x0,y0,xs,ys: integer;
+  Step,Loc,x0,y0,xs,ys: Integer;
   Info: string;
   InfoSize: TSize;
@@ -7002 +7002 @@
   MoveAdvice.MoreTurns:=0;
   MoveAdvice.MaxHostile_MovementLeft:=MyUn[UnFocus].Health-50;
-  if Server(sGetMoveAdvice,me,UnFocus,MoveAdvice)<rExecuted then
+  if Server(sGetMoveAdvice,Me,UnFocus,MoveAdvice)<rExecuted then
   ToLoc:=-1
   end;
-  if (ToLoc=MoveHintToLoc) and not Force then exit;
+  if (ToLoc=MoveHintToLoc) and not Force then Exit;
   if (ToLoc<>MoveHintToLoc) and (MoveHintToLoc>=0) then
   begin invalidate; update end; // clear old hint from screen
   MoveHintToLoc:=ToLoc;
-  if ToLoc<0 then exit;
-
-  with canvas do
+  if ToLoc<0 then Exit;
+
+  with Canvas do
   begin
   Pen.Color:=$80C0FF;
@@ -7022 +7022 @@
   xs:=(x0-xw)*66+y0 and 1*33-G.lx*66;
   while abs(2*(xs+G.lx*66)-MapWidth)<abs(2*xs-MapWidth) do
-  inc(xs,G.lx*66);
+  Inc(xs,G.lx*66);
   ys:=(y0-yw)*16;
   if Step=0 then moveto(xs+33,ys+16)
@@ -7030 +7030 @@
   end;
   Brush.Color:=$80C0FF;
-  Info:=' '+inttostr(88)+' ';
+  Info:=' '+IntToStr(88)+' ';
   InfoSize:=TextExtent(Info);
   TextOut(xs+33-InfoSize.cx div 2, ys+16-InfoSize.cy div 2, Info);
@@ -7037 +7037 @@
   end; *)
 
-procedure TMainScreen.SetDebugMap(p: integer);
-begin
-  MainMap.pDebugMap := p;
+procedure TMainScreen.SetDebugMap(P: Integer);
+begin
+  MainMap.pDebugMap := P;
   MapOptions := MapOptions - [moLocCodes];
-  mLocCodes.Checked := false;
-  MapValid := false;
+  mLocCodes.Checked := False;
+  MapValid := False;
   MainOffscreenPaint;
 end;
 
-procedure TMainScreen.SetViewpoint(p: integer);
+procedure TMainScreen.SetViewpoint(P: Integer);
 var
-  i: Integer;
-begin
-  if supervising and (G.RO[0].Turn > 0) and
-    ((p = 0) or (1 shl p and G.RO[0].Alive <> 0)) then
+  I: Integer;
+begin
+  if Supervising and (G.RO[0].Turn > 0) and
+    ((P = 0) or (1 shl P and G.RO[0].Alive <> 0)) then
   begin
     ApplyToVisibleForms(faClose);
-    ItsMeAgain(p);
+    ItsMeAgain(P);
     SumCities(TaxSum, ScienceSum);
-    for i := 0 to MyRO.nModel - 1 do
-      if not Assigned(Tribe[me].ModelPicture[i].HGr) then
-        InitMyModel(i, True);
+    for I := 0 to MyRO.nModel - 1 do
+      if not Assigned(Tribe[Me].ModelPicture[I].HGr) then
+        InitMyModel(I, True);
 
     SetTroopLoc(-1);
@@ -7146 +7146 @@
 end;
 
-procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
+procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 
@@ -7156 +7156 @@
   end;
 
-  procedure SetViewpointMe(p: Integer);
-  begin
-    if p = me then SetViewpoint(p)
-      else SetViewpoint(p);
+  procedure SetViewpointMe(P: Integer);
+  begin
+    if P = Me then SetViewpoint(P)
+      else SetViewpoint(P);
   end;
 
@@ -7195 +7195 @@
          'A':
           begin // auto symmetry
-          Server($7F0,me,0,nil^);
-          MapValid:=false;
+          Server($7F0,Me,0,nil^);
+          MapValid:=False;
           PaintAll;
           end;
@@ -7203 +7203 @@
           dy:=0;
           for dx:=G.lx to G.lx*(G.ly-1)-1 do
-          if MyMap[dx] and fTerrain>=fGrass then inc(dy);
+          if MyMap[dx] and fTerrain>=fGrass then Inc(dy);
           dy:=dy
           end;
@@ -7330 +7330 @@
 function TMainScreen.DoJob(j0: Integer): Integer;
 var
-  Loc0, Movement0: integer;
+  Loc0, Movement0: Integer;
 begin
   with MyUn[UnFocus] do
   begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     Loc0 := Loc;
     Movement0 := Movement;
     if j0 < 0 then
-      result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
+      Result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
       // terrain enhancement
     else
-      result := Server(sStartJob + j0 shl 4, me, UnFocus, nil^);
-    if result >= rExecuted then
-    begin
-      if result = eDied then
+      Result := Server(sStartJob + j0 shl 4, Me, UnFocus, nil^);
+    if Result >= rExecuted then
+    begin
+      if Result = eDied then
         UnFocus := -1;
       PaintLoc(Loc0);
       if UnFocus >= 0 then
       begin
-        if (j0 < 0) and (result <> eJobDone) then
+        if (j0 < 0) and (Result <> eJobDone) then
           // multi-turn terrain enhancement
           Status := Status and ($FFFF - usStay - usRecover - usGoto) or
@@ -7360 +7360 @@
         begin
           Status := Status and not usWaiting;
-          NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
         end
         else
@@ -7366 +7366 @@
       end
       else
-        NextUnit(UnStartLoc, true);
-    end;
-  end;
-  case result of
+        NextUnit(UnStartLoc, True);
+    end;
+  end;
+  case Result of
     eNoBridgeBuilding:
       SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
@@ -7378 +7378 @@
         'NOMOVE_TREATY');
   else
-    if result < rExecuted then
+    if Result < rExecuted then
       Play('INVALID');
   end;
@@ -7390 +7390 @@
   with TUn(MyUn[UnFocus]) do begin
     if (Sender = mUtilize) and
-      not(Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized) then
+      not(Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
     begin
       SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
       // freight for colony ship is the only case in which the command is
       // available to player though not valid
-      exit;
+      Exit;
     end;
     if (Sender = mUtilize) and (Health < 100) then
       if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
       then
-        exit;
+        Exit;
     Loc0 := Loc;
     CityOptimizer_BeforeRemoveUnit(UnFocus);
-    if Server(sRemoveUnit, me, UnFocus, nil^) = eUtilized then
+    if Server(sRemoveUnit, Me, UnFocus, nil^) = eUtilized then
       Play('CITY_UTILIZE')
     else
@@ -7409 +7409 @@
     CityOptimizer_AfterRemoveUnit;
     SetTroopLoc(Loc0);
-    UpdateViews(true);
-    DestinationMarkON := false;
+    UpdateViews(True);
+    DestinationMarkON := False;
     PaintDestination;
     UnFocus := -1;
     PaintLoc(Loc0);
-    NextUnit(UnStartLoc, true);
+    NextUnit(UnStartLoc, True);
   end;
 end;
@@ -7420 +7420 @@
 procedure TMainScreen.InitPopup(Popup: TPopupMenu);
 var
-  i, p1, Tile, Test: integer;
-  NoSuper, extended, Multi, NeedSep, HaveCities: boolean;
-  LastSep, m: TMenuItem;
+  I, p1, Tile, Test: Integer;
+  NoSuper, Extended, Multi, NeedSep, HaveCities: Boolean;
+  LastSep, M: TMenuItem;
   mox: ^TModel;
 begin
-  NoSuper := not supervising and (1 shl me and MyRO.Alive <> 0);
-  HaveCities := false;
-  for i := 0 to MyRO.nCity - 1 do
-    if MyCity[i].Loc >= 0 then
-    begin
-      HaveCities := true;
+  NoSuper := not Supervising and (1 shl Me and MyRO.Alive <> 0);
+  HaveCities := False;
+  for I := 0 to MyRO.nCity - 1 do
+    if MyCity[I].Loc >= 0 then
+    begin
+      HaveCities := True;
       Break;
     end;
@@ -7436 +7436 @@
   begin
     mTechTree.Visible := ClientMode <> cEditMap;
-    mResign.Enabled := supervising or (me = 0) and (ClientMode < scContact);
+    mResign.Enabled := Supervising or (Me = 0) and (ClientMode < scContact);
     mRandomMap.Visible := (ClientMode = cEditMap) and
-      (Server(sMapGeneratorRequest, me, 0, nil^) = eOK);
+      (Server(sMapGeneratorRequest, Me, 0, nil^) = eOK);
     mOptions.Visible := ClientMode <> cEditMap;
     mManip.Visible := ClientMode <> cEditMap;
@@ -7452 +7452 @@
       case SoundMode of
         smOff:
-          mSoundOff.Checked := true;
+          mSoundOff.Checked := True;
         smOn:
-          mSoundOn.Checked := true;
+          mSoundOn.Checked := True;
         smOnAlt:
-          mSoundOnAlt.Checked := true;
-      end;
-
-      for i := 0 to nTestFlags - 1 do
-        mManip[i].Checked := MyRO.TestFlags and (1 shl i) <> 0;
-      mManip.Enabled := supervising or (me = 0);
-
-      Multi := false;
+          mSoundOnAlt.Checked := True;
+      end;
+
+      for I := 0 to nTestFlags - 1 do
+        mManip[I].Checked := MyRO.TestFlags and (1 shl I) <> 0;
+      mManip.Enabled := Supervising or (Me = 0);
+
+      Multi := False;
       for p1 := 1 to nPl - 1 do
         if G.RO[p1] <> nil then
-          Multi := true;
+          Multi := True;
       mEnemyMovement.Visible := not Multi;
     end;
@@ -7472 +7472 @@
     if NoSuper and (ClientMode < scContact) then
     begin
-      mCityTypes.Enabled := false;
+      mCityTypes.Enabled := False;
       // check if city types already usefull:
       if MyRO.nCity > 0 then
-        for i := nWonder to nImp - 1 do
-          if (i <> imTrGoods) and (Imp[i].Kind = ikCommon) and
-            (Imp[i].Preq <> preNA) and
-            ((Imp[i].Preq = preNone) or (MyRO.Tech[Imp[i].Preq] >= tsApplicable))
+        for I := nWonder to nImp - 1 do
+          if (I <> imTrGoods) and (Imp[I].Kind = ikCommon) and
+            (Imp[I].Preq <> preNA) and
+            ((Imp[I].Preq = preNone) or (MyRO.Tech[Imp[I].Preq] >= tsApplicable))
           then
           begin
-            mCityTypes.Enabled := true;
+            mCityTypes.Enabled := True;
             Break
           end;
     end;
-    mViewpoint.Visible := (ClientMode <> cEditMap) and supervising;
+    mViewpoint.Visible := (ClientMode <> cEditMap) and Supervising;
     mViewpoint.Enabled := G.RO[0].Turn > 0;
-    if supervising then
+    if Supervising then
     begin
       EmptyMenu(mViewpoint);
@@ -7493 +7493 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TMenuItem.Create(mViewpoint);
+          M := TMenuItem.Create(mViewpoint);
           if p1 = 0 then
-            m.Caption := Phrases.Lookup('SUPER')
+            M.Caption := Phrases.Lookup('SUPER')
           else
-            m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
-          m.Tag := p1;
-          m.OnClick := ViewpointClick;
+            M.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+          M.Tag := p1;
+          M.OnClick := ViewpointClick;
           if p1 < 10 then
-            m.ShortCut := ShortCut(48 + p1, [ssCtrl]);
-          m.RadioItem := true;
-          if p1 = me then
-            m.Checked := true;
-          mViewpoint.Add(m);
+            M.ShortCut := ShortCut(48 + p1, [ssCtrl]);
+          M.RadioItem := True;
+          if p1 = Me then
+            M.Checked := True;
+          mViewpoint.Add(M);
         end
     end;
-    mDebugMap.Visible := (ClientMode <> cEditMap) and supervising;
-    if supervising then
+    mDebugMap.Visible := (ClientMode <> cEditMap) and Supervising;
+    if Supervising then
     begin
       EmptyMenu(mDebugMap);
@@ -7515 +7515 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TMenuItem.Create(mDebugMap);
+          M := TMenuItem.Create(mDebugMap);
           if p1 = 0 then
-            m.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
+            M.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
           else
-            m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+            M.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
           if p1 = 0 then
-            m.Tag := -1
+            M.Tag := -1
           else
-            m.Tag := p1;
-          m.OnClick := DebugMapClick;
+            M.Tag := p1;
+          M.OnClick := DebugMapClick;
           if p1 < 10 then
-            m.ShortCut := ShortCut(48 + p1, [ssAlt]);
-          m.RadioItem := true;
-          if m.Tag = MainMap.pDebugMap then
-            m.Checked := true;
-          mDebugMap.Add(m);
+            M.ShortCut := ShortCut(48 + p1, [ssAlt]);
+          M.RadioItem := True;
+          if M.Tag = MainMap.pDebugMap then
+            M.Checked := True;
+          mDebugMap.Add(M);
         end;
     end;
@@ -7545 +7545 @@
       (ClientMode < scContact);
     mUnitStat.Enabled := NoSuper or (MyRO.Turn > 0);
-    mCityStat.Visible := 1 shl me and MyRO.Alive <> 0;
+    mCityStat.Visible := 1 shl Me and MyRO.Alive <> 0;
     mCityStat.Enabled := HaveCities;
-    mScienceStat.Visible := true;
+    mScienceStat.Visible := True;
     mScienceStat.Enabled := not NoSuper or (MyRO.ResearchTech >= 0) or
       (MyRO.Happened and phTech <> 0) or (MyRO.Happened and phGameEnd <> 0)
@@ -7554 +7554 @@
     mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
     { mWonders.Enabled:= false;
-      for i:=0 to nWonder - 1 do if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
-      mWonders.Enabled:=true; }
+      for I:=0 to nWonder - 1 do if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
+      mWonders.Enabled:=True; }
     mDiagram.Enabled := MyRO.Turn >= 2;
-    mShips.Enabled := false;
+    mShips.Enabled := False;
     for p1 := 0 to nPl - 1 do
       if MyRO.Ship[p1].Parts[spComp] + MyRO.Ship[p1].Parts[spPow] +
         MyRO.Ship[p1].Parts[spHab] > 0 then
-        mShips.Enabled := true;
+        mShips.Enabled := True;
   end
   else if Popup = UnitPopup then
@@ -7567 +7567 @@
     mox := @MyModel[MyUn[UnFocus].mix];
     Tile := MyMap[MyUn[UnFocus].Loc];
-    extended := Tile and fCity = 0;
-    if extended then
+    Extended := Tile and fCity = 0;
+    if Extended then
     begin
       mCity.Caption := Phrases.Lookup('BTN_FOUND');
@@ -7579 +7579 @@
     end;
 
-    extended := extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
+    Extended := Extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
       and (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
       (MyUn[UnFocus].Master < 0) and (Tile and fDeadLands = 0);
     if (mox.Kind = mkFreight) and (Tile and fCity <> 0) and
       not Phrases2FallenBackToEnglish or
-      (Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized) then
-    begin
-      mDisband.Visible := false;
-      mUtilize.Visible := true;
+      (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
+    begin
+      mDisband.Visible := False;
+      mUtilize.Visible := True;
       if mox.Kind = mkFreight then
         mUtilize.Caption := Phrases.Lookup('UTILIZE')
@@ -7595 +7595 @@
     else
     begin
-      mDisband.Visible := true;
-      mUtilize.Visible := false
+      mDisband.Visible := True;
+      mUtilize.Visible := False
     end;
     mGoOn.Visible := MyUn[UnFocus].Status and (usGoto or usWaiting) = usGoto or
@@ -7603 +7603 @@
     mRecover.Visible := (MyUn[UnFocus].Health < 100) and
       (Tile and fTerrain >= fGrass) and
-      ((MyRO.Wonder[woGardens].EffectiveOwner = me) or
+      ((MyRO.Wonder[woGardens].EffectiveOwner = Me) or
       (Tile and fTerrain <> fArctic) and (Tile and fTerrain <> fDesert)) and
       not((mox.Domain = dAir) and (Tile and fCity = 0) and
@@ -7609 +7609 @@
     mStay.Visible := not((mox.Domain = dAir) and (Tile and fCity = 0) and
       (Tile and fTerImp <> tiBase));
-    mCity.Visible := extended and (mox.Kind = mkSettler) or
+    mCity.Visible := Extended and (mox.Kind = mkSettler) or
       (Tile and fCity <> 0) and ((mox.Kind in [mkSettler, mkSlaves]) or
       (MyUn[UnFocus].Flags and unConscripts <> 0));
@@ -7617 +7617 @@
       (MyUn[UnFocus].Status and (usRecover or usGoto) <> 0);
 
-    Test := Server(sLoadUnit - sExecute, me, UnFocus, nil^);
+    Test := Server(sLoadUnit - sExecute, Me, UnFocus, nil^);
     mLoad.Visible := (Test >= rExecuted) or (Test = eNoTime_Load);
     mUnload.Visible := (MyUn[UnFocus].Master >= 0) or
       (MyUn[UnFocus].TroopLoad + MyUn[UnFocus].AirLoad > 0);
-    mSelectTransport.Visible := Server(sSelectTransport - sExecute, me, UnFocus,
+    mSelectTransport.Visible := Server(sSelectTransport - sExecute, Me, UnFocus,
       nil^) >= rExecuted;
   end
@@ -7628 +7628 @@
     mox := @MyModel[MyUn[UnFocus].mix];
     Tile := MyMap[MyUn[UnFocus].Loc];
-    extended := Tile and fCity = 0;
+    Extended := Tile and fCity = 0;
 
     if (Tile and fRiver <> 0) and (MyRO.Tech[adBridgeBuilding] >= tsApplicable)
@@ -7648 +7648 @@
       mClear.Caption := Phrases.Lookup('BTN_DRAIN');
 
-    extended := extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
+    Extended := Extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
       and (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
       (MyUn[UnFocus].Master < 0);
-    if extended then
+    if Extended then
     begin
       mRoad.Visible := JobTest(UnFocus, jRoad, [eNoBridgeBuilding, eTreaty]);
@@ -7671 +7671 @@
     else
     begin
-      for i := 0 to Popup.Items.Count - 1 do
-        Popup.Items[i].Visible := false;
+      for I := 0 to Popup.Items.Count - 1 do
+        Popup.Items[I].Visible := False;
     end;
   end;
@@ -7678 +7678 @@
   // set menu seperators
   LastSep := nil;
-  NeedSep := false;
-  for i := 0 to Popup.Items.Count - 1 do
-    if Popup.Items[i].Caption = '-' then
-    begin
-      Popup.Items[i].Visible := NeedSep;
+  NeedSep := False;
+  for I := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[I].Caption = '-' then
+    begin
+      Popup.Items[I].Visible := NeedSep;
       if NeedSep then
-        LastSep := Popup.Items[i];
-      NeedSep := false
+        LastSep := Popup.Items[I];
+      NeedSep := False
     end
-    else if Popup.Items[i].Visible then
-      NeedSep := true;
+    else if Popup.Items[I].Visible then
+      NeedSep := True;
   if (LastSep <> nil) and not NeedSep then
-    LastSep.Visible := false
+    LastSep.Visible := False
 end;
 
@@ -7709 +7709 @@
 end;
 
-procedure TMainScreen.CityClosed(Activateuix: integer; StepFocus: boolean;
-  SelectFocus: boolean);
-begin
-  if supervising then
+procedure TMainScreen.CityClosed(Activateuix: Integer; StepFocus: Boolean;
+  SelectFocus: Boolean);
+begin
+  if Supervising then
   begin
     SetTroopLoc(-1);
@@ -7729 +7729 @@
     end
     else if StepFocus then
-      NextUnit(TroopLoc, true)
+      NextUnit(TroopLoc, True)
     else
     begin
@@ -7744 +7744 @@
 
 procedure TMainScreen.PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  xCentre, yCentre: integer;
+  xCentre, yCentre: Integer;
 begin
   if Tracking and (ssLeft in Shift) then
   with MainMap do begin
-    if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx) and
-      (y < yMini + 2 + G.ly) then
-    begin
-      xCentre := (xwMini + (x - xMini - 2) div 2 + G.lx div 2 +
+    if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
+      (Y < yMini + 2 + G.ly) then
+    begin
+      xCentre := (xwMini + (X - xMini - 2) div 2 + G.lx div 2 +
         MapWidth div (xxt * 4)) mod G.lx;
-      yCentre := (y - yMini - 2);
+      yCentre := (Y - yMini - 2);
       xw := (xCentre - MapWidth div (xxt * 4) + G.lx) mod G.lx;
       if ywmax <= 0 then
@@ -7769 +7769 @@
       BitBltCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
       if ywmax <= 0 then
-        Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
-          x - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
+        Frame(Buffer.Canvas, X - xMini - 2 - MapWidth div (xxt * 2), 0,
+          X - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
           MainTexture.ColorMark, MainTexture.ColorMark)
       else
-        Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), yw,
-          x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
+        Frame(Buffer.Canvas, X - xMini - 2 - MapWidth div (xxt * 2), yw,
+          X - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
           2, MainTexture.ColorMark, MainTexture.ColorMark);
       BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
@@ -7786 +7786 @@
   end
   else
-    Tracking := false;
+    Tracking := False;
 end;
 
 procedure TMainScreen.PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if Tracking then
   begin
-    Tracking := false;
+    Tracking := False;
     xwMini := xw;
     ywMini := yw;
@@ -7803 +7803 @@
 
 procedure TMainScreen.MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  MouseLoc: integer;
-begin
-  xMouse := x;
-  yMouse := y;
+  MouseLoc: Integer;
+begin
+  xMouse := X;
+  yMouse := Y;
   if (ClientMode = cEditMap) and (ssLeft in Shift) and not Tracking then
   begin
-    MouseLoc := LocationOfScreenPixel(x, y);
+    MouseLoc := LocationOfScreenPixel(X, Y);
     if MouseLoc <> BrushLoc then
-      MapBoxMouseDown(nil, mbLeft, Shift, x, y);
+      MapBoxMouseDown(nil, mbLeft, Shift, X, Y);
   end
-  (* else if idle and (UnFocus>=0) then
+  (* else if Idle and (UnFocus>=0) then
     begin
     qx:=(xMouse*32+yMouse*66+16*66) div(32*66)-1;
@@ -7828 +7828 @@
   TMenuItem(Sender).Checked := not TMenuItem(Sender).Checked;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
@@ -7834 +7834 @@
 procedure TMainScreen.mNamesClick(Sender: TObject);
 var
-  p1: integer;
+  p1: Integer;
 begin
   mNames.Checked := not mNames.Checked;
@@ -7844 +7844 @@
       else
         Tribe[p1].NumberName := p1;
-  MapValid := false;
+  MapValid := False;
   PaintAll;
 end;
 
-function TMainScreen.IsPanelPixel(x, y: integer): boolean;
-begin
-  result := (y >= TopBarHeight + MapHeight) or (y >= ClientHeight - PanelHeight)
-    and ((x < xMidPanel) or (x >= xRightPanel));
+function TMainScreen.IsPanelPixel(X, Y: Integer): Boolean;
+begin
+  Result := (Y >= TopBarHeight + MapHeight) or (Y >= ClientHeight - PanelHeight)
+    and ((X < xMidPanel) or (X >= xRightPanel));
 end;
 
 procedure TMainScreen.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-  if idle then
-    if (x < 40) and (y < 40) then
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Idle then
+    if (X < 40) and (Y < 40) then
     begin
       if GameMode <> cMovie then
@@ -7870 +7870 @@
       end;
     end
-    else if IsPanelPixel(x, y) then
-      PanelBoxMouseDown(Sender, Button, Shift, x,
-        y - (ClientHeight - PanelHeight))
-    else if (y >= TopBarHeight) and (x >= MapOffset) and
-      (x < MapOffset + MapWidth) then
-      MapBoxMouseDown(Sender, Button, Shift, x - MapOffset, y - TopBarHeight)
+    else if IsPanelPixel(X, Y) then
+      PanelBoxMouseDown(Sender, Button, Shift, X,
+        Y - (ClientHeight - PanelHeight))
+    else if (Y >= TopBarHeight) and (X >= MapOffset) and
+      (X < MapOffset + MapWidth) then
+      MapBoxMouseDown(Sender, Button, Shift, X - MapOffset, Y - TopBarHeight)
 end;
 
 procedure TMainScreen.FormMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
-begin
-  if idle then
-    if IsPanelPixel(x, y) then
-      PanelBoxMouseMove(Sender, Shift, x, y - (ClientHeight - PanelHeight))
-    else if (y >= TopBarHeight) and (x >= MapOffset) and
-      (x < MapOffset + MapWidth) then
-      MapBoxMouseMove(Sender, Shift, x - MapOffset, y - TopBarHeight);
+  X, Y: Integer);
+begin
+  if Idle then
+    if IsPanelPixel(X, Y) then
+      PanelBoxMouseMove(Sender, Shift, X, Y - (ClientHeight - PanelHeight))
+    else if (Y >= TopBarHeight) and (X >= MapOffset) and
+      (X < MapOffset + MapWidth) then
+      MapBoxMouseMove(Sender, Shift, X - MapOffset, Y - TopBarHeight);
 end;
 
 procedure TMainScreen.FormMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-  if idle then
-    PanelBoxMouseUp(Sender, Button, Shift, x, y - (ClientHeight - PanelHeight));
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Idle then
+    PanelBoxMouseUp(Sender, Button, Shift, X, Y - (ClientHeight - PanelHeight));
 end;
 
@@ -7902 +7902 @@
     with Canvas do
     begin // pillarbox, make left and right border black
-      if me < 0 then
+      if Me < 0 then
         Brush.Color := $000000
       else
@@ -7929 +7929 @@
     end;
   BitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
-    offscreen.Canvas, 0, 0);
+    Offscreen.Canvas, 0, 0);
   BitBltCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
     0, 0);
   if xMidPanel > MapOffset then
     BitBltCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas,
+      ClientWidth div 2 - xMidPanel, overlap, Offscreen.Canvas,
       xMidPanel - MapOffset, MapHeight - overlap)
   else
     BitBltCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas, 0,
+      ClientWidth div 2 - MapOffset, overlap, Offscreen.Canvas, 0,
       MapHeight - overlap);
   if xRightPanel < MapOffset + MapWidth then
     BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
-      xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas,
+      xRightPanel - ClientWidth div 2, overlap, Offscreen.Canvas,
       ClientWidth div 2 - MapOffset, MapHeight - overlap)
   else
     BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       MapOffset + MapWidth - ClientWidth div 2, overlap,
-      offscreen.Canvas, ClientWidth div 2 - MapOffset,
+      Offscreen.Canvas, ClientWidth div 2 - MapOffset,
       MapHeight - overlap);
   BitBltCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
@@ -7960 +7960 @@
 end;
 
-procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: integer);
+procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: Integer);
 var
   r0: HRgn;
 begin
   r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
 
-procedure TMainScreen.SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+procedure TMainScreen.SmartRectInvalidate(Left, Top, Rigth, Bottom: Integer);
 var
-  i: integer;
+  I: Integer;
   r0, r1: HRgn;
 begin
   r0 := CreateRectRgn(Left, Top, Rigth, Bottom);
-  for i := 0 to ControlCount - 1 do
-    if not(Controls[i] is TArea) and Controls[i].Visible then
-    begin
-      with Controls[i].BoundsRect do
+  for I := 0 to ControlCount - 1 do
+    if not(Controls[I] is TArea) and Controls[I].Visible then
+    begin
+      with Controls[I].BoundsRect do
         r1 := CreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);
     end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -8048 +8048 @@
 procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Timer1.Enabled := false;
+  Timer1.Enabled := False;
 end;
 
 procedure TMainScreen.Radio(Sender: TObject);
 begin
-  TMenuItem(Sender).Checked := true;
+  TMenuItem(Sender).Checked := True;
 end;
 
 procedure TMainScreen.mManipClick(Sender: TObject);
 var
-  Flag: integer;
+  Flag: Integer;
 begin
   with TMenuItem(Sender) do
@@ -8070 +8070 @@
       Play('CHEAT');
     end;
-    if not supervising then
+    if not Supervising then
     begin
       if Flag = tfUncover then
       begin
-        MapValid := false;
+        MapValid := False;
         PaintAllMaps;
       end
@@ -8098 +8098 @@
   else
   begin
-    MapValid := false;
+    MapValid := False;
     PaintAllMaps;
   end; // update main map
@@ -8117 +8117 @@
   end;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
@@ -8135 +8135 @@
   end;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
 
-procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: word;
+procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-  if idle and (Key = VK_APPS) then
+  if Idle and (Key = VK_APPS) then
   begin
     InitPopup(GamePopup);
@@ -8150 +8150 @@
       GamePopup.Popup(Left + 4, Top + GetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
-    exit;
+    Exit;
   end; // windows menu button calls game menu
 end;
@@ -8156 +8156 @@
 procedure TMainScreen.CreateUnitClick(Sender: TObject);
 var
-  p1, mix: integer;
+  p1, mix: Integer;
 begin
   p1 := TComponent(Sender).Tag shr 16;
   mix := TComponent(Sender).Tag and $FFFF;
-  if Server(sCreateUnit + p1 shl 4, me, mix, EditLoc) >= rExecuted then
+  if Server(sCreateUnit + p1 shl 4, Me, mix, EditLoc) >= rExecuted then
     PaintLoc(EditLoc);
 end;
@@ -8181 +8181 @@
 { procedure TMainScreen.AdviceBtnClick;
   var
-  OldAdviceLoc: integer;
-  begin
-  DestinationMarkON:=false;
+  OldAdviceLoc: Integer;
+  begin
+  DestinationMarkON:=False;
   PaintDestination;
   AdvisorDlg.GiveStrategyAdvice;
@@ -8193 +8193 @@
 { procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
   var
-  OldAdviceLoc,x,y: integer;
+  OldAdviceLoc,X,Y: Integer;
   begin
   if Loc<>MainMap.AdviceLoc then
@@ -8199 +8199 @@
   if Loc>=0 then
   begin // center
-  y:=Loc div G.lx;
-  x:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
-  Centre(y*G.lx+x);
+  Y:=Loc div G.lx;
+  X:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
+  Centre(Y*G.lx+X);
   PaintAllMaps;
   end;
@@ -8259 +8259 @@
 procedure TMainScreen.SaveMenuItemsState;
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   if soTellAI in OptionChecked then OptionChecked := [soTellAI]
     else OptionChecked := [];
-  for i := 0 to ComponentCount - 1 do
-    if Components[i] is TMenuItem then
-      for j := 0 to Length(SaveOption) - 1 do
-        if TMenuItem(Components[i]).Checked and
-          (TMenuItem(Components[i]).Tag = SaveOption[j]) then
-          OptionChecked := OptionChecked + [TSaveOption(j)];
+  for I := 0 to ComponentCount - 1 do
+    if Components[I] is TMenuItem then
+      for J := 0 to Length(SaveOption) - 1 do
+        if TMenuItem(Components[I]).Checked and
+          (TMenuItem(Components[I]).Tag = SaveOption[J]) then
+          OptionChecked := OptionChecked + [TSaveOption(J)];
 end;
 
@@ -8280 +8280 @@
   with Reg do
   try
-    OpenKey(AppRegistryKey, true);
+    OpenKey(AppRegistryKey, True);
     WriteInteger('TileSize', Integer(MainMap.TileSize));
     WriteInteger('OptionChecked', Integer(OptionChecked));
     WriteInteger('MapOptionChecked', Integer(MapOptionChecked));
-    WriteInteger('CityReport', integer(CityRepMask));
+    WriteInteger('CityReport', Integer(CityRepMask));
   finally
     Free;

trunk/LocalPlayer/Tribes.pas

@@ -49 +49 @@
     constructor Create(FileName: string);
     destructor Destroy; override;
-    function GetCityName(i: Integer): string;
-{$IFNDEF SCR} procedure SetCityName(i: Integer; NewName: string); {$ENDIF}
+    function GetCityName(I: Integer): string;
+{$IFNDEF SCR} procedure SetCityName(I: Integer; NewName: string); {$ENDIF}
 {$IFNDEF SCR} function TString(Template: string): string;
     function TPhrase(Item: string): string; {$ENDIF}
@@ -74 +74 @@
 procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
 function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): Boolean;
-procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; X, Y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 
@@ -215 +215 @@
 function Get: string;
 var
-  p: Integer;
+  P: Integer;
 begin
   while (Input <> '') and ((Input[1] = ' ') or (Input[1] = #9)) do
     Delete(Input, 1, 1);
-  p := Pos(',', Input);
-  if p = 0 then
-    p := Length(Input) + 1;
-  Result := Copy(Input, 1, p - 1);
-  Delete(Input, 1, p);
+  P := Pos(',', Input);
+  if P = 0 then
+    P := Length(Input) + 1;
+  Result := Copy(Input, 1, P - 1);
+  Delete(Input, 1, P);
 end;
 
 function GetNum: Integer;
 var
-  i: Integer;
-begin
-  Val(Get, Result, i);
-  if i <> 0 then
+  I: Integer;
+begin
+  Val(Get, Result, I);
+  if I <> 0 then
     Result := 0;
 end;
@@ -237 +237 @@
 procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
 var
-  i: Integer;
-begin
-  for i := 0 to StdUnitScript.Count - 1 do
+  I: Integer;
+begin
+  for I := 0 to StdUnitScript.Count - 1 do
   begin // look through StdUnits
-    Input := StdUnitScript[i];
+    Input := StdUnitScript[I];
     pix := GetNum;
     if Code = GetNum then
@@ -340 +340 @@
 end;
 
-procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; X, Y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 begin
   xp := 0;
-  while (xp < xmax) and (HGr.Data.Canvas.Pixels[x + 1 + xp, y] <> Mark) do
+  while (xp < xmax) and (HGr.Data.Canvas.Pixels[X + 1 + xp, Y] <> Mark) do
     Inc(xp);
   yp := 0;
-  while (yp < ymax) and (HGr.Data.Canvas.Pixels[x, y + 1 + yp] <> Mark) do
+  while (yp < ymax) and (HGr.Data.Canvas.Pixels[X, Y + 1 + yp] <> Mark) do
     Inc(yp);
 end;
 
-function TTribe.GetCityName(i: Integer): string;
+function TTribe.GetCityName(I: Integer): string;
 begin
   Result := '';
-  if nCityLines > i then
-  begin
-    Result := Script[CityLine0 + i];
+  if nCityLines > I then
+  begin
+    Result := Script[CityLine0 + I];
     while (Result <> '') and ((Result[1] = ' ') or (Result[1] = #9)) do
       Delete(Result, 1, 1);
@@ -362 +362 @@
 {$IFNDEF SCR}
   else
-    Result := Format(TPhrase('GENCITY'), [i + 1]);
+    Result := Format(TPhrase('GENCITY'), [I + 1]);
 {$ENDIF}
 end;
 
 {$IFNDEF SCR}
-procedure TTribe.SetCityName(i: Integer; NewName: string);
-begin
-  while nCityLines <= i do
+procedure TTribe.SetCityName(I: Integer; NewName: string);
+begin
+  while nCityLines <= I do
   begin
     Script.Insert(CityLine0 + nCityLines, Format(TPhrase('GENCITY'),
@@ -375 +375 @@
     Inc(nCityLines);
   end;
-  Script[CityLine0 + i] := NewName;
+  Script[CityLine0 + I] := NewName;
 end;
 
 function TTribe.TString(Template: string): string;
 var
-  p: Integer;
+  P: Integer;
   Variant: Char;
   CaseUp: Boolean;
 begin
   repeat
-    p := pos('#', Template);
-    if (p = 0) or (p = Length(Template)) then
+    P := Pos('#', Template);
+    if (P = 0) or (P = Length(Template)) then
       Break;
-    Variant := Template[p + 1];
+    Variant := Template[P + 1];
     CaseUp := Variant in ['A' .. 'Z'];
     if CaseUp then
       Inc(Variant, 32);
-    Delete(Template, p, 2);
+    Delete(Template, P, 2);
     if Variant in ['a' .. 'z'] then
     begin
       if NumberName < 0 then
-        Insert(Name[Variant], Template, p)
+        Insert(Name[Variant], Template, P)
       else
-        Insert(Format('P%d', [NumberName]), Template, p);
-      if CaseUp and (Length(Template) >= p) and
-        (Template[p] in ['a' .. 'z', #$E0 .. #$FF]) then
-        Dec(Template[p], 32);
+        Insert(Format('P%d', [NumberName]), Template, P);
+      if CaseUp and (Length(Template) >= P) and
+        (Template[P] in ['a' .. 'z', #$E0 .. #$FF]) then
+        Dec(Template[P], 32);
     end
   until False;
@@ -418 +418 @@
   TLine = array [0 .. 649, 0 .. 2] of Byte;
 var
-  i, x, Gray: Integer;
+  I, X, Gray: Integer;
   Item: string;
 begin
@@ -426 +426 @@
   with Script do
   begin
-    i := 0;
-    while (i < Count) and (Copy(Strings[i], 1, 6) <>
+    I := 0;
+    while (I < Count) and (Copy(Strings[I], 1, 6) <>
         '#AGE' + char(48 + Age) + ' ') do
-      Inc(i);
-    if i < Count then
-    begin
-      Input := Strings[i];
+      Inc(I);
+    if I < Count then
+    begin
+      Input := Strings[I];
       system.Delete(Input, 1, 6);
       Item := Get;
@@ -448 +448 @@
           end;
         cHGr := LoadGraphicSet(Item + '.png');
-        for x := 0 to 3 do
-          with CityPicture[x] do begin
-            FindPosition(cHGr, x * 65, cpix * 49, 63, 47, $00FFFF,
+        for X := 0 to 3 do
+          with CityPicture[X] do begin
+            FindPosition(cHGr, X * 65, cpix * 49, 63, 47, $00FFFF,
               xShield, yShield);
             // FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
@@ -486 +486 @@
 procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
 var
-  i: Integer;
+  I: Integer;
   ok: Boolean;
 begin
@@ -493 +493 @@
     if not IsNew then
     begin
-      i := nPictureList - 1;
-      while (i >= 0) and (PictureList[i].Hash <> Info.Hash) do
-        Dec(i);
-      assert(i >= 0);
-      assert(PictureList[i].HGr = LoadGraphicSet(GrName));
-      assert(PictureList[i].pix = pix);
-      ModelPicture[mix].HGr := PictureList[i].HGr;
-      ModelPicture[mix].pix := PictureList[i].pix;
-      ModelName[mix] := PictureList[i].ModelName;
+      I := nPictureList - 1;
+      while (I >= 0) and (PictureList[I].Hash <> Info.Hash) do
+        Dec(I);
+      Assert(I >= 0);
+      Assert(PictureList[I].HGr = LoadGraphicSet(GrName));
+      Assert(PictureList[I].pix = pix);
+      ModelPicture[mix].HGr := PictureList[I].HGr;
+      ModelPicture[mix].pix := PictureList[I].pix;
+      ModelName[mix] := PictureList[I].ModelName;
     end
     else
@@ -515 +515 @@
       // read model name from tribe script
       ok := False;
-      for i := 0 to Script.Count - 1 do
-      begin
-        Input := Script[i];
+      for I := 0 to Script.Count - 1 do
+      begin
+        Input := Script[I];
         if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
           ok := True
@@ -531 +531 @@
       if ModelName[mix] = '' then
       begin // read model name from StdUnits.txt
-        for i := 0 to StdUnitScript.Count - 1 do
+        for I := 0 to StdUnitScript.Count - 1 do
         begin
-          Input := StdUnitScript[i];
+          Input := StdUnitScript[I];
           if GetNum = pix then
           begin
@@ -567 +567 @@
   Code, Turn: Integer; ForceNew: Boolean): Boolean;
 var
-  i: Integer;
+  I: Integer;
   Cnt: Integer;
   HGr: TGraphicSet;
@@ -606 +606 @@
   if not ForceNew and (Picture.Hash > 0) then
   begin
-    for i := 0 to nPictureList - 1 do
-      if PictureList[i].Hash = Picture.Hash then
-      begin
-        Picture.GrName := PictureList[i].HGr.Name;
-        Picture.pix := PictureList[i].pix;
+    for I := 0 to nPictureList - 1 do
+      if PictureList[I].Hash = Picture.Hash then
+      begin
+        Picture.GrName := PictureList[I].HGr.Name;
+        Picture.pix := PictureList[I].pix;
         Result := False;
         Exit;
@@ -622 +622 @@
   TestPic.GrName := 'StdUnits.png';
   HGr := HGrStdUnits;
-  for i := 0 to StdUnitScript.Count - 1 do
+  for I := 0 to StdUnitScript.Count - 1 do
   begin // look through StdUnits
-    Input := StdUnitScript[i];
+    Input := StdUnitScript[I];
     Check;
   end;
 
   ok := False;
-  for i := 0 to Script.Count - 1 do
+  for I := 0 to Script.Count - 1 do
   begin // look through units defined in tribe script
-    Input := Script[i];
+    Input := Script[I];
     if Copy(Input, 1, 6) = '#UNITS' then
     begin

trunk/LocalPlayer/UKeyBindings.pas

@@ -397 +397 @@
 end.
 
+

trunk/LocalPlayer/UnitStat.pas

@@ -28 +28 @@
   public
     procedure CheckAge;
-    procedure ShowNewContent_OwnModel(NewMode: TWindowMode; mix: integer);
-    procedure ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: integer);
-    procedure ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: integer);
-    procedure ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: integer);
-    procedure ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: integer);
-    procedure ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: integer);
+    procedure ShowNewContent_OwnModel(NewMode: TWindowMode; mix: Integer);
+    procedure ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: Integer);
+    procedure ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: Integer);
+    procedure ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: Integer);
+    procedure ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
+    procedure ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
 
   protected
     mixShow, // for dkOwnModel
-    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: integer;
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: Integer;
     // for dkEnemyUnit, euixShow=-1 ->
     mox: ^TModelInfo; // for dkEnemyModel
@@ -121 +121 @@
 procedure TUnitStatDlg.FormShow(Sender: TObject);
 var
-  owner, mix: integer;
-  IsSpecialUnit: boolean;
+  owner, mix: Integer;
+  IsSpecialUnit: Boolean;
 begin
   if Kind in [dkEnemyUnit, dkEnemyCityDefense, dkEnemyCity] then
@@ -132 +132 @@
         euixShow := MyRO.nEnemyUn - 1;
         while (euixShow >= 0) and (MyRO.EnemyUn[euixShow].Loc <> UnitLoc) do
-          dec(euixShow);
-        assert(euixShow >= 0);
+          Dec(euixShow);
+        Assert(euixShow >= 0);
       end;
       with MyRO.EnemyUn[euixShow] do
@@ -148 +148 @@
       ecixShow := MyRO.nEnemyCity - 1;
       while (ecixShow >= 0) and (MyRO.EnemyCity[ecixShow].Loc <> UnitLoc) do
-        dec(ecixShow);
-      assert(ecixShow >= 0);
+        Dec(ecixShow);
+      Assert(ecixShow >= 0);
     end;
   end;
@@ -178 +178 @@
   end;
 
-  SwitchBtn.Visible := not supervising and (Kind = dkOwnModel);
-  ConscriptsBtn.Visible := not supervising and (Kind = dkOwnModel) and
+  SwitchBtn.Visible := not Supervising and (Kind = dkOwnModel);
+  ConscriptsBtn.Visible := not Supervising and (Kind = dkOwnModel) and
     (MyRO.Tech[adConscription] >= tsApplicable) and
     (MyModel[mixShow].Domain = dGround) and (MyModel[mixShow].Kind < mkScout);
-  IsSpecialUnit := false;
+  IsSpecialUnit := False;
   if Kind in [dkEnemyCity, dkEnemyCityDefense] then
     Caption := CityName(MyRO.EnemyCity[ecixShow].ID)
@@ -190 +190 @@
       dkOwnModel:
         begin
-          owner := me;
+          owner := Me;
           mix := mixShow;
           IsSpecialUnit := MyModel[mix].Kind >= $10;
@@ -196 +196 @@
       dkOwnUnit:
         begin
-          owner := me;
+          owner := Me;
           mix := MyUn[uixShow].mix;
           IsSpecialUnit := MyModel[mix].Kind >= $10;
@@ -218 +218 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode: TWindowMode; mix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode: TWindowMode; mix: Integer);
 begin
   Kind := dkOwnModel;
@@ -225 +225 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: Integer);
 begin
   Kind := dkOwnUnit;
@@ -232 +232 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: Integer);
 begin
   Kind := dkEnemyUnit;
@@ -240 +240 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: Integer);
 begin
   Kind := dkEnemyUnit;
@@ -248 +248 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
 begin
   Kind := dkEnemyModel;
@@ -255 +255 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
 begin
   if MyMap[Loc] and fUnit <> 0 then
@@ -286 +286 @@
   PPicture: ^TModelPicture;
 
-  function IsToCount(emix: integer): boolean;
+  function IsToCount(emix: Integer): Boolean;
   var
     PTestPicture: ^TModelPicture;
@@ -294 +294 @@
       PTestPicture := @Tribe[MyRO.EnemyModel[emix].owner].ModelPicture
         [MyRO.EnemyModel[emix].mix];
-      result := (PPicture.HGr = PTestPicture.HGr) and
+      Result := (PPicture.HGr = PTestPicture.HGr) and
         (PPicture.pix = PTestPicture.pix) and
         (ModelHash(mox^) = ModelHash(MyRO.EnemyModel[emix]));
     end
     else
-      result := (MyRO.EnemyModel[emix].owner = mox.owner) and
+      Result := (MyRO.EnemyModel[emix].owner = mox.owner) and
         (MyRO.EnemyModel[emix].mix = mox.mix);
   end;
 
-  procedure FeatureBar(dst: TBitmap; x, y: integer; const mi: TModelInfo;
+  procedure FeatureBar(dst: TBitmap; X, Y: Integer; const mi: TModelInfo;
     T: TTexture);
   var
-    i, w, dx, num: integer;
-    s: string;
-  begin
-    DarkGradient(dst.Canvas, x - 6, y + 1, 180, 1);
+    I, W, dx, num: Integer;
+    S: string;
+  begin
+    DarkGradient(dst.Canvas, X - 6, Y + 1, 180, 1);
     with dst.Canvas do
       if mi.Kind >= $10 then
       begin
-        s := Phrases.Lookup('UNITSPECIAL');
+        S := Phrases.Lookup('UNITSPECIAL');
         Font.Color := $000000;
-        Textout(x - 1, y + 1, s);
+        Textout(X - 1, Y + 1, S);
         Font.Color := $B0B0B0;
-        Textout(x - 2, y, s);
+        Textout(X - 2, Y, S);
       end
       else
@@ -323 +323 @@
         Font.Color := $000000;
         dx := 2;
-        for i := 3 to nFeature - 1 do
+        for I := 3 to nFeature - 1 do
         begin
           num := 0;
-          case i of
+          case I of
             mcSeaTrans:
               if mi.Domain = dSea then
@@ -342 +342 @@
                 num := mi.TTrans;
             mcFirstNonCap .. nFeature - 1:
-              if mi.Cap and (1 shl (i - mcFirstNonCap)) <> 0 then
+              if mi.Cap and (1 shl (I - mcFirstNonCap)) <> 0 then
                 num := 1
           end;
           if (num > 0) and
-            ((i <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
+            ((I <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
           then
           begin
             if num > 1 then
             begin
-              s := IntToStr(num);
-              w := TextWidth(s);
+              S := IntToStr(num);
+              W := TextWidth(S);
               Brush.Color := $FFFFFF;
-              FillRect(Rect(x - 3 + dx, y + 2, x + w - 1 + dx, y + 16));
+              FillRect(Rect(X - 3 + dx, Y + 2, X + W - 1 + dx, Y + 16));
               Brush.Style := bsClear;
-              Textout(x - 3 + dx + 1, y, s);
-              inc(dx, w + 1)
+              Textout(X - 3 + dx + 1, Y, S);
+              Inc(dx, W + 1)
             end;
             Brush.Color := $C0C0C0;
-            FrameRect(Rect(x - 3 + dx, y + 2, x + 11 + dx, y + 16));
+            FrameRect(Rect(X - 3 + dx, Y + 2, X + 11 + dx, Y + 16));
             Brush.Style := bsClear;
-            Sprite(dst, HGrSystem, x - 1 + dx, y + 4, 10, 10,
-              66 + i mod 11 * 11, 137 + i div 11 * 11);
-            inc(dx, 15)
+            Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
+              66 + I mod 11 * 11, 137 + I div 11 * 11);
+            Inc(dx, 15)
           end;
         end;
@@ -370 +370 @@
   end; { featurebar }
 
-  procedure NumberBarS(dst: TBitmap; x, y: integer; Cap, s: string; T: TTexture);
-  begin
-    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.ColorBevelShade, T.ColorBevelLight);
-    LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
-    RisedTextout(dst.Canvas, x + 170 - BiColorTextWidth(dst.Canvas, s), y, s);
+  procedure NumberBarS(dst: TBitmap; X, Y: Integer; Cap, S: string; T: TTexture);
+  begin
+    DLine(dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade, T.ColorBevelLight);
+    LoweredTextOut(dst.Canvas, -1, T, X - 2, Y, Cap);
+    RisedTextout(dst.Canvas, X + 170 - BiColorTextWidth(dst.Canvas, S), Y, S);
   end;
 
 var
-  i, j, x, y, cix, uix, emix, InProd, Available, Destroyed, Loc, Cnt, yView,
-    yTotal, yCaption: integer;
-  s: string;
+  I, J, X, Y, cix, uix, emix, InProd, Available, Destroyed, Loc, Cnt, yView,
+    yTotal, yCaption: Integer;
+  S: string;
   ui: TUnitInfo;
   mi: TModelInfo;
@@ -389 +389 @@
     dkOwnModel:
       begin
-        BitBltCanvas(offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hOwnModel,
           Back.Canvas, 0, 0);
         yView := 13;
@@ -396 +396 @@
     dkEnemyModel:
       begin
-        BitBltCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
           Back.Canvas, wCommon, 0);
         yView := 13;
@@ -403 +403 @@
     dkEnemyUnit, dkOwnUnit:
       begin
-        BitBltCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
           Back.Canvas, 2 * wCommon, 0);
         yView := 13;
@@ -410 +410 @@
     dkEnemyCityDefense:
       begin
-        BitBltCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
           Back.Canvas, 3 * wCommon, 0);
         yView := 171;
@@ -417 +417 @@
     dkEnemyCity:
       begin
-        BitBltCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+        BitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
           Back.Canvas, 4 * wCommon, 0);
       end;
@@ -427 +427 @@
   begin // show city defense facilities
     Cnt := 0;
-    for i := 0 to 3 do
-      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
-        inc(Cnt);
-    x := (wCommon - Cnt * xSizeSmall) div 2 - (Cnt - 1) * 2;
-    for i := 0 to 3 do
-      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
-      begin
-        case i of
-          0: j := imWalls;
-          1: j := imCoastalFort;
-          2: j := imMissileBat;
-          3: j := imBunker
+    for I := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl I) <> 0 then
+        Inc(Cnt);
+    X := (wCommon - Cnt * xSizeSmall) div 2 - (Cnt - 1) * 2;
+    for I := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl I) <> 0 then
+      begin
+        case I of
+          0: J := imWalls;
+          1: J := imCoastalFort;
+          2: J := imMissileBat;
+          3: J := imBunker
         end;
-        Frame(offscreen.Canvas, x - 1, yImp - 1, x + xSizeSmall,
+        Frame(Offscreen.Canvas, X - 1, yImp - 1, X + xSizeSmall,
           yImp + ySizeSmall, MainTexture.ColorBevelLight,
           MainTexture.ColorBevelShade);
-        BitBltCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
-          SmallImp.Canvas, j mod 7 * xSizeSmall,
-          (j + SystemIconLines * 7) div 7 * ySizeSmall);
-        inc(x, xSizeSmall + 4);
+        BitBltCanvas(Offscreen.Canvas, X, yImp, xSizeSmall, ySizeSmall,
+          SmallImp.Canvas, J mod 7 * xSizeSmall,
+          (J + SystemIconLines * 7) div 7 * ySizeSmall);
+        Inc(X, xSizeSmall + 4);
       end;
   end;
@@ -454 +454 @@
     PPicture := @Tribe[mox.owner].ModelPicture[mox.mix];
     Available := 0;
-    if G.Difficulty[me] = 0 then // supervisor -- count stacked units too
+    if G.Difficulty[Me] = 0 then // supervisor -- count stacked units too
       for Loc := 0 to G.lx * G.ly - 1 do
       begin
         if MyMap[Loc] and fUnit <> 0 then
         begin
-          Server(sGetUnits, me, Loc, Cnt);
+          Server(sGetUnits, Me, Loc, Cnt);
           for uix := 0 to Cnt - 1 do
             if IsToCount(MyRO.EnemyUn[MyRO.nEnemyUn + uix].emix) then
-              inc(Available);
+              Inc(Available);
         end;
       end
@@ -469 +469 @@
         if (MyRO.EnemyUn[uix].Loc >= 0) and IsToCount(MyRO.EnemyUn[uix].emix)
         then
-          inc(Available);
+          Inc(Available);
     Destroyed := 0;
     for emix := 0 to MyRO.nEnemyModel - 1 do
       if IsToCount(emix) then
-        inc(Destroyed, MyRO.EnemyModel[emix].Lost);
+        Inc(Destroyed, MyRO.EnemyModel[emix].Lost);
   end
   else
@@ -480 +480 @@
     for uix := 0 to MyRO.nUn - 1 do
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].mix = mixShow) then
-        inc(Available);
+        Inc(Available);
     InProd := 0;
     for cix := 0 to MyRO.nCity - 1 do
       if (MyCity[cix].Loc >= 0) and
         (MyCity[cix].Project and (cpImp + cpIndex) = mixShow) then
-        inc(InProd);
-  end;
-
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+        Inc(InProd);
+  end;
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   if Kind in [dkEnemyCityDefense, dkEnemyCity] then
   begin
-    NoMap.SetOutput(offscreen);
-    NoMap.PaintCity(ClientWidth div 2, 53, MyRO.EnemyCity[ecixShow], false);
-
-    s := Tribe[MyRO.EnemyCity[ecixShow].owner].TPhrase('UNITOWNER');
-    LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-      (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 105, s);
+    NoMap.SetOutput(Offscreen);
+    NoMap.PaintCity(ClientWidth div 2, 53, MyRO.EnemyCity[ecixShow], False);
+
+    S := Tribe[MyRO.EnemyCity[ecixShow].owner].TPhrase('UNITOWNER');
+    LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+      (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2, 105, S);
   end;
 
@@ -502 +502 @@
   begin // show unit stats
     if Kind = dkOwnModel then
-      MakeModelInfo(me, mixShow, MyModel[mixShow], mi)
+      MakeModelInfo(Me, mixShow, MyModel[mixShow], mi)
     else if Kind = dkOwnUnit then
     begin
-      MakeUnitInfo(me, MyUn[uixShow], ui);
-      MakeModelInfo(me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi);
+      MakeUnitInfo(Me, MyUn[uixShow], ui);
+      MakeModelInfo(Me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi);
     end
     else
@@ -522 +522 @@
           { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
             MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
-            RFrame(offscreen.canvas,xView-2,yView-2,xView+65,yView+49,
+            RFrame(Offscreen.Canvas,xView-2,yView-2,xView+65,yView+49,
             MainTexture.ColorBevelShade,MainTexture.ColorBevelLight); }
-          with offscreen.Canvas do
+          with Offscreen.Canvas do
           begin
             Brush.Color := HGrSystem.Data.Canvas.Pixels[98, 67];
-            offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
+            Offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
               yView + 16));
             Brush.Style := bsClear;
@@ -534 +534 @@
           if MyMap[Loc] and fTerrain >= fForest then
           begin
-            x := 1 + 2 * (xxt * 2 + 1);
-            y := 1 + yyt + 2 * (yyt * 3 + 1);
+            X := 1 + 2 * (xxt * 2 + 1);
+            Y := 1 + yyt + 2 * (yyt * 3 + 1);
           end
           else
           begin
-            x := integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
-            y := 1 + yyt;
+            X := Integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
+            Y := 1 + yyt;
           end;
-          for j := -1 to 1 do
-            for i := -1 to 1 do
-              if (i + j) and 1 = 0 then
+          for J := -1 to 1 do
+            for I := -1 to 1 do
+              if (I + J) and 1 = 0 then
               begin
-                Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2,
-                  yyt * 2, x, y);
+                Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2,
+                  yyt * 2, X, Y);
                 if MyMap[Loc] and (fTerrain or fSpecial) = fGrass or fSpecial1
                 then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 2 * (xxt * 2 + 1), 1 + yyt + 1 * (yyt * 3 + 1))
                 else if (MyMap[Loc] and fTerrain = fForest) and
                   IsJungle(Loc div G.lx) then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 7 * (xxt * 2 + 1), 1 + yyt + 19 * (yyt * 3 + 1))
                 else if MyMap[Loc] and fTerrain >= fForest then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 7 * (xxt * 2 + 1),
-                    1 + yyt + 2 * integer(2 + MyMap[Loc] and fTerrain - fForest)
+                    1 + yyt + 2 * Integer(2 + MyMap[Loc] and fTerrain - fForest)
                     * (yyt * 3 + 1));
               end;
-          BitBltCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
+          BitBltCanvas(Offscreen.Canvas, xView, yView + 16, 64, 32,
             Buffer.Canvas, 1, 0);
 
           // show unit, experience and health
-          Sprite(offscreen, HGr, xView, yView, 64, 48, pix mod 10 * 65 + 1,
+          Sprite(Offscreen, HGr, xView, yView, 64, 48, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
           if Flags and unFortified <> 0 then
-            Sprite(offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
+            Sprite(Offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
               1 + 6 * (xxu * 2 + 1), 1);
-          FrameImage(offscreen.Canvas, HGrSystem.Data, xView - 20,
+          FrameImage(Offscreen.Canvas, HGrSystem.Data, xView - 20,
             yView + 5, 12, 14, 121 + Exp div ExpCost * 13, 28);
           if Health < 100 then
           begin
-            s := IntToStr(Health) + '%';
-            LightGradient(offscreen.Canvas, xView - 45, yView + 24, 38,
+            S := IntToStr(Health) + '%';
+            LightGradient(Offscreen.Canvas, xView - 45, yView + 24, 38,
               (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
-            RisedTextout(offscreen.Canvas, xView - 45 + 20 -
-              BiColorTextWidth(offscreen.Canvas, s) div 2, yView + 23, s);
+            RisedTextout(Offscreen.Canvas, xView - 45 + 20 -
+              BiColorTextWidth(Offscreen.Canvas, S) div 2, yView + 23, S);
           end;
 
           if Kind = dkEnemyUnit then
           begin
-            s := Tribe[mox.owner].TPhrase('UNITOWNER');
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-              (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
-              yView + 80, s);
+            S := Tribe[mox.owner].TPhrase('UNITOWNER');
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+              (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2,
+              yView + 80, S);
           end;
         end
       else
       begin
-        FrameImage(offscreen.Canvas, BigImp, xView + 4, yView, 56, 40, 0, 0);
-        Sprite(offscreen, HGr, xView, yView - 4, 64, 44, pix mod 10 * 65 + 1,
+        FrameImage(Offscreen.Canvas, BigImp, xView + 4, yView, 56, 40, 0, 0);
+        Sprite(Offscreen, HGr, xView, yView - 4, 64, 44, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1);
       end;
 
-      DarkGradient(offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
-      RisedTextout(offscreen.Canvas, xTotal - 2, yTotal,
+      DarkGradient(Offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
+      RisedTextout(Offscreen.Canvas, xTotal - 2, yTotal,
         Phrases.Lookup('UNITSTRENGTH'));
-      s := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
-      RisedTextout(offscreen.Canvas,
-        xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s), yTotal, s);
-      FeatureBar(offscreen, xTotal, yTotal + 19, mi, MainTexture);
-      NumberBarS(offscreen, xTotal, yTotal + 38, Phrases.Lookup('UNITSPEED'),
+      S := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
+      RisedTextout(Offscreen.Canvas,
+        xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S), yTotal, S);
+      FeatureBar(Offscreen, xTotal, yTotal + 19, mi, MainTexture);
+      NumberBarS(Offscreen, xTotal, yTotal + 38, Phrases.Lookup('UNITSPEED'),
         MovementToString(mi.Speed), MainTexture);
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, yTotal + 57,
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, yTotal + 57,
         Phrases.Lookup('UNITCOST'));
-      DLine(offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
+      DLine(Offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      if G.Difficulty[me] = 0 then
-        s := IntToStr(mi.cost)
+      if G.Difficulty[Me] = 0 then
+        S := IntToStr(mi.cost)
       else
-        s := IntToStr(mi.cost * BuildCostMod[G.Difficulty[me]] div 12);
-      RisedTextout(offscreen.Canvas,
-        xTotal + 159 - BiColorTextWidth(offscreen.Canvas, s), yTotal + 57, s);
-      Sprite(offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
+        S := IntToStr(mi.cost * BuildCostMod[G.Difficulty[Me]] div 12);
+      RisedTextout(Offscreen.Canvas,
+        xTotal + 159 - BiColorTextWidth(Offscreen.Canvas, S), yTotal + 57, S);
+      Sprite(Offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
         10, 88, 115);
 
@@ -624 +624 @@
         begin
           if MyModel[mixShow].Kind = mkEnemyDeveloped then
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2,
               (yTotal + StatDown - 19), Phrases.Lookup('UNITADOPT'))
           else
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2,
               (yTotal + StatDown - 19), Phrases.Lookup('UNITINTRO'));
-          DLine(offscreen.Canvas, xTotal - 2, xTotal + 170,
+          DLine(Offscreen.Canvas, xTotal - 2, xTotal + 170,
             (yTotal + StatDown - 19) + 16, MainTexture.ColorTextShade,
             MainTexture.ColorTextLight);
-          s := TurnToString(MyModel[mixShow].IntroTurn);
-          RisedTextout(offscreen.Canvas,
-            xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s),
-            (yTotal + StatDown - 19), s);
+          S := TurnToString(MyModel[mixShow].IntroTurn);
+          RisedTextout(Offscreen.Canvas,
+            xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S),
+            (yTotal + StatDown - 19), S);
         end;
 
-        NumberBar(offscreen, xTotal, yTotal + StatDown,
+        NumberBar(Offscreen, xTotal, yTotal + StatDown,
           Phrases.Lookup('UNITBUILT'), MyModel[mixShow].Built, MainTexture);
         if MyModel[mixShow].Lost > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 19,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 19,
             Phrases.Lookup('UNITLOST'), MyModel[mixShow].Lost, MainTexture);
         if InProd > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 57,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 57,
             Phrases.Lookup('UNITINPROD'), InProd, MainTexture);
         if Available > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 38,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 38,
             Phrases.Lookup('UNITAVAILABLE'), Available, MainTexture);
 
@@ -674 +674 @@
       begin
         if Destroyed > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown - 19,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown - 19,
             Phrases.Lookup('UNITDESTROYED'), Destroyed, MainTexture);
         if Available > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown,
             Phrases.Lookup('UNITKNOWN'), Available, MainTexture);
       end;
@@ -683 +683 @@
   end;
 
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   case Kind of
     dkOwnModel, dkEnemyModel:
@@ -692 +692 @@
       yCaption := 79;
   end;
-  RisedTextout(offscreen.Canvas,
-    (ClientWidth - BiColorTextWidth(offscreen.Canvas, Caption)) div 2,
+  RisedTextout(Offscreen.Canvas,
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, Caption)) div 2,
     yCaption, Caption);
 end;

trunk/LocalPlayer/Wonders.pas

@@ -23 +23 @@
     Selection: Integer;
     Center: TPoint;
-    procedure DarkIcon(i: Integer);
-    procedure Glow(i, GlowColor: Integer);
+    procedure DarkIcon(I: Integer);
+    procedure Glow(I, GlowColor: Integer);
     procedure PaintBackgroundShape;
   public
@@ -116 +116 @@
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
-      r := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
+      R := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
       ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
-      if (r < ScaleToNative(8) * Height * Width * Width) and
-        ((r >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
+      if (R < ScaleToNative(8) * Height * Width * Width) and
+        ((R >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
         ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
         ((ax < amax1 * X) or (ax > amin3 * X))) then begin
         for ch := 0 to 2 do begin
-          c := Line[0].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[0].Pixel^.Planes[ch] := 0
-            else Line[0].Pixel^.Planes[ch] := c;
-          c := Line[1].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[1].Pixel^.Planes[ch] := 0
-            else Line[1].Pixel^.Planes[ch] := c;
-          c := Line[2].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[2].Pixel^.Planes[ch] := 0
-            else Line[2].Pixel^.Planes[ch] := c;
-          c := Line[3].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[3].Pixel^.Planes[ch] := 0
-            else Line[3].Pixel^.Planes[ch] := c;
+          C := Line[0].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[0].Pixel^.Planes[ch] := 0
+            else Line[0].Pixel^.Planes[ch] := C;
+          C := Line[1].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[1].Pixel^.Planes[ch] := 0
+            else Line[1].Pixel^.Planes[ch] := C;
+          C := Line[2].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[2].Pixel^.Planes[ch] := 0
+            else Line[2].Pixel^.Planes[ch] := C;
+          C := Line[3].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[3].Pixel^.Planes[ch] := 0
+            else Line[3].Pixel^.Planes[ch] := C;
         end;
       end;
@@ -150 +150 @@
 end;
 
-procedure TWondersDlg.DarkIcon(i: Integer);
-var
-  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
+procedure TWondersDlg.DarkIcon(I: Integer);
+var
+  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, C: Integer;
   Src, Dst: TPixelPointer;
 begin
   Offscreen.BeginUpdate;
-  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X;
-  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y;
-  x0Src := (i mod 7) * xSizeBig;
-  y0Src := (i div 7 + SystemIconLines) * ySizeBig;
+  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X;
+  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y;
+  x0Src := (I mod 7) * xSizeBig;
+  y0Src := (I div 7 + SystemIconLines) * ySizeBig;
   Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
   Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
@@ -167 +167 @@
         15 + (255 - Src.Pixel^.R) * 9) div 128;
       for ch := 0 to 2 do begin
-        c := Dst.Pixel^.Planes[ch] - Darken;
-        if c < 0 then Dst.Pixel^.Planes[ch] := 0
-          else Dst.Pixel^.Planes[ch] := c;
+        C := Dst.Pixel^.Planes[ch] - Darken;
+        if C < 0 then Dst.Pixel^.Planes[ch] := 0
+          else Dst.Pixel^.Planes[ch] := C;
       end;
       Src.NextPixel;
@@ -180 +180 @@
 end;
 
-procedure TWondersDlg.Glow(i, GlowColor: Integer);
+procedure TWondersDlg.Glow(I, GlowColor: Integer);
 begin
   GlowFrame(Offscreen,
-    ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X,
-    ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y,
+    ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X,
+    ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y,
     xSizeBig, ySizeBig, GlowColor);
 end;

trunk/Log.pas

@@ -27 +27 @@
     procedure mClearClick(Sender: TObject);
     procedure mSlotClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure Toggle(Sender: TObject);
     procedure ListMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-    procedure FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
   public
     Host: TForm;
-    procedure Add(Level, Turn: Integer; Text: pchar);
+    procedure Add(Level, Turn: Integer; Text: PChar);
   private
     MaxLevel: Integer;
@@ -61 +61 @@
 begin
   MaxLevel := TMenuItem(Sender).Tag;
-  TMenuItem(Sender).Checked := true;
+  TMenuItem(Sender).Checked := True;
 end;
 
-procedure TLogDlg.Add(Level, Turn: Integer; Text: pchar);
+procedure TLogDlg.Add(Level, Turn: Integer; Text: PChar);
 begin
   if (MaxLevel > 0) and (Level <= MaxLevel) or (Level = 1 shl 16 + 1) and
@@ -89 +89 @@
 var
   X, Y: Integer;
-  s: string;
+  S: string;
 begin
   for Y := 0 to 2 do
   begin
-    s := '| ';
+    S := '| ';
     for X := 0 to 2 do
       if G.Difficulty[SlotNo[Y, X]] = 0 then
-        s := s + 'SUP |'
+        S := S + 'SUP |'
       else if G.Difficulty[SlotNo[Y, X]] < 0 then
-        s := s + '--- |'
+        S := S + '--- |'
       else
       begin
@@ -104 +104 @@
         begin // check multi control
           if G.Difficulty[SlotNo[Y, X] + 3] >= 0 then
-            s := s + Tribe[SlotNo[Y, X] + 3].TPhrase('SHORTNAME') + '+';
+            S := S + Tribe[SlotNo[Y, X] + 3].TPhrase('SHORTNAME') + '+';
           if G.Difficulty[SlotNo[Y, X] + 6] >= 0 then
-            s := s + Tribe[SlotNo[Y, X] + 6].TPhrase('SHORTNAME') + '+';
+            S := S + Tribe[SlotNo[Y, X] + 6].TPhrase('SHORTNAME') + '+';
         end;
-        s := s + Tribe[SlotNo[Y, X]].TPhrase('SHORTNAME') + ' | ';
+        S := S + Tribe[SlotNo[Y, X]].TPhrase('SHORTNAME') + ' | ';
       end;
-    List.Lines.Add(s);
+    List.Lines.Add(S);
   end;
   PostMessage(List.Handle, WM_VSCROLL, SB_BOTTOM, 0);
 end;
 
-procedure TLogDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TLogDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -134 +134 @@
 end;
 
-procedure TLogDlg.FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+procedure TLogDlg.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
   if Host <> nil then

trunk/Messg.pas

@@ -53 +53 @@
 procedure TMessgDlg.FormShow(Sender: TObject);
 begin
-  Button1.Visible := true;
+  Button1.Visible := True;
   Button2.Visible := not(Kind in [mkOK]);
   if Button2.Visible then
@@ -70 +70 @@
   end;
 
-  SplitText(true);
+  SplitText(True);
   CorrectHeight;
 end;

trunk/Network/UNetworkClient.pas

@@ -176 +176 @@
 end.
 
+

trunk/Network/UNetworkCommon.pas

@@ -44 +44 @@
 end.
 
+

trunk/Network/UNetworkServer.pas

@@ -69 +69 @@
     ServerEventLoop: TEventLoop;
     procedure ConnectExecute(Sender: TConnectionBasedSocket; AStream: TSocketStream);
-    procedure Client(Command: TCommand; Player: integer; var Data);
+    procedure Client(Command: TCommand; Player: Integer; var Data);
   public
     TCPServer: TTCPServer;
@@ -81 +81 @@
 {$ENDIF}
 
-procedure Client(Command, Player: integer; var Data); stdcall;
+procedure Client(Command, Player: Integer; var Data); stdcall;
 
 
@@ -91 +91 @@
 {$ENDIF}
 
-procedure Client(Command, Player: integer; var Data);
+procedure Client(Command, Player: Integer; var Data);
 begin
   {$IFDEF UNIX}
@@ -338 +338 @@
 end.
 
+

trunk/NoTerm.pas

@@ -18 +18 @@
     procedure FormPaint(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   public
-    procedure Client(Command, Player: integer; var Data);
+    procedure Client(Command, Player: Integer; var Data);
   private
     Me: Integer;
@@ -43 +43 @@
     procedure NewStat;
     procedure EndPlaying;
-    procedure ShowActive(p: integer; Active: boolean);
+    procedure ShowActive(P: Integer; Active: Boolean);
     procedure ShowYear;
   end;
@@ -50 +50 @@
   NoTermDlg: TNoTermDlg;
 
-procedure Client(Command, Player: integer; var Data); stdcall;
+procedure Client(Command, Player: Integer; var Data); stdcall;
 
 
@@ -69 +69 @@
   dxBrain = 128;
   dyBrain = 128;
-  xBrain: array [0 .. nPlOffered - 1] of integer = (x0Brain, x0Brain,
+  xBrain: array [0 .. nPlOffered - 1] of Integer = (x0Brain, x0Brain,
     x0Brain + dxBrain, x0Brain + dxBrain, x0Brain + dxBrain, x0Brain,
     x0Brain - dxBrain, x0Brain - dxBrain, x0Brain - dxBrain);
-  yBrain: array [0 .. nPlOffered - 1] of integer = (y0Brain, y0Brain - dyBrain,
+  yBrain: array [0 .. nPlOffered - 1] of Integer = (y0Brain, y0Brain - dyBrain,
     y0Brain - dyBrain, y0Brain, y0Brain + dyBrain, y0Brain + dyBrain,
     y0Brain + dyBrain, y0Brain, y0Brain - dyBrain);
-  xActive: array [0 .. nPlOffered - 1] of integer = (0, 0, 36, 51, 36, 0,
+  xActive: array [0 .. nPlOffered - 1] of Integer = (0, 0, 36, 51, 36, 0,
     -36, -51, -36);
-  yActive: array [0 .. nPlOffered - 1] of integer = (0, -51, -36, 0, 36, 51,
+  yActive: array [0 .. nPlOffered - 1] of Integer = (0, -51, -36, 0, 36, 51,
     36, 0, -36);
 
 var
-  FormsCreated: boolean;
+  FormsCreated: Boolean;
 
 procedure TNoTermDlg.FormCreate(Sender: TObject);
@@ -108 +108 @@
 procedure TNoTermDlg.EndPlaying;
 var
-  EndCommand: integer;
+  EndCommand: Integer;
 begin
   NewStat;
-  if G.RO[me].Turn > 0 then
+  if G.RO[Me].Turn > 0 then
     with MessgDlg do
     begin
@@ -127 +127 @@
 end;
 
-procedure TNoTermDlg.ShowActive(p: integer; Active: boolean);
-begin
-  if p < nPlOffered then
-    Sprite(Canvas, HGrSystem, x0Brain + 28 + xActive[p],
-      y0Brain + 28 + yActive[p], 8, 8, 81 + 9 * Byte(Active), 16);
+procedure TNoTermDlg.ShowActive(P: Integer; Active: Boolean);
+begin
+  if P < nPlOffered then
+    Sprite(Canvas, HGrSystem, x0Brain + 28 + xActive[P],
+      y0Brain + 28 + yActive[P], 8, 8, 81 + 9 * Byte(Active), 16);
 end;
 
@@ -138 +138 @@
   Fill(State.Canvas, 0, 0, 192, 20, 64, 287 + 138);
   RisedTextOut(State.Canvas, 0, 0, Format(Phrases.Lookup('AIT_ROUND'), [Round])
-    + ' ' + TurnToString(G.RO[me].Turn));
+    + ' ' + TurnToString(G.RO[Me].Turn));
   BitBltCanvas(Canvas, 64, 287 + 138, 192, 20, State.Canvas, 0, 0);
 end;
 
-procedure TNoTermDlg.Client(Command, Player: integer; var Data);
-var
-  i, x, y, p: integer;
-  ActiveDuration: extended;
-  ShipComplete: boolean;
-  r: TRect;
+procedure TNoTermDlg.Client(Command, Player: Integer; var Data);
+var
+  I, X, Y, P: Integer;
+  ActiveDuration: Extended;
+  ShipComplete: Boolean;
+  R: TRect;
   nowt: TDateTime;
 begin
   case Command of
     cDebugMessage:
-      LogDlg.Add(Player, G.RO[0].Turn, pchar(@Data));
+      LogDlg.Add(Player, G.RO[0].Turn, PChar(@Data));
 
     cInitModule:
@@ -160 +160 @@
         Shade := TBitmap.Create;
         Shade.SetSize(64, 64);
-        for x := 0 to 63 do
-          for y := 0 to 63 do
-            if Odd(x + y) then
-              Shade.Canvas.Pixels[x, y] := $FFFFFF
+        for X := 0 to 63 do
+          for Y := 0 to 63 do
+            if Odd(X + Y) then
+              Shade.Canvas.Pixels[X, Y] := $FFFFFF
             else
-              Shade.Canvas.Pixels[x, y] := $000000;
+              Shade.Canvas.Pixels[X, Y] := $000000;
         State := TBitmap.Create;
         State.SetSize(192, 20);
@@ -181 +181 @@
     cNewGame, cLoadGame:
       begin
-        inc(Round);
+        Inc(Round);
         if Mode = rmRunning then
         begin
@@ -190 +190 @@
           Show;
         G := TNewGameData(Data);
-        LogDlg.mSlot.Visible := false;
+        LogDlg.mSlot.Visible := False;
         LogDlg.Host := nil;
-        ToldAlive := G.RO[me].Alive;
+        ToldAlive := G.RO[Me].Alive;
         Active := -1;
         FillChar(DisallowShowActive, SizeOf(DisallowShowActive), 0); // false
@@ -213 +213 @@
     cTurn, cResume, cContinue:
       begin
-        me := Player;
+        Me := Player;
         if Active >= 0 then
         begin
-          ShowActive(Active, false);
+          ShowActive(Active, False);
           Active := -1;
         end; // should not happen
@@ -228 +228 @@
         TurnTime := SecondOf(nowt - LastNewTurn);
         LastNewTurn := nowt;
-        if (G.RO[me].Alive <> ToldAlive) then
-        begin
-          for p := 1 to nPlOffered - 1 do
-            if 1 shl p and (G.RO[me].Alive xor ToldAlive) <> 0 then
+        if (G.RO[Me].Alive <> ToldAlive) then
+        begin
+          for P := 1 to nPlOffered - 1 do
+            if 1 shl P and (G.RO[Me].Alive xor ToldAlive) <> 0 then
             begin
-              r := Rect(xBrain[p], yBrain[p] - 16, xBrain[p] + 64,
-                yBrain[p] - 16 + 64);
-              InvalidateRect(Handle, @r, false);
+              R := Rect(xBrain[P], yBrain[P] - 16, xBrain[P] + 64,
+                yBrain[P] - 16 + 64);
+              InvalidateRect(Handle, @R, False);
             end;
-          ToldAlive := G.RO[me].Alive;
+          ToldAlive := G.RO[Me].Alive;
         end;
         Application.ProcessMessages;
         if Mode = rmQuit then
           EndPlaying
-        else if G.RO[me].Happened and phGameEnd <> 0 then
+        else if G.RO[Me].Happened and phGameEnd <> 0 then
         begin // game ended, update statistics
-          for p := 1 to nPlOffered - 1 do
-            if Assigned(PlayersBrain[p]) then
-              if 1 shl p and G.RO[me].Alive = 0 then
-                inc(ExtStat[p]) // extinct
-              else if G.RO[me].Alive = 1 shl p then
-                inc(AloneStat[p]) // only player alive
+          for P := 1 to nPlOffered - 1 do
+            if Assigned(PlayersBrain[P]) then
+              if 1 shl P and G.RO[Me].Alive = 0 then
+                Inc(ExtStat[P]) // extinct
+              else if G.RO[Me].Alive = 1 shl P then
+                Inc(AloneStat[P]) // only player alive
               else
               begin // alive but not alone -- check colony ship
-                ShipComplete := true;
-                for i := 0 to nShipPart - 1 do
-                  if G.RO[me].Ship[p].Parts[i] < ShipNeed[i] then
-                    ShipComplete := false;
+                ShipComplete := True;
+                for I := 0 to nShipPart - 1 do
+                  if G.RO[Me].Ship[P].Parts[I] < ShipNeed[I] then
+                    ShipComplete := False;
                 if ShipComplete then
-                  inc(WinStat[p]);
+                  Inc(WinStat[P]);
               end;
           if Mode = rmRunning then
-            Server(sNextRound, me, 0, nil^);
+            Server(sNextRound, Me, 0, nil^);
         end
         else if Mode = rmRunning then
-          Server(sTurn, me, 0, nil^);
+          Server(sTurn, Me, 0, nil^);
         if Mode = rmStop then
         begin
@@ -280 +280 @@
           TotalStatTime := TotalStatTime + ActiveDuration;
           if not DisallowShowActive[Active] then
-            ShowActive(Active, false);
+            ShowActive(Active, False);
           DisallowShowActive[Active] := (ActiveDuration < TurnTime * 0.25) and
             (ActiveDuration < ShowActiveThreshold);
@@ -286 +286 @@
         LastShowTurnChange := nowt;
 
-        Active := integer(Data);
+        Active := Integer(Data);
         if (Active >= 0) and not DisallowShowActive[Active] then
-          ShowActive(Active, true);
+          ShowActive(Active, True);
       end;
   end;
@@ -302 +302 @@
     GoBtn.ButtonIndex := 23;
     GoBtn.Update;
-    Server(sTurn, me, 0, nil^);
+    Server(sTurn, Me, 0, nil^);
   end;
 end;
@@ -314 +314 @@
 procedure TNoTermDlg.FormPaint(Sender: TObject);
 var
-  i, TimeShare: integer;
+  I, TimeShare: Integer;
 begin
   Fill(Canvas, 3, 3, ClientWidth - 6, ClientHeight - 6, 0, 0);
@@ -330 +330 @@
     7, Caption);
   Canvas.Font.Assign(UniFont[ftSmall]);
-  for i := 1 to nPlOffered - 1 do
-    if Assigned(PlayersBrain[i]) then
+  for I := 1 to nPlOffered - 1 do
+    if Assigned(PlayersBrain[I]) then
     begin
-      Frame(Canvas, xBrain[i] - 24, yBrain[i] - 8 - 16, xBrain[i] - 24 + 111,
-        yBrain[i] - 8 - 16 + 111, MainTexture.ColorBevelShade,
+      Frame(Canvas, xBrain[I] - 24, yBrain[I] - 8 - 16, xBrain[I] - 24 + 111,
+        yBrain[I] - 8 - 16 + 111, MainTexture.ColorBevelShade,
         MainTexture.ColorBevelShade);
-      FrameImage(Canvas, PlayersBrain[i].Picture, xBrain[i],
-        yBrain[i] - 16, 64, 64, 0, 0);
-      if 1 shl i and G.RO[me].Alive = 0 then
-        BitBltCanvas(Canvas, xBrain[i], yBrain[i] - 16, 64, 64,
+      FrameImage(Canvas, PlayersBrain[I].Picture, xBrain[I],
+        yBrain[I] - 16, 64, 64, 0, 0);
+      if 1 shl I and G.RO[Me].Alive = 0 then
+        BitBltCanvas(Canvas, xBrain[I], yBrain[I] - 16, 64, 64,
           Shade.Canvas, 0, 0, SRCAND);
-      Sprite(Canvas, HGrSystem, xBrain[i] + 30 - 14, yBrain[i] + 53, 14,
+      Sprite(Canvas, HGrSystem, xBrain[I] + 30 - 14, yBrain[I] + 53, 14,
         14, 1, 316);
-      RisedTextOut(Canvas, xBrain[i] + 30 - 16 - BiColorTextWidth(Canvas,
-        IntToStr(WinStat[i])), yBrain[i] + 51, IntToStr(WinStat[i]));
-      Sprite(Canvas, HGrSystem, xBrain[i] + 34, yBrain[i] + 53, 14, 14,
+      RisedTextOut(Canvas, xBrain[I] + 30 - 16 - BiColorTextWidth(Canvas,
+        IntToStr(WinStat[I])), yBrain[I] + 51, IntToStr(WinStat[I]));
+      Sprite(Canvas, HGrSystem, xBrain[I] + 34, yBrain[I] + 53, 14, 14,
         1 + 15, 316);
-      RisedTextOut(Canvas, xBrain[i] + 34 + 16, yBrain[i] + 51,
-        IntToStr(AloneStat[i]));
-      Sprite(Canvas, HGrSystem, xBrain[i] + 30 - 14, yBrain[i] + 53 + 16, 14,
+      RisedTextOut(Canvas, xBrain[I] + 34 + 16, yBrain[I] + 51,
+        IntToStr(AloneStat[I]));
+      Sprite(Canvas, HGrSystem, xBrain[I] + 30 - 14, yBrain[I] + 53 + 16, 14,
         14, 1 + 30, 316);
-      RisedTextOut(Canvas, xBrain[i] + 30 - 16 - BiColorTextWidth(Canvas,
-        IntToStr(ExtStat[i])), yBrain[i] + 51 + 16, IntToStr(ExtStat[i]));
-      Sprite(Canvas, HGrSystem, xBrain[i] + 34, yBrain[i] + 53 + 16, 14, 14,
+      RisedTextOut(Canvas, xBrain[I] + 30 - 16 - BiColorTextWidth(Canvas,
+        IntToStr(ExtStat[I])), yBrain[I] + 51 + 16, IntToStr(ExtStat[I]));
+      Sprite(Canvas, HGrSystem, xBrain[I] + 34, yBrain[I] + 53 + 16, 14, 14,
         1 + 45, 316);
       if TotalStatTime > 0 then
       begin
-        TimeShare := trunc(TimeStat[i] / TotalStatTime * 100 + 0.5);
-        RisedTextOut(Canvas, xBrain[i] + 34 + 16, yBrain[i] + 51 + 16,
+        TimeShare := trunc(TimeStat[I] / TotalStatTime * 100 + 0.5);
+        RisedTextOut(Canvas, xBrain[I] + 34 + 16, yBrain[I] + 51 + 16,
           IntToStr(TimeShare) + '%');
       end;
-      ShowActive(i, i = Active);
+      ShowActive(I, I = Active);
     end;
   Sprite(Canvas, HGrSystem2, x0Brain + 32 - 20, y0Brain + 32 - 20, 40,
@@ -381 +381 @@
 end;
 
-procedure TNoTermDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TNoTermDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin

trunk/Packages/CevoComponents/AsyncProcess2.pas

@@ -122 +122 @@
 
 end.
+

trunk/Packages/CevoComponents/BaseWin.pas

@@ -23 +23 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDeactivate(Sender: TObject);
-    procedure SmartUpdateContent(ImmUpdate: Boolean = false);
+    procedure SmartUpdateContent(ImmUpdate: Boolean = False);
     procedure StayOnTop_Workaround;
   protected
@@ -50 +50 @@
     CaptionRight: Integer;
     InnerWidth: Integer;
-    InnerHeight: integer;
+    InnerHeight: Integer;
     WideBottom: Boolean;
     FullCaption: Boolean;
@@ -180 +180 @@
       UserLeft := Left;
       UserTop := Top;
-      Visible := false;
+      Visible := False;
       FWindowMode := NewMode;
       ShowModal;
@@ -186 +186 @@
     else if forceclose then
     begin // make modal
-      Visible := false;
+      Visible := False;
       FWindowMode := NewMode;
       Left := UserLeft;
@@ -272 +272 @@
 procedure TFramedDlg.SmartInvalidate;
 var
-  i, BottomFrame: integer;
+  I, BottomFrame: Integer;
   r0, r1: HRgn;
 begin
@@ -281 +281 @@
   r0 := CreateRectRgn(SideFrame, TitleHeight, ClientWidth - SideFrame,
     ClientHeight - BottomFrame);
-  for i := 0 to ControlCount - 1 do
-    if not(Controls[i] is TArea) and Controls[i].Visible then
+  for I := 0 to ControlCount - 1 do
+    if not(Controls[I] is TArea) and Controls[I].Visible then
     begin
-      with Controls[i].BoundsRect do
+      with Controls[I].BoundsRect do
         r1 := CreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
@@ -295 +295 @@
 procedure TFramedDlg.VPaint;
 
-  procedure CornerFrame(x0, y0, x1, y1: integer);
+  procedure CornerFrame(x0, y0, x1, y1: Integer);
   begin
     Frame(Canvas, x0 + 1, y0 + 1, x1 - 2, y1 - 2, MainTexture.ColorBevelLight,
@@ -308 +308 @@
 
 var
-  i, l, FrameTop, FrameBottom, InnerBottom, Cut, xTexOffset,
-    yTexOffset: integer;
+  I, L, FrameTop, FrameBottom, InnerBottom, Cut, xTexOffset,
+    yTexOffset: Integer;
   R: TRect;
 begin
@@ -321 +321 @@
   end;
   Canvas.Font.Assign(UniFont[ftCaption]);
-  l := BiColorTextWidth(Canvas, Caption);
-  Cut := (ClientWidth - l) div 2;
+  L := BiColorTextWidth(Canvas, Caption);
+  Cut := (ClientWidth - L) div 2;
   xTexOffset := (Maintexture.Width - ClientWidth) div 2;
   yTexOffset := (Maintexture.Height - ClientHeight) div 2;
@@ -446 +446 @@
   RisedTextOut(Canvas, Cut - 1, 7, Caption);
 
-  for i := 0 to ControlCount - 1 do
-    if Controls[i].Visible and (Controls[i] is TButtonBase) then
+  for I := 0 to ControlCount - 1 do
+    if Controls[I].Visible and (Controls[I] is TButtonBase) then
     begin
-      R := Controls[i].BoundsRect;
+      R := Controls[I].BoundsRect;
       if (R.Bottom <= TitleHeight) or (R.Top >= InnerBottom) then
         BtnFrame(Canvas, R, MainTexture);
@@ -463 +463 @@
 begin
   if FullCaption then
-    exit;
+    Exit;
   r0 := CreateRectRgn(0, 0, ClientWidth, ClientHeight);
   r1 := CreateRectRgn(0, 0, CaptionLeft, TitleHeight - NarrowFrame);

trunk/Packages/CevoComponents/ButtonB.pas

@@ -11 +11 @@
   private
     FMask: TBitmap;
-    FIndex: integer;
-    procedure SetIndex(Text: integer);
+    FIndex: Integer;
+    procedure SetIndex(Text: Integer);
   public
     property Mask: TBitmap read FMask write FMask;
   published
     property Visible;
-    property ButtonIndex: integer read FIndex write SetIndex;
+    property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
   protected
@@ -61 +61 @@
 end;
 
-procedure TButtonB.SetIndex(Text: integer);
+procedure TButtonB.SetIndex(Text: Integer);
 begin
   if Text <> FIndex then begin

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -15 +15 @@
     ClickProc: TNotifyEvent;
     DownChangedProc: TNotifyEvent;
-    procedure SetDown(x: boolean);
+    procedure SetDown(X: Boolean);
     // procedure PlayDownSound;
     // procedure PlayUpSound;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
-      x, y: integer); override;
+      X, Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
-      x, y: integer); override;
-    procedure MouseMove(Shift: TShiftState; x, y: integer); override;
+      X, Y: Integer); override;
+    procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
   private
-    Active: boolean;
+    Active: Boolean;
   public
     constructor Create(aOwner: TComponent); override;
@@ -32 +32 @@
   published
     property Visible;
-    property Down: boolean read FDown write SetDown;
-    property Permanent: boolean read FPermanent write FPermanent;
+    property Down: Boolean read FDown write SetDown;
+    property Permanent: Boolean read FPermanent write FPermanent;
     property OnClick: TNotifyEvent read ClickProc write ClickProc;
     property OnDownChanged: TNotifyEvent read DownChangedProc
@@ -50 +50 @@
   // FUpSound:='';
   FGraphic := nil;
-  Active := false;
-  FDown := false;
-  FPermanent := false;
+  Active := False;
+  FDown := False;
+  FPermanent := False;
   ClickProc := nil;
 end;
 
 procedure TButtonBase.MouseDown(Button: TMouseButton; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 begin
-  Active := true;
-  MouseMove(Shift, x, y);
+  Active := True;
+  MouseMove(Shift, X, Y);
 end;
 
 procedure TButtonBase.MouseUp(Button: TMouseButton; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 begin
   if ssLeft in Shift then
-    exit;
-  MouseMove(Shift, x, y);
+    Exit;
+  MouseMove(Shift, X, Y);
   if Active and FDown then
   begin
     // PlayUpSound;
-    Active := false;
+    Active := False;
     if FDown <> FPermanent then
     begin
@@ -86 +86 @@
   begin
     // if FDown then PlayUpSound;
-    Active := false;
+    Active := False;
     if FDown then
     begin
-      FDown := false;
+      FDown := False;
       Invalidate;
       if @DownChangedProc <> nil then
@@ -97 +97 @@
 end;
 
-procedure TButtonBase.MouseMove(Shift: TShiftState; x, y: integer);
+procedure TButtonBase.MouseMove(Shift: TShiftState; X, Y: Integer);
 begin
   if Active then
-    if (x >= 0) and (x < Width) and (y >= 0) and (y < Height) then
+    if (X >= 0) and (X < Width) and (Y >= 0) and (Y < Height) then
       if (ssLeft in Shift) and not FDown then
       begin
         { PlayDownSound; }
-        FDown := true;
+        FDown := True;
         Paint;
         if @DownChangedProc <> nil then
@@ -113 +113 @@
     begin
       { PlayUpSound; }
-      FDown := false;
+      FDown := False;
       Paint;
       if @DownChangedProc <> nil then
@@ -120 +120 @@
 end;
 
-procedure TButtonBase.SetDown(x: boolean);
+procedure TButtonBase.SetDown(X: Boolean);
 begin
-  FDown := x;
+  FDown := X;
   Invalidate;
 end;

trunk/Packages/CevoComponents/ButtonC.pas

@@ -14 +14 @@
   published
     property Visible;
-    property ButtonIndex: integer read FIndex write SetIndex;
+    property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
   protected
@@ -50 +50 @@
 end;
 
-procedure TButtonC.SetIndex(Text: integer);
+procedure TButtonC.SetIndex(Text: Integer);
 begin
   if Text <> FIndex then

trunk/Packages/CevoComponents/ButtonN.pas

@@ -10 +10 @@
     constructor Create(aOwner: TComponent); override;
   private
-    FPossible, FLit: boolean;
+    FPossible, FLit: Boolean;
     FGraphic, FMask, FBackGraphic: TBitmap;
-    FIndex, BackIndex: integer;
+    FIndex, BackIndex: Integer;
     FSmartHint: string;
     ChangeProc: TNotifyEvent;
-    procedure SetPossible(x: boolean);
-    procedure SetLit(x: boolean);
-    procedure SetIndex(x: integer);
-    procedure SetSmartHint(x: string);
+    procedure SetPossible(X: Boolean);
+    procedure SetLit(X: Boolean);
+    procedure SetIndex(X: Integer);
+    procedure SetSmartHint(X: string);
   published
-    property Possible: boolean read FPossible write SetPossible;
-    property Lit: boolean read FLit write SetLit;
+    property Possible: Boolean read FPossible write SetPossible;
+    property Lit: Boolean read FLit write SetLit;
     property SmartHint: string read FSmartHint write SetSmartHint;
     property Graphic: TBitmap read FGraphic write FGraphic;
     property Mask: TBitmap read FMask write FMask;
     property BackGraphic: TBitmap read FBackGraphic write FBackGraphic;
-    property ButtonIndex: integer read FIndex write SetIndex;
+    property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick: TNotifyEvent read ChangeProc write ChangeProc;
   protected
     procedure Paint; override;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
-      x, y: integer); override;
+      X, Y: Integer); override;
   end;
 
@@ -46 +46 @@
 begin
   inherited;
-  ShowHint := true;
+  ShowHint := True;
   FGraphic := nil;
   FBackGraphic := nil;
-  FPossible := true;
-  FLit := false;
+  FPossible := True;
+  FLit := False;
   FIndex := -1;
   ChangeProc := nil;
@@ -63 +63 @@
     begin
       BitBltCanvas(Canvas, 1, 1, 40, 40, FBackGraphic.Canvas,
-        1 + 80 * BackIndex + 40 * byte(FPossible and FLit), 176);
+        1 + 80 * BackIndex + 40 * Byte(FPossible and FLit), 176);
       if FPossible then
       begin
@@ -83 +83 @@
 
 procedure TButtonN.MouseDown(Button: TMouseButton; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 begin
   if FPossible and (Button = mbLeft) and (@ChangeProc <> nil) then
@@ -89 +89 @@
 end;
 
-procedure TButtonN.SetPossible(x: boolean);
+procedure TButtonN.SetPossible(X: Boolean);
 begin
-  if x <> FPossible then
+  if X <> FPossible then
   begin
-    FPossible := x;
-    if x then
+    FPossible := X;
+    if X then
       Hint := FSmartHint
     else
@@ -102 +102 @@
 end;
 
-procedure TButtonN.SetLit(x: boolean);
+procedure TButtonN.SetLit(X: Boolean);
 begin
-  if x <> FLit then
+  if X <> FLit then
   begin
-    FLit := x;
+    FLit := X;
     Invalidate;
   end;
 end;
 
-procedure TButtonN.SetIndex(x: integer);
+procedure TButtonN.SetIndex(X: Integer);
 begin
-  if x <> FIndex then
+  if X <> FIndex then
   begin
-    FIndex := x;
-    if x < 6 then
+    FIndex := X;
+    if X < 6 then
       BackIndex := 1
     else
@@ -124 +124 @@
 end;
 
-procedure TButtonN.SetSmartHint(x: string);
+procedure TButtonN.SetSmartHint(X: string);
 begin
-  if x <> FSmartHint then
+  if X <> FSmartHint then
   begin
-    FSmartHint := x;
+    FSmartHint := X;
     if FPossible then
-      Hint := x;
+      Hint := X;
   end;
 end;

trunk/Packages/CevoComponents/CevoComponents.pas

@@ -29 +29 @@
   RegisterPackage('CevoComponents', @Register);
 end.
+

trunk/Packages/CevoComponents/Directories.pas

@@ -33 +33 @@
 
   if Lang = '' then begin
-    for i := 1 to Paramcount - 1 do
-      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-        (ParamStrUTF8(i) = '--lang') then
-          Lang := ParamStrUTF8(i + 1);
+    for I := 1 to Paramcount - 1 do
+      if (ParamStrUTF8(I) = '--LANG') or (ParamStrUTF8(I) = '-l') or
+        (ParamStrUTF8(I) = '--lang') then
+          Lang := ParamStrUTF8(I + 1);
   end;
   if Lang = '' then begin
@@ -73 +73 @@
         (Dst.Time < Src.Time) then
         CopyFile(SourceDir + DirectorySeparator + Src.Name,
-          DestinationDir + DirectorySeparator + Src.Name, false);
+          DestinationDir + DirectorySeparator + Src.Name, False);
       FindClose(Dst);
     until FindNext(Src) <> 0;

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -331 +331 @@
 end.
 
+

trunk/Packages/CevoComponents/EOTButton.pas

@@ -19 +19 @@
     constructor Create(aOwner: TComponent); override;
     destructor Destroy; override;
-    procedure SetButtonIndexFast(x: integer);
-    procedure SetBack(ca: TCanvas; x, y: integer);
+    procedure SetButtonIndexFast(X: Integer);
+    procedure SetBack(ca: TCanvas; X, Y: Integer);
   private
     FTemplate: TBitmap;
-    FIndex: integer;
-    procedure SetIndex(x: integer);
+    FIndex: Integer;
+    procedure SetIndex(X: Integer);
   public
     property Template: TBitmap read FTemplate write FTemplate;
   published
     property Visible;
-    property ButtonIndex: integer read FIndex write SetIndex;
+    property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
   protected
@@ -60 +60 @@
   Back.SetSize(48, 48);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
-  ShowHint := true;
+  ShowHint := True;
   SetBounds(0, 0, 48, 48);
 end;
@@ -89 +89 @@
 end;
 
-procedure TEOTButton.SetIndex(x: integer);
+procedure TEOTButton.SetIndex(X: Integer);
 begin
-  if x <> FIndex then begin
-    FIndex := x;
+  if X <> FIndex then begin
+    FIndex := X;
     Invalidate;
   end;
 end;
 
-procedure TEOTButton.SetButtonIndexFast(x: integer);
+procedure TEOTButton.SetButtonIndexFast(X: Integer);
 begin
-  if Visible and (x <> FIndex) then begin
-    FIndex := x;
+  if Visible and (X <> FIndex) then begin
+    FIndex := X;
     try
       Paint;
@@ -108 +108 @@
 end;
 
-procedure TEOTButton.SetBack(ca: TCanvas; x, y: integer);
+procedure TEOTButton.SetBack(ca: TCanvas; X, Y: Integer);
 begin
-  BitBltCanvas(Back.Canvas, 0, 0, 48, 48, ca, x, y);
+  BitBltCanvas(Back.Canvas, 0, 0, 48, 48, ca, X, Y);
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -17 +17 @@
 
 {$IFDEF WINDOWS}
-function ChangeResolution(x, y, bpp, freq: integer): boolean;
+function ChangeResolution(X, Y, bpp, freq: Integer): Boolean;
 {$ENDIF}
 procedure RestoreResolution;
 procedure EmptyMenu(MenuItems: TMenuItem; Keep: Integer = 0);
-function TurnToYear(Turn: integer): integer;
-function TurnToString(Turn: integer): string;
-function MovementToString(Movement: integer): string;
-procedure BtnFrame(ca: TCanvas; p: TRect; T: TTexture);
-procedure EditFrame(ca: TCanvas; p: TRect; T: TTexture);
-function HexStringToColor(S: string): integer;
+function TurnToYear(Turn: Integer): Integer;
+function TurnToString(Turn: Integer): string;
+function MovementToString(Movement: Integer): string;
+procedure BtnFrame(ca: TCanvas; P: TRect; T: TTexture);
+procedure EditFrame(ca: TCanvas; P: TRect; T: TTexture);
+function HexStringToColor(S: string): Integer;
 function ExtractFileNameWithoutExt(const Filename: string): string;
-function LoadGraphicFile(Bmp: TBitmap; FileName: string; Options: TLoadGraphicFileOptions = []): boolean;
+function LoadGraphicFile(Bmp: TBitmap; FileName: string; Options: TLoadGraphicFileOptions = []): Boolean;
 function LoadGraphicSet(const Name: string; Transparency: Boolean = True): TGraphicSet;
-procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 procedure BitmapReplaceColor(Dst: TBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
-procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
   overload;
-procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
   overload;
 procedure MakeBlue(Dst: TBitmap; X, Y, Width, Height: Integer);
@@ -45 +45 @@
 procedure ImageOp_CBC(Dst, Src: TBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
   Color0, Color2: Integer);
-procedure ImageOp_CCC(bmp: TBitmap; x, y, Width, Height, Color0, Color1, Color2: Integer);
+procedure ImageOp_CCC(bmp: TBitmap; X, Y, Width, Height, Color0, Color1, Color2: Integer);
 function BitBltCanvas(DestCanvas: TCanvas; X, Y, Width, Height: Integer;
   SrcCanvas: TCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
@@ -54 +54 @@
 function BitBltBitmap(Dest: TBitmap; DestRect: TRect;
   Src: TBitmap; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
-procedure SLine(ca: TCanvas; x0, x1, y: integer; cl: TColor);
-procedure DLine(ca: TCanvas; x0, x1, y: integer; cl0, cl1: TColor);
-procedure Frame(ca: TCanvas; x0, y0, x1, y1: integer; cl0, cl1: TColor);
-procedure RFrame(ca: TCanvas; x0, y0, x1, y1: integer; cl0, cl1: TColor);
-procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: integer; cl: TColor);
+procedure SLine(ca: TCanvas; x0, x1, Y: Integer; cl: TColor);
+procedure DLine(ca: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
+procedure Frame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+procedure RFrame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
 procedure FrameImage(ca: TCanvas; Src: TBitmap;
-  x, y, Width, Height, xSrc, ySrc: integer; IsControl: boolean = False);
-procedure GlowFrame(Dst: TBitmap; x0, y0, Width, Height: integer; cl: TColor);
+  X, Y, Width, Height, xSrc, ySrc: Integer; IsControl: Boolean = False);
+procedure GlowFrame(Dst: TBitmap; x0, y0, Width, Height: Integer; cl: TColor);
 procedure InitOrnament;
 procedure InitCityMark(T: TTexture);
-procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer); overload;
+procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer); overload;
 procedure Fill(Canvas: TCanvas; Rect: TRect; Offset: TPoint); overload;
-procedure FillLarge(ca: TCanvas; x0, y0, x1, y1, xm: integer);
-procedure FillSeamless(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: integer;
+procedure FillLarge(ca: TCanvas; x0, y0, x1, y1, xm: Integer);
+procedure FillSeamless(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer;
   const Texture: TBitmap);
-procedure FillRectSeamless(ca: TCanvas; x0, y0, x1, y1, xOffset, yOffset: integer;
+procedure FillRectSeamless(ca: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
   const Texture: TBitmap);
-procedure PaintBackground(Form: TForm; Left, Top, Width, Height: integer);
-procedure Corner(ca: TCanvas; x, y, Kind: integer; T: TTexture);
-procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; x, y: integer; s: string);
+procedure PaintBackground(Form: TForm; Left, Top, Width, Height: Integer);
+procedure Corner(ca: TCanvas; X, Y, Kind: Integer; T: TTexture);
+procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
 procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
-  x, y: integer; s: string);
-function BiColorTextWidth(ca: TCanvas; s: string): integer;
-procedure RisedTextOut(ca: TCanvas; x, y: integer; s: string);
-procedure LightGradient(ca: TCanvas; x, y, Width, Color: integer);
-procedure DarkGradient(ca: TCanvas; x, y, Width, Kind: integer);
-procedure VLightGradient(ca: TCanvas; x, y, Height, Color: integer);
-procedure VDarkGradient(ca: TCanvas; x, y, Height, Kind: integer);
+  X, Y: Integer; S: string);
+function BiColorTextWidth(ca: TCanvas; S: string): Integer;
+procedure RisedTextOut(ca: TCanvas; X, Y: Integer; S: string);
+procedure LightGradient(ca: TCanvas; X, Y, Width, Color: Integer);
+procedure DarkGradient(ca: TCanvas; X, Y, Width, Kind: Integer);
+procedure VLightGradient(ca: TCanvas; X, Y, Height, Color: Integer);
+procedure VDarkGradient(ca: TCanvas; X, Y, Height, Kind: Integer);
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
-procedure NumberBar(dst: TBitmap; x, y: integer; Cap: string; val: integer;
+procedure NumberBar(dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
   T: TTexture);
-procedure CountBar(dst: TBitmap; x, y, w: integer; Kind: integer;
-  Cap: string; val: integer; T: TTexture);
-procedure PaintProgressBar(ca: TCanvas; Kind, x, y, pos, Growth, max: integer;
+procedure CountBar(dst: TBitmap; X, Y, W: Integer; Kind: Integer;
+  Cap: string; val: Integer; T: TTexture);
+procedure PaintProgressBar(ca: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
 procedure PaintRelativeProgressBar(ca: TCanvas;
-  Kind, x, y, size, pos, Growth, max: integer; IndicateComplete: boolean;
+  Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
-procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: integer);
+procedure PaintLogo(Canvas: TCanvas; X, Y, LightColor, ShadeColor: Integer);
 procedure LoadPhrases;
 procedure Texturize(Dest, Texture: TBitmap; TransparentColor: Cardinal);
@@ -204 +204 @@
   {$IFDEF WINDOWS}
   StartResolution: TDeviceMode;
-  ResolutionChanged: boolean;
+  ResolutionChanged: Boolean;
   {$ENDIF}
 
@@ -210 +210 @@
 
 {$IFDEF WINDOWS}
-function ChangeResolution(x, y, bpp, freq: integer): boolean;
+function ChangeResolution(X, Y, bpp, freq: Integer): Boolean;
 var
   DevMode: TDeviceMode;
@@ -217 +217 @@
   DevMode.dmFields := DM_PELSWIDTH or DM_PELSHEIGHT or DM_BITSPERPEL or
     DM_DISPLAYFREQUENCY;
-  DevMode.dmPelsWidth := x;
-  DevMode.dmPelsHeight := y;
+  DevMode.dmPelsWidth := X;
+  DevMode.dmPelsHeight := Y;
   DevMode.dmBitsPerPel := bpp;
   DevMode.dmDisplayFrequency := freq;
@@ -318 +318 @@
 end;
 
-procedure BtnFrame(ca: TCanvas; p: TRect; T: TTexture);
-begin
-  RFrame(ca, p.Left - 1, p.Top - 1, p.Right, p.Bottom, T.ColorBevelShade,
+procedure BtnFrame(ca: TCanvas; P: TRect; T: TTexture);
+begin
+  RFrame(ca, P.Left - 1, P.Top - 1, P.Right, P.Bottom, T.ColorBevelShade,
     T.ColorBevelLight);
 end;
 
-procedure EditFrame(ca: TCanvas; p: TRect; T: TTexture);
-begin
-  Frame(ca, p.Left - 1, p.Top - 1, p.Right, p.Bottom, $000000, $000000);
-  Frame(ca, p.Left - 2, p.Top - 2, p.Right + 1, p.Bottom + 1, $000000, $000000);
-  Frame(ca, p.Left - 3, p.Top - 3, p.Right + 2, p.Bottom + 1, $000000, $000000);
-  RFrame(ca, p.Left - 4, p.Top - 4, p.Right + 3, p.Bottom + 2, T.ColorBevelShade,
+procedure EditFrame(ca: TCanvas; P: TRect; T: TTexture);
+begin
+  Frame(ca, P.Left - 1, P.Top - 1, P.Right, P.Bottom, $000000, $000000);
+  Frame(ca, P.Left - 2, P.Top - 2, P.Right + 1, P.Bottom + 1, $000000, $000000);
+  Frame(ca, P.Left - 3, P.Top - 3, P.Right + 2, P.Bottom + 1, $000000, $000000);
+  RFrame(ca, P.Left - 4, P.Top - 4, P.Right + 3, P.Bottom + 2, T.ColorBevelShade,
     T.ColorBevelLight);
 end;
@@ -335 +335 @@
 function HexCharToInt(X: Char): Integer;
 begin
-  case x of
+  case X of
     '0' .. '9': Result := Ord(X) - Ord('0');
     'A' .. 'F': Result := Ord(X) - Ord('A') + 10;
@@ -492 +492 @@
 function LoadGraphicSet(const Name: string; Transparency: Boolean = True): TGraphicSet;
 var
-  x: Integer;
-  y: Integer;
+  X: Integer;
+  Y: Integer;
   OriginalColor: Integer;
   FileName: string;
@@ -522 +522 @@
       DataPixel := PixelPointer(Result.Data);
       MaskPixel := PixelPointer(Result.Mask);
-      for y := 0 to ScaleToNative(Result.Data.Height) - 1 do begin
-        for x := 0 to ScaleToNative(Result.Data.Width) - 1 do begin
+      for Y := 0 to ScaleToNative(Result.Data.Height) - 1 do begin
+        for X := 0 to ScaleToNative(Result.Data.Width) - 1 do begin
           OriginalColor := DataPixel.Pixel^.ARGB and $FFFFFF;
           if (OriginalColor = TransparentColor1) or (OriginalColor = TransparentColor2) then begin
@@ -552 +552 @@
 end;
 
-procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 begin
   BitBltCanvas(dst.Canvas, xDst, yDst, Width, Height,
@@ -650 +650 @@
     Height := ScaleToNative(dst.Height) - yDst;
   if (Width < 0) or (Height < 0) then
-    exit;
+    Exit;
 
   dst.BeginUpdate;
@@ -659 +659 @@
     for X := 0 to Width - 1 do  begin
       Brightness := PixelSrc.Pixel^.B; // One byte for 8-bit color
-      test := (PixelDst.Pixel^.R * Brightness) shr 7;
-      if test >= 256 then
+      Test := (PixelDst.Pixel^.R * Brightness) shr 7;
+      if Test >= 256 then
         PixelDst.Pixel^.R := 255
       else
-        PixelDst.Pixel^.R := test; // Red
-      test := (PixelDst.Pixel^.G * Brightness) shr 7;
-      if test >= 256 then
+        PixelDst.Pixel^.R := Test; // Red
+      Test := (PixelDst.Pixel^.G * Brightness) shr 7;
+      if Test >= 256 then
         PixelDst.Pixel^.G := 255
       else
-        PixelDst.Pixel^.G := test; // Green
-      test := (PixelDst.Pixel^.B * Brightness) shr 7;
-      if test >= 256 then
+        PixelDst.Pixel^.G := Test; // Green
+      Test := (PixelDst.Pixel^.B * Brightness) shr 7;
+      if Test >= 256 then
         PixelDst.Pixel^.R := 255
       else
@@ -716 +716 @@
     Height := ScaleToNative(dst.Height) - yDst;
   if (Width < 0) or (Height < 0) then
-    exit;
+    Exit;
 
   Src.BeginUpdate;
@@ -765 +765 @@
 // R channel = Color2 amp
 var
-  ix, iy, amp0, amp1, trans, Value: integer;
+  ix, iy, amp0, amp1, trans, Value: Integer;
   SrcPixel: TPixelPointer;
   DstPixel: TPixelPointer;
@@ -807 +807 @@
 end;
 
-procedure ImageOp_CCC(bmp: TBitmap; x, y, Width, Height, Color0, Color1, Color2: Integer);
+procedure ImageOp_CCC(bmp: TBitmap; X, Y, Width, Height, Color0, Color1, Color2: Integer);
 // Bmp is template
 // B channel = Color0 amp, 128=original brightness
@@ -813 +813 @@
 // R channel = Color2 amp, 128=original brightness
 var
-  i, Red, Green: Integer;
+  I, Red, Green: Integer;
   PixelPtr: TPixelPointer;
 begin
@@ -821 +821 @@
   Height := ScaleToNative(Height);
   bmp.BeginUpdate;
-  assert(bmp.PixelFormat = pf24bit);
-  Height := y + Height;
-  PixelPtr := PixelPointer(Bmp, x, y);
-  while y < Height do begin
-    for i := 0 to Width - 1 do begin
+  Assert(bmp.PixelFormat = pf24bit);
+  Height := Y + Height;
+  PixelPtr := PixelPointer(Bmp, X, Y);
+  while Y < Height do begin
+    for I := 0 to Width - 1 do begin
       Red := ((PixelPtr.Pixel^.B * (Color0 and $0000FF) + PixelPtr.Pixel^.G *
         (Color1 and $0000FF) + PixelPtr.Pixel^.R * (Color2 and $0000FF)) shr 8) and $ff;
@@ -838 +838 @@
       PixelPtr.NextPixel;
     end;
-    Inc(y);
+    Inc(Y);
     PixelPtr.NextLine;
   end;
@@ -844 +844 @@
 end;
 
-procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 begin
   BitBltCanvas(Canvas, xDst, yDst, Width, Height,
@@ -852 +852 @@
 end;
 
-procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 begin
   BitBltCanvas(dst.Canvas, xDst, yDst, Width, Height,
@@ -890 +890 @@
 end;
 
-procedure SLine(ca: TCanvas; x0, x1, y: integer; cl: TColor);
+procedure SLine(ca: TCanvas; x0, x1, Y: Integer; cl: TColor);
 begin
   with ca do begin
     Pen.Color := cl;
-    MoveTo(x0, y);
-    LineTo(x1 + 1, y);
-  end;
-end;
-
-procedure DLine(ca: TCanvas; x0, x1, y: integer; cl0, cl1: TColor);
+    MoveTo(x0, Y);
+    LineTo(x1 + 1, Y);
+  end;
+end;
+
+procedure DLine(ca: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
 begin
   with ca do begin
     Pen.Color := cl0;
-    MoveTo(x0, y);
-    LineTo(x1, y);
+    MoveTo(x0, Y);
+    LineTo(x1, Y);
     Pen.Color := cl1;
-    MoveTo(x0 + 1, y + 1);
-    LineTo(x1 + 1, y + 1);
-    Pixels[x0, y + 1] := cl0;
-    Pixels[x1, y] := cl1;
-  end;
-end;
-
-procedure Frame(ca: TCanvas; x0, y0, x1, y1: integer; cl0, cl1: TColor);
+    MoveTo(x0 + 1, Y + 1);
+    LineTo(x1 + 1, Y + 1);
+    Pixels[x0, Y + 1] := cl0;
+    Pixels[x1, Y] := cl1;
+  end;
+end;
+
+procedure Frame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
 begin
   with ca do begin
@@ -926 +926 @@
 end;
 
-procedure RFrame(ca: TCanvas; x0, y0, x1, y1: integer; cl0, cl1: TColor);
+procedure RFrame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
 begin
   with ca do begin
@@ -942 +942 @@
 end;
 
-procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: integer; cl: TColor);
+procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
 begin
   with ca do begin
@@ -962 +962 @@
 
 procedure FrameImage(ca: TCanvas; Src: TBitmap;
-  x, y, Width, Height, xSrc, ySrc: integer; IsControl: boolean = False);
+  X, Y, Width, Height, xSrc, ySrc: Integer; IsControl: Boolean = False);
 begin
   if IsControl then begin
-    Frame(ca, x - 1, y - 1, x + Width, y + Height, $B0B0B0, $FFFFFF);
-    RFrame(ca, x - 2, y - 2, x + Width + 1, y + Height + 1, $FFFFFF, $B0B0B0);
+    Frame(ca, X - 1, Y - 1, X + Width, Y + Height, $B0B0B0, $FFFFFF);
+    RFrame(ca, X - 2, Y - 2, X + Width + 1, Y + Height + 1, $FFFFFF, $B0B0B0);
   end else
-    Frame(ca, x - 1, y - 1, x + Width, y + Height, $000000, $000000);
-  BitBltCanvas(ca, x, y, Width, Height, Src.Canvas, xSrc, ySrc);
+    Frame(ca, X - 1, Y - 1, X + Width, Y + Height, $000000, $000000);
+  BitBltCanvas(ca, X, Y, Width, Height, Src.Canvas, xSrc, ySrc);
 end;
 
 procedure GlowFrame(Dst: TBitmap; x0, y0, Width, Height: Integer; cl: TColor);
 var
-  x, y, ch, r: Integer;
+  X, Y, ch, R: Integer;
   DstPtr: TPixelPointer;
   DpiGlowRange: Integer;
@@ -985 +985 @@
   Dst.BeginUpdate;
   DstPtr := PixelPointer(Dst, x0 - DpiGlowRange + 1, y0 - DpiGlowRange + 1);
-  for y := -DpiGlowRange + 1 to Height - 1 + DpiGlowRange - 1 do begin
-    for x := -DpiGlowRange + 1 to Width - 1 + DpiGlowRange - 1 do begin
-      if x < 0 then
-        if y < 0 then
-          r := round(sqrt(sqr(x) + sqr(y)))
-        else if y >= Height then
-          r := round(sqrt(sqr(x) + sqr(y - (Height - 1))))
+  for Y := -DpiGlowRange + 1 to Height - 1 + DpiGlowRange - 1 do begin
+    for X := -DpiGlowRange + 1 to Width - 1 + DpiGlowRange - 1 do begin
+      if X < 0 then
+        if Y < 0 then
+          R := round(sqrt(sqr(X) + sqr(Y)))
+        else if Y >= Height then
+          R := round(sqrt(sqr(X) + sqr(Y - (Height - 1))))
         else
-          r := -x
-      else if x >= Width then
-        if y < 0 then
-          r := round(sqrt(sqr(x - (Width - 1)) + sqr(y)))
-        else if y >= Height then
-          r := round(sqrt(sqr(x - (Width - 1)) + sqr(y - (Height - 1))))
+          R := -X
+      else if X >= Width then
+        if Y < 0 then
+          R := round(sqrt(sqr(X - (Width - 1)) + sqr(Y)))
+        else if Y >= Height then
+          R := round(sqrt(sqr(X - (Width - 1)) + sqr(Y - (Height - 1))))
         else
-          r := x - (Width - 1)
-      else if y < 0 then
-        r := -y
-      else if y >= Height then
-        r := y - (Height - 1)
+          R := X - (Width - 1)
+      else if Y < 0 then
+        R := -Y
+      else if Y >= Height then
+        R := Y - (Height - 1)
       else begin
         DstPtr.NextPixel;
         continue;
       end;
-      if r = 0 then
-        r := 1;
-      if r < DpiGlowRange then
+      if R = 0 then
+        R := 1;
+      if R < DpiGlowRange then
         for ch := 0 to 2 do
           DstPtr.Pixel^.Planes[2 - ch] :=
-            (DstPtr.Pixel^.Planes[2 - ch] * (r - 1) + (cl shr (8 * ch) and $FF) *
-            (DpiGlowRange - r)) div (DpiGlowRange - 1);
+            (DstPtr.Pixel^.Planes[2 - ch] * (R - 1) + (cl shr (8 * ch) and $FF) *
+            (DpiGlowRange - R)) div (DpiGlowRange - 1);
       DstPtr.NextPixel;
     end;
@@ -1065 +1065 @@
 procedure InitCityMark(T: TTexture);
 var
-  x: Integer;
-  y: Integer;
+  X: Integer;
+  Y: Integer;
   Intensity: Integer;
 begin
-  for x := 0 to CityMark1.Width - 1 do begin
-    for y := 0 to CityMark1.Height - 1 do begin
-      if HGrSystem.Mask.Canvas.Pixels[CityMark1.Left + x, CityMark1.Top + y] = 0 then
+  for X := 0 to CityMark1.Width - 1 do begin
+    for Y := 0 to CityMark1.Height - 1 do begin
+      if HGrSystem.Mask.Canvas.Pixels[CityMark1.Left + X, CityMark1.Top + Y] = 0 then
       begin
         Intensity := HGrSystem.Data.Canvas.Pixels[CityMark1.Left +
-          x, CityMark1.Top + y] and $FF;
-        HGrSystem.Data.Canvas.Pixels[CityMark2.Left + x, CityMark2.Top + y] :=
+          X, CityMark1.Top + Y] and $FF;
+        HGrSystem.Data.Canvas.Pixels[CityMark2.Left + X, CityMark2.Top + Y] :=
           T.ColorMark and $FF * Intensity div $FF + T.ColorMark shr 8 and
           $FF * Intensity div $FF shl 8 + T.ColorMark shr 16 and
@@ -1103 +1103 @@
   function Band(I: Integer): Integer;
   var
-    n: integer;
+    N: Integer;
   begin
-    n := ((MainTexture.Height div 2) div (y1 - y0)) * 2;
+    N := ((MainTexture.Height div 2) div (y1 - y0)) * 2;
     while MainTexture.Height div 2 + (I + 1) * (y1 - y0) > MainTexture.Height do
-      Dec(I, n);
+      Dec(I, N);
     while MainTexture.Height div 2 + I * (y1 - y0) < 0 do
-      Inc(I, n);
+      Inc(I, N);
     Result := I;
   end;
@@ -1137 +1137 @@
   const Texture: TBitmap);
 var
-  x, y, x0cut, y0cut, x1cut, y1cut: Integer;
+  X, Y, x0cut, y0cut, x1cut, y1cut: Integer;
 begin
   while xOffset < 0 do
@@ -1143 +1143 @@
   while yOffset < 0 do
     Inc(yOffset, Texture.Height);
-  for y := (Top + yOffset) div Texture.Height to (Top + yOffset + Height - 1) div
+  for Y := (Top + yOffset) div Texture.Height to (Top + yOffset + Height - 1) div
     Texture.Height do
   begin
-    y0cut := Top + yOffset - y * Texture.Height;
+    y0cut := Top + yOffset - Y * Texture.Height;
     if y0cut < 0 then
       y0cut := 0;
-    y1cut := (y + 1) * Texture.Height - (Top + yOffset + Height);
+    y1cut := (Y + 1) * Texture.Height - (Top + yOffset + Height);
     if y1cut < 0 then
       y1cut := 0;
-    for x := (Left + xOffset) div Texture.Width to (Left + xOffset + Width - 1) div
+    for X := (Left + xOffset) div Texture.Width to (Left + xOffset + Width - 1) div
       Texture.Width do
     begin
-      x0cut := Left + xOffset - x * Texture.Width;
+      x0cut := Left + xOffset - X * Texture.Width;
       if x0cut < 0 then
         x0cut := 0;
-      x1cut := (x + 1) * Texture.Width - (Left + xOffset + Width);
+      x1cut := (X + 1) * Texture.Width - (Left + xOffset + Width);
       if x1cut < 0 then
         x1cut := 0;
-      BitBltCanvas(ca, x * Texture.Width + x0cut - xOffset,
-        y * Texture.Height + y0cut - yOffset, Texture.Width - x0cut - x1cut,
+      BitBltCanvas(ca, X * Texture.Width + x0cut - xOffset,
+        Y * Texture.Height + y0cut - yOffset, Texture.Width - x0cut - x1cut,
         Texture.Height - y0cut - y1cut, Texture.Canvas, x0cut, y0cut);
     end;
@@ -1180 +1180 @@
 end;
 
-procedure Corner(ca: TCanvas; x, y, Kind: Integer; T: TTexture);
+procedure Corner(ca: TCanvas; X, Y, Kind: Integer; T: TTexture);
 begin
   { BitBltCanvas(ca,x,y,8,8,T.HGr.Mask.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCAND);
-    BitBltCanvas(ca,x,y,8,8,T.HGr.Data.Canvas,
+    BitBltCanvas(ca,X,Y,8,8,T.HGr.Data.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCPAINT); }
 end;
 
-procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; x, y: Integer; s: string);
-
-  procedure PaintIcon(x, y, Kind: Integer);
+procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
+
+  procedure PaintIcon(X, Y, Kind: Integer);
   begin
-    BitBltCanvas(ca, x, y + 6, 10, 10, HGrSystem.Mask.Canvas,
+    BitBltCanvas(ca, X, Y + 6, 10, 10, HGrSystem.Mask.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCAND);
-    BitBltCanvas(ca, x, y + 6, 10, 10, HGrSystem.Data.Canvas,
+    BitBltCanvas(ca, X, Y + 6, 10, 10, HGrSystem.Data.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCPAINT);
   end;
 
 var
-  p, xp: Integer;
+  P, xp: Integer;
   sp: string;
   shadow: Boolean;
   Text: string;
 begin
-  Inc(x);
-  Inc(y);
+  Inc(X);
+  Inc(Y);
   for shadow := True downto False do
     with ca do
@@ -1214 +1214 @@
         else
           Font.Color := clMain;
-        sp := s;
-        xp := x;
+        sp := S;
+        xp := X;
         repeat
-          p := pos('%', sp);
-          if (p = 0) or (p + 1 > Length(sp)) or not
-            (sp[p + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w']) then
+          P := Pos('%', sp);
+          if (P = 0) or (P + 1 > Length(sp)) or not
+            (sp[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w']) then
           begin
-            ca.Textout(xp, y, sp);
+            ca.Textout(xp, Y, sp);
             Break;
           end
           else
           begin
-            Text := Copy(sp, 1, p - 1);
-            Textout(xp, y, Text);
+            Text := Copy(sp, 1, P - 1);
+            Textout(xp, Y, Text);
             Inc(xp, ca.TextWidth(Text));
             if not shadow then
-              case sp[p + 1] of
-                'c': PaintIcon(xp + 1, y, 6);
-                'f': PaintIcon(xp + 1, y, 0);
-                'l': PaintIcon(xp + 1, y, 8);
-                'm': PaintIcon(xp + 1, y, 17);
-                'n': PaintIcon(xp + 1, y, 7);
-                'o': PaintIcon(xp + 1, y, 16);
-                'p': PaintIcon(xp + 1, y, 2);
-                'r': PaintIcon(xp + 1, y, 12);
-                't': PaintIcon(xp + 1, y, 4);
-                'w': PaintIcon(xp + 1, y, 13);
+              case sp[P + 1] of
+                'c': PaintIcon(xp + 1, Y, 6);
+                'f': PaintIcon(xp + 1, Y, 0);
+                'l': PaintIcon(xp + 1, Y, 8);
+                'm': PaintIcon(xp + 1, Y, 17);
+                'n': PaintIcon(xp + 1, Y, 7);
+                'o': PaintIcon(xp + 1, Y, 16);
+                'p': PaintIcon(xp + 1, Y, 2);
+                'r': PaintIcon(xp + 1, Y, 12);
+                't': PaintIcon(xp + 1, Y, 4);
+                'w': PaintIcon(xp + 1, Y, 13);
               end;
             Inc(xp, 10);
-            Delete(sp, 1, p + 1);
+            Delete(sp, 1, P + 1);
           end;
         until False;
-        Dec(x);
-        Dec(y);
+        Dec(X);
+        Dec(Y);
       end;
 end;
 
-function BiColorTextWidth(ca: TCanvas; s: string): Integer;
+function BiColorTextWidth(ca: TCanvas; S: string): Integer;
 var
   P: Integer;
@@ -1257 +1257 @@
   Result := 1;
   repeat
-    P := Pos('%', s);
-    if (P = 0) or (P = Length(s)) then
+    P := Pos('%', S);
+    if (P = 0) or (P = Length(S)) then
     begin
-      Inc(Result, ca.TextWidth(s));
+      Inc(Result, ca.TextWidth(S));
       Break;
     end
     else
     begin
-      if not (s[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w'])
+      if not (S[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w'])
       then
-        Inc(Result, ca.TextWidth(copy(s, 1, P + 1)))
+        Inc(Result, ca.TextWidth(Copy(S, 1, P + 1)))
       else
-        Inc(Result, ca.TextWidth(copy(s, 1, P - 1)) + 10);
-      Delete(s, 1, P + 1);
+        Inc(Result, ca.TextWidth(Copy(S, 1, P - 1)) + 10);
+      Delete(S, 1, P + 1);
     end;
   until False;
@@ -1276 +1276 @@
 
 procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
-  x, y: Integer; s: string);
+  X, Y: Integer; S: string);
 begin
   if cl = -2 then
     BiColorTextOut(ca, (T.ColorBevelShade and $FEFEFE) shr 1,
-      T.ColorBevelLight, x, y, s)
+      T.ColorBevelLight, X, Y, S)
   else if cl < 0 then
-    BiColorTextOut(ca, T.ColorTextShade, T.ColorTextLight, x, y, s)
+    BiColorTextOut(ca, T.ColorTextShade, T.ColorTextLight, X, Y, S)
   else
-    BiColorTextOut(ca, cl, T.ColorTextLight, x, y, s);
-end;
-
-procedure RisedTextOut(ca: TCanvas; x, y: integer; s: string);
-begin
-  BiColorTextOut(ca, $FFFFFF, $000000, x, y, s);
-end;
-
-procedure Gradient(ca: TCanvas; x, y, dx, dy, Width, Height, Color: Integer;
-  Brightness: array of integer);
-var
-  i, r, g, b: Integer;
-begin
-  for i := 0 to Length(Brightness) - 1 do begin // gradient
-    r := Color and $FF + Brightness[i];
-    if r < 0 then
-      r := 0
-    else if r >= 256 then
-      r := 255;
-    g := Color shr 8 and $FF + Brightness[i];
-    if g < 0 then
-      g := 0
-    else if g >= 256 then
-      g := 255;
-    b := Color shr 16 and $FF + Brightness[i];
-    if b < 0 then
-      b := 0
-    else if b >= 256 then
-      b := 255;
-    ca.Pen.Color := r + g shl 8 + b shl 16;
-    ca.MoveTo(x + dx * i, y + dy * i);
-    ca.LineTo(x + dx * i + Width, y + dy * i + Height);
+    BiColorTextOut(ca, cl, T.ColorTextLight, X, Y, S);
+end;
+
+procedure RisedTextOut(ca: TCanvas; X, Y: Integer; S: string);
+begin
+  BiColorTextOut(ca, $FFFFFF, $000000, X, Y, S);
+end;
+
+procedure Gradient(ca: TCanvas; X, Y, dx, dy, Width, Height, Color: Integer;
+  Brightness: array of Integer);
+var
+  I, R, G, B: Integer;
+begin
+  for I := 0 to Length(Brightness) - 1 do begin // gradient
+    R := Color and $FF + Brightness[I];
+    if R < 0 then
+      R := 0
+    else if R >= 256 then
+      R := 255;
+    G := Color shr 8 and $FF + Brightness[I];
+    if G < 0 then
+      G := 0
+    else if G >= 256 then
+      G := 255;
+    B := Color shr 16 and $FF + Brightness[I];
+    if B < 0 then
+      B := 0
+    else if B >= 256 then
+      B := 255;
+    ca.Pen.Color := R + G shl 8 + B shl 16;
+    ca.MoveTo(X + dx * I, Y + dy * I);
+    ca.LineTo(X + dx * I + Width, Y + dy * I + Height);
   end;
   ca.Pen.Color := $000000;
-  ca.MoveTo(x + 1, y + 16 * dy + Height);
-  ca.LineTo(x + 16 * dx + Width, y + 16 * dy + Height);
-  ca.LineTo(x + 16 * dx + Width, y);
-end;
-
-procedure LightGradient(ca: TCanvas; x, y, Width, Color: Integer);
+  ca.MoveTo(X + 1, Y + 16 * dy + Height);
+  ca.LineTo(X + 16 * dx + Width, Y + 16 * dy + Height);
+  ca.LineTo(X + 16 * dx + Width, Y);
+end;
+
+procedure LightGradient(ca: TCanvas; X, Y, Width, Color: Integer);
 const
-  Brightness: array [0 .. 15] of integer =
+  Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, x, y, 0, 1, Width, 0, Color, Brightness);
-end;
-
-procedure DarkGradient(ca: TCanvas; x, y, Width, Kind: Integer);
+  Gradient(ca, X, Y, 0, 1, Width, 0, Color, Brightness);
+end;
+
+procedure DarkGradient(ca: TCanvas; X, Y, Width, Kind: Integer);
 const
-  Brightness: array [0 .. 15] of integer =
+  Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12 - 24, -16 + 16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, x, y, 0, 1, Width, 0, HGrSystem.Data.Canvas.Pixels
+  Gradient(ca, X, Y, 0, 1, Width, 0, HGrSystem.Data.Canvas.Pixels
     [187, 137 + Kind], Brightness);
 end;
 
-procedure VLightGradient(ca: TCanvas; x, y, Height, Color: Integer);
+procedure VLightGradient(ca: TCanvas; X, Y, Height, Color: Integer);
 const
-  Brightness: array [0 .. 15] of integer =
+  Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, x, y, 1, 0, 0, Height, Color, Brightness);
-end;
-
-procedure VDarkGradient(ca: TCanvas; x, y, Height, Kind: Integer);
+  Gradient(ca, X, Y, 1, 0, 0, Height, Color, Brightness);
+end;
+
+procedure VDarkGradient(ca: TCanvas; X, Y, Height, Kind: Integer);
 const
-  Brightness: array [0 .. 15] of integer =
+  Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12 - 24, -16 + 16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, x, y, 1, 0, 0, Height,
+  Gradient(ca, X, Y, 1, 0, 0, Height,
     HGrSystem.Data.Canvas.Pixels[187, 137 + Kind], Brightness);
 end;
@@ -1364 +1364 @@
 end;
 
-procedure NumberBar(dst: TBitmap; x, y: integer; Cap: string;
+procedure NumberBar(dst: TBitmap; X, Y: Integer; Cap: string;
   val: Integer; T: TTexture);
 var
-  s: string;
+  S: string;
 begin
   if val > 0 then
   begin
-    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.ColorBevelShade,
+    DLine(dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade,
       T.ColorBevelLight);
-    LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
-    s := IntToStr(val);
-    RisedTextOut(dst.Canvas, x + 170 - BiColorTextWidth(dst.Canvas,
-      s), y, s);
-  end;
-end;
-
-procedure CountBar(dst: TBitmap; x, y, w: Integer; Kind: Integer;
+    LoweredTextOut(dst.Canvas, -1, T, X - 2, Y, Cap);
+    S := IntToStr(val);
+    RisedTextOut(dst.Canvas, X + 170 - BiColorTextWidth(dst.Canvas,
+      S), Y, S);
+  end;
+end;
+
+procedure CountBar(dst: TBitmap; X, Y, W: Integer; Kind: Integer;
   Cap: string; val: Integer; T: TTexture);
 var
-  i, sd, ld, cl, xIcon, yIcon: Integer;
-  s: string;
+  I, sd, ld, cl, xIcon, yIcon: Integer;
+  S: string;
 begin
   // val:=random(40); //!!!
@@ -1396 +1396 @@
     // DLine(dst.Canvas,x-2,x+170+32,y+16,T.ColorBevelShade,T.ColorBevelLight);
 
-    xIcon := x - 5;
-    yIcon := y + 15;
-    DLine(dst.Canvas, x - 2, xIcon + w + 2, yIcon + 16, T.ColorBevelShade,
+    xIcon := X - 5;
+    yIcon := Y + 15;
+    DLine(dst.Canvas, X - 2, xIcon + W + 2, yIcon + 16, T.ColorBevelShade,
       T.ColorBevelLight);
 
-    s := IntToStr(val);
+    S := IntToStr(val);
     if val < 0 then
       cl := $0000FF
     else
       cl := -1;
-    LoweredTextOut(dst.Canvas, cl, T, x - 2, y, Cap);
+    LoweredTextOut(dst.Canvas, cl, T, X - 2, Y, Cap);
     LoweredTextOut(dst.Canvas, cl, T,
-      xIcon + w + 2 - BiColorTextWidth(dst.Canvas, s), yIcon, s);
+      xIcon + W + 2 - BiColorTextWidth(dst.Canvas, S), yIcon, S);
 
     if (Kind = 12) and (val >= 100) then
@@ -1416 +1416 @@
       if sd = 0 then
         sd := 1;
-      if sd < w - 44 then
+      if sd < W - 44 then
         ld := sd
       else
-        ld := w - 44;
-      for i := 0 to val mod 10 - 1 do
+        ld := W - 44;
+      for I := 0 to val mod 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 2 + 1, 14,
+        BitBltCanvas(dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
           14, HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
+        Sprite(dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for i := 0 to val div 10 - 1 do
+      for I := 0 to val div 10 - 1 do
       begin
         BitBltCanvas(dst.Canvas, xIcon + 4 + (val mod 10) *
-          (14 * ld div sd) + i * (14 * ld div sd), yIcon + 3, 14, 14,
+          (14 * ld div sd) + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val mod 10) *
-          (14 * ld div sd) + i * (14 * ld div sd), yIcon + 2, 14,
+          (14 * ld div sd) + I * (14 * ld div sd), yIcon + 2, 14,
           14, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15);
@@ -1449 +1449 @@
       if sd = 0 then
         sd := 1;
-      if sd < w - 44 then
+      if sd < W - 44 then
         ld := sd
       else
-        ld := w - 44;
-      for i := 0 to val div 10 - 1 do
+        ld := W - 44;
+      for I := 0 to val div 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 3, 14, 14,
+        BitBltCanvas(dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
+        Sprite(dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
-      for i := 0 to val mod 10 - 1 do
+      for I := 0 to val mod 10 - 1 do
       begin
         BitBltCanvas(dst.Canvas, xIcon + 4 + (val div 10) *
-          (14 * ld div sd) + i * (10 * ld div sd), yIcon + 7, 10, 10,
+          (14 * ld div sd) + I * (10 * ld div sd), yIcon + 7, 10, 10,
           HGrSystem.Mask.Canvas, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val div 10) *
-          (14 * ld div sd) + i * (10 * ld div sd), yIcon + 6, 10,
+          (14 * ld div sd) + I * (10 * ld div sd), yIcon + 6, 10,
           10, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11);
@@ -1476 +1476 @@
 end;
 
-procedure PaintProgressBar(ca: TCanvas; Kind, x, y, pos, Growth, max: Integer;
+procedure PaintProgressBar(ca: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
 var
-  i: Integer;
-begin
-  if pos > max then
-    pos := max;
+  I: Integer;
+begin
+  if Pos > Max then
+    Pos := Max;
   if Growth < 0 then
   begin
-    pos := pos + Growth;
-    if pos < 0 then
+    Pos := Pos + Growth;
+    if Pos < 0 then
     begin
-      Growth := Growth - pos;
-      pos := 0;
+      Growth := Growth - Pos;
+      Pos := 0;
     end;
   end
-  else if pos + Growth > max then
-    Growth := max - pos;
-  Frame(ca, x - 1, y - 1, x + max, y + 7, $000000, $000000);
-  RFrame(ca, x - 2, y - 2, x + max + 1, y + 8, T.ColorBevelShade,
+  else if Pos + Growth > Max then
+    Growth := Max - Pos;
+  Frame(ca, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
+  RFrame(ca, X - 2, Y - 2, X + Max + 1, Y + 8, T.ColorBevelShade,
     T.ColorBevelLight);
   with ca do
   begin
-    for i := 0 to pos div 8 - 1 do
-      BitBltCanvas(ca, x + i * 8, y, 8, 7,
+    for I := 0 to Pos div 8 - 1 do
+      BitBltCanvas(ca, X + I * 8, Y, 8, 7,
         HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
-    BitBltCanvas(ca, x + 8 * (pos div 8), y, pos - 8 * (pos div 8), 7,
+    BitBltCanvas(ca, X + 8 * (Pos div 8), Y, Pos - 8 * (Pos div 8), 7,
       HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
     if Growth > 0 then
     begin
-      for i := 0 to Growth div 8 - 1 do
-        BitBltCanvas(ca, x + pos + i * 8, y, 8, 7,
+      for I := 0 to Growth div 8 - 1 do
+        BitBltCanvas(ca, X + Pos + I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 112, 9 + 8 * Kind);
-      BitBltCanvas(ca, x + pos + 8 * (Growth div 8), y,
+      BitBltCanvas(ca, X + Pos + 8 * (Growth div 8), Y,
         Growth - 8 * (Growth div 8), 7, HGrSystem.Data.Canvas,
         112, 9 + 8 * Kind);
@@ -1515 +1515 @@
     else if Growth < 0 then
     begin
-      for i := 0 to -Growth div 8 - 1 do
-        BitBltCanvas(ca, x + pos + i * 8, y, 8, 7,
+      for I := 0 to -Growth div 8 - 1 do
+        BitBltCanvas(ca, X + Pos + I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 1);
-      BitBltCanvas(ca, x + pos + 8 * (-Growth div 8), y, -Growth -
+      BitBltCanvas(ca, X + Pos + 8 * (-Growth div 8), Y, -Growth -
         8 * (-Growth div 8), 7,
         HGrSystem.Data.Canvas, 104, 1);
     end;
     Brush.Color := $000000;
-    FillRect(Rect(x + pos + abs(Growth), y, x + max, y + 7));
+    FillRect(Rect(X + Pos + abs(Growth), Y, X + Max, Y + 7));
     Brush.Style := bsClear;
   end;
@@ -1530 +1530 @@
 // pos and growth are relative to max, set size independent
 procedure PaintRelativeProgressBar(ca: TCanvas;
-  Kind, x, y, size, pos, Growth, max: Integer; IndicateComplete: Boolean;
+  Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
 begin
   if Growth > 0 then
-    PaintProgressBar(ca, Kind, x, y, pos * size div max,
-      (Growth * size + max div 2) div max, size, T)
+    PaintProgressBar(ca, Kind, X, Y, Pos * size div Max,
+      (Growth * size + Max div 2) div Max, size, T)
   else
-    PaintProgressBar(ca, Kind, x, y, pos * size div max,
-      (Growth * size - max div 2) div max, size, T);
-  if IndicateComplete and (pos + Growth >= max) then
-    Sprite(ca, HGrSystem, x + size - 10, y - 7, 23, 16, 1, 129);
+    PaintProgressBar(ca, Kind, X, Y, Pos * size div Max,
+      (Growth * size - Max div 2) div Max, size, T);
+  if IndicateComplete and (Pos + Growth >= Max) then
+    Sprite(ca, HGrSystem, X + size - 10, Y - 7, 23, 16, 1, 129);
 end;
 
@@ -1610 +1610 @@
 procedure DarkenImage(Bitmap: TBitmap; Change: Integer);
 var
-  x, y: integer;
+  X, Y: Integer;
   PicturePixel: TPixelPointer;
 begin
   Bitmap.BeginUpdate;
   PicturePixel := PixelPointer(Bitmap);
-  for y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
-    for x := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
+  for Y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
+    for X := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
       PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - Change, 0);
       PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - Change, 0);
@@ -1662 +1662 @@
   Section: TFontType;
   FontScript: TextFile;
-  Size: integer;
+  Size: Integer;
   S: string;
-  I: integer;
-  P: integer;
+  I: Integer;
+  P: Integer;
 begin
   Section := ftNormal;
@@ -1672 +1672 @@
     Reset(FontScript);
     while not Eof(FontScript) do begin
-      ReadLn(FontScript, s);
-      if s <> '' then
-        if s[1] = '#' then begin
-          s := TrimRight(s);
-          if s = '#SMALL' then Section := ftSmall
-          else if s = '#TINY' then Section := ftTiny
-          else if s = '#CAPTION' then Section := ftCaption
-          else if s = '#BUTTON' then Section := ftButton
+      ReadLn(FontScript, S);
+      if S <> '' then
+        if S[1] = '#' then begin
+          S := TrimRight(S);
+          if S = '#SMALL' then Section := ftSmall
+          else if S = '#TINY' then Section := ftTiny
+          else if S = '#CAPTION' then Section := ftCaption
+          else if S = '#BUTTON' then Section := ftButton
           else Section := ftNormal;
         end else begin
-          p := Pos(',', s);
-          if p > 0 then begin
-            UniFont[section].Name := Trim(Copy(s, 1, p - 1));
+          P := Pos(',', S);
+          if P > 0 then begin
+            UniFont[section].Name := Trim(Copy(S, 1, P - 1));
             Size := 0;
-            for i := p + 1 to Length(s) do
-              case s[i] of
+            for I := P + 1 to Length(S) do
+              case S[I] of
                 '0' .. '9':
-                  Size := Size * 10 + Byte(s[i]) - 48;
+                  Size := Size * 10 + Byte(S[I]) - 48;
                 'B', 'b':
                   UniFont[section].Style := UniFont[section].Style + [fsBold];

trunk/Packages/CevoComponents/Sound.pas

@@ -280 +280 @@
 begin
   Result := 0;
-  while (Result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
+  while (Result < SoundList.Count) and (SoundList[Result].FFileName <> FileName) do
     Inc(Result);
   if Result = SoundList.Count then begin

trunk/Packages/CevoComponents/StringTables.pas

@@ -16 +16 @@
     constructor Create;
     destructor Destroy; override;
-    function LoadFromFile(const FileName: String): boolean;
-    function GetHandle(const Item: string): integer;
-    function LookupByHandle(Handle: integer; Index: integer = -1): string;
+    function LoadFromFile(const FileName: String): Boolean;
+    function GetHandle(const Item: string): Integer;
+    function LookupByHandle(Handle: Integer; Index: Integer = -1): string;
     function Lookup(const Item: string; Index: Integer = -1): string;
-    function Search(const Content: string; var Handle, Index: integer): boolean;
+    function Search(const Content: string; var Handle, Index: Integer): Boolean;
   end;
 
@@ -45 +45 @@
 end;
 
-function TStringTable.LoadFromFile(const FileName: String): boolean;
+function TStringTable.LoadFromFile(const FileName: String): Boolean;
 begin
   Result := True;
@@ -56 +56 @@
 end;
 
-function TStringTable.GetHandle(const Item: string): integer;
+function TStringTable.GetHandle(const Item: string): Integer;
 var
   I: Integer;
@@ -67 +67 @@
 end;
 
-function TStringTable.LookupByHandle(Handle: integer; Index: integer): string;
+function TStringTable.LookupByHandle(Handle: Integer; Index: Integer): string;
 var
-  s: string;
+  S: string;
 begin
   if Index < 0 then begin
@@ -77 +77 @@
     end else begin
       if Pos(' ', Lines[Handle]) = 0 then S := ''
-        else s := Copy(Lines[Handle], Pos(' ', Lines[Handle]) + 1, MaxInt);
+        else S := Copy(Lines[Handle], Pos(' ', Lines[Handle]) + 1, MaxInt);
       while ((Handle + 1) < Lines.Count) and (Copy(Lines[Handle + 1], 1, 1) <> '#') do begin
         Inc(Handle);
         if (Length(Lines[Handle]) > 0) and (Lines[Handle][1] <> '''') then begin
-          if (s <> '') and (s[Length(s)] <> '\') then
-            s := s + ' ';
-          s := s + Lines[Handle];
+          if (S <> '') and (S[Length(S)] <> '\') then
+            S := S + ' ';
+          S := S + Lines[Handle];
         end;
       end;
@@ -116 +116 @@
 { might become necessary for 1.3
 
-  function TStringTable.Lookup(const Fallback: TStringTable; const Item: string; Index: integer): string;
+  function TStringTable.Lookup(const Fallback: TStringTable; const Item: string; Index: Integer): string;
   var
-  Handle: integer;
+  Handle: Integer;
   begin
   Handle:=Gethandle(Item);
-  if Handle>=0 then result:=LookupByHandle(Handle, Index)
-  else result:='';
-  if result='' then
-  result:=Fallback.Lookup(Item, Index);
+  if Handle>=0 then Result:=LookupByHandle(Handle, Index)
+  else Result:='';
+  if Result='' then
+  Result:=Fallback.Lookup(Item, Index);
   end;
 
-  function TStringTable.TryLookup(const Item: string; Index: integer): string;
+  function TStringTable.TryLookup(const Item: string; Index: Integer): string;
   var
-  Handle: integer;
+  Handle: Integer;
   begin
   Handle:=Gethandle(Item);
-  if Handle>=0 then result:=LookupByHandle(Handle, Index)
-  else result:='';
+  if Handle>=0 then Result:=LookupByHandle(Handle, Index)
+  else Result:='';
   end; }
 
 function TStringTable.Search(const Content: string;
-  var Handle, Index: integer): boolean;
+  var Handle, Index: Integer): Boolean;
 var
-  h, i: integer;
+  H, I: Integer;
   UContent: string;
 begin
   UContent := UpperCase(Content);
-  h := Handle;
-  if h < 0 then
-    i := 0
+  H := Handle;
+  if H < 0 then
+    I := 0
   else
-    i := Index + 1;
+    I := Index + 1;
   repeat
-    if h + i + 1 >= Lines.Count then
+    if H + I + 1 >= Lines.Count then
     begin
-      result := false;
-      exit;
+      Result := False;
+      Exit;
     end;
-    if Copy(Lines[h + i + 1], 1, 1) = '#' then
+    if Copy(Lines[H + I + 1], 1, 1) = '#' then
     begin
-      h := h + i + 1;
-      i := -1;
+      H := H + I + 1;
+      I := -1;
     end;
-    if (h >= 0) and not ((Length(Lines[h + i + 1]) > 0) and (Lines[h + i + 1][1] in ['#', ':', ';'])) and
-      (Pos(UContent, UpperCase(Lines[h + i + 1])) > 0) then
+    if (H >= 0) and not ((Length(Lines[H + I + 1]) > 0) and (Lines[H + I + 1][1] in ['#', ':', ';'])) and
+      (Pos(UContent, UpperCase(Lines[H + I + 1])) > 0) then
     begin
-      Index := i;
-      Handle := h;
+      Index := I;
+      Handle := H;
       Result := True;
       Exit;

trunk/Packages/CevoComponents/UGraphicSet.pas

@@ -272 +272 @@
 end.
 
+

trunk/Packages/CevoComponents/UTexture.pas

@@ -97 +97 @@
 end.
 
+

trunk/Packages/Common/Common.pas

@@ -37 +37 @@
   RegisterPackage('Common', @Register);
 end.
+

trunk/Packages/Common/StopWatch.pas

@@ -35 +35 @@
 implementation
 
-constructor TStopWatch.Create(const startOnCreate : boolean = false) ;
+constructor TStopWatch.Create(const startOnCreate : Boolean = False) ;
 begin
   inherited Create;
@@ -72 +72 @@
 begin
   dt := ElapsedMiliseconds / MSecsPerSec / SecsPerDay;
-  result := Format('%d days, %s', [Trunc(dt), FormatDateTime('hh:nn:ss.z', Frac(dt))]) ;
+  Result := Format('%d days, %s', [Trunc(dt), FormatDateTime('hh:nn:ss.z', Frac(dt))]) ;
 end;
 
@@ -93 +93 @@
 
 end.
+

trunk/Packages/Common/UAboutDialog.pas

@@ -51 +51 @@
 end.
 
+

trunk/Packages/Common/UCommon.pas

@@ -42 +42 @@
   clLightRed = TColor($8080FF);
 
-function AddLeadingZeroes(const aNumber, Length : integer) : string;
+function AddLeadingZeroes(const aNumber, Length : Integer) : string;
 function BinToInt(BinStr: string): Int64;
 function BinToHexString(Source: AnsiString): string;
@@ -96 +96 @@
 function BinToInt(BinStr : string) : Int64;
 var
-  i : byte;
+  I : Byte;
   RetVar : Int64;
 begin
   BinStr := UpperCase(BinStr);
-  if BinStr[length(BinStr)] = 'B' then Delete(BinStr,length(BinStr),1);
+  if BinStr[Length(BinStr)] = 'B' then Delete(BinStr,Length(BinStr),1);
   RetVar := 0;
-  for i := 1 to length(BinStr) do begin
-    if not (BinStr[i] in ['0','1']) then begin
+  for I := 1 to Length(BinStr) do begin
+    if not (BinStr[I] in ['0','1']) then begin
       RetVar := 0;
       Break;
     end;
-    RetVar := (RetVar shl 1) + (byte(BinStr[i]) and 1) ;
+    RetVar := (RetVar shl 1) + (Byte(BinStr[I]) and 1) ;
   end;
 
@@ -435 +435 @@
 end;
 
-function AddLeadingZeroes(const aNumber, Length : integer) : string;
+function AddLeadingZeroes(const aNumber, Length : Integer) : string;
 begin
   Result := SysUtils.Format('%.*d', [Length, aNumber]) ;
@@ -614 +614 @@
   begin
     for J := ReadFrom to Len do
-      if (S[j] = C) then
+      if (S[J] = C) then
       begin
         Result := J;
@@ -631 +631 @@
     Inc(I);
     APos := ReadUntil(I, '<');
-    Result := Result + Copy(S, I, APos - i);
+    Result := Result + Copy(S, I, APos - I);
     I := ReadUntil(APos + 1, '>');
   end;

trunk/Packages/Common/UFindFile.pas

@@ -6 +6 @@
 Tired of using FindFirst, Next and Close?
 Come see how to encapsulate all those functions
-in a single "find-files-recursively" component.
+in A Single "find-files-recursively" component.
 It's easy to use, free and with code.
 
@@ -34 +34 @@
   TFindFile = class(TComponent)
   private
-    s : TStringList;
-    fSubFolder : boolean;
+    S : TStringList;
+    fSubFolder : Boolean;
     fAttr: TFileAttrib;
     fPath : string;
@@ -47 +47 @@
   published
     property FileAttr: TFileAttrib read fAttr write fAttr;
-    property InSubFolders : boolean read fSubFolder write fSubFolder;
+    property InSubFolders : Boolean read fSubFolder write fSubFolder;
     property Path : string read fPath write SetPath;
     property FileMask : string read fFileMask write fFileMask ;
@@ -79 +79 @@
   FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
-  s := TStringList.Create;
+  S := TStringList.Create;
 end;
 
 destructor TFindFile.Destroy;
 begin
-  s.Free;
+  S.Free;
   inherited Destroy;
 end;
@@ -101 +101 @@
 function TFindFile.SearchForFiles: TStringList;
 begin
-  s.Clear;
+  S.Clear;
   try
     FileSearch(Path);
   finally
-    Result := s;
+    Result := S;
   end;
 end;
@@ -111 +111 @@
 procedure TFindFile.FileSearch(const InPath : string);
 var Rec  : TSearchRec;
-    Attr : integer;
+    Attr : Integer;
 begin
   Attr := 0;
@@ -125 +125 @@
   try
     repeat
-      s.Add(inPath + Rec.Name);
+      S.Add(inPath + Rec.Name);
     until SysUtils.FindNext(Rec) <> 0;
   finally

trunk/Packages/Common/UFormAbout.pas

@@ -83 +83 @@
 end.
 
+

trunk/Packages/Common/UGeometric.pas

@@ -52 +52 @@
 function PointToLineDistance(const P, V, W: TPoint): Integer;
 var
-  l2, t: Double;
+  l2, T: Double;
   tt: TPoint;
 begin
@@ -165 +165 @@
 end.
 
+

trunk/Packages/Common/UJobProgressView.pas

@@ -221 +221 @@
       for I := 0 to ListViewJobs.Items.Count - 1 do
       begin
-        ItemRect := ListViewJobs.Items[i].DisplayRect(drBounds);
+        ItemRect := ListViewJobs.Items[I].DisplayRect(drBounds);
         Maxh := Max(Maxh, ItemRect.Top + (ItemRect.Bottom - ItemRect.Top));
       end;

trunk/Packages/Common/UMetaCanvas.pas

@@ -124 +124 @@
     procedure SetWidth(AValue: Integer); override;
     function GetWidth: Integer; override;
-    procedure DoLine (x1,y1,x2,y2:integer); override;
+    procedure DoLine (x1,y1,x2,y2:Integer); override;
     procedure DoTextOut(X, Y: Integer; Text: string); override;
     procedure DoRectangle(const Bounds: TRect); override;
@@ -451 +451 @@
 end;
 
-procedure TMetaCanvas.DoLine(x1, y1, x2, y2: integer);
+procedure TMetaCanvas.DoLine(x1, y1, x2, y2: Integer);
 var
   NewObj: TCanvasLine;
@@ -665 +665 @@
 end.
 
+

trunk/Packages/Common/UPrefixMultiplier.pas

@@ -30 +30 @@
   BasePrefixMultipliers: TPrefixMultiplierDef =
   (
-    (ShortText: 'y'; FullText: 'yocto'; Value: 1e-24),
-          (ShortText: 'z'; FullText: 'zepto'; Value: 1e-21),
-    (ShortText: 'a'; FullText: 'atto'; Value: 1e-18),
-    (ShortText: 'f'; FullText: 'femto'; Value: 1e-15),
-    (ShortText: 'p'; FullText: 'piko'; Value: 1e-12),
-    (ShortText: 'n'; FullText: 'nano'; Value: 1e-9),
-    (ShortText: 'u'; FullText: 'mikro'; Value: 1e-6),
-    (ShortText: 'm'; FullText: 'mili'; Value: 1e-3),
+    (ShortText: 'y'; FullText: 'yocto'; Value: 1E-24),
+          (ShortText: 'z'; FullText: 'zepto'; Value: 1E-21),
+    (ShortText: 'a'; FullText: 'atto'; Value: 1E-18),
+    (ShortText: 'f'; FullText: 'femto'; Value: 1E-15),
+    (ShortText: 'p'; FullText: 'piko'; Value: 1E-12),
+    (ShortText: 'n'; FullText: 'nano'; Value: 1E-9),
+    (ShortText: 'u'; FullText: 'mikro'; Value: 1E-6),
+    (ShortText: 'm'; FullText: 'mili'; Value: 1E-3),
     (ShortText: ''; FullText: ''; Value: 1e0),
     (ShortText: 'k'; FullText: 'kilo'; Value: 1e3),
@@ -51 +51 @@
   TimePrefixMultipliers: TPrefixMultiplierDef =
   (
-    (ShortText: 'ys'; FullText: 'yocto'; Value: 1e-24),
-          (ShortText: 'zs'; FullText: 'zepto'; Value: 1e-21),
-    (ShortText: 'as'; FullText: 'atto'; Value: 1e-18),
-    (ShortText: 'fs'; FullText: 'femto'; Value: 1e-15),
-    (ShortText: 'ps'; FullText: 'piko'; Value: 1e-12),
-    (ShortText: 'ns'; FullText: 'nano'; Value: 1e-9),
-    (ShortText: 'us'; FullText: 'mikro'; Value: 1e-6),
-    (ShortText: 'ms'; FullText: 'mili'; Value: 1e-3),
+    (ShortText: 'ys'; FullText: 'yocto'; Value: 1E-24),
+          (ShortText: 'zs'; FullText: 'zepto'; Value: 1E-21),
+    (ShortText: 'as'; FullText: 'atto'; Value: 1E-18),
+    (ShortText: 'fs'; FullText: 'femto'; Value: 1E-15),
+    (ShortText: 'ps'; FullText: 'piko'; Value: 1E-12),
+    (ShortText: 'ns'; FullText: 'nano'; Value: 1E-9),
+    (ShortText: 'us'; FullText: 'mikro'; Value: 1E-6),
+    (ShortText: 'ms'; FullText: 'mili'; Value: 1E-3),
     (ShortText: 's'; FullText: 'sekunda'; Value: 1),
     (ShortText: 'min'; FullText: 'minuta'; Value: 60),

trunk/Packages/Common/UResetableThread.pas

@@ -296 +296 @@
 end.
 
+

trunk/Packages/Common/UScaleDPI.pas

@@ -259 +259 @@
     begin
       ImgList.Add(Temp[I], nil);
-      Temp[i].Free;
+      Temp[I].Free;
     end;
   finally

trunk/Packages/Common/UStringTable.pas

@@ -39 +39 @@
 function TStringTable.GetColCount: Integer;
 begin
-  Result := Size.x;
+  Result := Size.X;
 end;
 

trunk/Packages/Common/UTheme.pas

@@ -188 +188 @@
 
 end.
+

trunk/Packages/Common/UTranslator.pas

@@ -420 +420 @@
 
   if Lang = '' then begin
-    for i := 1 to Paramcount - 1 do
-      if (ParamStr(i) = '--LANG') or (ParamStr(i) = '-l') or
-        (ParamStr(i) = '--lang') then
-        Lang := ParamStr(i + 1);
+    for I := 1 to Paramcount - 1 do
+      if (ParamStr(I) = '--LANG') or (ParamStr(I) = '-l') or
+        (ParamStr(I) = '--lang') then
+        Lang := ParamStr(I + 1);
   end;
   if Lang = '' then begin
@@ -473 +473 @@
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator + LangID +
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
       + LangID + DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -489 +489 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     {$IFDEF UNIX}
@@ -496 +496 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
     {$ENDIF}
     // Let us search for reducted files
-    LangShortID := copy(LangID, 1, 2);
+    LangShortID := Copy(LangID, 1, 2);
     // At first, check all was checked
     Result := ExtractFilePath(ParamStrUTF8(0)) + LangShortID +
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator +
@@ -510 +510 @@
       ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -516 +516 @@
       ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -522 +522 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     // Full language in file name - this will be default for the project
@@ -529 +529 @@
       Result := ExtractFilePath(ParamStrUTF8(0)) + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        exit;
+        Exit;
       // Common location (like in Lazarus)
       Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator +
         ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        exit;
+        Exit;
 
       Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' +
         DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        exit;
+        Exit;
     except
       Result := ''; // Or do something else (useless)
@@ -548 +548 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
     {$ENDIF}
     Result := ExtractFilePath(ParamStrUTF8(0)) + ChangeFileExt(
       ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator +
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator +
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      exit;
+      Exit;
   end;
 

trunk/Platform.pas

@@ -61 +61 @@
 end.
 
+

trunk/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),
@@ -1563 +1563 @@
   TGetCityData = record
     Owner: Integer;
-    c: TCity;
+    C: TCity;
   end;
 
@@ -1644 +1644 @@
   TCreateUnitData = record
     Loc: Integer;
-    p: Integer;
+    P: Integer;
     mix: Integer;
   end;
@@ -1653 +1653 @@
   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;
@@ -1815 +1815 @@
     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,
@@ -1824 +1824 @@
   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;
@@ -1836 +1836 @@
 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;
@@ -1896 +1896 @@
   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])
@@ -1903 +1903 @@
 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/Settings.pas

@@ -293 +293 @@
 end.
 
+

trunk/Start.pas

@@ -69 +69 @@
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     procedure Up1BtnClick(Sender: TObject);
     procedure Down1BtnClick(Sender: TObject);
@@ -122 +122 @@
     MiniMap: TMiniMap;
     LastGame: string;
-    procedure DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
+    procedure DrawAction(Y, IconIndex: Integer; HeaderItem, TextItem: string);
     procedure InitPopup(PlayerIndex: Integer);
     procedure OfferBrain(Brain: TBrain; FixedLines: Integer);
@@ -129 +129 @@
     procedure ChangeTab(NewTab: TStartTab);
     procedure UnlistBackupFile(FileName: string);
-    procedure SmartInvalidate(x0, y0, x1, y1: integer;
-      invalidateTab0: boolean = false); overload;
+    procedure SmartInvalidate(x0, y0, x1, y1: Integer;
+      invalidateTab0: Boolean = False); overload;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -160 +160 @@
   // attention: lx*ly+1 must be prime!
   { MaxWorldSize=8;
-    lxpre: array[0..nWorldSize-1] of integer =(30,40,50,60,70,90,110,130);
-    lypre: array[0..nWorldSize-1] of integer =(46,52,60,70,84,94,110,130);
+    lxpre: array[0..nWorldSize-1] of Integer =(30,40,50,60,70,90,110,130);
+    lypre: array[0..nWorldSize-1] of Integer =(46,52,60,70,84,94,110,130);
     DefaultWorldTiles=4200; }
   MaxWorldSize = 6;
@@ -192 +192 @@
   dxBrain = 104;
   dyBrain = 80;
-  xBrain: array [0 .. nPlOffered - 1] of integer = (x0Brain, x0Brain,
+  xBrain: array [0 .. nPlOffered - 1] of Integer = (x0Brain, x0Brain,
     x0Brain + dxBrain, x0Brain + dxBrain, x0Brain + dxBrain, x0Brain,
     x0Brain - dxBrain, x0Brain - dxBrain, x0Brain - dxBrain);
-  yBrain: array [0 .. nPlOffered - 1] of integer = (y0Brain, y0Brain - dyBrain,
+  yBrain: array [0 .. nPlOffered - 1] of Integer = (y0Brain, y0Brain - dyBrain,
     y0Brain - dyBrain, y0Brain, y0Brain + dyBrain, y0Brain + dyBrain,
     y0Brain + dyBrain, y0Brain, y0Brain - dyBrain);
@@ -202 +202 @@
   TabHeight = 40;
 
-  InitAlive: array [1 .. nPl] of integer = (1, 1 + 2, 1 + 2 + 32,
+  InitAlive: array [1 .. nPl] of Integer = (1, 1 + 2, 1 + 2 + 32,
     1 + 2 + 8 + 128, 1 + 2 + 8 + 32 + 128, 1 + 2 + 8 + 16 + 64 + 128,
     1 + 2 + 4 + 16 + 32 + 64 + 256, 511 - 32, 511, 511 - 32, 511, 511 - 32, 511,
     511 - 32, 511);
-  InitMulti: array [nPlOffered + 1 .. nPl] of integer = (256, 256, 256 + 128,
+  InitMulti: array [nPlOffered + 1 .. nPl] of Integer = (256, 256, 256 + 128,
     256 + 128, 256 + 128 + 64, 256 + 128 + 64);
 
-  PlayerAutoDiff: array [1 .. 5] of integer = (1, 1, 2, 2, 3);
-  EnemyAutoDiff: array [1 .. 5] of integer = (4, 3, 2, 1, 1);
+  PlayerAutoDiff: array [1 .. 5] of Integer = (1, 1, 2, 2, 3);
+  EnemyAutoDiff: array [1 .. 5] of Integer = (4, 3, 2, 1, 1);
 
 { TStartDlg }
@@ -216 +216 @@
 procedure TStartDlg.FormCreate(Sender: TObject);
 var
-  x, i: Integer;
+  X, I: Integer;
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
@@ -236 +236 @@
 
   BrainDefault := nil;
-  for i := Brains.IndexOf(BrainRandom) to Brains.Count - 1 do
-    if AnsiCompareFileName(DefaultAI, Brains[i].FileName) = 0 then
-      BrainDefault := Brains[i];
+  for I := Brains.IndexOf(BrainRandom) to Brains.Count - 1 do
+    if AnsiCompareFileName(DefaultAI, Brains[I].FileName) = 0 then
+      BrainDefault := Brains[I];
   if (BrainDefault = BrainRandom) and (Brains.GetKindCount(btAI) < 2) then
     BrainDefault := nil;
@@ -260 +260 @@
   ReplayBtn.Hint := Phrases.Lookup('BTN_REPLAY');
   PlayerSlots.Count := nPlOffered;
-  for i := 0 to PlayerSlots.Count - 1 do
-  with PlayerSlots[i] do begin
+  for I := 0 to PlayerSlots.Count - 1 do
+  with PlayerSlots[I] do begin
     DiffUpBtn := TButtonC.Create(self);
     DiffUpBtn.Graphic := HGrSystem.Data;
-    DiffUpBtn.left := xBrain[i] - 18;
-    DiffUpBtn.top := yBrain[i] + 39;
+    DiffUpBtn.left := xBrain[I] - 18;
+    DiffUpBtn.top := yBrain[I] + 39;
     DiffUpBtn.ButtonIndex := 1;
     DiffUpBtn.Parent := self;
@@ -271 +271 @@
     DiffDownBtn := TButtonC.Create(self);
     DiffDownBtn.Graphic := HGrSystem.Data;
-    DiffDownBtn.left := xBrain[i] - 18;
-    DiffDownBtn.top := yBrain[i] + 51;
+    DiffDownBtn.left := xBrain[I] - 18;
+    DiffDownBtn.top := yBrain[I] + 51;
     DiffDownBtn.ButtonIndex := 0;
     DiffDownBtn.Parent := self;
     DiffDownBtn.OnClick := DiffBtnClick;
   end;
-  for i := 6 to 8 do
-  with PlayerSlots[i] do begin
+  for I := 6 to 8 do
+  with PlayerSlots[I] do begin
     MultiBtn := TButtonC.Create(self);
     MultiBtn.Graphic := HGrSystem.Data;
-    MultiBtn.left := xBrain[i] - 18;
-    MultiBtn.top := yBrain[i];
+    MultiBtn.left := xBrain[I] - 18;
+    MultiBtn.top := yBrain[I];
     MultiBtn.Parent := self;
     MultiBtn.OnClick := MultiBtnClick;
@@ -288 +288 @@
   end;
 
-  x := BiColorTextWidth(Canvas, Phrases.Lookup('STARTCONTROLS', 7)) div 2;
-  CustomizeBtn.left := x0Brain + 32 - 16 - x;
+  X := BiColorTextWidth(Canvas, Phrases.Lookup('STARTCONTROLS', 7)) div 2;
+  CustomizeBtn.left := x0Brain + 32 - 16 - X;
   if AutoDiff < 0 then
     CustomizeBtn.ButtonIndex := 3
@@ -339 +339 @@
 end;
 
-procedure TStartDlg.SmartInvalidate(x0, y0, x1, y1: integer;
-  invalidateTab0: boolean);
-var
-  i: integer;
+procedure TStartDlg.SmartInvalidate(x0, y0, x1, y1: Integer;
+  invalidateTab0: Boolean);
+var
+  I: Integer;
   r0, r1: HRgn;
 begin
   r0 := CreateRectRgn(x0, y0, x1, y1);
-  for i := 0 to ControlCount - 1 do
-    if not (Controls[i] is TArea) and Controls[i].Visible then
+  for I := 0 to ControlCount - 1 do
+    if not (Controls[I] is TArea) and Controls[I].Visible then
     begin
-      with Controls[i].BoundsRect do
+      with Controls[I].BoundsRect do
         r1 := CreateRectRgn(left, top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
@@ -359 +359 @@
     DeleteObject(r1);
   end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -530 +530 @@
 end;
 
-procedure TStartDlg.DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
+procedure TStartDlg.DrawAction(Y, IconIndex: Integer; HeaderItem, TextItem: string);
 begin
   Canvas.Font.Assign(UniFont[ftCaption]);
   Canvas.Font.Style := Canvas.Font.Style + [fsUnderline];
-  RisedTextOut(Canvas, xAction, y - 3, Phrases2.Lookup(HeaderItem));
+  RisedTextOut(Canvas, xAction, Y - 3, Phrases2.Lookup(HeaderItem));
   Canvas.Font.Assign(UniFont[ftNormal]);
   BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText],
-    $000000, xAction, y + 21, Phrases2.Lookup(TextItem));
+    $000000, xAction, Y + 21, Phrases2.Lookup(TextItem));
 
   UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
-    xActionIcon - 2, y - 2);
+    xActionIcon - 2, Y - 2);
   GlowFrame(LogoBuffer, 8, 8, 34, 34, $202020);
-  BitBltCanvas(Canvas, xActionIcon - 2, y - 2, 50, 50,
+  BitBltCanvas(Canvas, xActionIcon - 2, Y - 2, 50, 50,
     LogoBuffer.Canvas, 0, 0);
-  BitBltCanvas(Canvas, xActionIcon, y, 40, 40, BigImp.Canvas,
+  BitBltCanvas(Canvas, xActionIcon, Y, 40, 40, BigImp.Canvas,
     (IconIndex mod 7) * xSizeBig + 8, (IconIndex div 7) * ySizeBig);
-  RFrame(Canvas, xActionIcon - 1, y - 1, xActionIcon + 40, y + 40,
+  RFrame(Canvas, xActionIcon - 1, Y - 1, xActionIcon + 40, Y + 40,
     $000000, $000000);
 end;
@@ -555 +555 @@
   TabNames: array[TStartTab] of Integer = (0, 11, 3, 4);
 var
-  i, w, h, xMini, yMini, y: integer;
-  s: string;
+  I, W, H, xMini, yMini, Y: Integer;
+  S: string;
   Tab2: TStartTab;
   MainAction: TMainAction;
@@ -588 +588 @@
 
   // draw tabs
-  Frame(Canvas, 2, 2 + 2 * integer(Tab <> tbMain), TabOffset + (0 + 1) * TabSize - 1,
+  Frame(Canvas, 2, 2 + 2 * Integer(Tab <> tbMain), TabOffset + (0 + 1) * TabSize - 1,
     TabHeight, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  Frame(Canvas, 1, 1 + 2 * integer(Tab <> tbMain), TabOffset + (0 + 1) * TabSize,
+  Frame(Canvas, 1, 1 + 2 * Integer(Tab <> tbMain), TabOffset + (0 + 1) * TabSize,
     TabHeight, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-  Canvas.Pixels[1, 1 + 2 * integer(Tab <> tbMain)] := MainTexture.ColorBevelShade;
+  Canvas.Pixels[1, 1 + 2 * Integer(Tab <> tbMain)] := MainTexture.ColorBevelShade;
   for Tab2 := tbMap to tbPrevious do
   begin
-    Frame(Canvas, TabOffset + Integer(Tab2) * TabSize + 2, 2 + 2 * integer(Tab <> Tab2),
+    Frame(Canvas, TabOffset + Integer(Tab2) * TabSize + 2, 2 + 2 * Integer(Tab <> Tab2),
       TabOffset + (Integer(Tab2) + 1) * TabSize - 1, TabHeight, MainTexture.ColorBevelLight,
       MainTexture.ColorBevelShade);
-    Frame(Canvas, TabOffset + Integer(Tab2) * TabSize + 1, 1 + 2 * integer(Tab <> Tab2),
+    Frame(Canvas, TabOffset + Integer(Tab2) * TabSize + 1, 1 + 2 * Integer(Tab <> Tab2),
       TabOffset + (Integer(Tab2) + 1) * TabSize, TabHeight, MainTexture.ColorBevelLight,
       MainTexture.ColorBevelShade);
-    Canvas.Pixels[TabOffset + Integer(Tab2) * TabSize + 1, 1 + 2 * integer(Tab <> Tab2)] :=
+    Canvas.Pixels[TabOffset + Integer(Tab2) * TabSize + 1, 1 + 2 * Integer(Tab <> Tab2)] :=
       MainTexture.ColorBevelShade;
   end;
@@ -607 +607 @@
   for Tab2 := tbMap to tbPrevious do
   begin
-    s := Phrases.Lookup('STARTCONTROLS', TabNames[Tab2]);
+    S := Phrases.Lookup('STARTCONTROLS', TabNames[Tab2]);
     RisedTextOut(Canvas, TabOffset + Integer(Tab2) * TabSize + 1 +
-      (TabSize - BiColorTextWidth(Canvas, s)) div 2,
-      10 + 2 * integer(Tab <> Tab2), s);
+      (TabSize - BiColorTextWidth(Canvas, S)) div 2,
+      10 + 2 * Integer(Tab <> Tab2), S);
   end;
   Frame(Canvas, TabOffset + 4 * TabSize + 1, -1, ClientWidth, TabHeight,
@@ -640 +640 @@
   UnshareBitmap(LogoBuffer);
   BitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
-    3 + 2 * integer(Tab <> tbMain));
+    3 + 2 * Integer(Tab <> tbMain));
 
   ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
@@ -646 +646 @@
   ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
     MenuLogo.Top + 27, MenuLogo.Width - 10, 9, $BFBF20, $4040DF); // logo part 2
-  BitBltCanvas(Canvas, 6, 3 + 2 * integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
+  BitBltCanvas(Canvas, 6, 3 + 2 * Integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
     LogoBuffer.Canvas, 0, 0);
 
   if Page = pgMain then begin
     if SelectedAction <> maNone then // mark selected action
-      for i := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
+      for I := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
       begin
-        w := ClientWidth - 2 * ActionSideBorder - i * wBuffer;
-        if w > wBuffer then
-          w := wBuffer;
-        h := ActionPitch;
-        if yAction + Integer(SelectedAction) * ActionPitch - 8 + h > ClientHeight - ActionBottomBorder
+        W := ClientWidth - 2 * ActionSideBorder - I * wBuffer;
+        if W > wBuffer then
+          W := wBuffer;
+        H := ActionPitch;
+        if yAction + Integer(SelectedAction) * ActionPitch - 8 + H > ClientHeight - ActionBottomBorder
         then
-          h := ClientHeight - ActionBottomBorder -
+          H := ClientHeight - ActionBottomBorder -
             (yAction + Integer(SelectedAction) * ActionPitch - 8);
 
         UnshareBitmap(LogoBuffer);
-        BitBltCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
-          ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
+        BitBltCanvas(LogoBuffer.Canvas, 0, 0, W, H, Canvas,
+          ActionSideBorder + I * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
           - 8);
-        MakeBlue(LogoBuffer, 0, 0, w, h);
-        BitBltCanvas(Canvas, ActionSideBorder + i * wBuffer,
-          yAction + Integer(SelectedAction) * ActionPitch - 8, w, h,
+        MakeBlue(LogoBuffer, 0, 0, W, H);
+        BitBltCanvas(Canvas, ActionSideBorder + I * wBuffer,
+          yAction + Integer(SelectedAction) * ActionPitch - 8, W, H,
           LogoBuffer.Canvas, 0, 0);
       end;
-    y := yAction;
+    Y := yAction;
     for MainAction := Low(TMainActionSet) to High(TMainActionSet) do
     begin
       if MainAction in ActionsOffered then
         case MainAction of
-          maConfig: DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
-          maManual: DrawAction(y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
-          maCredits: DrawAction(y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
-          maAIDev: DrawAction(y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
+          maConfig: DrawAction(Y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
+          maManual: DrawAction(Y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
+          maCredits: DrawAction(Y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
+          maAIDev: DrawAction(Y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
           maWeb:
             begin
               Canvas.Font.Assign(UniFont[ftCaption]);
               // Canvas.Font.Style:=Canvas.Font.Style+[fsUnderline];
-              RisedTextOut(Canvas, xActionIcon + 99, y,
+              RisedTextOut(Canvas, xActionIcon + 99, Y,
                 Format(Phrases2.Lookup('ACTIONHEADER_WEB'), [CevoHomepageShort]));
               Canvas.Font.Assign(UniFont[ftNormal]);
@@ -690 +690 @@
               UnshareBitmap(LogoBuffer);
               BitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
-                xActionIcon, y + 2);
+                xActionIcon, Y + 2);
               ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
                 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]);
-              BitBltCanvas(Canvas, xActionIcon, y + 2, LinkArrows.Width, LinkArrows.Height,
+              BitBltCanvas(Canvas, xActionIcon, Y + 2, LinkArrows.Width, LinkArrows.Height,
                 LogoBuffer.Canvas, 0, 0);
             end;
         end;
-      Inc(y, ActionPitch);
+      Inc(Y, ActionPitch);
     end;
   end
@@ -705 +705 @@
       TurnToString(MaxTurn), 344, y0Mini + 61, 170);
 
-    s := Phrases.Lookup('STARTCONTROLS', 7);
-    w := Canvas.TextWidth(s);
-    LoweredTextOut(Canvas, -2, MainTexture, x0Brain + 32 - w div 2,
-      y0Brain + dyBrain + 69, s);
+    S := Phrases.Lookup('STARTCONTROLS', 7);
+    W := Canvas.TextWidth(S);
+    LoweredTextOut(Canvas, -2, MainTexture, x0Brain + 32 - W div 2,
+      y0Brain + dyBrain + 69, S);
 
     InitOrnament;
     if AutoDiff < 0 then
     begin
-      for i := 12 to 19 do
-        if (i < 13) or (i > 17) then begin
-          BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+      for I := 12 to 19 do
+        if (I < 13) or (I > 17) then begin
+          BitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);
-          BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+          BitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Data.Canvas, Ornament.Left, Ornament.Top, SRCPAINT);
         end;
@@ -723 +723 @@
         MainTexture.ColorBevelShade);
 
-      for i := 0 to nPlOffered - 1 do
-        if 1 shl i and SlotAvailable <> 0 then
+      for I := 0 to nPlOffered - 1 do
+        if 1 shl I and SlotAvailable <> 0 then
         begin
-          if Assigned(PlayersBrain[i]) then
-            FrameImage(Canvas, PlayersBrain[i].Picture, xBrain[i], yBrain[i],
-              64, 64, 0, 0, true)
+          if Assigned(PlayersBrain[I]) then
+            FrameImage(Canvas, PlayersBrain[I].Picture, xBrain[I], yBrain[I],
+              64, 64, 0, 0, True)
           else
-            FrameImage(Canvas, EmptyPicture, xBrain[i], yBrain[i], 64, 64,
-              0, 0, true);
-          if Assigned(PlayersBrain[I]) and (PlayersBrain[i].Kind in [btTerm, btRandom, btAI]) then
+            FrameImage(Canvas, EmptyPicture, xBrain[I], yBrain[I], 64, 64,
+              0, 0, True);
+          if Assigned(PlayersBrain[I]) and (PlayersBrain[I].Kind in [btTerm, btRandom, btAI]) then
           begin
-            BitBltCanvas(Canvas, xBrain[i] - 18, yBrain[i] + 19, 12, 14,
-              HGrSystem.Data.Canvas, 134 + (Difficulty[i] - 1) *
+            BitBltCanvas(Canvas, xBrain[I] - 18, yBrain[I] + 19, 12, 14,
+              HGrSystem.Data.Canvas, 134 + (Difficulty[I] - 1) *
               13, 28);
-            Frame(Canvas, xBrain[i] - 19, yBrain[i] + 18, xBrain[i] - 18 + 12,
-              yBrain[i] + (19 + 14), $000000, $000000);
-            RFrame(Canvas, PlayerSlots[i].DiffUpBtn.left - 1, PlayerSlots[i].DiffUpBtn.top - 1,
-              PlayerSlots[i].DiffUpBtn.left + 12, PlayerSlots[i].DiffUpBtn.top + 24,
+            Frame(Canvas, xBrain[I] - 19, yBrain[I] + 18, xBrain[I] - 18 + 12,
+              yBrain[I] + (19 + 14), $000000, $000000);
+            RFrame(Canvas, PlayerSlots[I].DiffUpBtn.left - 1, PlayerSlots[I].DiffUpBtn.top - 1,
+              PlayerSlots[I].DiffUpBtn.left + 12, PlayerSlots[I].DiffUpBtn.top + 24,
               MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
             with Canvas do
             begin
               Brush.Color := $000000;
-              FillRect(Rect(xBrain[i] - 5, yBrain[i] + 25, xBrain[i] - 2,
-                yBrain[i] + 27));
+              FillRect(Rect(xBrain[I] - 5, yBrain[I] + 25, xBrain[I] - 2,
+                yBrain[I] + 27));
               Brush.Style := bsClear;
             end;
@@ -754 +754 @@
                 PlayerSlots[I].MultiBtn.left + 12, PlayerSlots[I].MultiBtn.top + 12,
                 MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-              BitBltCanvas(Canvas, xBrain[i] - 31, yBrain[i], 13, 12,
+              BitBltCanvas(Canvas, xBrain[I] - 31, yBrain[I], 13, 12,
                 HGrSystem.Data.Canvas, 88, 47);
             end;
           end;
-          if Assigned(PlayersBrain[i]) then
+          if Assigned(PlayersBrain[I]) then
           begin
-            PlayerSlots[i].DiffUpBtn.Hint := Format(Phrases.Lookup('STARTCONTROLS', 9),
-              [PlayersBrain[i].Name]);
-            PlayerSlots[i].DiffDownBtn.Hint := PlayerSlots[i].DiffUpBtn.Hint;
+            PlayerSlots[I].DiffUpBtn.Hint := Format(Phrases.Lookup('STARTCONTROLS', 9),
+              [PlayersBrain[I].Name]);
+            PlayerSlots[I].DiffDownBtn.Hint := PlayerSlots[I].DiffUpBtn.Hint;
           end;
         end;
@@ -773 +773 @@
         yMain + 140 { y0Mini-77 } , Phrases.Lookup('STARTCONTROLS', 15));
       if Page = pgStartRandom then
-        s := IntToStr(AutoEnemies)
+        S := IntToStr(AutoEnemies)
       else if nMapStartPositions = 0 then
-        s := '0'
+        S := '0'
       else
-        s := IntToStr(nMapStartPositions - 1);
-      RisedTextOut(Canvas, 198 - BiColorTextWidth(Canvas, s), yMain + 140, s);
+        S := IntToStr(nMapStartPositions - 1);
+      RisedTextOut(Canvas, 198 - BiColorTextWidth(Canvas, S), yMain + 140, S);
 
       DLine(Canvas, 24, xDefault - 6, yMain + 164 + 19,
@@ -786 +786 @@
       if AutoDiff = 1 then
         FrameImage(Canvas, Brains.GetBeginner.Picture, xDefault, yDefault, 64,
-          64, 0, 0, false)
+          64, 0, 0, False)
       else
         FrameImage(Canvas, BrainDefault.Picture, xDefault, yDefault, 64, 64,
-          0, 0, true);
+          0, 0, True);
       DLine(Canvas, 56, 272, y0Mini + 61 + 19, MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
@@ -795 +795 @@
       RisedTextOut(Canvas, 56, y0Mini + 61,
         Phrases.Lookup('STARTCONTROLS', 14));
-      s := Phrases.Lookup('AUTODIFF', AutoDiff - 1);
-      RisedTextOut(Canvas, 272 - BiColorTextWidth(Canvas, s), y0Mini + 61, s);
-
-      for i := 0 to 19 do
-        if (i < 2) or (i > 6) then begin
-          BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+      S := Phrases.Lookup('AUTODIFF', AutoDiff - 1);
+      RisedTextOut(Canvas, 272 - BiColorTextWidth(Canvas, S), y0Mini + 61, S);
+
+      for I := 0 to 19 do
+        if (I < 2) or (I > 6) then begin
+          BitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);
-          BitBltCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+          BitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Data.Canvas, Ornament.Left, Ornament.Top, SRCPAINT);
         end;
@@ -825 +825 @@
         MainTexture.ColorBevelShade);
     RisedTextOut(Canvas, 344, y0Mini + 61, Phrases.Lookup('STARTCONTROLS', 8));
-    s := TurnToString(LoadTurn);
-    RisedTextOut(Canvas, 514 - BiColorTextWidth(Canvas, s), y0Mini + 61, s);
+    S := TurnToString(LoadTurn);
+    RisedTextOut(Canvas, 514 - BiColorTextWidth(Canvas, S), y0Mini + 61, S);
   end
   else if Page = pgEditRandom then
@@ -840 +840 @@
   begin
     // DLine(Canvas,344,514,y0Mini+61+19,MainTexture.ColorBevelLight,MainTexture.ColorBevelShade);
-    s := Format(Phrases2.Lookup('MAPPROP'),
+    S := Format(Phrases2.Lookup('MAPPROP'),
       [(nMapLandTiles * 100 + 556) div 1112,
       // 1112 is typical for world with 100% size and default land mass
       nMapStartPositions]);
-    RisedTextOut(Canvas, x0Mini - BiColorTextWidth(Canvas, s) div 2,
-      y0Mini + 61, s);
+    RisedTextOut(Canvas, x0Mini - BiColorTextWidth(Canvas, S) div 2,
+      y0Mini + 61, S);
   end;
 
@@ -888 +888 @@
       MainTexture.ColorBevelLight);
 
-    s := '';
+    S := '';
     if MiniMap.Mode = mmPicture then
     begin
@@ -894 +894 @@
         MiniMap.Bitmap.Canvas, 0, 0);
       if Page = pgStartRandom then
-        s := Phrases.Lookup('RANMAP')
+        S := Phrases.Lookup('RANMAP')
     end
     else if MiniMap.Mode = mmMultiPlayer then
-      s := Phrases.Lookup('MPMAP')
+      S := Phrases.Lookup('MPMAP')
     else if Page = pgStartMap then
-      s := Copy(MapFileName, 1, Length(MapFileName) - Length(CevoMapExt))
+      S := Copy(MapFileName, 1, Length(MapFileName) - Length(CevoMapExt))
     else if Page = pgEditMap then
-      s := List.Items[List.ItemIndex]
+      S := List.Items[List.ItemIndex]
     else if Page = pgNoLoad then
-      s := Phrases.Lookup('NOGAMES');
-    if s <> '' then
-      RisedTextOut(Canvas, x0Mini + 2 - BiColorTextWidth(Canvas, s) div 2,
-        y0Mini - 8, s);
+      S := Phrases.Lookup('NOGAMES');
+    if S <> '' then
+      RisedTextOut(Canvas, x0Mini + 2 - BiColorTextWidth(Canvas, S) div 2,
+        y0Mini - 8, S);
   end;
 end;
@@ -959 +959 @@
       begin // load
         FileName := List.Items[List.ItemIndex];
-        if LoadGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, LoadTurn, false)
+        if LoadGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, LoadTurn, False)
         then
           UnlistBackupFile(FileName)
@@ -979 +979 @@
         with Reg do
         try
-          OpenKey(AppRegistryKey, true);
+          OpenKey(AppRegistryKey, True);
           if ValueExists('GameCount') then GameCount := ReadInteger('GameCount')
             else GameCount := 0;
@@ -1168 +1168 @@
           if Assigned(PlayersBrain[I]) and (PlayersBrain[I].Kind = btTerm) then begin
             PlayersBrain[I] := nil;
-            PlayerSlots[I].DiffUpBtn.Visible := false;
+            PlayerSlots[I].DiffUpBtn.Visible := False;
             PlayerSlots[I].DiffUpBtn.Tag := 0;
-            PlayerSlots[I].DiffDownBtn.Visible := false;
+            PlayerSlots[I].DiffDownBtn.Visible := False;
             PlayerSlots[I].DiffDownBtn.Tag := 0;
             if PlayerSlots[I].OfferMultiple then begin
-              PlayerSlots[I].MultiBtn.Visible := false;
+              PlayerSlots[I].MultiBtn.Visible := False;
               PlayerSlots[I].MultiBtn.Tag := 0;
             end;
@@ -1199 +1199 @@
   J := FixedLines;
   while (J < PopupMenu1.Items.Count) and
-    (StrIComp(pchar(MenuItem.Caption), pchar(PopupMenu1.Items[J].Caption)) > 0) do
+    (StrIComp(PChar(MenuItem.Caption), PChar(PopupMenu1.Items[J].Caption)) > 0) do
     Inc(J);
   MenuItem.RadioItem := True;
@@ -1210 +1210 @@
 var
   I: Integer;
-  FixedLines: integer;
+  FixedLines: Integer;
   MenuItem: TMenuItem;
   AIBrains: TBrains;
@@ -1244 +1244 @@
     end;
     for I := Brains.IndexOf(BrainTerm) downto 0 do // offer game interfaces
-      if (PlayerPopupIndex = 0) or (Brains[i].Kind = btTerm) and
+      if (PlayerPopupIndex = 0) or (Brains[I].Kind = btTerm) and
         (PlayersBrain[0].Kind <> btNoTerm) then begin
         OfferBrain(Brains[I], FixedLines);
@@ -1268 +1268 @@
         if (AIBrains[I].Flags and fMultiple <> 0) or (AIBrains[I].Flags and fUsed = 0)
           or (Brains[I] = PlayersBrain[PlayerPopupIndex]) then
-          OfferBrain(AIBrains[i], FixedLines);
+          OfferBrain(AIBrains[I], FixedLines);
       FreeAndNil(AIBrains);
     end;
@@ -1283 +1283 @@
     repeat
       I := FormerGames.Count;
-      while (I > 0) and (F.Time < integer(FormerGames.Objects[I - 1])) do
+      while (I > 0) and (F.Time < Integer(FormerGames.Objects[I - 1])) do
         Dec(I);
       FormerGames.InsertObject(I, Copy(F.Name, 1, Length(F.Name) - 5),
@@ -1297 +1297 @@
 procedure TStartDlg.UpdateMaps;
 var
-  f: TSearchRec;
+  F: TSearchRec;
 begin
   Maps.Clear;
-  if FindFirst(GetMapsDir + DirectorySeparator + '*' + CevoMapExt, $21, f) = 0 then
+  if FindFirst(GetMapsDir + DirectorySeparator + '*' + CevoMapExt, $21, F) = 0 then
     repeat
-      Maps.Add(Copy(f.Name, 1, Length(f.Name) - Length(CevoMapExt)));
-    until FindNext(f) <> 0;
+      Maps.Add(Copy(F.Name, 1, Length(F.Name) - Length(CevoMapExt)));
+    until FindNext(F) <> 0;
   FindClose(F);
   Maps.Sort;
@@ -1314 +1314 @@
 procedure TStartDlg.ChangePage(NewPage: TStartPage);
 var
-  i, j, p1: integer;
-  s: string;
+  I, J, p1: Integer;
+  S: string;
   Reg: TRegistry;
-  InvalidateTab0: boolean;
+  InvalidateTab0: Boolean;
 begin
   InvalidateTab0 := (Page = pgMain) or (NewPage = pgMain);
@@ -1326 +1326 @@
         StartBtn.Caption := Phrases.Lookup('STARTCONTROLS', 1);
         if Page = pgStartRandom then
-          i := nPlOffered
+          I := nPlOffered
         else
         begin
-          i := nMapStartPositions;
-          if i = 0 then
+          I := nMapStartPositions;
+          if I = 0 then
           begin
             PlayersBrain[0] := BrainSuperVirtual;
@@ -1336 +1336 @@
           end;
           if PlayersBrain[0].Kind in [btNoTerm, btSuperVirtual] then
-            inc(i);
-          if i > nPl then
-            i := nPl;
-          if i <= nPlOffered then
+            Inc(I);
+          if I > nPl then
+            I := nPl;
+          if I <= nPlOffered then
             MultiControl := 0
           else
-            MultiControl := InitMulti[i];
+            MultiControl := InitMulti[I];
         end;
-        if InitAlive[i] <> SlotAvailable then
+        if InitAlive[I] <> SlotAvailable then
           if Page = pgStartRandom then
           begin // restore AI assignment of last start
@@ -1353 +1353 @@
               for p1 := 0 to nPlOffered - 1 do begin
                 PlayersBrain[p1] := nil;
-                s := ReadString('Control' + IntToStr(p1));
+                S := ReadString('Control' + IntToStr(p1));
                 Difficulty[p1] := ReadInteger('Diff' + IntToStr(p1));
-                if s <> '' then
-                  for j := 0 to Brains.Count - 1 do
-                    if AnsiCompareFileName(s, Brains[j].FileName) = 0 then
-                      PlayersBrain[p1] := Brains[j];
+                if S <> '' then
+                  for J := 0 to Brains.Count - 1 do
+                    if AnsiCompareFileName(S, Brains[J].FileName) = 0 then
+                      PlayersBrain[p1] := Brains[J];
               end;
             finally
@@ -1366 +1366 @@
           else
             for p1 := 1 to nPl - 1 do
-              if 1 shl p1 and InitAlive[i] <> 0 then
+              if 1 shl p1 and InitAlive[I] <> 0 then
               begin
                 PlayersBrain[p1] := BrainDefault;
@@ -1373 +1373 @@
               else
                 PlayersBrain[p1] := nil;
-        SlotAvailable := InitAlive[i];
-        for i := 0 to nPlOffered - 1 do
-          if (AutoDiff < 0) and Assigned(PlayersBrain[i]) and
-            (PlayersBrain[i].Kind in [btTerm, btRandom, btAI]) then
+        SlotAvailable := InitAlive[I];
+        for I := 0 to nPlOffered - 1 do
+          if (AutoDiff < 0) and Assigned(PlayersBrain[I]) and
+            (PlayersBrain[I].Kind in [btTerm, btRandom, btAI]) then
           begin
-            PlayerSlots[i].DiffUpBtn.Tag := 768;
-            PlayerSlots[i].DiffDownBtn.Tag := 768;
+            PlayerSlots[I].DiffUpBtn.Tag := 768;
+            PlayerSlots[I].DiffDownBtn.Tag := 768;
           end
           else
           begin
-            PlayerSlots[i].DiffUpBtn.Tag := 0;
-            PlayerSlots[i].DiffDownBtn.Tag := 0;
+            PlayerSlots[I].DiffUpBtn.Tag := 0;
+            PlayerSlots[I].DiffDownBtn.Tag := 0;
           end;
-        for i := 6 to 8 do
-          if (AutoDiff < 0) and Assigned(PlayersBrain[i]) and
-            (PlayersBrain[i].Kind in [btTerm, btRandom, btAI]) then
+        for I := 6 to 8 do
+          if (AutoDiff < 0) and Assigned(PlayersBrain[I]) and
+            (PlayersBrain[I].Kind in [btTerm, btRandom, btAI]) then
           begin
-            PlayerSlots[i].MultiBtn.Tag := 768;
-            PlayerSlots[i].MultiBtn.ButtonIndex := 2 + (MultiControl shr i) and 1;
-            PlayerSlots[i].MultiBtn.Enabled := Page = pgStartRandom
+            PlayerSlots[I].MultiBtn.Tag := 768;
+            PlayerSlots[I].MultiBtn.ButtonIndex := 2 + (MultiControl shr I) and 1;
+            PlayerSlots[I].MultiBtn.Enabled := Page = pgStartRandom
           end
           else
-            PlayerSlots[i].MultiBtn.Tag := 0;
+            PlayerSlots[I].MultiBtn.Tag := 0;
         if (AutoDiff > 0) and (Page <> pgStartMap) then
         begin
@@ -1434 +1434 @@
 
   PaintInfo;
-  for i := 0 to ControlCount - 1 do
-    Controls[i].Visible := Controls[i].Tag and (256 shl Integer(Page)) <> 0;
+  for I := 0 to ControlCount - 1 do
+    Controls[I].Visible := Controls[I].Tag and (256 shl Integer(Page)) <> 0;
   if Page = pgLoad then
     ReplayBtn.Visible := MiniMap.Mode <> mmMultiPlayer;
@@ -1479 +1479 @@
 
 procedure TStartDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
   I: Integer;
 begin
-  if (y < TabHeight + 1) and (x - TabOffset < TabSize * 4) and
-    ((x - TabOffset) div TabSize <> Integer(Tab)) then
+  if (Y < TabHeight + 1) and (X - TabOffset < TabSize * 4) and
+    ((X - TabOffset) div TabSize <> Integer(Tab)) then
   begin
     // Play('BUTTON_DOWN');
     ListIndex[Tab] := List.ItemIndex;
-    ChangeTab(TStartTab((x - TabOffset) div TabSize));
+    ChangeTab(TStartTab((X - TabOffset) div TabSize));
   end
   else if Page = pgMain then begin
@@ -1503 +1503 @@
   begin
     for I := 0 to nPlOffered - 1 do
-      if (1 shl I and SlotAvailable <> 0) and (x >= xBrain[I]) and
-        (y >= yBrain[I]) and (x < xBrain[I] + 64) and (y < yBrain[I] + 64) then
+      if (1 shl I and SlotAvailable <> 0) and (X >= xBrain[I]) and
+        (Y >= yBrain[I]) and (X < xBrain[I] + 64) and (Y < yBrain[I] + 64) then
       begin
         InitPopup(I);
@@ -1514 +1514 @@
   end
   else if (AutoDiff > 1) and ((Page = pgStartRandom) or (Page = pgStartMap)) and
-    (x >= xDefault) and (y >= yDefault) and (x < xDefault + 64) and
-    (y < yDefault + 64) then
+    (X >= xDefault) and (Y >= yDefault) and (X < xDefault + 64) and
+    (Y < yDefault + 64) then
     if Brains.GetKindCount(btAI) < 2 then
       SimpleMessage(Phrases.Lookup('NOALTAI'))
@@ -1523 +1523 @@
       PopupMenu1.Popup(left + xDefault + 4, top + yDefault + 4);
     end
-  else if (Page = pgLoad) and (LastTurn > 0) and (y >= yTurnSlider) and
-    (y < yTurnSlider + 7) and (x >= xTurnSlider) and
-    (x <= xTurnSlider + wTurnSlider) then
-  begin
-    LoadTurn := LastTurn * (x - xTurnSlider) div wTurnSlider;
+  else if (Page = pgLoad) and (LastTurn > 0) and (Y >= yTurnSlider) and
+    (Y < yTurnSlider + 7) and (X >= xTurnSlider) and
+    (X <= xTurnSlider + wTurnSlider) then
+  begin
+    LoadTurn := LastTurn * (X - xTurnSlider) div wTurnSlider;
     SmartInvalidate(xTurnSlider - 2, y0Mini + 61, xTurnSlider + wTurnSlider + 2,
       yTurnSlider + 9);
@@ -1540 +1540 @@
       if MaxTurn < 1400 then
       begin
-        inc(MaxTurn, 200);
+        Inc(MaxTurn, 200);
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 82);
       end;
@@ -1546 +1546 @@
       if LoadTurn < LastTurn then
       begin
-        inc(LoadTurn);
+        Inc(LoadTurn);
         SmartInvalidate(xTurnSlider - 2, y0Mini + 61, xTurnSlider + wTurnSlider
           + 2, yTurnSlider + 9);
@@ -1553 +1553 @@
       if StartLandMass < 96 then
       begin
-        inc(StartLandMass, 5);
+        Inc(StartLandMass, 5);
         PaintInfo;
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 61 + 21);
@@ -1566 +1566 @@
       if MaxTurn > 400 then
       begin
-        dec(MaxTurn, 200);
+        Dec(MaxTurn, 200);
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 82);
       end;
@@ -1572 +1572 @@
       if LoadTurn > 0 then
       begin
-        dec(LoadTurn);
+        Dec(LoadTurn);
         SmartInvalidate(xTurnSlider - 2, y0Mini + 61, xTurnSlider + wTurnSlider
           + 2, yTurnSlider + 9);
@@ -1579 +1579 @@
       if StartLandMass > 10 then
       begin
-        dec(StartLandMass, 5);
+        Dec(StartLandMass, 5);
         PaintInfo;
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 61 + 21);
@@ -1634 +1634 @@
 procedure TStartDlg.RenameBtnClick(Sender: TObject);
 var
-  i: integer;
+  I: Integer;
   NewName: string;
-  f: file;
-  ok: boolean;
+  F: file;
+  ok: Boolean;
   MapPictureFileName: string;
 begin
@@ -1655 +1655 @@
       (NewName <> List.Items[List.ItemIndex]) then
     begin
-      for i := 1 to Length(NewName) do
-        if NewName[i] in ['\', '/', ':', '*', '?', '"', '<', '>', '|'] then
+      for I := 1 to Length(NewName) do
+        if NewName[I] in ['\', '/', ':', '*', '?', '"', '<', '>', '|'] then
         begin
-          SimpleMessage(Format(Phrases.Lookup('NOFILENAME'), [NewName[i]]));
+          SimpleMessage(Format(Phrases.Lookup('NOFILENAME'), [NewName[I]]));
           Exit;
         end;
       if Page = pgLoad then
-        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(F, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
-        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(F, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
-      ok := true;
+      ok := True;
       try
         if Page = pgLoad then
-          Rename(f, GetSavedDir + DirectorySeparator + NewName + CevoExt)
+          Rename(F, GetSavedDir + DirectorySeparator + NewName + CevoExt)
         else
-          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapExt);
+          Rename(F, GetMapsDir + DirectorySeparator + NewName + CevoMapExt);
       except
         // Play('INVALID');
@@ -1682 +1682 @@
         if FileExists(MapPictureFileName) then
         try
-          AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
+          AssignFile(F, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
             + CevoMapPictureExt);
-          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapPictureExt);
+          Rename(F, GetMapsDir + DirectorySeparator + NewName + CevoMapPictureExt);
         except
         end;
@@ -1704 +1704 @@
 procedure TStartDlg.DeleteBtnClick(Sender: TObject);
 var
-  iDel: integer;
-  f: file;
+  iDel: Integer;
+  F: file;
 begin
   if List.ItemIndex >= 0 then
@@ -1718 +1718 @@
     begin
       if Page = pgLoad then
-        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(F, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
-        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(F, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
-      Erase(f);
+      Erase(F);
       iDel := List.ItemIndex;
       if Page = pgLoad then
@@ -1743 +1743 @@
           List.Invalidate;
           if Page = pgLoad then
-            TurnValid := false;
+            TurnValid := False;
           PaintInfo;
           if Page = pgLoad then
@@ -1842 +1842 @@
 
 procedure TStartDlg.FormMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   Tracking := False;
@@ -1848 +1848 @@
 
 procedure TStartDlg.FormMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
   OldLoadTurn: Integer;
@@ -1855 +1855 @@
   if Tracking then
   begin
-    x := x - xTurnSlider;
-    if x < 0 then
-      x := 0
-    else if x > wTurnSlider then
-      x := wTurnSlider;
+    X := X - xTurnSlider;
+    if X < 0 then
+      X := 0
+    else if X > wTurnSlider then
+      X := wTurnSlider;
     OldLoadTurn := LoadTurn;
-    LoadTurn := LastTurn * x div wTurnSlider;
+    LoadTurn := LastTurn * X div wTurnSlider;
     if LoadTurn < OldLoadTurn then
     begin
@@ -1879 +1879 @@
   else if Page = pgMain then
   begin
-    if (x >= ActionSideBorder) and (x < ClientWidth - ActionSideBorder) and
-      (y >= yAction - 8) and (y < ClientHeight - ActionBottomBorder) then
+    if (X >= ActionSideBorder) and (X < ClientWidth - ActionSideBorder) and
+      (Y >= yAction - 8) and (Y < ClientHeight - ActionBottomBorder) then
     begin
-      NewSelectedAction := TMainAction((y - (yAction - 8)) div ActionPitch);
+      NewSelectedAction := TMainAction((Y - (yAction - 8)) div ActionPitch);
       if not (NewSelectedAction in ActionsOffered) then
         NewSelectedAction := maNone;

trunk/UBrain.pas

@@ -206 +206 @@
 end.
 
+

trunk/UMiniMap.pas

@@ -330 +330 @@
 end.
 
+

trunk/UnitProcessing.pas

@@ -13 +13 @@
   TMoveInfo = record
     MoveType: TMoveType;
-    Cost, ToMaster, EndHealth, Defender, Dcix, Duix, EndHealthDef: integer;
-    MountainDelay: boolean;
+    Cost, ToMaster, EndHealth, Defender, Dcix, Duix, EndHealthDef: Integer;
+    MountainDelay: Boolean;
   end;
 
 var
-  uixSelectedTransport: integer;
-  Worked: array [0 .. nPl - 1] of integer; { settler work statistics }
+  uixSelectedTransport: Integer;
+  Worked: array [0 .. nPl - 1] of Integer; { settler work statistics }
 
   // Moving/Combat
-function HostileDamage(p, mix, Loc, MP: integer): integer;
-function CalculateMove(p, uix, ToLoc, MoveLength: integer; TestOnly: boolean;
-  var MoveInfo: TMoveInfo): integer;
-function GetBattleForecast(Loc: integer; var BattleForecast: TBattleForecast;
-  var Duix, Dcix, AStr, DStr, ABaseDamage, DBaseDamage: integer): integer;
-function LoadUnit(p, uix: integer; TestOnly: boolean): integer;
-function UnloadUnit(p, uix: integer; TestOnly: boolean): integer;
-procedure Recover(p, uix: integer);
-function GetMoveAdvice(p, uix: integer; var a: TMoveAdviceData): integer;
-function CanPlaneReturn(p, uix: integer;
-  PlaneReturnData: TPlaneReturnData): boolean;
+function HostileDamage(P, mix, Loc, MP: Integer): Integer;
+function CalculateMove(P, uix, ToLoc, MoveLength: Integer; TestOnly: Boolean;
+  var MoveInfo: TMoveInfo): Integer;
+function GetBattleForecast(Loc: Integer; var BattleForecast: TBattleForecast;
+  var Duix, Dcix, AStr, DStr, ABaseDamage, DBaseDamage: Integer): Integer;
+function LoadUnit(P, uix: Integer; TestOnly: Boolean): Integer;
+function UnloadUnit(P, uix: Integer; TestOnly: Boolean): Integer;
+procedure Recover(P, uix: Integer);
+function GetMoveAdvice(P, uix: Integer; var A: TMoveAdviceData): Integer;
+function CanPlaneReturn(P, uix: Integer;
+  PlaneReturnData: TPlaneReturnData): Boolean;
 
 // Terrain Improvement
-function StartJob(p, uix, NewJob: integer; TestOnly: boolean): integer;
-function Work(p, uix: integer): boolean;
-function GetJobProgress(p, Loc: integer;
-  var JobProgressData: TJobProgressData): integer;
+function StartJob(P, uix, NewJob: Integer; TestOnly: Boolean): Integer;
+function Work(P, uix: Integer): Boolean;
+function GetJobProgress(P, Loc: Integer;
+  var JobProgressData: TJobProgressData): Integer;
 
 // Start/End Game
@@ -74 +74 @@
 
 type
-  TToWorkList = array [0 .. INFIN, 0 .. nJob - 1] of word;
+  TToWorkList = array [0 .. INFIN, 0 .. nJob - 1] of Word;
 
 var
@@ -83 +83 @@
     ____________________________________________________________________
   }
-function HostileDamage(p, mix, Loc, MP: integer): integer;
-var
-  Tile: integer;
+function HostileDamage(P, mix, Loc, MP: Integer): Integer;
+var
+  Tile: Integer;
 begin
   Tile := RealMap[Loc];
-  if (RW[p].Model[mix].Domain >= dSea) or (RW[p].Model[mix].Kind = mkSettler)
-    and (RW[p].Model[mix].Speed >= 200) or
+  if (RW[P].Model[mix].Domain >= dSea) or (RW[P].Model[mix].Kind = mkSettler)
+    and (RW[P].Model[mix].Speed >= 200) or
     (Tile and (fCity or fRiver or fCanal) <> 0) or (Tile and fTerImp = tiBase)
-    or (GWonder[woGardens].EffectiveOwner = p) then
-    result := 0
+    or (GWonder[woGardens].EffectiveOwner = P) then
+    Result := 0
   else if (Tile and fTerrain = fDesert) and
     (Tile and fSpecial <> fSpecial1 { Oasis } ) then
   begin
-    assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
-    result := (DesertThurst * MP - 1) div RW[p].Model[mix].Speed + 1
+    Assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
+    Result := (DesertThurst * MP - 1) div RW[P].Model[mix].Speed + 1
   end
   else if Tile and fTerrain = fArctic then
   begin
-    assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
-    result := (ArcticThurst * MP - 1) div RW[p].Model[mix].Speed + 1
+    Assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
+    Result := (ArcticThurst * MP - 1) div RW[P].Model[mix].Speed + 1
   end
   else
-    result := 0
-end;
-
-function Controlled(p, Loc: integer; IsDest: boolean): integer;
+    Result := 0;
+end;
+
+function Controlled(P, Loc: Integer; IsDest: Boolean): Integer;
 { whether tile at Loc is in control zone of enemy unit
   returns combination of tile control flags }
 var
-  Loc1, V8: integer;
+  Loc1, V8: Integer;
   Adjacent: TVicinity8Loc;
 begin
-  result := 0;
-  if IsDest and (Occupant[Loc] = p) and (ZoCMap[Loc] > 0) then
-    exit;
+  Result := 0;
+  if IsDest and (Occupant[Loc] = P) and (ZoCMap[Loc] > 0) then
+    Exit;
   // destination tile, not controlled if already occupied
 
-  if (RealMap[Loc] and fCity = 0) or (integer(RealMap[Loc] shr 27) <> p) and
-    (ServerVersion[p] >= $000EF0) then
+  if (RealMap[Loc] and fCity = 0) or (Integer(RealMap[Loc] shr 27) <> P) and
+    (ServerVersion[P] >= $000EF0) then
   begin // not own city
     V8_to_Loc(Loc, Adjacent);
@@ -128 +128 @@
       Loc1 := Adjacent[V8];
       if (Loc1 >= 0) and (Loc1 < MapSize) and (ZoCMap[Loc1] > 0) and
-        (Occupant[Loc1] >= 0) and (Occupant[Loc1] <> p) and
-        (RW[p].Treaty[Occupant[Loc1]] < trAlliance) then
-        if ObserveLevel[Loc1] and (3 shl (p * 2)) > 0 then
+        (Occupant[Loc1] >= 0) and (Occupant[Loc1] <> P) and
+        (RW[P].Treaty[Occupant[Loc1]] < trAlliance) then
+        if ObserveLevel[Loc1] and (3 shl (P * 2)) > 0 then
         begin // p observes tile
-          result := coKnown or coTrue;
-          exit;
+          Result := coKnown or coTrue;
+          Exit;
         end
         else
-          result := coTrue; // p does not observe tile
+          Result := coTrue; // p does not observe tile
     end;
   end;
 end;
 
-function GetMoveCost(p, mix, FromLoc, ToLoc, MoveLength: integer;
-  var MoveCost: integer): integer;
+function GetMoveCost(P, mix, FromLoc, ToLoc, MoveLength: Integer;
+  var MoveCost: Integer): Integer;
 // MoveLength - 2 for short move, 3 for long move
 var
-  FromTile, ToTile: integer;
-begin
-  result := eOK;
+  FromTile, ToTile: Integer;
+begin
+  Result := eOK;
   FromTile := RealMap[FromLoc];
   ToTile := RealMap[ToLoc];
-  with RW[p].Model[mix] do
+  with RW[P].Model[mix] do
   begin
     case Domain of
@@ -160 +160 @@
           if (FromTile and (fRR or fCity) <> 0) and
             (ToTile and (fRR or fCity) <> 0) then
-            if GWonder[woShinkansen].EffectiveOwner = p then
+            if GWonder[woShinkansen].EffectiveOwner = P then
               MoveCost := 0
             else
@@ -174 +174 @@
               MoveCost := 20
           else if Cap[mcOver] > 0 then
-            result := eNoRoad
+            Result := eNoRoad
           else
             case Terrain[ToTile and fTerrain].MoveCost of
@@ -181 +181 @@
               2:
                 begin
-                  assert(Speed - 150 <= 600);
+                  Assert(Speed - 150 <= 600);
                   MoveCost := 50 + (Speed - 150) * 13 shr 7; // heavy terrain
                 end;
@@ -187 +187 @@
                 begin
                   MoveCost := Speed;
-                  result := eMountains;
-                  exit;
+                  Result := eMountains;
+                  Exit;
                 end;
             end;
@@ -194 +194 @@
         end
         else
-          result := eDomainMismatch;
+          Result := eDomainMismatch;
 
       dSea:
@@ -202 +202 @@
             MoveCost := 50 * MoveLength { valid move }
           else
-            result := eNoNav { navigation required for open sea }
-        else
-          result := eDomainMismatch;
+            Result := eNoNav { navigation required for open sea }
+        else
+          Result := eDomainMismatch;
 
       dAir:
@@ -212 +212 @@
 end;
 
-function CalculateMove(p, uix, ToLoc, MoveLength: integer; TestOnly: boolean;
-  var MoveInfo: TMoveInfo): integer;
+function CalculateMove(P, uix, ToLoc, MoveLength: Integer; TestOnly: Boolean;
+  var MoveInfo: TMoveInfo): Integer;
 var
   uix1, p1, FromLoc, DestControlled, AStr, DStr, ABaseDamage,
-    DBaseDamage: integer;
+    DBaseDamage: Integer;
   PModel: ^TModel;
   BattleForecast: TBattleForecast;
 begin
-  with RW[p], Un[uix] do
+  with RW[P], Un[uix] do
   begin
     PModel := @Model[mix];
     FromLoc := Loc;
 
-    BattleForecast.pAtt := p;
+    BattleForecast.pAtt := P;
     BattleForecast.mixAtt := mix;
     BattleForecast.HealthAtt := Health;
@@ -231 +231 @@
     BattleForecast.FlagsAtt := Flags;
     BattleForecast.Movement := Movement;
-    result := GetBattleForecast(ToLoc, BattleForecast, MoveInfo.Duix,
+    Result := GetBattleForecast(ToLoc, BattleForecast, MoveInfo.Duix,
       MoveInfo.Dcix, AStr, DStr, ABaseDamage, DBaseDamage);
 
-    if result = eHiddenUnit then
+    if Result = eHiddenUnit then
       if TestOnly then
-        result := eOK // behave just like unit was moving
+        Result := eOK // behave just like unit was moving
       else if Mode > moLoading_Fast then
         Map[ToLoc] := Map[ToLoc] or fHiddenUnit;
-    if result = eStealthUnit then
+    if Result = eStealthUnit then
       if TestOnly then
-        result := eOK // behave just like unit was moving
+        Result := eOK // behave just like unit was moving
       else if Mode > moLoading_Fast then
         Map[ToLoc] := Map[ToLoc] or fStealthUnit;
-    if result < rExecuted then
-      exit;
-
-    case result of
+    if Result < rExecuted then
+      Exit;
+
+    case Result of
       eOK:
         MoveInfo.MoveType := mtMove;
@@ -261 +261 @@
       begin
         p1 := RealMap[ToLoc] shr 27;
-        if (p1 < nPl) and (p1 <> p) and
+        if (p1 < nPl) and (p1 <> P) and
           ((RealMap[Loc] shr 27 <> Cardinal(p1)) and (PModel.Kind <> mkDiplomat)
           and (Treaty[p1] >= trPeace) and (Treaty[p1] < trAlliance) or
           (RealMap[ToLoc] and fCity <> 0) and (Treaty[p1] >= trPeace)) then
         begin
-          result := eTreaty;
-          exit;
+          Result := eTreaty;
+          Exit;
         end; // keep peace treaty!
       end;
       if (RealMap[ToLoc] and fCity <> 0) and
-        (RealMap[ToLoc] shr 27 <> Cardinal(p)) then // empty enemy city
+        (RealMap[ToLoc] shr 27 <> Cardinal(P)) then // empty enemy city
         if PModel.Kind = mkDiplomat then
         begin
@@ -280 +280 @@
           if PModel.Flags and mdCivil <> 0 then
           begin
-            result := eNoCapturer;
-            exit;
+            Result := eNoCapturer;
+            Exit;
           end;
           MoveInfo.MoveType := mtCapture;
@@ -289 +289 @@
           if (PModel.Domain = dSea) and (PModel.Cap[mcArtillery] = 0) then
           begin
-            result := eDomainMismatch;
-            exit;
+            Result := eDomainMismatch;
+            Exit;
           end
           else if (PModel.Attack = 0) and
@@ -296 +296 @@
           then
           begin
-            result := eNoBombarder;
-            exit;
+            Result := eNoBombarder;
+            Exit;
           end
           else if Movement < 100 then
           begin
-            result := eNoTime_Bombard;
-            exit;
+            Result := eNoTime_Bombard;
+            Exit;
           end;
           MoveInfo.MoveType := mtBombard;
-          result := eBombarded;
-        end;
-    end;
-
-    MoveInfo.MountainDelay := false;
+          Result := eBombarded;
+        end;
+    end;
+
+    MoveInfo.MountainDelay := False;
     if MoveInfo.MoveType in [mtAttack, mtBombard, mtExpel] then
     begin
@@ -317 +317 @@
       then
       begin
-        result := eViolation;
-        exit
+        Result := eViolation;
+        Exit;
       end;
       if MoveInfo.MoveType = mtBombard then
@@ -337 +337 @@
         MoveInfo.Cost := PModel.Speed;
         if RealMap[ToLoc] and fTerrain < fGrass then
-          result := eDomainMismatch;
+          Result := eDomainMismatch;
       end
       else
       begin
-        result := GetMoveCost(p, mix, FromLoc, ToLoc, MoveLength,
+        Result := GetMoveCost(P, mix, FromLoc, ToLoc, MoveLength,
           MoveInfo.Cost);
-        if result = eMountains then
-        begin
-          result := eOK;
-          MoveInfo.MountainDelay := true
+        if Result = eMountains then
+        begin
+          Result := eOK;
+          MoveInfo.MountainDelay := True
         end;
       end;
-      if (result >= rExecuted) and (MoveInfo.MoveType = mtSpyMission) then
-        result := eMissionDone;
+      if (Result >= rExecuted) and (MoveInfo.MoveType = mtSpyMission) then
+        Result := eMissionDone;
 
       MoveInfo.ToMaster := -1;
-      if (result = eDomainMismatch) and (PModel.Domain < dSea) and
+      if (Result = eDomainMismatch) and (PModel.Domain < dSea) and
         (PModel.Cap[mcOver] = 0) then
       begin
@@ -361 +361 @@
               (TroopLoad < Model[mix].MTrans * Model[mix].Cap[mcSeaTrans]) then
             begin
-              result := eLoaded;
+              Result := eLoaded;
               MoveInfo.Cost := PModel.Speed;
               MoveInfo.ToMaster := uix1;
@@ -378 +378 @@
               (AirLoad < Model[mix].MTrans * Model[mix].Cap[mcCarrier]) then
             begin // load plane to ship
-              result := eLoaded;
+              Result := eLoaded;
               MoveInfo.ToMaster := uix1;
               if (uixSelectedTransport >= 0) and (uix1 = uixSelectedTransport)
@@ -385 +385 @@
             end;
       end;
-      if result < rExecuted then
-        exit;
+      if Result < rExecuted then
+        Exit;
 
       if (Master < 0) and (MoveInfo.ToMaster < 0) then
-        MoveInfo.EndHealth := Health - HostileDamage(p, mix, ToLoc,
+        MoveInfo.EndHealth := Health - HostileDamage(P, mix, ToLoc,
           MoveInfo.Cost)
       else
@@ -395 +395 @@
 
       if (Mode = moPlaying) and (PModel.Flags and mdZOC <> 0) and (Master < 0)
-        and (MoveInfo.ToMaster < 0) and (Controlled(p, FromLoc, false) >= coTrue)
+        and (MoveInfo.ToMaster < 0) and (Controlled(P, FromLoc, False) >= coTrue)
       then
       begin
-        DestControlled := Controlled(p, ToLoc, true);
+        DestControlled := Controlled(P, ToLoc, True);
         if DestControlled >= coTrue + coKnown then
         begin
-          result := eZOC;
-          exit;
+          Result := eZOC;
+          Exit;
         end
         else if not TestOnly and (DestControlled >= coTrue) then
         begin
-          result := eZOC_EnemySpotted;
-          exit;
+          Result := eZOC_EnemySpotted;
+          Exit;
         end;
       end;
-      if (Movement = 0) and (ServerVersion[p] >= $0100F1) or
+      if (Movement = 0) and (ServerVersion[P] >= $0100F1) or
         (MoveInfo.Cost > Movement) then
         if (Master >= 0) or (MoveInfo.ToMaster >= 0) then
         begin
-          result := eNoTime_Load;
-          exit;
+          Result := eNoTime_Load;
+          Exit;
         end
         else
         begin
-          result := eNoTime_Move;
-          exit;
+          Result := eNoTime_Move;
+          Exit;
         end;
       if (MoveInfo.EndHealth <= 0) or (MoveInfo.MoveType = mtSpyMission) then
-        result := result or rUnitRemoved;
+        Result := Result or rUnitRemoved;
       // spy mission or victim of HostileDamage
 
@@ -438 +438 @@
 end;
 
-function GetBattleForecast(Loc: integer; var BattleForecast: TBattleForecast;
-  var Duix, Dcix, AStr, DStr, ABaseDamage, DBaseDamage: integer): integer;
-var
-  Time, Defender, ABon, DBon, DCnt, MultiDamage: integer;
+function GetBattleForecast(Loc: Integer; var BattleForecast: TBattleForecast;
+  var Duix, Dcix, AStr, DStr, ABaseDamage, DBaseDamage: Integer): Integer;
+var
+  Time, Defender, ABon, DBon, DCnt, MultiDamage: Integer;
   PModel, DModel: ^TModel;
 begin
@@ -449 +449 @@
     if (Defender < 0) or (Defender = pAtt) then
     begin
-      result := eOK;
-      exit;
+      Result := eOK;
+      Exit;
     end; // no attack, simple move
 
@@ -459 +459 @@
       EndHealthAtt := HealthAtt;
       EndHealthDef := RW[Defender].Un[Duix].Health;
-      result := eOK;
-      exit;
+      Result := eOK;
+      Exit;
     end;
 
@@ -470 +470 @@
         (ObserveLevel[Loc] shr (2 * pAtt) and 3 < lObserveAll) then
       begin
-        result := eHiddenUnit;
-        exit;
+        Result := eHiddenUnit;
+        Exit;
       end; // attacking submarine not allowed
       if (DModel.Cap[mcStealth] > 0) and
         (ObserveLevel[Loc] shr (2 * pAtt) and 3 <> lObserveSuper) then
       begin
-        result := eStealthUnit;
-        exit;
+        Result := eStealthUnit;
+        Exit;
       end; // attacking stealth aircraft not allowed
       if (DModel.Domain = dAir) and (DModel.Kind <> mkSpecial_Glider) and
         (PModel.Domain <> dAir) then
       begin
-        result := eDomainMismatch;
-        exit;
+        Result := eDomainMismatch;
+        Exit;
       end; // can't attack plane
     end;
@@ -492 +492 @@
       (PModel.Domain = dSea) and (RealMap[Loc] and fTerrain >= fGrass)) then
     begin
-      result := eDomainMismatch;
-      exit;
+      Result := eDomainMismatch;
+      Exit;
     end;
     if (PModel.Attack = 0) and not((PModel.Cap[mcBombs] > 0) and
       (FlagsAtt and unBombsLoaded <> 0) and (DModel.Domain < dAir)) then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end;
 
     if Movement = 0 then
     begin
-      result := eNoTime_Attack;
-      exit;
-    end;
-
-{$IFOPT O-}assert(InvalidTreatyMap = 0); {$ENDIF}
+      Result := eNoTime_Attack;
+      Exit;
+    end;
+
+{$IFOPT O-}Assert(InvalidTreatyMap = 0); {$ENDIF}
     if RW[pAtt].Treaty[Defender] >= trPeace then
     begin
       if (PModel.Domain <> dAir) and (PModel.Attack > 0) and
-        (integer(RealMap[Loc] shr 27) = pAtt) then
+        (Integer(RealMap[Loc] shr 27) = pAtt) then
         if Movement >= 100 then
         begin // expel friendly unit
           EndHealthDef := RW[Defender].Un[Duix].Health;
           EndHealthAtt := HealthAtt;
-          result := eExpelled
+          Result := eExpelled
         end
         else
-          result := eNoTime_Expel
+          Result := eNoTime_Expel
       else
-        result := eTreaty;
-      exit;
+        Result := eTreaty;
+      Exit;
     end;
 
@@ -534 +534 @@
         (Continent[RW[Defender].City[Dcix].Loc] = GrWallContinent[Defender]))
       then
-        inc(DBon, 8)
+        Inc(DBon, 8)
       else if (PModel.Domain = dSea) and
         (RW[Defender].City[Dcix].Built[imCoastalFort] = 1) then
-        inc(DBon, 4)
+        Inc(DBon, 4)
       else if (PModel.Domain = dAir) and
         (RW[Defender].City[Dcix].Built[imMissileBat] = 1) then
-        inc(DBon, 4);
+        Inc(DBon, 4);
       if RW[Defender].City[Dcix].Built[imBunker] = 1 then
-        inc(DBon, 4)
+        Inc(DBon, 4)
     end;
     if (PModel.Domain = dAir) and (DModel.Cap[mcAirDef] > 0) then
-      inc(DBon, 4);
+      Inc(DBon, 4);
     DStr := DModel.Defense * DBon * 100;
     if (DModel.Domain = dAir) and ((RealMap[Loc] and fCity <> 0) or
@@ -622 +622 @@
 
     if EndHealthDef > 0 then
-      result := eLost
+      Result := eLost
     else if EndHealthAtt > 0 then
-      result := eWon
+      Result := eWon
     else
-      result := eBloody;
+      Result := eBloody;
   end;
 end;
 
-function LoadUnit(p, uix: integer; TestOnly: boolean): integer;
-var
-  uix1, d, Cost, ToMaster: integer;
-begin
-  result := eOK;
-  with RW[p].Un[uix] do
-  begin
-    d := RW[p].Model[mix].Domain;
-    if (Master >= 0) or (d = dSea) or
-      (RW[p].Model[mix].Cap[mcAirTrans] + RW[p].Model[mix].Cap[mcOver] > 0) then
-      result := eViolation
+function LoadUnit(P, uix: Integer; TestOnly: Boolean): Integer;
+var
+  uix1, D, Cost, ToMaster: Integer;
+begin
+  Result := eOK;
+  with RW[P].Un[uix] do
+  begin
+    D := RW[P].Model[mix].Domain;
+    if (Master >= 0) or (D = dSea) or
+      (RW[P].Model[mix].Cap[mcAirTrans] + RW[P].Model[mix].Cap[mcOver] > 0) then
+      Result := eViolation
     else
     begin
       ToMaster := -1;
-      for uix1 := 0 to RW[p].nUn - 1 do
-        if RW[p].Un[uix1].Loc = Loc then
-          with RW[p].Un[uix1], RW[p].Model[mix] do
-            if (d < dSea) and
+      for uix1 := 0 to RW[P].nUn - 1 do
+        if RW[P].Un[uix1].Loc = Loc then
+          with RW[P].Un[uix1], RW[P].Model[mix] do
+            if (D < dSea) and
               (TroopLoad < MTrans * (Cap[mcSeaTrans] + Cap[mcAirTrans])) or
-              (d = dAir) and (AirLoad < MTrans * Cap[mcCarrier]) then
+              (D = dAir) and (AirLoad < MTrans * Cap[mcCarrier]) then
             begin { load onto unit uix1 }
               if (uixSelectedTransport < 0) or (uix1 = uixSelectedTransport)
@@ -661 +661 @@
             end;
       if ToMaster < 0 then
-        result := eNoLoadCapacity
+        Result := eNoLoadCapacity
       else
       begin
-        if d = dAir then
+        if D = dAir then
           Cost := 100
         else
-          Cost := RW[p].Model[mix].Speed;
+          Cost := RW[P].Model[mix].Speed;
         if Movement < Cost then
-          result := eNoTime_Load
+          Result := eNoTime_Load
         else if not TestOnly then
         begin
-          FreeUnit(p, uix);
-          dec(Movement, Cost);
-          if d = dAir then
-            inc(RW[p].Un[ToMaster].AirLoad)
+          FreeUnit(P, uix);
+          Dec(Movement, Cost);
+          if D = dAir then
+            Inc(RW[P].Un[ToMaster].AirLoad)
           else
-            inc(RW[p].Un[ToMaster].TroopLoad);
+            Inc(RW[P].Un[ToMaster].TroopLoad);
           Master := ToMaster;
           UpdateUnitMap(Loc);
@@ -686 +686 @@
 end;
 
-function UnloadUnit(p, uix: integer; TestOnly: boolean): integer;
-var
-  Cost: integer;
-begin
-  result := eOK;
-  with RW[p].Un[uix] do
+function UnloadUnit(P, uix: Integer; TestOnly: Boolean): Integer;
+var
+  Cost: Integer;
+begin
+  Result := eOK;
+  with RW[P].Un[uix] do
     if Master < 0 then
-      result := eNotChanged
-    else if (RW[p].Model[mix].Domain < dSea) and
+      Result := eNotChanged
+    else if (RW[P].Model[mix].Domain < dSea) and
       (RealMap[Loc] and fTerrain < fGrass) then
-      result := eDomainMismatch
+      Result := eDomainMismatch
       // else if (RW[p].Model[mix].Domain<dSea)
       // and (RW[p].Model[mix].Flags and mdCivil<>0)
@@ -702 +702 @@
     else
     begin
-      if RW[p].Model[mix].Domain = dAir then
+      if RW[P].Model[mix].Domain = dAir then
         Cost := 100
       else
-        Cost := RW[p].Model[mix].Speed;
+        Cost := RW[P].Model[mix].Speed;
       if Movement < Cost then
-        result := eNoTime_Load
+        Result := eNoTime_Load
       else if not TestOnly then
       begin
-        dec(Movement, Cost);
-        if RW[p].Model[mix].Domain = dAir then
-          dec(RW[p].Un[Master].AirLoad)
-        else
-        begin
-          dec(RW[p].Un[Master].TroopLoad);
+        Dec(Movement, Cost);
+        if RW[P].Model[mix].Domain = dAir then
+          Dec(RW[P].Un[Master].AirLoad)
+        else
+        begin
+          Dec(RW[P].Un[Master].TroopLoad);
           // Movement:=0 // no more movement after unload
         end;
         Master := -1;
-        PlaceUnit(p, uix);
+        PlaceUnit(P, uix);
         UpdateUnitMap(Loc);
       end;
@@ -725 +725 @@
 end;
 
-procedure Recover(p, uix: integer);
-var
-  cix, Recovery: integer;
-begin
-  with RW[p], Un[uix] do
+procedure Recover(P, uix: Integer);
+var
+  cix, Recovery: Integer;
+begin
+  with RW[P], Un[uix] do
   begin
     if (Master >= 0) and (Model[Un[Master].mix].Cap[mcSupplyShip] > 0) then
@@ -739 +739 @@
       cix := nCity - 1;
       while (cix >= 0) and (City[cix].Loc <> Loc) do
-        dec(cix);
+        Dec(cix);
       if City[cix].Flags and chDisorder <> 0 then
         Recovery := NoCityRecovery
@@ -762 +762 @@
     if Recovery > 100 - Health then
       Recovery := 100 - Health;
-    inc(Health, Recovery);
+    Inc(Health, Recovery);
   end;
 end;
 
-function GetMoveAdvice(p, uix: integer; var a: TMoveAdviceData): integer;
+function GetMoveAdvice(P, uix: Integer; var A: TMoveAdviceData): Integer;
 const
   // domains
@@ -778 +778 @@
   gmaAlpine = 8;
 var
-  i, FromLoc, EndLoc, T, T1, maxmov, initmov, Loc, Loc1, FromTile, ToTile, V8,
+  I, FromLoc, EndLoc, T, T1, maxmov, initmov, Loc, Loc1, FromTile, ToTile, V8,
     MoveInfo, HeavyCost, RailCost, MoveCost, AddDamage, MaxDamage,
-    MovementLeft: integer;
+    MovementLeft: Integer;
   Map: ^TTileList;
   Q: TIPQ;
   Adjacent: TVicinity8Loc;
-  From: array [0 .. lxmax * lymax - 1] of integer;
-  Time: array [0 .. lxmax * lymax - 1] of integer;
-  Damage: array [0 .. lxmax * lymax - 1] of integer;
-  MountainDelay, Resistant: boolean;
+  From: array [0 .. lxmax * lymax - 1] of Integer;
+  Time: array [0 .. lxmax * lymax - 1] of Integer;
+  Damage: array [0 .. lxmax * lymax - 1] of Integer;
+  MountainDelay, Resistant: Boolean;
   // tt,tt0: int64;
 begin
   // QueryPerformanceCounter(tt0);
 
-  MaxDamage := RW[p].Un[uix].Health - 1;
-  if MaxDamage > a.MaxHostile_MovementLeft then
-    if a.MaxHostile_MovementLeft >= 0 then
-      MaxDamage := a.MaxHostile_MovementLeft
+  MaxDamage := RW[P].Un[uix].Health - 1;
+  if MaxDamage > A.MaxHostile_MovementLeft then
+    if A.MaxHostile_MovementLeft >= 0 then
+      MaxDamage := A.MaxHostile_MovementLeft
     else
       MaxDamage := 0;
 
-  Map := @(RW[p].Map^);
-  if (a.ToLoc <> maNextCity) and ((a.ToLoc < 0) or (a.ToLoc >= MapSize)) then
-  begin
-    result := eInvalid;
-    exit;
+  Map := @(RW[P].Map^);
+  if (A.ToLoc <> maNextCity) and ((A.ToLoc < 0) or (A.ToLoc >= MapSize)) then
+  begin
+    Result := eInvalid;
+    Exit;
   end;
-  if (a.ToLoc <> maNextCity) and (Map[a.ToLoc] and fTerrain = fUNKNOWN) then
-  begin
-    result := eNoWay;
-    exit;
+  if (A.ToLoc <> maNextCity) and (Map[A.ToLoc] and fTerrain = fUNKNOWN) then
+  begin
+    Result := eNoWay;
+    Exit;
   end;
 
-  with RW[p].Model[RW[p].Un[uix].mix] do
+  with RW[P].Model[RW[P].Un[uix].mix] do
     case Domain of
       dGround:
-        if (a.ToLoc <> maNextCity) and (Map[a.ToLoc] and fTerrain = fOcean) then
-        begin
-          result := eDomainMismatch;
-          exit;
+        if (A.ToLoc <> maNextCity) and (Map[A.ToLoc] and fTerrain = fOcean) then
+        begin
+          Result := eDomainMismatch;
+          Exit;
         end
         else
@@ -826 +826 @@
             MoveInfo := gmaGround_NoZoC;
           if Cap[mcOver] > 0 then
-            inc(MoveInfo, gmaOver);
+            Inc(MoveInfo, gmaOver);
           if Cap[mcAlpine] > 0 then
-            inc(MoveInfo, gmaAlpine);
+            Inc(MoveInfo, gmaAlpine);
           HeavyCost := 50 + (Speed - 150) * 13 shr 7;
-          if GWonder[woShinkansen].EffectiveOwner = p then
+          if GWonder[woShinkansen].EffectiveOwner = P then
             RailCost := 0
           else
@@ -836 +836 @@
           maxmov := Speed;
           initmov := 0;
-          Resistant := (GWonder[woGardens].EffectiveOwner = p) or
+          Resistant := (GWonder[woGardens].EffectiveOwner = P) or
             (Kind = mkSettler) and (Speed >= 200);
         end;
       dSea:
-        if (a.ToLoc <> maNextCity) and (Map[a.ToLoc] and fTerrain >= fGrass) and
-          (Map[a.ToLoc] and (fCity or fUnit or fCanal) = 0) then
-        begin
-          result := eDomainMismatch;
-          exit;
+        if (A.ToLoc <> maNextCity) and (Map[A.ToLoc] and fTerrain >= fGrass) and
+          (Map[A.ToLoc] and (fCity or fUnit or fCanal) = 0) then
+        begin
+          Result := eDomainMismatch;
+          Exit;
         end
         else
@@ -850 +850 @@
           MoveInfo := gmaSea;
           if Cap[mcNav] > 0 then
-            inc(MoveInfo, gmaNav);
-          maxmov := UnitSpeed(p, RW[p].Un[uix].mix, 100);
-          initmov := maxmov - UnitSpeed(p, RW[p].Un[uix].mix,
-            RW[p].Un[uix].Health);
+            Inc(MoveInfo, gmaNav);
+          maxmov := UnitSpeed(P, RW[P].Un[uix].mix, 100);
+          initmov := maxmov - UnitSpeed(P, RW[P].Un[uix].mix,
+            RW[P].Un[uix].Health);
         end;
       dAir:
@@ -863 +863 @@
     end;
 
-  FromLoc := RW[p].Un[uix].Loc;
+  FromLoc := RW[P].Un[uix].Loc;
   FillChar(Time, SizeOf(Time), 255); { -1 }
   Damage[FromLoc] := 0;
   Q := TIPQ.Create(MapSize);
-  Q.Put(FromLoc, (maxmov - RW[p].Un[uix].Movement) shl 8);
+  Q.Put(FromLoc, (maxmov - RW[P].Un[uix].Movement) shl 8);
   while Q.Get(Loc, T) do
   begin
     Time[Loc] := T;
-    if T >= (a.MoreTurns + 1) shl 20 then
+    if T >= (A.MoreTurns + 1) shl 20 then
     begin
       Loc := -1;
@@ -877 +877 @@
     end;
     FromTile := Map[Loc];
-    if (Loc = a.ToLoc) or (a.ToLoc = maNextCity) and (FromTile and fCity <> 0)
+    if (Loc = A.ToLoc) or (A.ToLoc = maNextCity) and (FromTile and fCity <> 0)
     then
       Break;
     if T and $FFF00 = $FFF00 then
-      inc(T, $100000); // indicates mountain delay
+      Inc(T, $100000); // indicates mountain delay
     V8_to_Loc(Loc, Adjacent);
     for V8 := 0 to 7 do
@@ -889 +889 @@
       begin
         ToTile := Map[Loc1];
-        if (Loc1 = a.ToLoc) and (ToTile and (fUnit or fOwned) = fUnit) and
+        if (Loc1 = A.ToLoc) and (ToTile and (fUnit or fOwned) = fUnit) and
           not((MoveInfo and 3 = gmaSea) and (FromTile and fTerrain >= fGrass))
           and not((MoveInfo and 3 = gmaAir) and ((FromTile and fCity <> 0) or
@@ -898 +898 @@
         end
         else if (ToTile and fTerrain <> fUNKNOWN) and
-          ((Loc1 = a.ToLoc) or (ToTile and (fCity or fOwned) <> fCity))
+          ((Loc1 = A.ToLoc) or (ToTile and (fCity or fOwned) <> fCity))
         // don't move through enemy cities
-          and ((Loc1 = a.ToLoc) or (ToTile and (fUnit or fOwned) <> fUnit))
+          and ((Loc1 = A.ToLoc) or (ToTile and (fUnit or fOwned) <> fUnit))
         // way is blocked
           and (ToTile and not FromTile and fPeace = 0) and
@@ -910 +910 @@
           // calculate move cost, must be identic to GetMoveCost function
           AddDamage := 0;
-          MountainDelay := false;
+          MountainDelay := False;
           case MoveInfo of
 
@@ -956 +956 @@
                     begin
                       MoveCost := maxmov;
-                      MountainDelay := true;
+                      MountainDelay := True;
                     end;
                 end;
@@ -990 +990 @@
           if (MoveCost > 0) and not MountainDelay then
             if V8 and 1 <> 0 then
-              inc(MoveCost, MoveCost * 2)
+              Inc(MoveCost, MoveCost * 2)
             else
-              inc(MoveCost, MoveCost);
+              Inc(MoveCost, MoveCost);
 
           if (MoveInfo and 2 <> 0) // ground unit, check transport load/unload
@@ -1011 +1011 @@
                 if FromTile and (fTerrain or fCity or fRiver or fCanal or
                   fSpecial1 { Oasis } ) = fDesert then
-                  inc(AddDamage, (DesertThurst * (maxmov - T shr 8 and $FFF) -
+                  Inc(AddDamage, (DesertThurst * (maxmov - T shr 8 and $FFF) -
                     1) div maxmov + 1)
                 else if FromTile and (fTerrain or fCity or fRiver or fCanal) = fArctic
                 then
-                  inc(AddDamage, (ArcticThurst * (maxmov - T shr 8 and $FFF) -
+                  Inc(AddDamage, (ArcticThurst * (maxmov - T shr 8 and $FFF) -
                     1) div maxmov + 1);
 
@@ -1037 +1037 @@
   end;
   FreeAndNil(Q);
-  if (Loc = a.ToLoc) or (a.ToLoc = maNextCity) and (Loc >= 0) and
+  if (Loc = A.ToLoc) or (A.ToLoc = maNextCity) and (Loc >= 0) and
     (Map[Loc] and fCity <> 0) then
   begin
-    a.MoreTurns := T shr 20;
+    A.MoreTurns := T shr 20;
     EndLoc := Loc;
-    a.nStep := 0;
+    A.nStep := 0;
     while Loc <> FromLoc do
     begin
       if Time[Loc] < $100000 then
-        inc(a.nStep);
+        Inc(A.nStep);
       Loc := From[Loc];
     end;
     Loc := EndLoc;
-    i := a.nStep;
+    I := A.nStep;
     while Loc <> FromLoc do
     begin
       if Time[Loc] < $100000 then
       begin
-        dec(i);
-        if i < 25 then
-        begin
-          a.dx[i] := ((Loc mod lx * 2 + Loc div lx and 1) -
+        Dec(I);
+        if I < 25 then
+        begin
+          A.dx[I] := ((Loc mod lx * 2 + Loc div lx and 1) -
             (From[Loc] mod lx * 2 + From[Loc] div lx and 1) + 3 * lx)
             mod (2 * lx) - lx;
-          a.dy[i] := Loc div lx - From[Loc] div lx;
+          A.dy[I] := Loc div lx - From[Loc] div lx;
         end
       end;
       Loc := From[Loc];
     end;
-    a.MaxHostile_MovementLeft := maxmov - Time[EndLoc] shr 8 and $FFF;
-    if a.nStep > 25 then
-      a.nStep := 25;
-    result := eOK
+    A.MaxHostile_MovementLeft := maxmov - Time[EndLoc] shr 8 and $FFF;
+    if A.nStep > 25 then
+      A.nStep := 25;
+    Result := eOK
   end
   else
-    result := eNoWay;
+    Result := eNoWay;
 
   // QueryPerformanceCounter(tt);{time in s is: (tt-tt0)/PerfFreq}
 end;
 
-function CanPlaneReturn(p, uix: integer;
-  PlaneReturnData: TPlaneReturnData): boolean;
+function CanPlaneReturn(P, uix: Integer;
+  PlaneReturnData: TPlaneReturnData): Boolean;
 const
   mfEnd = 1;
   mfReached = 2;
 var
-  uix1, T, T1, Loc, Loc1, FromTile, ToTile, V8, MoveCost, maxmov: integer;
+  uix1, T, T1, Loc, Loc1, FromTile, ToTile, V8, MoveCost, maxmov: Integer;
   Map: ^TTileList;
   Q: TIPQ;
   Adjacent: TVicinity8Loc;
-  MapFlags: array [0 .. lxmax * lymax - 1] of byte;
-begin
-  Map := @(RW[p].Map^);
+  MapFlags: array [0 .. lxmax * lymax - 1] of Byte;
+begin
+  Map := @(RW[P].Map^);
 
   // calculate possible return points
   FillChar(MapFlags, SizeOf(MapFlags), 0);
-  if RW[p].Model[RW[p].Un[uix].mix].Kind = mkSpecial_Glider then
+  if RW[P].Model[RW[P].Un[uix].mix].Kind = mkSpecial_Glider then
   begin
     for Loc := 0 to MapSize - 1 do
@@ -1106 +1106 @@
         (Map[Loc] and (fUnit or fOwned) <> fUnit) then
         MapFlags[Loc] := MapFlags[Loc] or mfEnd;
-    if RW[p].Model[RW[p].Un[uix].mix].Cap[mcAirTrans] = 0 then
+    if RW[P].Model[RW[P].Un[uix].mix].Cap[mcAirTrans] = 0 then
     // plane can land on carriers
-      for uix1 := 0 to RW[p].nUn - 1 do
-        with RW[p].Un[uix1], RW[p].Model[mix] do
+      for uix1 := 0 to RW[P].nUn - 1 do
+        with RW[P].Un[uix1], RW[P].Model[mix] do
           if AirLoad < MTrans * Cap[mcCarrier] then
             MapFlags[Loc] := MapFlags[Loc] or mfEnd;
   end;
 
-  with RW[p].Un[uix] do
+  with RW[P].Un[uix] do
   begin
     if Master >= 0 then // can return to same carrier, even if full now
       MapFlags[Loc] := MapFlags[Loc] or mfEnd;
-    maxmov := RW[p].Model[mix].Speed;
+    maxmov := RW[P].Model[mix].Speed;
   end;
 
-  result := false;
+  Result := False;
   Q := TIPQ.Create(MapSize);
   Q.Put(PlaneReturnData.Loc, (maxmov - PlaneReturnData.Movement) shl 8);
@@ -1129 +1129 @@
     if T >= (PlaneReturnData.Fuel + 1) shl 20 then
     begin
-      result := false;
+      Result := False;
       Break;
     end;
     if MapFlags[Loc] and mfEnd <> 0 then
     begin
-      result := true;
+      Result := True;
       Break;
     end;
@@ -1173 +1173 @@
   ____________________________________________________________________
 }
-function CalculateJobWork(p, Loc, Job: integer; var JobWork: integer): integer;
-var
-  TerrType: integer;
-begin
-  result := eOK;
+function CalculateJobWork(P, Loc, Job: Integer; var JobWork: Integer): Integer;
+var
+  TerrType: Integer;
+begin
+  Result := eOK;
   TerrType := RealMap[Loc] and fTerrain;
   with Terrain[TerrType] do
@@ -1183 +1183 @@
       jCity:
         if RealMap[Loc] and fCity <> 0 then
-          result := eInvalid
+          Result := eInvalid
         else if IrrEff = 0 then
-          result := eNoCityTerrain
+          Result := eNoCityTerrain
         else
           JobWork := CityWork;
@@ -1193 +1193 @@
           JobWork := MoveCost * RoadWork;
           if RealMap[Loc] and fRiver <> 0 then
-            if RW[p].Tech[adBridgeBuilding] >= tsApplicable then
-              inc(JobWork, RoadBridgeWork) { across river }
+            if RW[P].Tech[adBridgeBuilding] >= tsApplicable then
+              Inc(JobWork, RoadBridgeWork) { across river }
             else
-              result := eNoBridgeBuilding;
+              Result := eNoBridgeBuilding;
         end
         else
-          result := eInvalid;
+          Result := eInvalid;
       jRR:
         if RealMap[Loc] and fRoad = 0 then
-          result := eNoPreq
+          Result := eNoPreq
         else if RealMap[Loc] and fRR <> 0 then
-          result := eInvalid
+          Result := eInvalid
         else
         begin
           JobWork := MoveCost * RRWork;
           if RealMap[Loc] and fRiver <> 0 then
-            inc(JobWork, RRBridgeWork); { across river }
+            Inc(JobWork, RRBridgeWork); { across river }
         end;
       jClear:
-        if (TerrType = fDesert) and (GWonder[woGardens].EffectiveOwner <> p)
+        if (TerrType = fDesert) and (GWonder[woGardens].EffectiveOwner <> P)
         then
-          result := eInvalid
+          Result := eInvalid
         else if ClearTerrain >= 0 then
           JobWork := IrrClearWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jIrr:
         begin
@@ -1224 +1224 @@
           if (IrrEff = 0) or (RealMap[Loc] and fTerImp = tiIrrigation) or
             (RealMap[Loc] and fTerImp = tiFarm) then
-            result := eInvalid;
+            Result := eInvalid;
         end;
       jFarm:
         if RealMap[Loc] and fTerImp <> tiIrrigation then
-          result := eNoPreq
+          Result := eNoPreq
         else
         begin
           JobWork := IrrClearWork * FarmWork;
           if (JobWork <= 0) or (RealMap[Loc] and fTerImp = tiFarm) then
-            result := eInvalid;
+            Result := eInvalid;
         end;
       jAfforest:
@@ -1239 +1239 @@
           JobWork := MineAfforestWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jMine:
         begin
           JobWork := MineAfforestWork;
           if (MineEff = 0) or (RealMap[Loc] and fTerImp = tiMine) then
-            result := eInvalid;
+            Result := eInvalid;
         end;
       jFort:
@@ -1250 +1250 @@
           JobWork := MoveCost * FortWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jCanal:
         if (RealMap[Loc] and fCanal = 0) and (TerrType in TerrType_Canalable)
@@ -1256 +1256 @@
           JobWork := CanalWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jTrans:
         begin
           JobWork := TransWork;
           if JobWork <= 0 then
-            result := eInvalid;
+            Result := eInvalid;
         end;
       jPoll:
@@ -1267 +1267 @@
           JobWork := PollWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jBase:
         if RealMap[Loc] and fTerImp <> tiBase then
           JobWork := MoveCost * BaseWork
         else
-          result := eInvalid;
+          Result := eInvalid;
       jPillage:
         if RealMap[Loc] and (fRoad or fRR or fCanal or fTerImp) <> 0 then
           JobWork := PillageWork
         else
-          result := eInvalid;
-    end;
-end;
-
-function StartJob(p, uix, NewJob: integer; TestOnly: boolean): integer;
-var
-  JobWork, Loc0, p1, uix1, TerrType: integer;
-begin
-{$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
-  result := eOK;
-  with RW[p].Un[uix] do
+          Result := eInvalid;
+    end;
+end;
+
+function StartJob(P, uix, NewJob: Integer; TestOnly: Boolean): Integer;
+var
+  JobWork, Loc0, p1, uix1, TerrType: Integer;
+begin
+{$IFOPT O-}Assert(1 shl P and InvalidTreatyMap = 0); {$ENDIF}
+  Result := eOK;
+  with RW[P].Un[uix] do
   begin
     if NewJob = Job then
     begin
-      result := eNotChanged;
-      exit;
+      Result := eNotChanged;
+      Exit;
     end;
     if NewJob = jNone then
@@ -1298 +1298 @@
       if not TestOnly then
         Job := jNone;
-      exit;
+      Exit;
     end;
     Loc0 := Loc;
@@ -1304 +1304 @@
       (NewJob <> jRR) then
     begin
-      result := eDeadLands;
-      exit;
+      Result := eDeadLands;
+      Exit;
     end;
     TerrType := RealMap[Loc0] and fTerrain;
     if (RealMap[Loc0] and fCity <> 0) or (TerrType < fGrass) or (Master >= 0) or
-      not((NewJob = jPillage) and (RW[p].Model[mix].Domain = dGround) or
-      (RW[p].Model[mix].Kind = mkSettler) or (NewJob <> jCity) and
-      (RW[p].Model[mix].Kind = mkSlaves) and (GWonder[woPyramids].EffectiveOwner
+      not((NewJob = jPillage) and (RW[P].Model[mix].Domain = dGround) or
+      (RW[P].Model[mix].Kind = mkSettler) or (NewJob <> jCity) and
+      (RW[P].Model[mix].Kind = mkSlaves) and (GWonder[woPyramids].EffectiveOwner
       >= 0)) then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end;
     if (JobPreq[NewJob] <> preNone) and
-      (RW[p].Tech[JobPreq[NewJob]] < tsApplicable) then
-    begin
-      result := eNoPreq;
-      exit;
-    end;
-
-    result := CalculateJobWork(p, Loc0, NewJob, JobWork);
-    if (Mode = moPlaying) and (result = eOK) and (NewJob <> jPoll) then
+      (RW[P].Tech[JobPreq[NewJob]] < tsApplicable) then
+    begin
+      Result := eNoPreq;
+      Exit;
+    end;
+
+    Result := CalculateJobWork(P, Loc0, NewJob, JobWork);
+    if (Mode = moPlaying) and (Result = eOK) and (NewJob <> jPoll) then
     begin // not allowed in territory of friendly nation
       p1 := RealMap[Loc0] shr 27; // owner of territory
-      if (p1 < nPl) and (p1 <> p) and (RW[p].Treaty[p1] >= trPeace) then
-        result := eTreaty; // keep peace treaty!
-    end;
-    if TestOnly or (result < rExecuted) then
-      exit;
+      if (p1 < nPl) and (p1 <> P) and (RW[P].Treaty[p1] >= trPeace) then
+        Result := eTreaty; // keep peace treaty!
+    end;
+    if TestOnly or (Result < rExecuted) then
+      Exit;
 
     if (ToWork[Loc0, NewJob] = 0) or (ToWork[Loc0, NewJob] > JobWork) then
@@ -1338 +1338 @@
     Job := NewJob;
     Flags := Flags and not unFortified;
-    for uix1 := 0 to RW[p].nUn - 1 do
-      if (RW[p].Un[uix1].Loc = Loc) and
-        (RW[p].Un[uix1].Job in ContraJobs[NewJob]) then
-        RW[p].Un[uix1].Job := jNone; // stop contradictive jobs
-    if ServerVersion[p] < $000EF0 then
-      if Work(p, uix) then
-        result := eJobDone;
-    if (NewJob = jCity) and (result = eJobDone) then
-    begin
-      RemoveUnit_UpdateMap(p, uix);
-      result := eCity;
+    for uix1 := 0 to RW[P].nUn - 1 do
+      if (RW[P].Un[uix1].Loc = Loc) and
+        (RW[P].Un[uix1].Job in ContraJobs[NewJob]) then
+        RW[P].Un[uix1].Job := jNone; // stop contradictive jobs
+    if ServerVersion[P] < $000EF0 then
+      if Work(P, uix) then
+        Result := eJobDone;
+    if (NewJob = jCity) and (Result = eJobDone) then
+    begin
+      RemoveUnit_UpdateMap(P, uix);
+      Result := eCity;
     end
     else if Health <= 0 then
     begin // victim of HostileDamage
-      RemoveUnit_UpdateMap(p, uix);
-      result := result or rUnitRemoved;
+      RemoveUnit_UpdateMap(P, uix);
+      Result := Result or rUnitRemoved;
     end;
     if Mode > moLoading_Fast then
     begin
-      if result = eCity then
-      begin
-        ObserveLevel[Loc0] := ObserveLevel[Loc0] and not(3 shl (2 * p));
-        Discover21(Loc0, p, lObserveUnhidden, true, true);
+      if Result = eCity then
+      begin
+        ObserveLevel[Loc0] := ObserveLevel[Loc0] and not(3 shl (2 * P));
+        Discover21(Loc0, P, lObserveUnhidden, True, True);
         // CheckContact;
       end;
@@ -1367 +1367 @@
 end;
 
-function Work(p, uix: integer): boolean;
-var
-  uix1, j0: integer;
-begin
-  result := false;
-  with RW[p].Un[uix] do
+function Work(P, uix: Integer): Boolean;
+var
+  uix1, j0: Integer;
+begin
+  Result := False;
+  with RW[P].Un[uix] do
     if Movement >= 100 then
     begin
-      assert(ToWork[Loc, Job] < $FFFF); // should have been set by StartJob
+      Assert(ToWork[Loc, Job] < $FFFF); // should have been set by StartJob
       if Job >= jRoad then
-        if integer(Movement) >= integer(ToWork[Loc, Job]) then { work complete }
-        begin
-          result := true;
+        if Integer(Movement) >= Integer(ToWork[Loc, Job]) then { work complete }
+        begin
+          Result := True;
           if Job <> jIrr then
-            Health := Health - HostileDamage(p, mix, Loc, ToWork[Loc, Job]);
-          dec(Movement, ToWork[Loc, Job]);
+            Health := Health - HostileDamage(P, mix, Loc, ToWork[Loc, Job]);
+          Dec(Movement, ToWork[Loc, Job]);
           if not(Job in [jCity, jPillage, jPoll]) then
-            inc(Worked[p], ToWork[Loc, Job]);
+            Inc(Worked[P], ToWork[Loc, Job]);
           if Job = jCity then
           begin // found new city
-            FoundCity(p, Loc);
-            inc(Founded[p]);
-            with RW[p].City[RW[p].nCity - 1] do
+            FoundCity(P, Loc);
+            Inc(Founded[P]);
+            with RW[P].City[RW[P].nCity - 1] do
             begin
-              ID := p shl 12 + Founded[p] - 1;
+              ID := P shl 12 + Founded[P] - 1;
               Flags := chFounded;
             end;
             if Mode = moPlaying then
             begin
-              LogCheckBorders(p, RW[p].nCity - 1);
-              RecalcPeaceMap(p);
+              LogCheckBorders(P, RW[P].nCity - 1);
+              RecalcPeaceMap(P);
             end;
 {$IFOPT O-} if Mode < moPlaying then
-              InvalidTreatyMap := not(1 shl p); {$ENDIF}
+              InvalidTreatyMap := not(1 shl P); {$ENDIF}
             // territory should not be considered for the rest of the command
             // execution, because during loading a game it's incorrect before
             // subsequent sIntExpandTerritory is processed
-            RW[p].Un[uix].Health := 0; // causes unit to be removed later
+            RW[P].Un[uix].Health := 0; // causes unit to be removed later
           end
           else
-            CompleteJob(p, Loc, Job);
+            CompleteJob(P, Loc, Job);
           ToWork[Loc, Job] := 0;
           j0 := Job;
-          for uix1 := 0 to RW[p].nUn - 1 do
-            if (RW[p].Un[uix1].Loc = Loc) and (RW[p].Un[uix1].Job = j0) then
-              RW[p].Un[uix1].Job := jNone
+          for uix1 := 0 to RW[P].nUn - 1 do
+            if (RW[P].Un[uix1].Loc = Loc) and (RW[P].Un[uix1].Job = j0) then
+              RW[P].Un[uix1].Job := jNone
         end
         else
         begin
-          dec(ToWork[Loc, Job], Movement);
+          Dec(ToWork[Loc, Job], Movement);
           if not(Job in [jCity, jPillage, jPoll]) then
-            inc(Worked[p], Movement);
-          Health := Health - HostileDamage(p, mix, Loc, Movement);
+            Inc(Worked[P], Movement);
+          Health := Health - HostileDamage(P, mix, Loc, Movement);
           Movement := 0;
         end
@@ -1425 +1425 @@
 end;
 
-function GetJobProgress(p, Loc: integer;
-  var JobProgressData: TJobProgressData): integer;
-var
-  Job, JobResult, uix: integer;
+function GetJobProgress(P, Loc: Integer;
+  var JobProgressData: TJobProgressData): Integer;
+var
+  Job, JobResult, uix: Integer;
 begin
   for Job := 0 to nJob - 1 do
   begin
-    JobResult := CalculateJobWork(p, Loc, Job, JobProgressData[Job].Required);
+    JobResult := CalculateJobWork(P, Loc, Job, JobProgressData[Job].Required);
     if JobResult = eOK then
     begin
@@ -1448 +1448 @@
     JobProgressData[Job].NextTurnPlus := 0;
   end;
-  for uix := 0 to RW[p].nUn - 1 do
-    if (RW[p].Un[uix].Loc = Loc) and (RW[p].Un[uix].Movement >= 100) then
-      inc(JobProgressData[RW[p].Un[uix].Job].NextTurnPlus,
-        RW[p].Un[uix].Movement);
-  result := eOK;
+  for uix := 0 to RW[P].nUn - 1 do
+    if (RW[P].Un[uix].Loc = Loc) and (RW[P].Un[uix].Movement >= 100) then
+      Inc(JobProgressData[RW[P].Un[uix].Job].NextTurnPlus,
+        RW[P].Un[uix].Movement);
+  Result := eOK;
 end;