Changeset 465

branches/highdpi/AI/StdAI/AI.pas

-              r349
+              r465
   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,
 …
   // 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;
 …
   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);
 …
   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;
 …
     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;
 …
     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;
 …
 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
 …
   begin
     LastResearchTech := -1;
     if PlayerHash[me] > 7 then
+    if PlayerHash[Me] > 7 then
       BehaviorFlags := bFemale
     else
 …
     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;
 …
 end;
 //-------------------------------
 //            RESEARCH
 //-------------------------------
 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
 …
 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);
 …
       begin
         Result := False;
         exit;
+        Exit;
       end;
     end;
 …
 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
 …
   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;
 …
   end;
   function LeaveOutsMissing(ad: integer): boolean;
+  function LeaveOutsMissing(ad: Integer): Boolean;
   var
     i: integer;
+    I: Integer;
   begin
     Result := False;
 …
         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;
 …
     Result := Barbarina_ChooseResearchAdvance;
     if Result >= 0 then
       exit;
+      Exit;
   end;
 …
       Result := ad;
   if Result >= 0 then
     exit;
+    Exit;
   if Data.BehaviorFlags and bBarbarina = 0 then
 …
       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;
 …
       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;
 …
         SetNewModelFeature(mcWeapons, 0);
         SetNewModelFeature(mcDefense, 3);
         exit;
+        Exit;
       end;
     end;
 …
       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;
 …
       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;
 …
         begin
           ok := True;
           break;
+          Break;
         end;
       if not ok then
 …
         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
 …
         begin
           Result := ad;
           exit;
+          Exit;
         end;
       end;
 …
     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;
 …
     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;
 …
 end;
 //-------------------------------
 //         TERRAFORMING
 …
   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
 …
   begin
     Value := 3 * 8 - 1;
     exit;
+    Exit;
   end; // better than any tile with 2 food
 …
       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
 …
       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
 …
     end;
   end;
   Server(sGetTileInfo, me, Loc, TileInfo);
+  Server(sGetTileInfo, Me, Loc, TileInfo);
   Value := TileInfo.Food * 8 + TileInfo.Prod * 2 + TileInfo.Trade;
   Map[Loc] := OldTile;
 …
 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
 …
   end;
   procedure ReserveCityRadius(Loc: integer);
+  procedure ReserveCityRadius(Loc: Integer);
   var
     V21, RadiusLoc: integer;
+    V21, RadiusLoc: Integer;
     Radius: TVicinity21Loc;
   begin
 …
   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
 …
       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
 …
           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
 …
                   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);
 …
 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
 …
     // rate possible new cities
     fillchar(CityScore, MapSize * sizeof(integer), 0);
+    FillChar(CityScore, MapSize * SizeOf(Integer), 0);
     for Loc := 0 to MapSize - 1 do
     begin
 …
         ((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;
 …
         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
 …
               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] +
 …
             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
 …
   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];
 …
   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
 …
           begin
             Started := True;
             break;
+            Break;
           end;
         if not Started then
 …
             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
 …
               begin
                 Inc(Happy, 2);
                 if RO.Wonder[woBach].EffectiveOwner = me then
+                if RO.Wonder[woBach].EffectiveOwner = Me then
                   Inc(Happy, 1);
               end;
 …
         end;
       end;
+end; // ProcessSettlers
+end;
 //-------------------------------
 …
 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;
 …
 begin
 {$IFDEF DEBUG}
   fillchar(DebugMap, sizeof(DebugMap), 0);
+  FillChar(DebugMap, SizeOf(DebugMap), 0);
 {$ENDIF}
 …
   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;
 …
     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;
 …
           begin
             AllHateMe := False;
             break;
+            Break;
           end;
       if AllHateMe then
 …
   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
 …
     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;
 …
     // 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
 …
   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
 …
   SetAdvanceValues;
 {$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);*)
 …
 {$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
 …
     end;
 end;
 {$ENDIF}
 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;
 …
         begin
           NewGender := -2;
           break;
+          Break;
         end; // ambiguous, don't change gender
         NewGender := bMale;
 …
 end;
 procedure TAI.SetAdvanceValues;
   procedure RateResearchAdv(ad, Time: integer);
+  procedure RateResearchAdv(ad, Time: Integer);
   var
     Value: integer;
+    Value: Integer;
   begin
     if Time = 0 then
 …
   end;
   procedure SetPreqValues(ad, Value: integer);
+  procedure SetPreqValues(ad, Value: Integer);
   begin
     if (RO.Tech[ad] < tsSeen) and (ad <> RO.ResearchTech) then
 …
   end;
   procedure RateImpPreq(iix, Value: integer);
+  procedure RateImpPreq(iix, Value: Integer);
   begin
     if (Value > 0) and (Imp[iix].Preq >= 0) then
 …
 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
 …
       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
 …
           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);
 …
       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;
 …
   // 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
 …
               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;
 …
 procedure TAI.AnalyzeMap;
 var
   cix, Loc, Loc1, V8, f1, p1: integer;
+  cix, Loc, Loc1, V8, f1, p1: Integer;
   Adjacent: TVicinity8Loc;
 begin
 …
   // 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
 …
   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
 …
       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);
 …
 procedure TAI.CollectModelCatStat;
 var
   i, uix, Cat, mix, Quality: integer;
+  I, uix, Cat, mix, Quality: Integer;
 begin
   // categorize models
 …
         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;
 procedure TAI.MoveUnitsHome;
 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
 …
           begin
             Result := True;
             exit;
+            Exit;
           end;
         end;
 …
   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
 …
           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;
 …
   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
 …
         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;
 …
       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
 …
               Reached[NextLoc] := True; // don't check moving there again
             csCheckTerritory:
               assert(False);
+              Assert(False);
           end;
       end;
 …
           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
 …
       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;
 …
               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
 …
         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;
 …
       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
 …
         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
 …
   // 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
 …
   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
 …
             Dec(UnitLack[District[Loc], ModelCat[mix]])
         end;
+end; // MoveUnitsHome
+procedure TAI.CheckAttack(uix: integer);
+end;
+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
 …
       AttackScore := -999999;
       AttackLoc := -1;
       fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       Pile.Create(MapSize);
       Pile.Put(Loc, $800 - Movement);
 …
         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
 …
     until Exhausted;
   end;
+end; // CheckAttack
+procedure TAI.Patrol(uix: integer);
+end;
+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
 …
           // assume a score of 50 is the best achievable
           or CaptureOnly and (TestTime >= $1000) then
           break;
+          Break;
         TestScore := 0;
 …
     until Exhausted;
   end;
 end; // Patrol
+end;
 procedure TAI.AttackAndPatrol;
 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
 …
               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
 …
           Patrol(uix);
       end;
+end; // AttackAndPatrol
+function TAI.HavePort: boolean;
+end;
+function TAI.HavePort: Boolean;
 var
   V8, cix, AdjacentLoc, f: integer;
+  V8, cix, AdjacentLoc, F: Integer;
   Adjacent: TVicinity8Loc;
 begin
 …
           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;
 …
       end;
 end;
 procedure TAI.SetCityProduction;
 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
 …
   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)
 …
       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;
 …
           Result := mix;
       end;
     assert(Count > 0);
+    Assert(Count > 0);
   end;
 …
   // 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
 …
       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
 …
         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
 …
       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
 …
 {    if (cixWorst>=0)
       and (Share-CityResult[cixWorst]*2>=Total*MilProdShare div 100) then
       MilProdCity[cixWorst]:=false;}
+      MilProdCity[cixWorst]:=False;}
     end;
 …
     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
 …
   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
 …
 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
 …
                     begin
                       TryBuild(imHarbor);
                       break;
+                      Break;
                     end;
                   end;
 …
               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
 …
           // 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
 …
   ChangeHomeCities;
+end; // SetCityProduction
+function TAI.ChooseGovernment: integer;
+end;
+function TAI.ChooseGovernment: Integer;
 begin
   if Data.BehaviorFlags and bBarbarina <> 0 then
 …
 end;
 //-------------------------------
 //           DIPLOMACY
 //-------------------------------
 function TAI.MostWanted(Nation, adGiveAway: integer): integer;
+function TAI.MostWanted(Nation, adGiveAway: Integer): Integer;
 var
   ad: integer;
+  ad: Integer;
 begin
   Result := -1;
 …
 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;
 …
     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
 …
 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;
 …
     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;
 …
 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
 …
   begin
     Barbarina_DoNegotiation;
     exit;
+    Exit;
   end;
 …
   begin
     Barbarina_DoCheckNegotiation;
     exit;
+    Exit;
   end;
 …
       (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
 …
         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
 …
         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;
     end;
   end;
+end; // Negotiation
+end;
 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;
 …
 var
   ad: integer;
+  ad: Integer;
 begin
   FillChar(LeaveOutValue, SizeOf(LeaveOutValue), $FF);
 …
 initialization
   RWDataSize := sizeof(TPersistentData);
+  RWDataSize := SizeOf(TPersistentData);
   SetLeaveOutValue;

branches/highdpi/AI/StdAI/Barbarina.pas

-              r349
+              r465
 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;
 …
 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;
 …
   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,
 …
 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;
 …
 // 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;
 …
         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
 …
 end;
 function TBarbarina.Barbarina_Go: boolean;
+function TBarbarina.Barbarina_Go: Boolean;
 begin
   if IsResearched(adMassProduction) then
 …
     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
 …
 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
 …
           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
 …
       begin
         mixBest[ctSeaTrans] := mix;
         break;
+        Break;
       end;
 end;
 …
 // 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
 …
     begin
       BestScore := 0;
       fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       MoveStyle := GetMyMoveStyle(mix, Health);
       Pile.Create(MapSize);
 …
 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;
 …
     else
       Kind := 0;
     fillchar(Reached, MapSize, False);
+    FillChar(Reached, MapSize, False);
     AttackPositionReached := False;
     MoveStyle := GetMyMoveStyle(mix, Health);
 …
     begin
       if (TestTime >= $800) or (AttackLoc = maNextCity) and (TestTime > $800 - 100) then
         break;
+        Break;
       Reached[TestLoc] := True;
       V8_to_Loc(TestLoc, Adjacent);
 …
           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
 …
           begin
             AttackPositionReached := True;
             break;
+            Break;
           end
           else if not Reached[NextLoc] then
 …
       begin
         PreLoc[NextLoc] := TestLoc;
         break;
+        Break;
       end;
     end;
     Pile.Free;
     if not AttackPositionReached then
       exit;
+      Exit;
     TestLoc := AttackLoc;
 …
     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);
 …
 end;
 function TBarbarina.ProcessMove(uix: integer): boolean;
+function TBarbarina.ProcessMove(uix: Integer): Boolean;
   // return true if no new enemy spotted
 const
 …
   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
 …
         if Map[Loc] and fCity = 0 then
           Unit_MoveEx(uix, maNextCity);
         exit;
+        Exit;
       end;
 …
           // 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;
 …
               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]
 …
         end;
         if PatrolLoc = Loc then
           exit;
+          Exit;
         TestLoc := PatrolLoc;
         NextLoc := PreLoc[TestLoc];
 …
             Result := MoveResult and rEnemySpotted = 0;
             done := True;
             break;
           end;
           assert(Loc = NextLoc);
+            Break;
+          end;
+          Assert(Loc = NextLoc);
         end;
         if Loc >= 0 then
 …
   if Result then
     Moved[uix] := True;
 end; // ProcessMove
+end;
 procedure TBarbarina.AttackAndPatrol;
 …
   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
 …
   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;
 …
             (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;
 …
         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;
 …
       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;
 …
   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
 …
             Unit_Step(uix1, ToLoc);
             UnitPresence[ToLoc] := UnitPresence[ToLoc] or Kind;
             break;
+            Break;
           end;
     end;
 …
   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
 …
         FastUnloadLoc := -1;
         EndLoc := -1;
         fillchar(Reached, MapSize, False);
+        FillChar(Reached, MapSize, False);
         Pile.Create(MapSize);
         Pile.Put(Loc, $800 - Movement);
 …
               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
 …
         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
 …
         begin
           Moved[uix] := False;
           exit;
+          Exit;
         end
       until False;
 …
 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
 …
       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
 …
       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
 …
       end;
       if not BackToStart then
         break;
+        Break;
       for uix := 0 to RO.nUn - 1 do
 …
             euixBest := euix;
         if euixBest < 0 then
           break;
+          Break;
         uix := uixAttack[euixBest];
         AttackLoc := RO.EnemyUn[euixBest].Loc;
 …
             begin
               BackToStart := True;
               break;
+              Break;
             end
   until not BackToStart;
 end; // AttackAndPatrol
+end;
 procedure TBarbarina.Barbarina_SetCityProduction;
 …
 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;
 …
         begin
           Result := True;
           exit;
+          Exit;
         end;
       end;
 …
   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
 …
       begin
         Result := iix;
         exit;
+        Exit;
       end;
     end;
 …
 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;
 …
   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
 …
       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;
 …
               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;
 …
           (LowPriority(cix) = DoLowPriority) then
         begin
           f := Formation[Loc];
+          F := Formation[Loc];
           IsCoastal := False;
           IsPort := False;
 …
               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;
 …
             (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
 …
               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
 …
           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) *
 div 3) then
             City_RebuildImprovement(cix, imTownHall)
 …
                 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
 …
       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
 …
         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;
 …
     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
 …
       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
 …
     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
 …
 begin
   if RO.Tech[adTheRepublic] >= tsSeen then
     exit; // default reaction
+    Exit; // default reaction
   if MyLastAction = scContact then
   begin
 …
 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
 …
       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
 …
                     NegoCause := CancelTreaty;
                     Result := True;
                     exit;
+                    Exit;
                   end;
                 end;
 …
 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
 …
               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
 …
                   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
 + ((MyCity[ColonyShipPlan[part].cixProducing].ID shr 12) +
 - me) and $F;
+- Me) and $F;
                     if TestValue <= BestValue then
                       ok := False;
 …
     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;
 …
       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
 …
                       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;

branches/highdpi/AI/StdAI/CustomAI.pas

-              r303
+              r465
   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;
 …
     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;
 …
     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;
 …
   Server: TServerCall;
   G: TNewGameData;
   RWDataSize, MapSize: integer;
   decompose24: cardinal;
   nodata: pointer;
+  RWDataSize, MapSize: Integer;
+  decompose24: Cardinal;
+  nodata: Pointer;
 const
 …
 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;
 …
 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;
 …
 // calculate
 push ecx
 div byte ptr [G]
+div Byte ptr [G]
 xor ebx,ebx
 mov bl,ah  // ebx:=Loc0 mod G.lx
 …
 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
 …
 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
 …
 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
 …
 {$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;
 …
 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;
 …
 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;
 …
 procedure Init(NewGameData: TNewGameData);
 {$IFDEF DEBUG}var
   Loc: integer;
+  Loc: Integer;
 {$ENDIF}
 begin
 …
 {$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;
 …
 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
 …
     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
 …
           NewGov := ChooseGovernment;
           if NewGov > gAnarchy then
             Server(sSetGovernment, me, NewGov, nodata^);
+            Server(sSetGovernment, Me, NewGov, nodata^);
         end;
         HaveTurned := False;
 …
         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
 …
         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
 …
         end
         else
           break;
+          Break;
       until False;
       if RO.Happened and phTech <> 0 then
 …
             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:
 …
       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:
 …
 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;
 …
 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;
 …
 procedure TCustomAI.StealAdvance;
 var
   Steal, ad, Count: integer;
+  Steal, ad, Count: Integer;
 begin
   Steal := ChooseStealAdvance;
 …
   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;
 …
 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;
 …
 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;
 …
 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}
 …
     Advice.MoreTurns := 9999;
     Advice.MaxHostile_MovementLeft := 100;
     Result := Server(sGetMoveAdvice, me, uix, Advice);
+    Result := Server(sGetMoveAdvice, Me, uix, Advice);
   end;
   if Result = eOk then
 …
         begin
           DestinationReached := True;
           break;
+          Break;
         end // stop next to destination
         else if Step = Advice.nStep then
 …
       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
 …
 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!
 …
 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;
 …
 // 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;
 …
     with MyUnit[uix] do
     begin
       BattleForecast.pAtt := me;
+      BattleForecast.pAtt := Me;
       BattleForecast.mixAtt := mix;
       BattleForecast.HealthAtt := Health;
 …
       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
 …
 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;
 …
     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
 …
 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
 …
 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
 …
 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
 …
 end;
 function TCustomAI.City_CurrentUnitProject(cix: integer): integer;
+function TCustomAI.City_CurrentUnitProject(cix: Integer): Integer;
 begin
   if MyCity[cix].Project and cpImp <> 0 then
 …
 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;
 …
   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;
 …
 // 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;

branches/highdpi/AI/StdAI/CustomAI_Reload.pas

-              r210
+              r465
 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;
 …
   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;
 …
   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;
 …
 Server: TServerCall;
 G: TNewGameData;
 RWDataSize, MapSize: integer;
 decompose24: cardinal;
 nodata: pointer;
+RWDataSize, MapSize: Integer;
+decompose24: Cardinal;
+nodata: Pointer;
 const
 …
 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);
 …
 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
 …
 // calculate
 push ecx
 div byte ptr [G]
+div Byte ptr [G]
 xor ebx,ebx
 mov bl,ah  // ebx:=Loc0 mod G.lx
 …
 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
 …
 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
 …
 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
 …
 {$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;
 …
 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;
 …
   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
 …
 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;
 …
 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);
 …
       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;
 …
 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;
 …
 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
 …
   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
 …
         NewGov:=ChooseGovernment;
         if NewGov>gAnarchy then
           Server(sSetGovernment,me,NewGov,nodata^);
+          Server(sSetGovernment,Me,NewGov,nodata^);
         end;
       HaveTurned:=false;
+      HaveTurned:=False;
       Contacted:=[];
       end;
 …
       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:=[];
 …
       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
 …
         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:
 …
     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:
 …
 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;
 …
 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}
 …
 procedure TCustomAI.StealAdvance;
 var
 Steal, ad, count: integer;
+Steal, ad, count: Integer;
 begin
 Steal:=ChooseStealAdvance;
 …
   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}
 …
   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
 …
           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;
 …
   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
 …
   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
 …
   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
 …
   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;

branches/highdpi/AI/StdAI/Pile.pas

-              r303
+              r465
 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;
 …
 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;
 …
 begin
         {$IFDEF DEBUG}
   assert(InUse);
+  Assert(InUse);
   InUse := False;
 {$ENDIF}
 …
 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;
 …
   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;
 …
 initialization
   n := 0;
+  N := 0;
   CurrentSize := 0;
         {$IFDEF DEBUG}

branches/highdpi/AI/StdAI/Protocol.pas

-              r349
+              r465
   Cost: Integer;
   Maint: Integer;
   Expiration: integer;
+  Expiration: Integer;
 end
 = ((Kind: ikWonder; Preq: adMathematics; Cost: 400; Maint: 0;
 …
   Strength: Integer;
   Trans: Integer;
   Cost: integer;
+  Cost: Integer;
 end
 = (((Preq: adWarriorCode; Strength: 4; Trans: 0; Cost: 3),
 …
   TGetCityData = record
     Owner: Integer;
     c: TCity;
+    C: TCity;
   end;
 …
   TCreateUnitData = record
     Loc: Integer;
     p: Integer;
+    P: Integer;
     mix: Integer;
   end;
 …
   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;
 …
 , 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,
 …
   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;
 …
 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;
 …
   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])
 …
 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;

branches/highdpi/AI/StdAI/StdAI.ai.txt

-              r124
+              r465
 #PATH_WIN32 StdAI-win32.dll
 #PATH_WIN64 StdAI-win64.dll
+#PATH_LINUX32 libstdai-i386.so
+#PATH_LINUX64 libstdai-amd64.so
+#PATH_LINUX_I386 libstdai-i386.so
+#PATH_LINUX_AMD64 libstdai-amd64.so
+#PATH_LINUX_ARM32 libstdai-arm32.so
+#PATH_LINUX_ARM64 libstdai-arm64.so
 #CREDITS Standard AI by Steffen Gerlach.

branches/highdpi/AI/StdAI/StdAI.lpr

-              r303
+              r465
 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
 …
 {$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:

branches/highdpi/AI/StdAI/ToolAI.pas

-              r349
+              r465
 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;
 …
   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
 …
     // 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)
 …
     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;
 …
     // 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
 …
     // 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
 …
     // 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;
 …
     // - 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:
 …
     // function returns false if no more transports are possible
+    function CurrentMStrength(Domain: integer): integer;
+  end;
+    function CurrentMStrength(Domain: Integer): Integer;
+  end;
 const
 …
   mxAdjacent = $00000001;
+var
+  nContinent, nOcean, nDistrict: integer;
+  Formation: array[0..lxmax * lymax - 1] of integer;
+var
+  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
 implementation
 …
 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
 …
 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
 …
 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;
 …
     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;
 …
       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
 …
   ScienceSum := 0;
   if RO.Government = gAnarchy then
     exit;
+    Exit;
   for p1 := 0 to nPl - 1 do
     if RO.Tribute[p1] <= RO.TributePaid[p1] then
 …
 end;
 //------------------------------------------------------------------------------
 // City Tiles Processing
 …
 procedure TToolAI.OptimizeCityTiles;
 var
   cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RO.nCity - 1 do
 …
 procedure TToolAI.GetCityProdPotential;
 var
   cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
 …
       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;
 …
 procedure TToolAI.GetCityTradePotential;
 var
   cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
 …
       begin
         Advice.ResourceWeights := rwMaxScience;
         Server(sGetCityTileAdvice, me, cix, Advice);
+        Server(sGetCityTileAdvice, Me, cix, Advice);
         CityResult[cix] := Advice.CityReport.Trade;
       end;
 end;
 //------------------------------------------------------------------------------
 …
 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
 …
 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;
 …
 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
 …
         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
 …
                   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
 …
             ((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;
 …
           Unit_StartJob(uix, TileJob[JobLocOfSettler[uix]]);
       end;
+end; // JobAssignment_Go
+end;
 //------------------------------------------------------------------------------
 …
 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
 …
               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;
 …
         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
 …
   end;
 end;
 //------------------------------------------------------------------------------
 …
 // 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
 …
       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);
 …
       begin
         Result := Speed;
         if RO.Wonder[woMagellan].EffectiveOwner = me then
+        if RO.Wonder[woMagellan].EffectiveOwner = Me then
           Inc(Result, 200);
         if Health < 100 then
 …
 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)));
 …
                 if ToTile and fPeace <> 0 then
                   Result := csCheckTerritory;
                 exit;
+                Exit;
               end;
             end;
 …
           begin
             Result := csForbiddenTile;
             exit;
+            Exit;
           end;
         end
 …
               // must wait for next turn
               Result := csOk;
               exit;
+              Exit;
             end;
           end;
 …
       Result := csForbiddenTile;
   end;
 end; // CheckStep
+end;
 (*
 -------- 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);
 …
   // 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
 …
           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
 …
 *)
 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);
 …
       begin
         Result := MoveResult;
         break;
+        Break;
       end;
     end;
 …
 end;
 //------------------------------------------------------------------------------
 // Oversea Transport
 …
 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;
 …
 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
 …
 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;
 …
 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
 …
 end;
 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
 …
         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;
 …
           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];
 …
               Inc(TransportPlan.nLoad);
               if TransportPlan.nLoad = TransportCapacity then
                 break;
+                Break;
             end;
           end;
           Result := True;
           exit;
+          Exit;
         end;
       end;
 …
   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
 …
         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
 …
       Result := False;
       Pile.Free;
       exit;
+      Exit;
     end;
     while Pile.Get(Loc0, Time0) do
 …
     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;
 …
     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);
 …
             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;
 …
           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
 …
             if StartLocPtr <> ArrivedEnd then
             begin
               Loc0 := (integer(StartLocPtr) - integer(@Arrived)) shr 2;
+              Loc0 := (Integer(StartLocPtr) - Integer(@Arrived)) shr 2;
               Inc(StartLocPtr);
               Time0 := $800;
 …
               if IsFirstLoc then
                 ContinueUnit := ContinueUnit and not (1 shl tuix);
               break;
+              Break;
             end;
             IsFirstLoc := False;
 …
             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;
 …
                 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
 …
         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]] :=
 …
         end;
       Result := True;
       exit;
+      Exit;
     end;
 …
     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];
 …
 end;
 //------------------------------------------------------------------------------
 // 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
 …
 end;
 //------------------------------------------------------------------------------
 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;
 …
     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;

branches/highdpi/Back.lfm

-              r246
+              r465
   Caption = 'C-evo'
   Color = clBlack
+  DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
+  Font.Height = -30
   Font.Name = 'MS Sans Serif'
   OnClose = FormClose
 …
   OnPaint = FormPaint
   OnShow = FormShow
+  LCLVersion = '1.6.2.0'
+  WindowState = wsMaximized
+  PixelsPerInch = 96
+  ShowInTaskBar = stNever
+  LCLVersion = '2.2.0.4'
   Scaled = False
+  WindowState = wsFullScreen
 end

branches/highdpi/Back.pas

-              r349
+              r465
 begin
   if Assigned(Img) then
     DpiBitCanvas(Canvas, DpiScreen.Width - Img.Width - (DpiScreen.Width - 800) *
+    DpiBitBltCanvas(Canvas, DpiScreen.Width - Img.Width - (DpiScreen.Width - 800) *
 div 8, (DpiScreen.Height - 600) div 3, Img.Width, Img.Height,
       Img.Canvas, 0, 0);
 …
       if FileExists(FileName) then begin
         Img := TDpiBitmap.Create;
+        LoadGraphicFile(img, FileName);
+        LoadGraphicFile(Img, FileName);
+        Repaint;
       end;
     end;

branches/highdpi/Brain.pas

-              r464
+              r465
+unit UBrain;
+{$mode delphi}
+unit Brain;
 interface
 uses
+  UDpiControls, Classes, SysUtils, fgl, Graphics, Protocol, LazFileUtils, dynlibs;
+  UDpiControls, Classes, SysUtils, Generics.Collections, Graphics, Protocol, LazFileUtils,
+  dynlibs, Types;
 const
 …
     Picture: TDpiBitmap;
     Beginner: Boolean;
+    procedure LoadPicture;
     procedure LoadFromFile(AIFileName: string);
     constructor Create;
 …
   { TBrains }
   TBrains = class(TFPGObjectList<TBrain>)
+  TBrains = class(TObjectList<TBrain>)
     function AddNew: TBrain;
     function GetKindCount(Kind: TBrainType): Integer;
     procedure GetByKind(Kind: TBrainType; Brains: TBrains);
     function GetBeginner: TBrain;
+    procedure LoadPictures;
   end;
 …
 uses
   ScreenTools;
+  ScreenTools, Directories;
 { TBrain }
+procedure TBrain.LoadPicture;
+var
+  TextSize: TSize;
+begin
+  if not LoadGraphicFile(Picture, GetAiDir + DirectorySeparator +
+    FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
+    with Picture.Canvas do begin
+      Brush.Color := $904830;
+      FillRect(Rect(0, 0, 64, 64));
+      Font.Assign(UniFont[ftTiny]);
+      Font.Style := [];
+      Font.Color := $5FDBFF;
+      TextSize := TextExtent(FileName);
+      TextOut(32 - TextSize.Width div 2, 32 - TextSize.Height div 2, FileName);
+    end;
+  end;
+end;
 procedure TBrain.LoadFromFile(AIFileName: string);
 …
       DLLName := BasePath + DirectorySeparator + Value
     {$ENDIF}{$ENDIF}
+    {$IFDEF LINUX}{$IFDEF CPU32}
+    else if Key = '#PATH_LINUX32' then
+      DLLName := BasePath + DirectorySeparator + Value
+    {$ENDIF}{$ENDIF}
+    {$IFDEF LINUX}{$IFDEF CPU64}
+    else if Key = '#PATH_LINUX64' then
+    {$IFDEF UNIX}{$IFDEF CPUI386}
+    else if Key = '#PATH_LINUX_I386' then
+      DLLName := BasePath + DirectorySeparator + Value
+    {$ENDIF}{$ENDIF}
+    {$IFDEF UNIX}{$IFDEF CPUAMD64}
+    else if Key = '#PATH_LINUX_AMD64' then
+      DLLName := BasePath + DirectorySeparator + Value
+    {$ENDIF}{$ENDIF}
+    {$IFDEF UNIX}{$IFDEF CPUARM}
+    else if Key = '#PATH_LINUX_ARM32' then
+      DLLName := BasePath + DirectorySeparator + Value
+    {$ENDIF}{$ENDIF}
+    {$IFDEF UNIX}{$IFDEF CPUAARCH64}
+    else if Key = '#PATH_LINUX_ARM64' then
       DLLName := BasePath + DirectorySeparator + Value
     {$ENDIF}{$ENDIF}
 …
 end;
+procedure TBrains.LoadPictures;
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+    with Items[I] do LoadPicture;
+end;
 end.

branches/highdpi/CityProcessing.pas

-              r349
+              r465
 // 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
 …
 procedure ReleaseGame;
 implementation
 type
   TTradeProcessing = record
+    TaxBonus, LuxBonus, ScienceBonus, FutResBonus, ScienceDoubling,
+      HappyBase: integer;
+    RelCorr: single;
+    FlexibleLuxury: boolean;
+    TaxBonus: Integer;
+    LuxBonus: Integer;
+    ScienceBonus: Integer;
+    FutResBonus: Integer;
+    ScienceDoubling: Integer;
+    HappyBase: Integer;
+    RelCorr: Single;
+    FlexibleLuxury: Boolean;
   end;
   TProdProcessing = record
+    ProdBonus, PollBonus, FutProdBonus, PollThreshold: integer;
+    ProdBonus: Integer;
+    PollBonus: Integer;
+    FutProdBonus: Integer;
+    PollThreshold: Integer;
   end;
 …
   TCityReportEx = record
+    BaseHappiness, BaseControl, Material: integer;
+    BaseHappiness: Integer;
+    BaseControl: Integer;
+    Material: Integer;
     ProdProcessing: TProdProcessing;
     TradeProcessing: TTradeProcessing;
 …
 var
   MaxDist: integer;
+  {
     Reporting
     ____________________________________________________________________
+  }
 procedure GetCityAreaInfo(p, Loc: integer; var CityAreaInfo: TCityAreaInfo);
 var
   V21, Loc1, p1: integer;
+  MaxDist: Integer;
+{
+  Reporting
+  ____________________________________________________________________
+}
+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
 …
       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
           Available[V21] := faNotAvailable
         else
           Available[V21] := faAvailable
       end
     end;
   end
 end;
 function CanCityGrow(p, cix: integer): boolean;
 begin
   with RW[p].City[cix] do
     result := (Size < MaxCitySize) and
+          Available[V21] := faAvailable;
+      end;
+    end;
+  end;
+end;
+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;
 …
 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;
 …
     Poll := 0
   else
     dec(Poll, ProdProcessing.PollThreshold);
+    Dec(Poll, ProdProcessing.PollThreshold);
   if ProdProcessing.FutProdBonus > 0 then
     Prod := BaseProd * (100 + ProdProcessing.ProdBonus * 50 +
 …
 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;
 …
       RelCorr := 1.0;
     HappyBase := Size + HappinessBeforeLux;
   end
 end;
 procedure SplitTrade(Trade, TaxRate, LuxRate, Working: integer;
+  end;
+end;
+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);
 …
 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;
         Control := Size
+        Control := Size;
       end // !!! old bug, kept for compatibility
       else
       begin
         Happy := 0;
         Control := 0
+        Control := 0;
       end;
 …
           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:
 …
             BaseHappiness := 0; // done by control
             Happy := Size;
             Control := Size
+            Control := Size;
           end;
       end;
       // 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);
 …
           // 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
 …
     end;
   end;
   result := eOk;
 end; { GetSmallCityReport }
 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;
 …
     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;
 …
     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;
 …
   ____________________________________________________________________
+}
 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);
 …
       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;
 …
             SelectedLoc := Loc1;
             SelectedV21 := V21;
             Most := Resources
           end
         end
       end
     end;
   end;
 end;
 procedure NextWorst(p, cix: integer; var SelectedLoc, SelectedV21: integer);
+            Most := Resources;
+          end;
+        end;
+      end;
+    end;
+  end;
+end;
+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;
 …
   SelectedLoc := -1;
   SelectedV21 := -1;
   with RW[p].City[cix] do
+  with RW[P].City[cix] do
   begin
     V21_to_Loc(Loc, Radius);
 …
         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;
 …
             SelectedLoc := Loc1;
             SelectedV21 := V21;
             Least := Resources
           end
         end;
       end
   end
 end;
 function NextPoll(p, cix: integer): integer;
 var
   Resources, Best, dx, dy, Loc1, Dist, BestDist, V21, pTerr: integer;
+            Least := Resources;
+          end;
+        end;
+      end;
+  end;
+end;
+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);
 …
         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;
 …
             then
             begin
               result := Loc1;
+              Result := Loc1;
               Best := Resources;
               BestDist := Dist;
 …
 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
     end
 end;
 procedure CityGrowth(p, cix: integer);
 var
   TileLoc, V21: integer;
+      UsedByCity[TileLoc] := Loc;
+    end;
+end;
+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 }
 …
       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
       end
     end;
   end
 end;
 procedure CityShrink(p, cix: integer);
 var
   TileLoc, V21, Working: integer;
+        UsedByCity[TileLoc] := Loc;
+      end;
+    end;
+  end;
+end;
+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
+      UsedByCity[TileLoc] := -1;
     end
     else { test whether exploitation of tile would lead to disorder }
 …
       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
       end
     end;
   end
 end;
 procedure Pollute(p, cix: integer);
 var
   PollutionLoc: integer;
 begin
   with RW[p].City[cix] do
+        UsedByCity[TileLoc] := -1;
+      end;
+    end;
+  end;
+end;
+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
+    end;
   end;
 end;
 …
   ____________________________________________________________________
+}
 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;
 …
       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);
 …
       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 }
 …
           (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);
         Prod := CityProjectCost
+        Inc(Money, Prod - CityProjectCost);
+        Prod := CityProjectCost;
       end;
       if Production < 0 then
 …
       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;
 …
 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;
 …
     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)
       end
+          Dec(Food, CityStorage);
+        Inc(SizeMod);
+      end;
     end
     else if Food < 0 then { famine }
 …
       // 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;
 …
         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
 …
               if TestDet < Det then
               begin
                 uix := i;
                 Det := TestDet
+                uix := I;
+                Det := TestDet;
               end;
             end;
         if uix >= 0 then
         begin
           RemoveUnit_UpdateMap(p, uix);
           inc(Flags, chUnitLost);
         end
       end
+          RemoveUnit_UpdateMap(P, uix);
+          Inc(Flags, chUnitLost);
+        end;
+      end;
     end;
 …
       (GWonder[Project and cpIndex].CityID <> WonderNotBuiltYet) then
     begin
       inc(Flags, chOldWonder);
       DoProd := false;
+      Inc(Flags, chOldWonder);
+      DoProd := False;
     end;
 …
       (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
 …
               Exp := ExpCost * 2; { vet }
             if Project and cpConscripts <> 0 then
               Flags := Flags or unConscripts
+              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;
 …
       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
 …
       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;
 …
         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;
 …
           case NewImp of
             imGrWall:
               GrWallContinent[p] := Continent[Loc];
+              GrWallContinent[P] := Continent[Loc];
           end;
         end;
 …
         begin // wonder
           GWonder[NewImp].CityID := ID;
           GWonder[NewImp].EffectiveOwner := p;
+          GWonder[NewImp].EffectiveOwner := P;
           CheckExpiration(NewImp);
 …
             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
+              end;
           end;
         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;
 …
       end;
       Prod0 := Prod;
       inc(Flags, chProduction)
+      Inc(Flags, chProduction);
     end
     else
 …
     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)
       end;
   end
 end; // CityTurn
+        CityShrink(P, cix);
+        Inc(SizeMod);
+      end;
+  end;
+end;
+{
 …
   ____________________________________________________________________
+}
 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
 …
       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
 …
         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
 …
         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
             UsedByCity[Loc1] := -1 // unemploy tile
         end;
       Tiles := NewTiles
     end
   end;
 end;
 procedure GetCityTileAdvice(p, cix: integer; var Advice: TCityTileAdviceData);
+            UsedByCity[Loc1] := -1; // unemploy tile
+        end;
+      Tiles := NewTiles;
+    end;
+  end;
+end;
+procedure GetCityTileAdvice(P, cix: Integer; var Advice: TCityTileAdviceData);
 const
   oFood = 0;
 …
 type
   TTileData = record
+    Food, Prod, Trade, SubValue, V21: integer;
+  end;
+var
+  i, V21, Loc1, nHierarchy, iH, iT, iH_Switch, MinWorking, MaxWorking,
+    Food: Integer;
+    Prod: Integer;
+    Trade: Integer;
+    SubValue: Integer;
+    V21: Integer;
+  end;
+var
+  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;
 …
   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
 …
     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;
 …
   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
 …
           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
 …
               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;
 …
       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;
 …
       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
 …
         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
+      end;
     end;
 …
       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
 …
               (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)
 …
               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;
 …
         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
 …
     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;
 …
       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;
 …
         (ProdBeforeBoost < WantedProd)) do
       begin
         assert(nSelection[iH] = 0);
+        Assert(nSelection[iH] = 0);
         Take := MinWorking - TestReport.Working;
         if Take > nTile[iH] then
 …
           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,
 …
           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
 …
               then
               begin
                 inc(Output[oTax], Output[oFood]);
+                Inc(Output[oTax], Output[oFood]);
                 Output[oFood] := 0;
               end;
 …
               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;
 …
               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;
 …
               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
 …
                   TestReport.Lux shr 1;
                 Advice.CityReport := TestReport;
               end
             end // if (SuperPlus>0) or (ValuePlus>=0.0)
           end // if SuperPlus>=0
         end
+              end;
+            end; // if (SuperPlus>0) or (ValuePlus>=0.0)
+          end; // if SuperPlus>=0
+        end;
       end;
 …
         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
 …
           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;
 end; // GetCityTileAdvice
+end;
+{
 …
 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;

branches/highdpi/CmdList.pas

-              r361
+              r465
 uses
   Classes;
+  Classes, SysUtils, Math;
 const
   MaxDataSize = 1024;
+  CommandDataElementSize = 4;
+  CommandDataElementCountMask = $F;
+  CommandDataMaxSize = CommandDataElementSize * CommandDataElementCountMask;
 type
 …
     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
 …
   end;
+  function CommandWithData(Command: Integer; DataSize: Byte): Integer;
+resourcestring
+  SCommandDataSizeError = 'Command data size %d out of range (0-%d).';
 implementation
 …
 type
   TData = array [0 .. MaxDataSize - 1] of Cardinal;
+  TData = array [0..MaxDataSize - 1] of Cardinal;
   PData = ^TData;
+function CommandWithData(Command: Integer; DataSize: Byte): Integer;
+var
+  DataElementCount: Byte;
+begin
+  if DataSize > CommandDataMaxSize then
+    raise Exception.Create(Format(SCommandDataSizeError, [DataSize, CommandDataMaxSize]));
+  DataElementCount := Ceil(DataSize / CommandDataElementSize);
+  Result := Command or (DataElementCount and CommandDataElementCountMask);
+end;
 constructor TCmdList.Create;
 …
 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;
 …
   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);
 …
     end;
     if Command and $F = 0 then
+    if Command and CommandDataElementCountMask = 0 then
       Data := nil
     else
     begin
       Data := @LogData[FState.LoadPos];
       inc(FState.LoadPos, Command and $F * 4);
     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
 …
     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
 …
       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;
 …
     begin
       PutData(@FState.MoveCode, 3);
       FState.MoveCode := code;
+      FState.MoveCode := Code;
     end;
     FState.LastMovingUnit := Subject;
 …
     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);
     end;
   end;
   if Command and $F <> 0 then
     PutData(Data, Command and $F * 4);
 end;
 procedure TCmdList.PutDataChanges(Command, Player: integer;
   OldData, NewData: pointer; DataSize: integer);
+      PutData(@Code, 4);
+    end;
+  end;
+  if Command and CommandDataElementCountMask <> 0 then
+    PutData(Data, Command and CommandDataElementCountMask * CommandDataElementSize);
+end;
+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;
 …
     if LogPos + 4 * 32 > LogAlloc then
     begin
       inc(LogAlloc, LogGrow);
+      Inc(LogAlloc, LogGrow);
       ReallocMem(LogData, LogAlloc);
     end;
 …
       begin
         Cardinal((@LogData[LogPos])^) := PData(NewData)[b1];
         inc(LogPos, 4);
         inc(Map1, $80000000);
+        Inc(LogPos, 4);
+        Inc(Map1, $80000000);
       end;
     end;
 …
       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;
 …
 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;
 …
 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;
 …
   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
 ppppccc cccccccc ccccc010
   (c = Command, p = Player)
+  (C = Command, P = Player)
   Single Move:
   Byte2    Byte1    Byte0
 ss ssssssss ssaaa110
   (a = Direction, s = Subject)
+  (A = Direction, S = Subject)
   Move + Follow Move:
   Byte2    Byte1    Byte0
 bbb1ss 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
 ssssss ssssssbb b110aaa1
   (a = Direction 1, b = Direction 2, s = Subject 2)
+  (A = Direction 1, B = Direction 2, S = Subject 2)
   Single Follow Move:
   Byte0
 aaa1
   (a = Direction)
+  (A = Direction)
   Double Follow Move:
   Byte0
   bbb1aaa1
   (a = Direction 1, b = Direction 2)
+  (A = Direction 1, B = Direction 2)
+}

branches/highdpi/Database.pas

-              r349
+              r465
   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;
 …
   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;
 …
   // 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;
 …
   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 }
 …
   // 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;
 implementation
 …
 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
 …
       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
 …
       end
       else
         inc(uix);
+        Inc(uix);
     // compact city list
 …
       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
 …
       end
       else
         inc(cix);
+        Inc(cix);
     // compact enemy city list
 …
       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-}
 …
         for V21 := 1 to 26 do
           if Tiles and (1 shl V21) <> 0 then
             assert(UsedByCity[Radius[V21]] = Loc);
       end
+            Assert(UsedByCity[Radius[V21]] = Loc);
+      end;
 {$ENDIF}
   end;
 end; // CompactLists
+end;
+{
 …
   ____________________________________________________________________
+}
 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;
 …
           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:
 …
     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 -
 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;
 …
           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
 …
         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
 …
       for uix := 0 to RW[p1].nUn - 1 do
         if RW[p1].Model[RW[p1].Un[uix].mix].Kind = mkSlaves then
           RW[p1].Un[uix].Job := jNone
 end;
 procedure DiscoverTech(p, ad: integer);
   procedure TellAboutKeyTech(p, Source: integer);
+          RW[p1].Un[uix].Job := jNone;
+end;
+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;
         if Wonder = woPyramids then
           FreeSlaves
       end
+          FreeSlaves;
+      end;
 end;
 …
   ____________________________________________________________________
+}
 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) -
 …
 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!
 …
   VicinityLoc[5] := Loc0 - lx0 * 2;
   VicinityLoc[7] := Loc0 + 1;
   inc(Loc0, y0);
+  Inc(Loc0, y0);
   VicinityLoc[0] := Loc0 + lx0;
   VicinityLoc[2] := Loc0 + lx0 - 1;
 …
     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);
       end
     end
+        Inc(VicinityLoc[2], lx0);
+        Inc(VicinityLoc[4], lx0);
+      end;
+    end;
   end
   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;
 …
   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);
 …
       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;
 …
+}
 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 }
 …
 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 }
 …
 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;
 …
   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;
 …
 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]
 …
             ReplaceCont(Continent[Loc - 1], Continent[Loc], Loc);
         if Continent[Loc] = -1 then
           Continent[Loc] := Loc
       end
+          Continent[Loc] := Loc;
+      end;
     end;
   { 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;
 …
 // 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
 …
   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
 …
                 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
               end
+                  RareByArea[xBlock, yBlock] := Loc0;
+              end;
             end;
           end;
         end
+        end;
     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;
 …
   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
+          end;
         end;
     xworst := 0;
     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;
             Cnt := 1
+            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;
             end
+              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
 …
         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]);
+        end;
+  end;
+  for I := 0 to 11 do
+    for J := 0 to 11 do
+      Dist[I, J] := Distance(RareLoc[I], RareLoc[J]);
   ibest := 0;
 …
   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
                 end
               end
+                  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;
 …
     RareLoc[jbest] := -1;
   end;
 end; // RarePositions
 function CheckShore(Loc: integer): boolean;
 var
   Loc1, OldTile, V21: integer;
+end;
+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
 …
     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 }
 …
   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 }
 …
       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
 …
     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
 …
     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;
 …
   while plus < MapSize * LandMass * ShMountains div 10000 do
   begin
     dec(bMountains);
     inc(plus, ElCount[bMountains])
+    Dec(bMountains);
+    Inc(plus, ElCount[bMountains]);
   end;
   Count := plus;
 …
   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;
 …
           (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
         RealMap[Loc0] := fOcean
+        RealMap[Loc0] := fOcean;
     end;
 …
       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
 …
     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
 …
         Loc1 := CopyFrom[Loc1];
       RealMap[Loc0] := RealMap[Loc0] and not fTerrain or
         RealMap[Loc1] and fTerrain
+        RealMap[Loc1] and fTerrain;
     end;
 …
           if Loc1 >= 0 then
             if RealMap[Loc1] and fTerrain < fGrass then
               inc(Count, 2)
+              Inc(Count, 2);
         end;
       end;
       if Count >= 4 then
         RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie
+        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie;
     end;
 …
         if Loc1 >= 0 then
           if RealMap[Loc1] and fTerrain <> fDesert then
             inc(Count)
+            Inc(Count);
       end;
       if Count >= 4 then
         RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie
+        RealMap[Loc0] := RealMap[Loc0] and not fTerrain or fPrairie;
     end;
   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;
 …
   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;
 …
 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
 …
   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 }
 …
     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 }
 …
         if p1 < nAlive + 1 then
           sc[p1] := sc[p1 - 1];
         dec(p1)
+        Dec(p1);
       end;
       if p1 < nAlive + 1 then
 …
   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;
 …
   CountGood := cgBest;
   repeat
     dec(MinGood);
+    Dec(MinGood);
     if (MinGood = 3) and (CountGood < cgLand) then // too demanding!
     begin
       inc(CountGood);
       MinGood := 6
+      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;
 …
               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;
 …
     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
+              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;
 …
         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
 …
         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;
 …
     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];
 …
           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;
       end;
     end;
 end; { StartPositions }
 procedure PredefinedStartPositions(Human: integer);
+end;
+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
 …
       StartLoc0[nStartLoc0] := StartLoc0[nPrefStartLoc0];
       StartLoc0[nPrefStartLoc0] := Loc1;
       inc(nPrefStartLoc0);
       inc(nStartLoc0);
+      Inc(nPrefStartLoc0);
+      Inc(nStartLoc0);
       RealMap[Loc1] := RealMap[Loc1] and not fPrefStartPos;
     end
 …
     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;
   SaveMapCenterLoc := StartLoc[0];
 end; { PredefinedStartPositions }
+end;
 procedure InitGame;
 var
   i, p, p1, uix, Loc1: integer;
+  I, P, p1, uix, Loc1: Integer;
 begin
   {$IFDEF FastContact}
 …
     if RealMap[Loc1] and fterrain>=fGrass then
     if Delphirandom(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRoad
     else if Delphirandom(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRR;
+    else if Delphirandom(3)=0 then RealMap[Loc1]:=RealMap[Loc1] or fRR;}
     {random Road and Railroad }
   { !!!for Loc1:=0 to MapSize-1 do
 …
   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);
 …
           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;
 …
           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 *
 …
             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
 …
   // 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;
 …
   TerritoryCount[nPl] := MapSize;
   // fillchar(NewContact, sizeof(NewContact), false);
 end; // InitGame
+end;
 procedure InitRandomGame;
 …
   CalculatePrimitive;
   CreateElevation;
   CreateMap(false);
+  CreateMap(False);
   StartPositions;
   InitGame;
 end;
 procedure InitMapGame(Human: integer);
+procedure InitMapGame(Human: Integer);
 begin
   DelphiRandSeed := RND;
 …
 procedure ReleaseGame;
 var
   p1, p2: integer;
+  p1, p2: Integer;
 begin
   for p1 := 0 to nPl - 1 do
 …
 procedure InitMapEditor;
 var
   p1: integer;
+  p1: Integer;
 begin
   CalculatePrimitive;
 …
 end;
 procedure EditTile(Loc, NewTile: integer);
 var
   Loc1, V21: integer;
+procedure EditTile(Loc, NewTile: Integer);
+var
+  Loc1, V21: Integer;
   Radius: TVicinity21Loc;
 begin
 …
     if (NewTile and fTerImp = tiIrrigation) or (NewTile and fTerImp = tiFarm)
     then
       NewTile := NewTile and not fTerImp
+      NewTile := NewTile and not fTerImp;
   end;
   if (Terrain[NewTile and fTerrain].MineEff = 0) and
 …
       RealMap[Loc1] := RealMap[Loc1] or ($F shl 27);
       RW[0].Map[Loc1] := RealMap[Loc1] and $07FFFFFF or fObserved;
     end
+    end;
   end;
   // RealMap[Loc]:=RealMap[Loc] and not fSpecial;
 …
   ____________________________________________________________________
+}
 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;
 …
     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
 = lObserveSuper)) then
         cix := -1
 …
     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
 …
       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];
 …
       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
 …
         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
 …
     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; { GetTileInfo }
 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;
 …
     if PUn.Loc = Loc then
     begin
       inc(Cnt);
+      Inc(Cnt);
       if PUn.Master < 0 then
       begin
 …
           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
 …
         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
 …
 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
 …
   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
 …
         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;
 …
 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;
 …
 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
 …
 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;
 …
   mox: ^TModel;
 begin
   result := false;
+  Result := False;
   with RW[pTell] do
   begin
 …
         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;
 …
             (1 shl trPeace or 1 shl TrFriendlyContact) <> 0 then
             AddFlags := AddFlags or fPeace;
         end
+        end;
       end;
 …
           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
 …
             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
 …
                 if (Loc1 >= 0) and (Loc1 < MapSize) then
                   Map[Loc1] := Map[Loc1] or fInEnemyZoC
               end
+              end;
             end;
             if EnableContact and (mox.Domain = dGround) then
 …
             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
 …
           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
 …
     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
 …
       Cardinal(Level) shl (2 * pTell);
   end;
 end; // DiscoverTile
 function Discover9(Loc, p, Level: integer;
   TellAllied, EnableContact: boolean): boolean;
 var
   V9, Loc1, pTell, OldLevel: integer;
+end;
+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
 …
       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);
 …
       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;
 …
 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
 …
             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
 …
           begin
             RW[pTell].EnemyCity[ecix].Loc := -1;
             RW[pTell].Map[Loc] := RW[pTell].Map[Loc] and not fCity
+            RW[pTell].Map[Loc] := RW[pTell].Map[Loc] and not fCity;
           end;
         end;
 …
 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
 …
     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
 …
           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 }
 …
           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
 …
     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);
 …
         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;
             Break
+            Break;
           end;
         end;
 …
 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);
 …
           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;
 …
   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
 …
 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
 …
     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)
 …
 // 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;
 …
         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)
 …
         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!
 …
         (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
 …
   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
 …
         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
 …
       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
 …
               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;
 …
       then
       begin
         assert(OriginLoc <> -2); // test if border saving works
+        Assert(OriginLoc <> -2); // test if border saving works
         ChangeTerritory(Loc, NewOwner);
       end;
 …
 {$IFOPT O-} if OriginLoc <> -2 then
     CheckBorders(-2); {$ENDIF} // check: single pass should do!
 end; // CheckBorders
 procedure LogCheckBorders(p, cix, PlayerLosingCity: integer);
 begin
   CheckBorders(RW[p].City[cix].Loc, PlayerLosingCity);
   IntServer(sIntExpandTerritory, p, cix, BorderChanges);
+end;
+procedure LogCheckBorders(P, cix, PlayerLosingCity: Integer);
+begin
+  CheckBorders(RW[P].City[cix].Loc, PlayerLosingCity);
+  IntServer(sIntExpandTerritory, P, cix, BorderChanges);
 end;
 …
+}
 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;
 …
       begin
         Fuel := Model[mix].Cap[mcFuel];
         Flags := Flags or unBombsLoaded
+        Flags := Flags or unBombsLoaded;
       end;
       Job := jNone;
 …
       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;
     Flags := Flags and not(unFortified or unMountainDelay);
     Loc0 := Loc
+    Loc0 := Loc;
   end;
   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;
             Break
           end
+            ZoC := True;
+            Break;
+          end;
         end;
     if not Occ then
 …
 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;
 …
 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;
 …
     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);
 …
       (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
+          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
 …
         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
 …
       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
 …
     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);
 …
     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;
 …
 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
 …
         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;
 …
       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
 …
           fPoll) or RealMap[Loc] and (fTerrain or fSpecial or fTerImp or
           fRoad or fRR or fCanal or fPoll);
 end; // CompleteJob
+end;
+{
 …
   ____________________________________________________________________
+}
 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;
 …
     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];
 …
     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
 …
 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
 …
     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
 …
       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
 …
       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
 …
           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
 …
           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
 …
       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!
 …
 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
 …
         pSubject := Price shr 16 and $F;
         if pTarget = pSubject then
           result := false
+          Result := False
         else if pSender = pSubject then
         begin
           if execute then
             GiveCivilReport(pTarget, pSender)
+            GiveCivilReport(pTarget, pSender);
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfCivilReport < 0 then
           result := false
+          Result := False
         else if execute then
           CopyCivilReport(pSender, pTarget, pSubject);
 …
         pSubject := Price shr 16 and $F;
         if pTarget = pSubject then
           result := false
+          Result := False
         else if pSender = pSubject then
         begin
           if execute then
             GiveMilReport(pTarget, pSender)
+            GiveMilReport(pTarget, pSender);
         end
         else if RW[pSender].EnemyReport[pSubject].TurnOfMilReport < 0 then
           result := false
+          Result := False
         else if execute then
           CopyMilReport(pSender, pTarget, pSubject)
+          CopyMilReport(pSender, pTarget, pSubject);
       end;
     opMap:
 …
         begin // agreed treaty end
           if execute then
             CancelTreaty(pSender, pTarget, false)
+            CancelTreaty(pSender, pTarget, False);
         end
         else
 …
             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;
 …
     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
 …
         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
 …
       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
 …
       begin
         if execute then
           CopyModel(pSender, pTarget, Price - opModel)
+          CopyModel(pSender, pTarget, Price - opModel);
       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);
+  end;
+end;
+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
 …
       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;
 …
   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;
 …
   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:
 …
     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;
 …
   ____________________________________________________________________
+}
 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
 …
 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;
 …
           begin // make p1 and p2 know each other
             if RW[p1].Treaty[p2] = trNoContact then
               IntroduceEnemy(p1, p2)
+              IntroduceEnemy(p1, p2);
           end;
 …
       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;
 …
   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;
 …
   ____________________________________________________________________
+}
+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
 …
       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);
 …
       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;
 …
         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;
 …
       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;
 …
       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;
 …
       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);
             DiscoverViewAreas(Subject);
             Break
           end
+            Break;
+          end;
       end;
     sIntSetDevModel:
       if Mode < moPlaying then
         move(Data, RW[Player].DevModel.Kind, sIntSetDevModel and $F * 4);
+        Move(Data, RW[Player].DevModel.Kind, sIntSetDevModel and $F * 4);
     sIntSetModelStatus:
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetModelStatus P%d', [Player]);
         {$ENDIF}
         RW[Player].Model[Subject].Status := integer(Data);
+        RW[Player].Model[Subject].Status := Integer(Data);
       end;
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetUnitStatus P%d', [Player]);
         {$ENDIF}
         RW[Player].Un[Subject].Status := integer(Data);
+        RW[Player].Un[Subject].Status := Integer(Data);
       end;
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetCityStatus P%d', [Player]);
         {$ENDIF}
         RW[Player].City[Subject].Status := integer(Data);
+        RW[Player].City[Subject].Status := Integer(Data);
       end;
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('IntSetECityStatus P%d', [Player]);
         {$ENDIF}
+        RW[Player].EnemyCity[Subject].Status := integer(Data);
+      end;
+  end; { case command }
+end; { IntServer }
+        RW[Player].EnemyCity[Subject].Status := Integer(Data);
+      end;
+  end;
+end;
 end.

branches/highdpi/Direct.lfm

-              r246
+              r465
   Caption = 'C-evo'
   Color = clBtnFace
   DesignTimePPI = 125
+  DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   FormStyle = fsStayOnTop
 …
   OnPaint = FormPaint
   OnShow = FormShow
   LCLVersion = '1.8.0.6'
   PixelsPerInch = 96
+  ShowInTaskBar = stNever
+  LCLVersion = '2.2.6.0'
   Scaled = False
 end

branches/highdpi/Direct.pas

-              r405
+              r465
   UDpiControls, Messg,
   LCLIntf, LCLType, {$IFDEF Linux}LMessages, {$ENDIF}Messages, SysUtils, Classes,
+  LCLIntf, LCLType, {$IFDEF UNIX}LMessages, {$ENDIF}Messages, SysUtils, Classes,
   Graphics, Controls, Forms, DrawDlg, GameServer;
 …
     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;
 …
   DirectDlg: TDirectDlg;
 implementation
 uses
   ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, UNetworkServer,
   UNetworkClient;
+  ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, NetworkServer,
+  NetworkClient;
 {$R *.lfm}
 …
 //  hMem: Cardinal;
 //  p: pointer;
   s: string;
+  S: string;
 Begin
   case ID of
 …
       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:
 …
           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);
 …
         State := -1;
         Show;
+        {$IFDEF LINUX}
+        // Force shown window repaint on Gtk2 widgetset
+        Sleep(1);
+        DpiApplication.ProcessMessages;
+        {$ENDIF}
+        Gtk2Fix;
         Invalidate;
         Update;
 …
   BrainTerm.Name := Phrases.Lookup('HUMAN');
   if NetworkEnabled then begin
     BrainNetworkServer.Client := UNetworkServer.Client;
+    BrainNetworkServer.Client := NetworkServer.Client;
     BrainNetworkServer.Name := Phrases.Lookup('NETWORK_SERVER');
     BrainNetworkClient.Client := UNetworkClient.Client;
+    BrainNetworkClient.Client := NetworkClient.Client;
     BrainNetworkClient.Name := Phrases.Lookup('NETWORK_CLIENT');
   end;
 …
   begin
     PostMessage(Handle, WM_GO, 0, 0);
     Gone := true;
+    Gone := True;
   end;
 end;
 …
 procedure TDirectDlg.OnGo(var Msg: TMessage);
 var
   i: integer;
   s: string;
+  I: Integer;
+  S: string;
   FileName: string;
 begin
 …
     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;
 …
         Quick := True;
         if not LoadGame(ExtractFilePath(ParamStr(1)), ExtractFileName(ParamStr(1)
         ), -1, false) then begin
+        ), -1, False) then begin
           SimpleMessage(Phrases.Lookup('LOADERR'));
           Close;
 …
 procedure TDirectDlg.FormPaint(Sender: TObject);
 begin
   PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
+  PaintBackground(Self, 3, 3, ClientWidth - 6, ClientHeight - 6);
   Frame(Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
   Frame(Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,
 …
 end;
 procedure TDirectDlg.SetInfo(x: string);
 begin
   Info := x;
+procedure TDirectDlg.SetInfo(X: string);
+begin
+  Info := X;
   Invalidate;
   Update;
   {$IFDEF LINUX}
+  {$IFDEF UNIX}
   DpiApplication.ProcessMessages;
   {$ENDIF}
 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,
 , MainTexture);

branches/highdpi/GameServer.pas

-              r405
+              r465
 uses
   Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils,
   Graphics, UBrain, Global;
+  Protocol, Database, dynlibs, Platform, dateutils, LazFileUtils, Graphics,
+  Brain, Global;
 const
 …
   // 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 }
 …
 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;
 …
   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 }
 …
   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}
   end
+  end;
 end;
 …
 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
 …
     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
 …
 procedure Init(NotifyFunction: TNotifyFunction);
 var
   f: TSearchRec;
+  F: TSearchRec;
   BasePath: string;
   NewBrain: TBrain;
 …
 begin
   Notify := NotifyFunction;
   PreviewElevation := false;
+  PreviewElevation := False;
   PlayersBrain := TBrains.Create(False);
   PlayersBrain.Count := nPl;
 …
   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;
 …
         end else Brains.Delete(Brains.Count - 1);
     end;
   until FindNext(f) <> 0;
+  until FindNext(F) <> 0;
   FindClose(F);
 …
 end;
 function PreviewMap(lm: integer): pointer;
+function PreviewMap(lm: Integer): Pointer;
 begin
   lx := lxmax;
 …
   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;
 …
 // hand over control to other client (as specified by CC...)
 var
   p: integer;
+  P: Integer;
   T: TDateTime;
 begin
 …
     [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;
 …
 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;
 …
   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 }
 …
       else
       begin
         hm := LoadLibrary(pchar(DLLName));
+        hm := LoadLibrary(PChar(DLLName));
         if hm = 0 then
         begin
 …
     if @Client <> nil then
     begin
       Initialized := true;
+      Initialized := True;
       InitModuleData.Server := @Server;
       InitModuleData.DataVersion := 0;
 …
 procedure SaveMap(FileName: string);
 var
   i: integer;
+  I: Integer;
   MapFile: TFileStream;
   s: string[255];
+  S: string[255];
 begin
   MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
 …
   try
     MapFile.Position := 0;
     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);
     MapFile.write(ly, 4);
     MapFile.write(RealMap, MapSize * 4);
+    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);
+    MapFile.Write(ly, 4);
+    MapFile.Write(RealMap, MapSize * 4);
   finally
     FreeAndNil(MapFile);
 …
 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(lx, 4);
       MapFile.read(ly, 4);
+      MapFile.Read(I, 4); // MaxTurn
+      MapFile.Read(lx, 4);
+      MapFile.Read(ly, 4);
       ly := ly and not 1;
       if lx > lxmax then
 …
         ly := lymax;
       MapSize := lx * ly;
       MapFile.read(RealMap, MapSize * 4);
+      MapFile.Read(RealMap, MapSize * 4);
       for Loc1 := 0 to MapSize - 1 do
       begin
 …
             or fDesert;
       end;
       result := true;
+      Result := True;
     end;
     FreeAndNil(MapFile);
 …
 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;
   if auto and AutoSaveExists then // append to existing file
+  if Auto and AutoSaveExists then // append to existing file
     LogFile := TFileStream.Create(SavePath + FileName, fmOpenReadWrite or
       fmShareExclusive)
 …
   zero := 0;
   LogFile.Position := 0;
   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);
   LogFile.write(ly, 4);
   LogFile.write(LandMass, 4);
+  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);
+  LogFile.Write(ly, 4);
+  LogFile.Write(LandMass, 4);
   if LandMass = 0 then
     LogFile.write(MapField^, MapSize * 4);
   LogFile.write(MaxTurn, 4);
   LogFile.write(RND, 4);
   LogFile.write(GTurn, 4);
+    LogFile.Write(MapField^, MapSize * 4);
+  LogFile.Write(MaxTurn, 4);
+  LogFile.Write(RND, 4);
+  LogFile.Write(GTurn, 4);
   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
       LogFile.write(zero, 4)
+    LogFile.Write(SaveMap, ((MapSize - 1) div 4 + 1) * 4);
+  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;
   if auto and AutoSaveExists then
+  if Auto and AutoSaveExists then
     CL.AppendToFile(LogFile, AutoSaveState)
   else
     CL.SaveToFile(LogFile);
   FreeAndNil(LogFile);
   if auto then
+  if Auto then
   begin
     AutoSaveState := CL.State;
     AutoSaveExists := true;
+    AutoSaveExists := True;
   end
 end;
 …
 procedure StartGame;
 var
   i, p, p1, Human, nAlive, bixUni: integer;
+  I, P, p1, Human, nAlive, bixUni: Integer;
   Game: TNewGameData;
   // GameEx: TNewGameExData;
 …
   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;
 …
     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;
 …
   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;
 …
   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;
 …
         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;
 …
           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;
         { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2);{ }
+          RW[P].DefaultDebugMap := nil;
+        { !!!for i:=0 to nShipPart-1 do GShip[p].Parts[i]:=Delphirandom((3-i)*2); }
       end;
 …
   begin // random map
     InitRandomGame;
     PreviewElevation := false;
+    PreviewElevation := False;
     MapField := nil;
   end
 …
       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;
 …
   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
 …
         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
 …
       else
       begin { module no longer used -- unload }
         CallClient(i, cReleaseModule, nil^);
+        CallClient(I, cReleaseModule, nil^);
         if Kind = btAI then
         begin
 …
           Client := nil;
         end;
         Initialized := false;
+        Initialized := False;
       end;
   end;
 …
   CheckBorders(-1);
 {$IFOPT O-}InvalidTreatyMap := 0; {$ENDIF}
   AutoSaveExists := false;
+  AutoSaveExists := False;
   pDipActive := -1;
   pTurn := 0;
 …
   if Mode >= moMovie then
     Notify(ntEndInfo);
 end; { StartGame }
+end;
 procedure EndGame;
 var
   i, p1: integer;
+  I, p1: Integer;
 begin
   if LandMass = 0 then
 …
     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);
 …
 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
 …
           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;
 …
 procedure LogCityTileChanges;
 var
   cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RW[pTurn].nCity - 1 do
 …
 procedure NoLogCityTileChanges;
 var
   cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RW[pTurn].nCity - 1 do
 …
 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
 …
         // if SavedResourceWeights[cix]<>ResourceWeights then result:=true;
         if SavedTiles[cix] <> Tiles then
           result := true;
+          Result := True;
       end;
 end;
 …
 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 }
 …
 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;
 …
     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);
 …
     LogFile.Read(SaveMap, 4);
     if SaveMap[0] <> $80 then
       LogFile.read(SaveMap[4], ((MapSize - 1) div 4 + 1) * 4 - 4);
+      LogFile.Read(SaveMap[4], ((MapSize - 1) div 4 + 1) * 4 - 4);
     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]
 …
         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
 …
   end;
   FreeAndNil(LogFile);
   if not result then
+  if not Result then
     Exit;
 …
 {$IFDEF TEXTLOG}AssignFile(TextLog, SavePath + LogFileName + '.txt');
   Rewrite(TextLog); {$ENDIF}
   LoadOK := true;
+  LoadOK := True;
   StartGame;
   if MovieMode then
 …
     Notify(ntLoadBegin);
   started := false;
   StatRequest := false;
   MovieStopped := false;
+  started := False;
+  StatRequest := False;
+  MovieStopped := False;
 {$IFDEF LOADPERF}QueryPerformanceCounter(time_total0);
   time_a := 0;
 …
     begin
       GenerateStat(pTurn);
       StatRequest := false;
+      StatRequest := False;
     end;
     // complete all internal commands following an sTurn before generating statistics
 …
         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;
 …
     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}
 …
   Inform(pTurn);
   ChangeClientWhenDone(cResume, 0, nil^, 0);
 end; // LoadGame
+end;
 procedure InsertTerritoryUpdateCommands;
 var
   p1, Command, Subject: integer;
   Data: pointer;
+  p1, Command, Subject: Integer;
+  Data: Pointer;
   FormerCLState: TCmdListState;
 begin
 …
 procedure StartNewGame(const Path, FileName, Map: string;
   Newlx, Newly, NewLandMass, NewMaxTurn: integer);
+  Newlx, Newly, NewLandMass, NewMaxTurn: Integer);
 var
   I: Integer;
 …
 end;
 procedure DirectHelp(Command: integer);
+procedure DirectHelp(Command: Integer);
 begin
   InitBrain(BrainTerm);
 …
 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
 …
 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;
 …
   // 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
 …
         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);
 …
 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
 …
 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
 …
     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
 …
           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);
 …
   RW[pTurn].nEnemyUn := 0;
   MirBuilt := false;
+  MirBuilt := False;
   if (Difficulty[pTurn] > 0) and (GWinner = 0) then
     with RW[pTurn] do
 …
                   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
 …
       if Mode >= moMovie then
         FillChar(ShowShipChange, SizeOf(ShowShipChange), 0);
       TribeExtinct := true;
+      TribeExtinct := True;
       nUpdateLoc := 0;
       for cix := 0 to nCity - 1 do
 …
               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;
 …
                   UsedByCity[Loc1] := -1;
                   Flags := Flags or chSiege;
                   inc(SiegedTiles);
+                  Inc(SiegedTiles);
                 end;
               end;
 …
               if not AddBestCityTile(pTurn, cix) then
                 Break;
               dec(SiegedTiles);
+              Dec(SiegedTiles);
             end;
 …
               if CityTurn(pTurn, cix) then
                 TribeExtinct := false
+                TribeExtinct := False
               else
               begin // city is erased
 …
                 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;
 …
               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;
 …
       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;
 …
               Movement := UnitSpeed(pTurn, mix, Health); { refresh movement }
             assert(Loc >= 0);
+            Assert(Loc >= 0);
             if Model[mix].Kind <> mkDiplomat then
             begin // check treaty violation
 …
               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
 …
             end;
           end;
         exit
+        Exit;
       end;
 …
           DiscoverTech(pTurn, ResearchTech);
         dec(Research, Cost);
+        Dec(Research, Cost);
         Happened := Happened or phTech;
         ResearchTech := -1
+        ResearchTech := -1;
       end
       else if (ResearchTech = -2) and (nCity > 0) then
 …
             (Treaty[p1] >= trPeace) then
           begin
             inc(Credibility);
+            Inc(Credibility);
             Break;
           end;
 …
           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);
           end
+          end;
       end;
       if WinOnAlone and (GAlive and not(1 shl pTurn or 1) = 0) then
 …
           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
 …
   end;
   // CheckContact;
 end; { BeforeTurn }
+end;
 procedure AfterTurn;
 var
   cix, uix, p1, Loc1, Job0: integer;
   JobDone: boolean;
+  cix, uix, p1, Loc1, Job0: Integer;
+  JobDone: Boolean;
 begin
   with RW[pTurn] do
 …
       end;
     inc(Money, OracleIncome);
+    Inc(Money, OracleIncome);
     OracleIncome := 0;
     if GWonder[woOracle].EffectiveOwner = pTurn then
 …
             if (RW[p1].City[cix].Loc >= 0) and
               (RW[p1].City[cix].built[imTemple] > 0) then
               inc(OracleIncome);
+              Inc(OracleIncome);
     end;
 …
             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
 …
             else
             begin
               dec(Fuel);
+              Dec(Fuel);
               if Fuel < 0 then
               begin
 …
         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
 …
           CheckWin(p1);
   end;
 end; // Afterturn
+end;
 procedure NextPlayer;
 …
 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];
 …
     if Master < 0 then
       FreeUnit(p, uix);
+      FreeUnit(P, uix);
     if (MoveInfo.MoveType in [mtMove, mtCapture]) and MoveInfo.MountainDelay
     then
 …
     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);
 …
           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
 …
           else
             MinLevel := lObserveUnhidden;
           SeeFrom := (p1 = p) or (ObserveLevel[FromLoc] shr (2 * p1) and
+          SeeFrom := (p1 = P) or (ObserveLevel[FromLoc] shr (2 * p1) and
 >= MinLevel);
           SeeTo := (p1 = p) or (ObserveLevel[ToLoc] shr (2 * p1) and
+          SeeTo := (p1 = P) or (ObserveLevel[ToLoc] shr (2 * p1) and
 >= 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)
 …
       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
 …
           begin
             UpdateLoc[nUpdateLoc] := Loc;
             inc(nUpdateLoc);
+            Inc(nUpdateLoc);
           end;
       // unit will be removed -- remember position and update for all players
 …
       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;
 …
         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
 …
       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;
 …
     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
 …
       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
 …
         (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;
 …
     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
 …
           else
             MinLevel := lObserveUnhidden;
           SeeFrom := (p1 = p) or (ObserveLevel[FromLoc] shr (2 * p1) and
+          SeeFrom := (p1 = P) or (ObserveLevel[FromLoc] shr (2 * p1) and
 >= MinLevel);
           SeeTo := (p1 = p) or (ObserveLevel[ToLoc] shr (2 * p1) and
+          SeeTo := (p1 = P) or (ObserveLevel[ToLoc] shr (2 * p1) and
 >= MinLevel);
           if SeeTo and (MoveInfo.MoveType = mtCapture) then
 …
           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; // ExecuteMove
 function ExecuteAttack(p, uix, ToLoc: integer; var MoveInfo: TMoveInfo;
   ShowMove: TShowMove): integer;
+end;
+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;
 …
         ReallocMem(BattleHistory, nBattleHistory * (2 * SizeOf(TBattle)));
       AttackerBattle := @BattleHistory[nBattleHistory];
       inc(nBattleHistory);
+      Inc(nBattleHistory);
     end;
     with RW[Defender] do
 …
         ReallocMem(BattleHistory, nBattleHistory * (2 * SizeOf(TBattle)));
       DefenderBattle := @BattleHistory[nBattleHistory];
       inc(nBattleHistory);
+      Inc(nBattleHistory);
     end;
     AttackerBattle.Enemy := Defender;
 …
 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;
 …
     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);
 …
       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
 …
           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
 …
     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
 …
           Exp := (nExp - 1) * ExpCost
         else
           inc(Exp, ExpGain);
+          Inc(Exp, ExpGain);
         Health := MoveInfo.EndHealth;
         Job := jNone;
 …
         Flags := Flags and not unFortified;
         if Movement > 100 then
           dec(Movement, 100)
+          Dec(Movement, 100)
         else
           Movement := 0;
 …
     end;
     ZoCDefenderDestroyed := false;
+    ZoCDefenderDestroyed := False;
     nUpdateLoc := 0;
     if MoveInfo.MoveType = mtExpel then
 …
           PlaceUnit(MoveInfo.Defender, MoveInfo.Duix);
           UpdateLoc[nUpdateLoc] := Loc;
           inc(nUpdateLoc);
+          Inc(nUpdateLoc);
           Flags := Flags or unWithdrawn;
         end;
 …
           Exp := (nExp - 1) * ExpCost
         else
           inc(Exp, ExpGain);
+          Inc(Exp, ExpGain);
         Health := MoveInfo.EndHealthDef;
       end
 …
           (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;
 …
               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
 …
     end;
   end;
 end; // ExecuteAttack
 function MoveUnit(p, uix, dx, dy: integer; TestOnly: boolean): integer;
+end;
+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;
 …
       ShowMove.Exp := Exp;
       ShowMove.Load := TroopLoad + AirLoad;
       ShowMove.Owner := p;
+      ShowMove.Owner := P;
       if (TroopLoad > 0) or (AirLoad > 0) then
         ShowMove.Flags := unMulti
 …
       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;
   end; // with
 end; { MoveUnit }
 function Server(Command, Player, Subject: integer; var Data): integer; stdcall;
   function CountPrice(const Offer: TOffer; PriceType: integer): integer;
+  end;
+end;
+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
 …
   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;
 …
   ShowShipChange: TShowShipChange;
   ShowNegoData: TShowNegoData;
+  logged, ok, HasShipChanged, AllHumansDead, OfferFullySupported: boolean;
+begin { >>>server }
+  logged, ok, HasShipChanged, AllHumansDead, OfferFullySupported: Boolean;
+begin
   if Command = sTurn then
   begin
 …
   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;
 …
     ((Subject < 0) or (Subject >= $1000))) then
   begin
     result := eInvalid;
     exit;
+    Result := eInvalid;
+    Exit;
   end;
 …
   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
 …
     PutMessage(1 shl 16 + 1, Format('No Turn: %d calls %x',
       [Player, Command shr 4]));
     result := eNoTurn;
     exit;
+    Result := eNoTurn;
+    Exit;
   end;
 …
   HandoverStack[nHandoverStack] := Player + $1000;
   HandoverStack[nHandoverStack + 1] := Command;
   inc(nHandoverStack, 2);
+  Inc(nHandoverStack, 2);
   InvalidTreatyMap := 0;
 …
     FormerCLState := CL.State;
     CL.Put(Command, Player, Subject, @Data);
     logged := true;
+    logged := True;
   end
   else
     logged := false;
+    logged := False;
   case Command of
 …
     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:
 …
           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:
 …
         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:
 …
       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:
 …
       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:
 …
             ((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
 …
               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));
 …
       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:
 …
         (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;
 …
           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));
 …
       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,
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     sGetEnemyCityReportNew:
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     sGetEnemyCityAreaInfo:
 …
       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));
 …
           EditTile(Loc, NewTile)
       else
         result := eInvalid;
+        Result := eInvalid;
     sRandomMap:
 …
       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;
+    {
 …
     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
 …
             begin
               LogChanges;
               SaveGame('~' + LogFileName, true);
+              SaveGame('~' + LogFileName, True);
             end;
 {$ENDIF}
 …
             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 +
 …
           begin
             if CheckSum <> Subject then
               LoadOK := false;
+              LoadOK := False;
           end
           else // save checksum
 …
             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
 …
     sBreak, sResign, sNextRound, sReload:
       if Mode = moMovie then
         MovieStopped := true
+        MovieStopped := True
       else
       begin
 …
         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
 …
           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);
 …
             LogCityTileChanges;
             LogChanges;
             SaveGame(LogFileName, false);
+            SaveGame(LogFileName, False);
           end;
           DeleteFile(SavePath + '~' + LogFileName);
 …
                 LandMass, MaxTurn);
             sReload:
               LoadGame(SavePath, LogFileName, integer(Data), false);
+              LoadGame(SavePath, LogFileName, Integer(Data), False);
           end;
         end
         else
           result := eInvalid;
+          Result := eInvalid;
       end;
 …
       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;
 …
         pContacted := Command shr 4 and $F;
         pDipActive := pContacted;
         assert(Mode = moPlaying);
+        Assert(Mode = moPlaying);
         Inform(pDipActive);
         ChangeClientWhenDone(scContact, pDipActive, pTurn, 4);
 …
         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:
 …
             RW[pTurn].Credibility;
           pDipActive := pTurn;
           assert(Mode = moPlaying);
+          Assert(Mode = moPlaying);
           IntServer(sIntHaveContact, pTurn, pContacted, nil^);
           ChangeClientWhenDone(scDipStart, pDipActive, nil^, 0);
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     scDipNotice, scDipAccept, scDipCancelTreaty, scDipBreak,
 …
       if pDipActive >= 0 then
       begin
         assert(Mode = moPlaying);
+        Assert(Mode = moPlaying);
         if pDipActive = pTurn then
           p1 := pContacted
 …
             // 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,
 …
               // 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;
 …
                     (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);
 …
             (GTurn < RW[pDipActive].LastCancelTreaty[p1] + CancelTreatyTurns)
           then
             result := eCancelTreatyRush
+            Result := eCancelTreatyRush
           else if Command >= sExecute then
           begin
 …
               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
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     scDipOffer, scDipOffer - sExecute:
 …
             pDipActive := -1;
             CallPlayer(cShowEndContact, pContacted, nil^);
             assert(Mode = moPlaying);
+            Assert(Mode = moPlaying);
             ChangeClientWhenDone(cContinue, pTurn, nil^, 0);
           end;
 …
           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
 :
 …
 :
               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;
 …
               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));
             end
           end
+            end;
+          end;
         end
       else
         result := eInvalid;
+        Result := eInvalid;
+    {
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     sSetTestFlag:
 …
       end
       else
         result := eInvalid;
+        Result := eInvalid;
     sSetGovernment, sSetGovernment - sExecute:
 …
 {$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
 …
             then
               RW[p1].EnemyReport[Player].Government := Subject;
         end
+        end;
       end;
 …
 {$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
           RW[Player].TaxRate := Subject and $F * 10;
           RW[Player].LuxRate := Subject shr 4 * 10;
         end
+        end;
       end;
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('Revolution P%d', [Player]); {$ENDIF}
         if RW[Player].Government = gAnarchy then
           result := eInvalid
+          Result := eInvalid
         else
         begin
 …
           if (Mode = moPlaying) and (Subject = adMilitary) and
             (DevModelTurn[Player] <> GTurn) then
             result := eNoModel
+            Result := eNoModel
           else if Subject <> adMilitary then
           begin
 …
             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
 …
                 (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
 …
         end
         else
           result := eViolation;
+          Result := eViolation;
       end;
 …
         {$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;
 …
         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
 …
       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
 …
           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;
 …
 {$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
 …
             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
 …
                   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
 …
 {$IFDEF TEXTLOG}CmdInfo := Format('SetDevModelCap P%d', [Player]); {$ENDIF}
         if Subject >= nFeature then
           result := eInvalid
+          Result := eInvalid
         else if DevModelTurn[Player] = GTurn then
         begin
 …
           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
 …
               (Feature[Subject].Preq >= 0) and
               (RW[Player].Tech[Feature[Subject].Preq] >= tsApplicable)) then
               result := eNoPreq
+              Result := eNoPreq
             else
             begin
 …
                   MaxCap := 3;
                 if RW[Player].Tech[adSteel] >= tsApplicable then
                   inc(MaxCap);
+                  Inc(MaxCap);
               end
               else
 …
               if (NewCap < MinCap) or (NewCap > MaxCap) or
                 (Weight + (NewCap - Cap[Subject]) * CapWeight > MaxWeight) then
                 result := eViolation
+                Result := eViolation
               else if Command >= sExecute then
               begin
 …
         end
         else
           result := eNoModel;
+          Result := eNoModel;
       end;
 …
 {$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 }
 …
                 (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
 …
                   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
 …
 {$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;
 …
 {$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;
 …
 {$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;
 …
       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,
 …
 {$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;
 …
 {$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
 …
             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 }
 …
       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;
 …
     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
 …
               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
 …
                   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
 …
               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
 …
                   (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:
 …
                         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:
 …
                           ((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;
 …
                       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
 …
                     and (pt0 <> ptCaravan) then
                   begin
                     inc(RW[Player].Money, Prod0);
+                    Inc(RW[Player].Money, Prod0);
                     Prod := 0;
                     Prod0 := 0;
 …
                   else
                     Prod := Prod0 * 2 div 3;
                 Project := NewProject
+                Project := NewProject;
               end;
             end;
 …
         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
 …
                 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);
 …
         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;
 …
     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;
 …
                 end;
               end;
               inc(Flags, chImprovementSold);
+              Inc(Flags, chImprovementSold);
             end;
       end;
 …
     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
 …
                 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;
 …
                   end;
                 end;
                 inc(Flags, chImprovementSold);
+                Inc(Flags, chImprovementSold);
               end;
         end;
 …
     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;
 …
     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
 …
       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]));
 …
   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}
 end; { <<<server }
+{$IFOPT O-}Dec(nHandoverStack, 2); {$ENDIF}
+end;

branches/highdpi/Global.pas

-              r412
+              r465
     ((CevoVersionBugFix and $ff) shl 0);
 implementation
 end.

branches/highdpi/Graphics/System2.grs

-              r349
+              r465
       <Height>26</Height>
     </Item>
+    <Item>
+      <Name>BrainNoTerm</Name>
+      <Left>1</Left>
+      <Top>111</Top>
+      <Width>64</Width>
+      <Height>64</Height>
+    </Item>
+    <Item>
+      <Name>BrainSuperVirtual</Name>
+      <Left>66</Left>
+      <Top>111</Top>
+      <Width>64</Width>
+      <Height>64</Height>
+    </Item>
+    <Item>
+      <Name>BrainTerm</Name>
+      <Left>131</Left>
+      <Top>111</Top>
+      <Width>64</Width>
+      <Height>64</Height>
+    </Item>
+    <Item>
+      <Name>BrainRandom</Name>
+      <Left>131</Left>
+      <Top>46</Top>
+      <Width>64</Width>
+      <Height>64</Height>
+    </Item>
   </Items>
 </GraphicSet>

branches/highdpi/IPQ.pas

-              r303
+              r465
 { binary heap priority queue
   code contributed by Rassim Eminli }
+  Code contributed by Rassim Eminli }
 {$INCLUDE Switches.inc}
 …
 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.
 …
 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;
 …
 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;
 …
   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;
 …
   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;

branches/highdpi/Inp.pas

-              r412
+              r465
     procedure CenterToRect(Rect: TRect);
   private
     Center: boolean;
+    Center: Boolean;
   end;
 var
   InputDlg: TInputDlg;
 implementation
 …
 , 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;

branches/highdpi/Install/rpm/c-evo.spec

-              r405
+              r465
 Requires:       sox
+#BuildRequires:  lazarus
+BuildRequires:  lazarus >= 2.0.12
 %description
 Turn-based empire building game inspired by Civilization.
+A turn-based empire building game inspired by Civilization.
 %global debug_package %{nil}
 …
 /usr/bin/c-evo
 /usr/share/applications/c-evo.desktop
 /usr/share/c-evo/*
+/usr/share/c-evo/
 /usr/share/pixmaps/c-evo.png

branches/highdpi/Install/snap/local/build.sh

r405	r465
4	4
5	5	pushd ../../..
6		snapcraft --debug --use-lxd
	6	snapcraft --debug --use-lxd $@
7	7	popd
8	8

branches/highdpi/Install/snap/snapcraft.yaml

-              r405
+              r465
 description: |
   This is a fork and Lazarus/FPC port of the original C-evo 1.2.0 game.
   Now it is finally possible to play C-evo natively on Linux.
+  Now it is finally possible to play C-evo natively on Linux.
   * Zoomable map by mouse wheel with three tile sizes
   * Many sample maps included
+  * All available localizations include
+  * Multiple localizations included
+  * Support for user defined key mapping
   * Many other small improvements
 confinement: strict
 base: core20
+confinement: devmode
+base: core22
 grade: stable
 icon: Graphics/c-evo_64x64.png
 license: NLPL
 environment:
   LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
+environment:
+  LD_LIBRARY_PATH: $SNAP_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
   PULSE_SERVER: unix:/run/user/1000/pulse/native
 layout:
   /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/sox:
     bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/sox
+    bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/sox
 parts:
 …
     source: .
     source-type: local
+    build-packages:
+    - fpc
+    - lazarus
+    - lcl
+    - lcl-utils
+    stage-packages:
+    after: [lazarus]
+    stage-packages:
     - sox
     - libsox-fmt-mp3
 …
     override-build: |
       snapcraftctl build
       (cd AI/StdAI &&lazbuild --build-mode=Release StdAI.lpi)
+      (cd AI/StdAI &&lazbuild --build-mode=Debug StdAI.lpi)
       mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
+      lazbuild --build-mode=Release Integrated.lpi
+      ROOT=/root/parts/c-evo/install
+      install -d -m 755 $ROOT/usr/share/c-evo
+      install -s -m 755 c-evo $ROOT/usr/share/c-evo
+      install -m 644 Language.txt $ROOT/usr/share/c-evo
+      install -m 644 Language2.txt $ROOT/usr/share/c-evo
+      install -m 644 Fonts.txt $ROOT/usr/share/c-evo
+      install -d -m 755 $ROOT/usr/share/applications
+      install -m 755 Install/deb/c-evo.desktop $ROOT/usr/share/applications
+      install -d -m 755 $ROOT/usr/share/mime/packages
+      install -m 755 Install/deb/c-evo.xml $ROOT/usr/share/mime/packages
+      install -d -m 755 $ROOT/usr/share/pixmaps
+      install -m 644 Graphics/c-evo_64x64.png $ROOT/usr/share/pixmaps/c-evo.png
+      install -m 644 Graphics/c-evo_64x64.png $ROOT/usr/share/pixmaps/application-cevo.png
+      install -m 644 Graphics/c-evo_64x64.png $ROOT/usr/share/pixmaps/application-cevomap.png
+      install -d -m 755 $ROOT/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/libstdai-amd64.so $ROOT/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/StdAI.ai.txt $ROOT/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/StdAI.png $ROOT/usr/share/c-evo/AI/StdAI
+      cp -r Graphics $ROOT/usr/share/c-evo
+      cp -r Help $ROOT/usr/share/c-evo
+      cp -r Sounds $ROOT/usr/share/c-evo
+      cp -r Tribes $ROOT/usr/share/c-evo
+      cp -r Localization $ROOT/usr/share/c-evo
+      cp -r Maps $ROOT/usr/share/c-evo
+      cp -r Saved $ROOT/usr/share/c-evo
+      cp -r "AI Template" $ROOT/usr/share/c-evo
+      lazbuild --build-mode=Debug Integrated.lpi
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -s -m 755 c-evo $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -m 644 Language.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -m 644 Language2.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -m 644 Fonts.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -m 755 Install/deb/c-evo.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -m 644 Install/deb/c-evo.xml $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -m 644 Graphics/c-evo_64x64.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/c-evo.png
+      install -m 644 Graphics/c-evo_64x64.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevo.png
+      install -m 644 Graphics/c-evo_64x64.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevomap.png
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/libstdai-amd64.so $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/StdAI.ai.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -m 644 AI/StdAI/StdAI.png $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      cp -r Graphics $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Help $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Sounds $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Tribes $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Localization $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Maps $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r Saved $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      cp -r "AI Template" $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
     stage:
       - etc
 …
       - usr/share/applications/c-evo.desktop
       - usr/share/mime/packages/c-evo.xml
+  lazarus:
+    plugin: nil
+    source: .
+    source-type: local
+    build-packages:
+    - wget
+    - libgtk2.0-dev
+    override-build: |
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/lazarus-project_2.2.2-0_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/fpc-laz_3.2.2-210709_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.2.2/fpc-src_3.2.2-210709_amd64.deb
+      apt install ./lazarus-project_2.2.2-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb
+    stage: [-*]
+    prime: [-*]
 apps:
   c-evo:
     command: usr/share/c-evo/c-evo
     desktop: usr/share/applications/c-evo.desktop
+    desktop: usr/share/applications/c-evo.desktop
     plugs:
       - home

branches/highdpi/Integrated.lpi

-              r405
+              r465
 <CONFIG>
   <ProjectOptions>
     <Version Value="11"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
 …
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="Integrated"/>
       <UseAppBundle Value="False"/>
 …
             <Debugging>
               <GenerateDebugInfo Value="False"/>
+              <DebugInfoType Value="dsDwarf2Set"/>
             </Debugging>
             <LinkSmart Value="True"/>
 …
       </Item4>
     </RequiredPackages>
     <Units Count="48">
+    <Units Count="47">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
 …
       </Unit40>
       <Unit41>
         <Filename Value="LocalPlayer\UKeyBindings.pas"/>
+        <Filename Value="LocalPlayer\KeyBindings.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit41>
       <Unit42>
         <Filename Value="UMiniMap.pas"/>
+        <Filename Value="MiniMap.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit42>
       <Unit43>
         <Filename Value="UBrain.pas"/>
+        <Filename Value="Brain.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit43>
       <Unit44>
         <Filename Value="Network\UNetworkServer.pas"/>
+        <Filename Value="Network\NetworkServer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit44>
       <Unit45>
         <Filename Value="Network\UNetworkClient.pas"/>
+        <Filename Value="Network\NetworkClient.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit45>
       <Unit46>
         <Filename Value="Network\UNetworkCommon.pas"/>
+        <Filename Value="Network\NetworkCommon.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit46>
-      <Unit47>
-        <Filename Value="ULanguages.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit47>
     </Units>
   </ProjectOptions>
 …
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>

branches/highdpi/Integrated.lpr

-              r405
+              r465
   cthreads, clocale,
   {$ENDIF}
   UDpiControls, Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
+  Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
   Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
   NoTerm, ScreenTools, Directories;
+  NoTerm, ScreenTools, Directories, UDpiControls;
 {$if declared(UseHeapTrace)}
 …
   DotNetClient := nil;
   DpiApplication.Initialize;
+  DpiApplication.Title := 'c-evo';
+  DpiApplication.Title := 'C-evo';
+  DpiApplication.TaskBarBehavior := tbMultiButton;
   Directories.UnitInit;
   ScreenTools.UnitInit;

branches/highdpi/Language.txt

r405	r465
140	140	#TITLE_SPYMISSION Covert Operation
141	141	#TITLE_SUICIDE Suicide Mission
	142	#TITLE_MESSAGE Message
142	143	#FRMILREP Military Report
143	144

branches/highdpi/LocalPlayer/Battle.pas

-              r361
+              r465
     uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
+    IsSuicideQuery: boolean;
+  end;
+var
+  BattleDlg: TBattleDlg;
+    IsSuicideQuery: Boolean;
+  end;
 implementation
 …
   TextSize: TSize;
   LabelText: string;
   FirstStrike: boolean;
+  FirstStrike: Boolean;
 begin
   MaxBar := 65;
 …
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
   DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Mask.Canvas, 26, 146, SRCAND);
   DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Data.Canvas, 26, 146, SRCPAINT);
 …
   if Forecast.EndHealthDef <= 0 then
   begin
     DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+    DpiBitBltCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
 …
   begin
     if Forecast.EndHealthDef > 0 then
       RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText)
+      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText);
   end
   else
 …
   if Forecast.EndHealthAtt <= 0 then
   begin
     DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
     DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
 …
     if Forecast.EndHealthAtt > 0 then
       RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage,
         LabelText)
+        LabelText);
   end
   else
 …
   IsoMap.SetOutput(Buffer);
   DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
+  DpiBitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
     ym - 8 - 12 - 48);
   { if TerrType<fForest then
 …
     end; }
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   DpiBitCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
+  DpiBitBltCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
 , 0);
   DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
+  DpiBitBltCanvas(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);
   DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }
+  DpiBitBltCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
+end;
 procedure TBattleDlg.FormCreate(Sender: TObject);
 …
     ClientWidth := 300;
     ClientHeight := 288;
     OKBtn.Visible := true;
     CancelBtn.Visible := true;
+    OKBtn.Visible := True;
+    CancelBtn.Visible := True;
     Left := (DpiScreen.Width - ClientWidth) div 2; // center on screen
     Top := (DpiScreen.Height - ClientHeight) div 2;
 …
     ClientWidth := 178;
     ClientHeight := 178;
     OKBtn.Visible := false;
     CancelBtn.Visible := false;
+    OKBtn.Visible := False;
+    CancelBtn.Visible := False;
   end;
 end;
 …
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
   ym, cix, p: Integer;
   s, s1: string;
+  ym, cix, P: Integer;
+  S, s1: string;
 begin
   with Canvas do
 …
     Brush.Style := bsClear;
     PaintBackground(self, 3 + Border, 3 + Border,
       ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border))
+      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border));
   end;
   Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
 …
   begin
     Canvas.Font.Assign(UniFont[ftCaption]);
     s := Phrases.Lookup('TITLE_SUICIDE');
     RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
 + Border, s);
+    S := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
++ 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,
 - MessageLineSpacing div 2, s1);
       s1 := copy(s, p + 1, 255);
+      s1 := Copy(S, P + 1, 255);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
     ym := 110
+    ym := 110;
   end
   else
 …
 begin
   if not IsSuicideQuery then
     Close
+    Close;
 end;
 …
     if Key <> VK_ESCAPE then
       MainScreen.FormKeyDown(Sender, Key, Shift);
   end
+  end;
 end;

branches/highdpi/LocalPlayer/CityScreen.pas

-              r405
+              r465
 uses
   UDpiControls, {$IFDEF LINUX}LMessages,{$ENDIF}
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA, ButtonC, Area, GraphType, UTexture;
+  UDpiControls, {$IFDEF UNIX}LMessages,{$ENDIF}
+  Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA,
+  ButtonC, Area, GraphType, Texture;
 const
 …
     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);
 …
     procedure PrevCityBtnClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    // procedure AdviceBtnClick(Sender: TObject);
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
   private
     c: TCity;
+    C: TCity;
     Report: TCityReportNew;
     cOwner: Integer;
 …
     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;
 …
     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
     RestoreUnFocus: integer;
+    RestoreUnFocus: Integer;
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
     procedure ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
     procedure Reset;
     procedure CheckAge;
   end;
-var
-  CityDlg: TCityDlg;
 implementation
 uses
   Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound, Term;
 {$R *.lfm}
 …
   wZoomEnvironment = 68;
+  ImpPosition: array [28 .. nImp - 1] of integer = (-1, // imTrGoods
+  ImpPosition: array [28 .. nImp - 1] of Integer = (
+    -1, // imTrGoods
 , // imBarracks
 , // imGranary
 …
 var
   ImpSorted: array [0 .. nImp - 1] of integer;
+  ImpSorted: array [0 .. nImp - 1] of Integer;
 procedure TCityDlg.FormCreate(Sender: TObject);
 …
   NoMap := TIsoMap.Create;
   AreaMap := TIsoMap.Create;
   AreaMap.SetOutput(offscreen);
+  AreaMap.SetOutput(Offscreen);
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
+  SmallMapMode := smImprovements;
+  ZoomArea := 1;
+  ProdHint := false;
+  Reset;
+  ProdHint := False;
   RestoreUnFocus := -1;
   OpenSoundEvent := -1;
 …
     UnshareBitmap(Back);
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
 …
 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;
 …
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
   DpiBitCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
+  DpiBitBltCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
     SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
   if IsPort then
   begin
     DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    DpiBitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
 …
   else
   begin
     DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    DpiBitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
 …
   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),
 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
 + 12 * (i mod 18 div 3)));
           break;
+          FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
++ 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
++ 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),
 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
 + 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),
++ 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
++ 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),
 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
 + 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),
++ 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
++ 12 * (I mod 18 div 3)));
         end;
       end;
     end;
     brush.style := bsClear;
+    Brush.style := bsClear;
   end;
 end;
 …
 begin
   UnshareBitmap(ZoomCityMap);
   DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
+  DpiBitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
   if SmallMapMode = smImprovements then begin
 …
 * (ZoomArea - 3), wZoomMap - wZoomEnvironment, hZoomMap);
       ImageOp_B(ZoomCityMap, CityMapTemplate, wZoomMap - wZoomEnvironment, 0,
 + wZoomEnvironment * byte(IsPort), 112 * (ZoomArea - 3),
++ wZoomEnvironment * Byte(IsPort), 112 * (ZoomArea - 3),
         wZoomEnvironment, hZoomMap);
     end;
 …
 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);
 …
       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 +
 * 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 +
+* Line, S);
+      Inc(Line);
     end;
   end;
 var
   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;
+  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;
   UnitInfo: TUnitInfo;
   UnitReport: TUnitReport;
   IsCityAlive, CanGrow: boolean;
+  IsCityAlive, CanGrow: Boolean;
 begin
   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;
   if supervising or (cix < 0) then
+    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
     dec(TrueFood, Report.FoodSurplus);
+    Dec(TrueFood, Report.FoodSurplus);
     if TrueFood < 0 then
       TrueFood := 0; // shouldn't happen
     dec(TrueProd, Report.Production);
+    Dec(TrueProd, Report.Production);
     if TrueProd < 0 then
       TrueProd := 0; // shouldn't happen
     dec(TruePoll, Report.AddPollution);
+    Dec(TruePoll, Report.AddPollution);
     if TruePoll < 0 then
       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);
 …
   RedTex.ColorTextShade := $0000FF;
   DpiBitCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+  DpiBitBltCanvas(Offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
   RisedTextOut(offscreen.Canvas, 42, 7, Caption);
   with offscreen.Canvas do
+  RisedTextOut(Offscreen.Canvas, 42, 7, Caption);
+  with Offscreen.Canvas do
   begin // city size
     brush.Color := $000000;
+    Brush.Color := $000000;
     FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
     brush.Color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     FillRect(Rect(8, 7, 36, 32));
     brush.style := bsClear;
+    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]);
 …
     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,
 + 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;
 …
     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));
     DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+      False, AllowChange and IsCityAlive and
+      (C.Status and csResourceWeightsMask = 0));
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
       xmArea + 102, 42);
 …
               ((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),
 + 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));
 …
   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
 …
     else
       xGr := 141;
     DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea - 192 + 5 + I * D, ymArea - 96 - 29,
 , 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,
 , 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;
     DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea + 192 - 27 + 1 - I * D, 29 + 1, 27,
 , 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,
 , 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,
 , 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;
 …
   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;
 …
   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'));
 …
   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
 …
   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;
 …
   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
   DpiBitCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+  DpiBitBltCanvas(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 +
 , 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);
   DpiBitCanvas(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);
+  DpiBitBltCanvas(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
 …
       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;
 …
       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
 …
           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
 …
             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,
 , 115);
         end
 …
   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,
 , 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,
 , 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,
 , 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,
 , 154, 126)
           end // unit visible in display
           else
             dec(FreeSupp, UnitReport.ProdSupport);
           inc(Cnt);
+            Dec(FreeSupp, UnitReport.ProdSupport);
+          Inc(Cnt);
         end;
     PageCount := (Cnt + 5) div 6;
 …
   PageDownBtn.Visible := PageCount > 1;
   with offscreen.Canvas do
+  with Offscreen.Canvas do
   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
 …
     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;
 …
   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);
 end; { OffscreenPaint }
+end;
 procedure TCityDlg.FormShow(Sender: TObject);
 var
   dx, dy, Loc1: integer;
+  dx, dy, Loc1: Integer;
   GetCityData: TGetCityData;
 begin
 …
   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;
 …
   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;
     NextCityBtn.Visible := false;
     PrevCityBtn.Visible := false;
+    NextCityBtn.Visible := False;
+    PrevCityBtn.Visible := False;
   end;
   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
 …
   // check if port
   IsPort := false;
+  IsPort := False;
   for dx := -2 to 2 do
     for dy := -2 to 2 do
       if abs(dx) + abs(dy) = 2 then
+      if Abs(dx) + Abs(dy) = 2 then
       begin
         Loc1 := dLoc(cLoc, dx, dy);
         if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
           (MyMap[Loc1] and fTerrain < fGrass) then
           IsPort := true;
+          IsPort := True;
       end;
 …
   end;
   Caption := CityName(c.ID);
+  Caption := CityName(C.ID);
   InitSmallCityMap;
 …
   OpenSoundEvent := -1;
   OffscreenPaint;
   Timer1.Enabled := true;
 end;
 procedure TCityDlg.ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+  Timer1.Enabled := True;
+end;
+procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
 begin
   if MyMap[Loc] and fOwned <> 0 then
 …
     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
 …
   else
     cix := -1;
   AllowChange := not supervising and (cix >= 0);
+  AllowChange := not Supervising and (cix >= 0);
   cLoc := Loc;
   Happened := ShowEvent;
 …
 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;
     SmartUpdateContent;
     exit;
   end;
   if (ssLeft in Shift) and (x >= xSupport) and (x < xSupport + wSupport) and
     (y >= ySupport) and (y < ySupport + hSupport) then
+    Exit;
+  end;
+  if (ssLeft in Shift) and (X >= xSupport) and (X < xSupport + wSupport) and
+    (Y >= ySupport) and (Y < ySupport + hSupport) then
   begin
     SmallMapMode := smSupportedUnits;
 …
     InitZoomCityMap;
     SmartUpdateContent;
     exit;
+    Exit;
   end;
   if not AllowChange then
     exit; // not an own city
+    Exit; // Not an own city
   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
+        with MainScreen.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;
 …
         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
             HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
+            MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, iix)
           else if (ClientMode < scContact) then
             with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               IconKind := mikImp;
 …
               else
               begin
                 SellResult := Server(sSellCityImprovement - sExecute, me,
+                SellResult := Server(sSellCityImprovement - sExecute, Me,
                   cix, iix);
                 if SellResult < rExecuted then
 …
                 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 + ' ' +
 …
                   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 + ' ' +
 …
                     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);
 …
       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
 …
           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;
 …
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
             HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
+            HelpOnTerrain(Loc1, WindowModeMakePersistent(FWindowMode))
         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
+            with MainScreen.MessgExDlg do
             begin
               MessgText := Phrases.Lookup('CITYMANAGEOFF');
 …
               ShowModal;
             end;
             if MessgExDlg.ModalResult = mrOK then
+            if MainScreen.MessgExDlg.ModalResult = mrOK then
             begin
               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;
 …
     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;
 .. 25 + 52:
               i := 4;
+              I := 4;
 + 52 .. 25 + 52 * 2:
               i := 5;
+              I := 5;
 - 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
 …
       end;
     end;
 end; { FormMouseDown }
+end;
 procedure TCityDlg.ChooseProject;
 …
   );
   function ProjectType(Project: integer): TProjectType;
+  function ProjectType(Project: Integer): TProjectType;
   begin
     if Project and cpCompleted <> 0 then
 …
 var
   NewProject, OldMoney, cix1: integer;
+  NewProject, OldMoney, cix1: Integer;
   pt0, pt1: TProjectType;
   QueryOk: boolean;
 begin
   Assert(not supervising);
   ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
   if ModalSelectDlg.result <> -1 then
   begin
     if ModalSelectDlg.result and cpType <> 0 then
+  QueryOk: Boolean;
+begin
+  Assert(not Supervising);
+  MainScreen.ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
+  if MainScreen.ModalSelectDlg.Result <> -1 then
+  begin
+    if MainScreen.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 + MainScreen.ModalSelectDlg.Result and cpIndex);
+      AutoBuild(cix, MyData.ImpOrder[MainScreen.ModalSelectDlg.Result and cpIndex]);
     end
     else
     begin
       NewProject := ModalSelectDlg.Result;
+      NewProject := MainScreen.ModalSelectDlg.Result;
       QueryOk := True;
       if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
         (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
         with MessgExDlg do
+        with MainScreen.MessgExDlg do
         begin
           cix1 := MyRO.nCity - 1;
 …
         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');
 …
 procedure TCityDlg.BuyClick(Sender: TObject);
 var
   NextProd, Cost: integer;
+  NextProd, Cost: Integer;
 begin
   if (cix < 0) or (ClientMode >= scContact) then
     exit;
   with MyCity[cix], MessgExDlg do
+    Exit;
+  with MyCity[cix], MainScreen.MessgExDlg do
   begin
     Cost := Report.ProjectCost;
 …
       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
 …
     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');
 …
 procedure TCityDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Timer1.Enabled := false;
   ProdHint := false;
+  Timer1.Enabled := False;
+  ProdHint := False;
   MarkCityLoc := -1;
   if Optimize_cixTileChange >= 0 then
 …
       with Canvas do
       begin
         DpiBitCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
+        DpiBitBltCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
           xView + 5, yView + 1);
         DpiBitCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
+        DpiBitBltCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
           xView + 5, yView + 3);
         DpiBitCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
+        DpiBitBltCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
           Back.Canvas, xView + 5 + 62, yView + 3);
         ScreenTools.Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
 …
     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
         DpiBitCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
+        DpiBitBltCanvas(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;
 …
   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
 …
 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;
 …
 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
 …
 end;
-{ procedure TCityDlg.AdviceBtnClick(Sender: TObject);
-  begin
-  AdvisorDlg.GiveCityAdvice(cix);
-  end; }
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin
   if Page > 0 then
   begin
     dec(Page);
+    Dec(Page);
     SmartUpdateContent;
   end;
 …
   if Page < PageCount - 1 then
   begin
     inc(Page);
+    Inc(Page);
     SmartUpdateContent;
   end;
 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;
 …
 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;

branches/highdpi/LocalPlayer/CityType.pas

-              r361
+              r465
 uses
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms,
+  ButtonB, ExtCtrls;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms, ButtonB, ExtCtrls;
 type
 …
     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);
   public
     procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   protected
     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;
-var
-  CityTypeDlg: TCityTypeDlg;
 implementation
+uses Help;
+uses
+  Help, Term;
 {$R *.lfm}
 …
 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);
 …
     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);
     DpiBitCanvas(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,
+    DpiBitBltCanvas(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 *
 , 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 *
+, 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);
     DpiBitCanvas(offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
       i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
+    DpiBitBltCanvas(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;
 …
     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 +
 …
         nPool div nPoolCol * 32, MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
       DpiBitCanvas(offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
+      DpiBitBltCanvas(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;
 …
   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; { MainPaint }
 procedure TCityTypeDlg.LoadType(NewType: integer);
 var
   i: integer;
+end;
+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
 …
       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;
 …
 end;
 procedure TCityTypeDlg.ShowNewContent(NewMode: integer);
+procedure TCityTypeDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
 …
 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(FWindowMode or wmPersistent, hkImp,
         MyData.ImpOrder[ctype, i])
+      MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp,
+        MyData.ImpOrder[ctype, I])
     else
     begin
       dragiix := MyData.ImpOrder[ctype, i];
+      dragiix := MyData.ImpOrder[ctype, I];
       DpiScreen.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(FWindowMode or wmPersistent, hkImp, Pooliix[i])
+      MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Pooliix[I])
     else
     begin
       dragiix := Pooliix[i];
+      dragiix := Pooliix[I];
       DpiScreen.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;
 …
 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;
 …
 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;

branches/highdpi/LocalPlayer/ClientTools.pas

-              r405
+              r465
 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;
 …
   Server: TServerCall;
   G: TNewGameData;
   me: integer;
+  Me: Integer;
   MyRO: ^TPlayerContext;
   MyMap: ^TTileList;
 …
   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;
 …
 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;
 …
 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);
 …
 end;
 function UnrestAtLoc(uix, Loc: integer): boolean;
 var
   uix1: integer;
+function UnrestAtLoc(uix, Loc: Integer): Boolean;
+var
+  uix1: Integer;
 begin
   Result := False;
 …
     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;
 …
 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
 …
       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
 …
 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;
 …
 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;
 …
 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;
 …
       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
 …
   ScienceSum := 0;
   if MyRO.Government = gAnarchy then
     exit;
+    Exit;
   for cix := 0 to MyRO.nCity - 1 do
     if MyCity[cix].Loc >= 0 then
 …
       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
 …
 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;
 …
     UnitInfo := MyRO.EnemyUn[uix];
   end;
 end; { GetUnitInfo }
 procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
+end;
+procedure GetCityInfo(Loc: Integer; var cix: Integer; var CityInfo: TCityInfo);
 begin
   if MyMap[Loc] and fOwned <> 0 then
 …
     with CityInfo do
     begin
       Owner := me;
+      Owner := Me;
       ID := MyCity[cix].ID;
       size := MyCity[cix].size;
 …
 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
 …
           if abs(dx) + abs(dy) = 2 then
             if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and
 shl 7, me, uix, nil^) >= rExecuted then
+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;
 …
         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;
 …
         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;
 …
         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;
 …
       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
 …
     eDied - job done and died (thurst) }
 var
   stage, NextJob, Tile: integer;
+  stage, NextJob, Tile: Integer;
   Done: set of jNone .. jPoll;
 begin
 …
   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
 …
       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;
 …
     (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;
 …
         Break;
       end;
       Inc(i);
+      Inc(I);
     until False;
   end;
 …
 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;
 …
 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;
 …
 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
 …
         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
 …
                     Done := False;
                 end;
               Server(sSetCityTiles, me, cix, Advice.Tiles);
+              Server(sSetCityTiles, Me, cix, Advice.Tiles);
             end;
         end;
 …
 procedure CityOptimizer_BeginOfTurn;
 var
   cix: integer;
+  cix: Integer;
 begin
   FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
 …
 end;
 procedure CityOptimizer_CityChange(cix: integer);
+procedure CityOptimizer_CityChange(cix: Integer);
 begin
   if (MyRO.Government <> gAnarchy) and (cix <> -1) and (MyCity[cix].Flags and
 …
 end;
 procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
+procedure CityOptimizer_TileBecomesAvailable(Loc: Integer);
 begin
   if (MyRO.Government <> gAnarchy) and MarkCitiesAround(Loc, -1) then
 …
 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
 …
 end;
 procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
 var
   uix1: integer;
+procedure CityOptimizer_BeforeRemoveUnit(uix: Integer);
+var
+  uix1: Integer;
 begin
   if MyRO.Government <> gAnarchy then
 …
 // all cities should already be optimized here -- only check this
 var
   cix: integer;
+  cix: Integer;
 begin
 {$IFOPT O-}

branches/highdpi/LocalPlayer/Diagram.pas

-              r361
+              r465
 type
+  TDiagramKind = (dkChart, dkShip);
   TDiaDlg = class(TFramedDlg)
     CloseBtn: TButtonB;
 …
     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: integer);
+    procedure ShowNewContent_Ship(NewMode: integer; p: integer = -1);
+    procedure ShowNewContent_Charts(NewMode: TWindowMode);
+    procedure ShowNewContent_Ship(NewMode: TWindowMode; P: Integer = -1);
   private
+    Kind: (dkChart, dkShip);
+    Player, Mode: integer;
+  end;
+var
+  DiaDlg: TDiaDlg;
+procedure PaintColonyShip(canvas: TDpiCanvas; Player, Left, Width, Top: integer);
+    Kind: TDiagramKind;
+    Player: Integer;
+    Mode: Integer;
+  end;
+procedure PaintColonyShip(Canvas: TDpiCanvas; Player, Left, Width, Top: Integer);
 implementation
 …
 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: TDpiCanvas; Player, Left, Width, Top: 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: TDpiCanvas; Player, Left, Width, Top: Integer);
 var
   i, x, r, nComp, nPow, nHab: integer;
+  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;
 …
     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;
 …
 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;
 …
   inherited;
   if Kind = dkChart then
     with offscreen.canvas do
+    with Offscreen.Canvas do
     begin
       Font.Assign(UniFont[ftTiny]);
 …
       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;
 …
       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;
 …
     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,
 …
     end;
   MarkUsedOffscreen(InnerWidth, InnerHeight);
 end; // OffscreenPaint
+end;
 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;
 …
 end;
 procedure TDiaDlg.ShowNewContent_Charts(NewMode: integer);
+procedure TDiaDlg.ShowNewContent_Charts(NewMode: TWindowMode);
 begin
   Kind := dkChart;
 …
 end;
 procedure TDiaDlg.ShowNewContent_Ship(NewMode, 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
 …
   end
   else
     Player := p;
+    Player := P;
   ToggleBtn.ButtonIndex := 28;
   ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
 …
 procedure TDiaDlg.ToggleBtnClick(Sender: TObject);
 var
   p1: integer;
   m: TDpiMenuItem;
+  p1: Integer;
+  M: TDpiMenuItem;
 begin
   if Kind = dkChart then
 …
         MyRO.Ship[p1].Parts[spHab] > 0 then
       begin
         m := TDpiMenuItem.Create(Popup);
         m.RadioItem := true;
         m.Caption := Tribe[p1].TPhrase('SHORTNAME');
         m.Tag := p1;
         m.OnClick := PlayerClick;
+        M := TDpiMenuItem.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);
 …
 end;
 procedure TDiaDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TDiaDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin

branches/highdpi/LocalPlayer/Diplomacy.pas

-              r210
+              r465
 function DipCommandToString(pSender, pTarget, Treaty, OppCommand,
   Command: integer; const OppOffer, Offer: TOffer): string;
+  Command: Integer; const OppOffer, Offer: TOffer): string;
 implementation
 …
 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
 :
             result := Format(Phrases.Lookup('PRICE_SHIPCOMP'),
+            Result := Format(Phrases.Lookup('PRICE_SHIPCOMP'),
               [Price and $FFFF]);
 :
             result := Format(Phrases.Lookup('PRICE_SHIPPOW'),
+            Result := Format(Phrases.Lookup('PRICE_SHIPPOW'),
               [Price and $FFFF]);
 :
             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;
 …
         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
 …
           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
 …
         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
 …
           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
 …
             // 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
 …
           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;
 …
   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;

branches/highdpi/LocalPlayer/Draft.pas

-              r361
+              r465
 uses
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonA,
+  ButtonB, Area;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA, ButtonB, Area;
 type
 …
     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: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   protected
     procedure OffscreenPaint; override;
   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: TDpiBitmap;
+    function IsFeatureInList(d, i: integer): boolean;
+    procedure SetDomain(d: integer);
+  end;
+var
+  DraftDlg: TDraftDlg;
+    function IsFeatureInList(D, I: Integer): Boolean;
+    procedure SetDomain(D: Integer);
+  end;
 implementation
+uses Help, Tribes, Directories;
+uses
+  Term, Help, Tribes, Directories;
 {$R *.lfm}
 …
 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,
 + i mod 11 * 11, 137 + i div 11 * 11);
+              Sprite(Offscreen, HGrSystem, xTotal2 - 1 - dx, Y + 4, 10, 10,
++ 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;
           end
+          end;
       end;
       // 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,
 , 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,
 , 88, 115);
       end;
 …
 var
   i, j, x, d, n, TextColor, CapWeight, DomainCount: integer;
+  I, J, X, D, N, TextColor, CapWeight, DomainCount: Integer;
 begin
   inherited;
 …
   // assemble background from 2 texture tiles
   begin
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
       MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
       MainTexture.Height - 64);
     DpiBitCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
+    DpiBitBltCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
       MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
 );
   end
   else
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
       (MainTexture.Height - ClientHeight) div 2);
 …
     Template.Height - 64 - Cut);
   DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  DpiBitBltCanvas(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,
 , 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,
 , 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;
 …
     // 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, 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, 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;
   MarkUsedOffscreen(ClientWidth, ClientHeight);
 end; { MainPaint }
 procedure TDraftDlg.SetDomain(d: integer);
   function Prio(fix: integer): integer;
+end;
+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;
 …
   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;
 …
 end;
 procedure TDraftDlg.ShowNewContent(NewMode: integer);
+procedure TDraftDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
 …
 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(FWindowMode or wmPersistent, 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
+        MainScreen.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;
       end
     end
   end
+      end;
+    end;
+  end;
 end;
 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;
 …
       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;

branches/highdpi/LocalPlayer/Enhance.pas

-              r361
+              r465
 uses
+  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms, IsoEngine,
+  ButtonB, ButtonC, Menus;
+  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, IsoEngine, ButtonB, ButtonC, Menus;
 type
 …
     NoMap: TIsoMap;
   public
     procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; TerrType: Integer = -1);
   protected
     Page: integer;
+    Page: Integer;
     procedure OffscreenPaint; override;
   end;
-var
-  EnhanceDlg: TEnhanceDlg;
 implementation
 uses
   Help, UKeyBindings;
+  Help, KeyBindings, Term;
 {$R *.lfm}
 …
 procedure TEnhanceDlg.FormCreate(Sender: TObject);
 var
   TerrType: integer;
   m: TDpiMenuItem;
+  TerrType: Integer;
+  M: TDpiMenuItem;
 begin
   inherited;
 …
     if TerrType <> fJungle then
     begin
       m := TDpiMenuItem.Create(Popup);
       m.RadioItem := true;
+      M := TDpiMenuItem.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;
 …
 procedure TEnhanceDlg.FormPaint(Sender: TObject);
 var
   i: integer;
+  I: Integer;
 begin
   inherited;
 …
   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
       DpiBitCanvas(Canvas, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
         HGrSystem.Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
 + Controls[i].Tag div 7 * 9);
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonC then
+      DpiBitBltCanvas(Canvas, Controls[I].Left + 2, Controls[I].Top - 11, 8, 8,
+        HGrSystem.Data.Canvas, 121 + Controls[I].Tag mod 7 * 9,
++ Controls[I].Tag div 7 * 9);
 end;
 …
 end;
 procedure TEnhanceDlg.ShowNewContent(NewMode, TerrType: integer);
+procedure TEnhanceDlg.ShowNewContent(NewMode: TWindowMode; TerrType: Integer);
 begin
   if (TerrType < fGrass) or (TerrType > fMountains) then
 …
 procedure TEnhanceDlg.OffscreenPaint;
 var
   i, stage, TerrType, TileImp, x, EndStage, Cost, LastJob: integer;
   s: string;
   Done: Set of jNone .. jTrans;
   TypeChanged: boolean;
+  I, stage, TerrType, TileImp, X, EndStage, Cost, LastJob: Integer;
+  S: string;
+  Done: set of jNone .. jTrans;
+  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;
 …
     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,
 + 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,
 + 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,
 + 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,
 + (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,
 + 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,
 + 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,
 + 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,
 + 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,
 + 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,
 + 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
 …
     (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)
 …
   MarkUsedOffscreen(InnerWidth, InnerHeight);
 end; { OffscreenPaint }
+end;
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);
 …
 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;
 …
 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
         (MyData.EnhancementJobs[Page, stage] = jFarm) then
+    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
+        (MyData.EnhancementJobs[Page, Stage] = jFarm) then
       begin
         if stage < 4 then
           move(MyData.EnhancementJobs[Page, stage + 1],
             MyData.EnhancementJobs[Page, stage], 4 - stage);
+        if Stage < 4 then
+          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;
 …
   NewJob := TButtonC(Sender).Tag;
   Done := [];
   stage := 0;
   while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
+  Stage := 0;
+  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
 …
     if (NewJob = jRR) and not(jRoad in Done) then
     begin
       MyData.EnhancementJobs[Page, stage] := jRoad;
       inc(stage);
+      MyData.EnhancementJobs[Page, Stage] := jRoad;
+      Inc(Stage);
     end;
     if (NewJob = jFarm) and not(jIrr in Done) then
     begin
       MyData.EnhancementJobs[Page, stage] := jIrr;
       inc(stage);
     end;
     MyData.EnhancementJobs[Page, stage] := NewJob;
+      MyData.EnhancementJobs[Page, Stage] := jIrr;
+      Inc(Stage);
+    end;
+    MyData.EnhancementJobs[Page, Stage] := NewJob;
   end;
   SmartUpdateContent;
 …
   ShortCut := KeyToShortCut(Key, Shift);
   if BHelp.Test(ShortCut) then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
       HelpDlg.TextIndex('MACRO'))
+    MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkText,
+      MainScreen.HelpDlg.TextIndex('MACRO'))
 end;

branches/highdpi/LocalPlayer/Help.pas

-              r412
+              r465
   UDpiControls, Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonB, PVSB, Types, fgl, IsoEngine;
+  ButtonB, PVSB, Types, Generics.Collections, IsoEngine;
 const
   MaxHist = 16;
+  { link categories }
+  hkNoLink = 0;
+  hkAdv = 1;
+  hkImp = 2;
+  hkTer = 3;
+  hkFeature = 4;
+  hkInternet = 5;
+  hkModel = 6;
+  hkMisc = 7;
+  hkCrossLink = $40;
+  hkText = $80;
+  liInvalid = $3FFF; // link index indicates invalid link
+  { link indices for category hkMisc }
+  miscMain = 0;
+  miscCredits = 1;
+  miscGovList = 2;
+  miscJobList = 3;
+  miscSearchResult = 7;
+  fJungle = 8; // pseudo terrain
+  fJungle = 8; // Pseudo terrain
 type
+  { Link categories }
+  TLinkCategory = (
+    hkNoLink,
+    hkAdv,
+    hkImp,
+    hkTer,
+    hkFeature ,
+    hkInternet,
+    hkModel,
+    hkMisc,
+    hkText);
+  { Link indices for category hkMisc }
+  TMiscLinkIndex = (
+    miscMain,
+    miscCredits,
+    miscGovList,
+    miscJobList,
+    miscSearchResult);
+  TTextFormat = (
+    pkNormal,
+    pkCaption,
+    pkSmallIcon,
+    pkBigIcon,
+    pkAdvIcon,
+    pkTer,
+    pkBigTer,
+    pkFeature,
+    pkDot,
+    pkNormal_Dot,
+    pkDomain,
+    pkSection,
+    pkBigFeature,
+    pkExp,
+    pkAITStat,
+    pkExternal,
+    pkModel,
+    pkNormal_64,
+    pkIllu,
+    pkLogo,
+    pkTerImp,
+    pkRightIcon,
+    pkAdvIcon_AsPreq,
+    pkSmallIcon_AsPreq,
+    pkSpecialIcon,
+    pkGov);
   { THyperText }
 …
   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: TTextFormat = pkNormal; Picpix: Integer = 0;
+      LinkCategory: TLinkCategory = hkNoLink; LinkIndex: Integer = 0; CrossLink: Boolean = False);
     procedure LineFeed;
     procedure AppendList(Source: THyperText);
-    destructor Destroy; override;
   end;
 …
   THistItem = class
     Kind: Integer;
+    Kind: TLinkCategory;
     No: Integer;
     Pos: Integer;
 …
   { THistItems }
   THistItems = class(TFPGObjectList<THistItem>)
     function AddNew(Kind, No, Pos: Integer; SearchContent: string): THistItem;
+  THistItems = class(TObjectList<THistItem>)
+    function AddNew(Kind: TLinkCategory; No, Pos: Integer; SearchContent: string): THistItem;
   end;
 …
     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);
 …
     procedure OffscreenPaint; override;
   private
     Kind: Integer;
     no: Integer;
+    Kind: TLinkCategory;
+    No: Integer;
     Sel: Integer;
     CaptionColor: Integer;
 …
     SearchResult: THyperText;
     HelpText: TStringTable;
+    ExtPic, TerrIcon: TDpiBitmap;
+    ExtPic: TDpiBitmap;
+    TerrIcon: TDpiBitmap;
     ScrollBar: TPVScrollbar;
     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: TDpiCanvas; i: Integer; lit: Boolean);
+    procedure Line(ACanvas: TDpiCanvas; I: Integer; Lit: Boolean);
     procedure Prepare(sbPos: Integer = 0);
     procedure ShowNewContentProcExecute(NewMode: Integer; HelpContext: string);
+    procedure ShowNewContentProcExecute(NewMode: TWindowMode; HelpContext: string);
     procedure WaterSign(x0, y0, iix: Integer);
     procedure Search(SearchString: string);
 …
     Difficulty: Integer;
     procedure ClearHistory;
     procedure ShowNewContent(NewMode, Category, Index: Integer);
+    procedure ShowNewContent(NewMode: TWindowMode; Category: TLinkCategory; Index: Integer);
     function TextIndex(Item: string): Integer;
   end;
-var
-  HelpDlg: THelpDlg;
 implementation
 uses
   Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
   UKeyBindings;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global,
+  KeyBindings;
 {$R *.lfm}
 …
   THelpLineInfo = class
     Format: Byte;
+    Format: TTextFormat;
     Picpix: Byte;
+    Link: Word;
+    Category: TLinkCategory;
+    Index: Integer;
+    CrossLink: Boolean;
     procedure Assign(Source: THelpLineInfo);
   end;
+{ THelpLineInfo }
+procedure THelpLineInfo.Assign(Source: THelpLineInfo);
+begin
+  Format := Source.Format;
+  PicPix := Source.PicPix;
+  Link := Source.Link;
+end;
+{ THistItem }
+procedure THistItem.Assign(Source: THistItem);
+begin
+  Kind := Source.Kind;
+  No := Source.No;
+  Pos := Source.Pos;
+  SearchContent := Source.SearchContent;
+end;
+{ THistItems }
+function THistItems.AddNew(Kind, No, Pos: Integer; SearchContent: string
+  ): THistItem;
+begin
+  Result := THistItem.Create;
+  Result.Kind := Kind;
+  Result.No := No;
+  Result.Pos := Pos;
+  Result.SearchContent := SearchContent;
+  Add(Result);
+end;
+procedure THyperText.AddLine(s: String; Format: integer; Picpix: integer;
+  LinkCategory: integer; LinkIndex: integer);
+var
+  HelpLineInfo: THelpLineInfo;
+begin
+  HelpLineInfo := THelpLineInfo.Create;
+  if LinkIndex < 0 then
+    LinkIndex := liInvalid;
+  HelpLineInfo.Format := Format;
+  HelpLineInfo.Picpix := Picpix;
+  HelpLineInfo.Link := LinkCategory shl 8 + LinkIndex;
+  AddObject(s, TObject(HelpLineInfo));
+end;
+procedure THyperText.LineFeed;
+begin
+  AddLine;
+end;
+procedure THyperText.AppendList(Source: THyperText);
+var
+  I: Integer;
+  HelpLineInfo: THelpLineInfo;
+begin
+  for I := 0 to Source.Count - 1 do begin
+    HelpLineInfo := THelpLineInfo.Create;
+    HelpLineInfo.Assign(THelpLineInfo(Source.Objects[I]));
+    AddObject(Source.Strings[I], HelpLineInfo);
+  end;
+end;
+destructor THyperText.Destroy;
+begin
+  inherited;
+end;
+  TSeeAlso = record
+    Kind: TLinkCategory;
+    No: Integer;
+    SeeKind: TLinkCategory;
+    SeeNo: Integer;
+  end;
 const
+  { text formats }
+  pkNormal = 0;
+  pkCaption = 1;
+  pkSmallIcon = 2;
+  pkBigIcon = 3;
+  pkAdvIcon = 4;
+  pkTer = 5;
+  pkBigTer = 6;
+  pkFeature = 7;
+  pkDot = 8;
+  pkNormal_Dot = 9;
+  pkDomain = 10;
+  pkSection = 11;
+  pkBigFeature = 12;
+  pkExp = 13;
+  pkAITStat = 14;
+  pkExternal = 15;
+  pkModel = 16;
+  pkNormal_64 = 17;
+  pkIllu = 18;
+  pkLogo = 19;
+  pkTerImp = 20;
+  pkRightIcon = 21;
+  pkAdvIcon_AsPreq = 22;
+  pkSmallIcon_AsPreq = 23;
+  pkSpecialIcon = 24;
+  pkGov = 25;
+  nSeeAlso = 14;
+  SeeAlso: array [0 .. nSeeAlso - 1] of record
+    Kind: Integer;
+    no: Integer;
+    SeeKind: Integer;
+    SeeNo: Integer;
+  end = ((Kind: hkImp; no: imWalls; SeeKind: hkFeature;
+  SeeAlso: array[0..13] of TSeeAlso = ((Kind: hkImp; no: imWalls; SeeKind: hkFeature;
     SeeNo: mcArtillery), (Kind: hkImp; no: imHydro; SeeKind: hkImp;
     SeeNo: woHoover), (Kind: hkImp; no: imWalls; SeeKind: hkImp;
 …
     SeeKind: hkFeature; SeeNo: mcDefense));
+  nTerrainHelp = 14;
+  TerrainHelp: array [0 .. nTerrainHelp - 1] of integer = (fGrass, fGrass + 12,
+  TerrainHelp: array[0..13] 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,
+    fDesert, 3 * 12 { DeadLands }, fShore, fOcean);
+  JobHelp: array[0..7] of Integer = (jRoad, jRR, jCanal, jIrr,
     jFarm, jMine, jFort, jBase);
+{ THelpLineInfo }
+procedure THelpLineInfo.Assign(Source: THelpLineInfo);
+begin
+  Format := Source.Format;
+  PicPix := Source.PicPix;
+  Category := Source.Category;
+  Index := Source.Index;
+end;
+{ THistItem }
+procedure THistItem.Assign(Source: THistItem);
+begin
+  Kind := Source.Kind;
+  No := Source.No;
+  Pos := Source.Pos;
+  SearchContent := Source.SearchContent;
+end;
+{ THistItems }
+function THistItems.AddNew(Kind: TLinkCategory; No, Pos: Integer; SearchContent: string
+  ): THistItem;
+begin
+  Result := THistItem.Create;
+  Result.Kind := Kind;
+  Result.No := No;
+  Result.Pos := Pos;
+  Result.SearchContent := SearchContent;
+  Add(Result);
+end;
+procedure THyperText.AddLine(S: String; Format: TTextFormat; Picpix: Integer;
+  LinkCategory: TLinkCategory = hkNoLink; LinkIndex: Integer = 0;
+  CrossLink: Boolean = False);
+var
+  HelpLineInfo: THelpLineInfo;
+begin
+  HelpLineInfo := THelpLineInfo.Create;
+  HelpLineInfo.Format := Format;
+  HelpLineInfo.Picpix := Picpix;
+  HelpLineInfo.Category := LinkCategory;
+  HelpLineInfo.Index := LinkIndex;
+  HelpLineInfo.CrossLink := CrossLink;
+  AddObject(S, HelpLineInfo);
+end;
+procedure THyperText.LineFeed;
+begin
+  AddLine;
+end;
+procedure THyperText.AppendList(Source: THyperText);
+var
+  I: Integer;
+  HelpLineInfo: THelpLineInfo;
+begin
+  for I := 0 to Source.Count - 1 do begin
+    HelpLineInfo := THelpLineInfo.Create;
+    HelpLineInfo.Assign(THelpLineInfo(Source.Objects[I]));
+    AddObject(Source.Strings[I], HelpLineInfo);
+  end;
+end;
 procedure THelpDlg.FormCreate(Sender: TObject);
 begin
-  inherited;
   NoMap := TIsoMap.Create;
 …
   CaptionLeft := BackBtn.Left + BackBtn.Width;
   CaptionRight := SearchBtn.Left;
   inc(ModalFrameIndent, 29);
+  Inc(ModalFrameIndent, 29);
   MainText := THyperText.Create;
   MainText.OwnsObjects := True;
 …
   HelpText := TStringTable.Create;
   HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'help.txt'));
+  HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'Help.txt'));
   hADVHELP := HelpText.Gethandle('ADVHELP');
   hIMPHELP := HelpText.Gethandle('IMPHELP');
 …
 end;
 procedure THelpDlg.ShowNewContentProcExecute(NewMode: Integer;
+procedure THelpDlg.ShowNewContentProcExecute(NewMode: TWindowMode;
   HelpContext: string);
 begin
+  HelpDlg.ShowNewContent(NewMode, hkText,
+    HelpDlg.TextIndex(HelpContext))
+  ShowNewContent(NewMode, hkText, TextIndex(HelpContext));
 end;
 …
   if ScrollBar.Process(Msg) then begin
     Sel := -1;
     SmartUpdateContent(true)
+    SmartUpdateContent(True)
   end;
+  }
 …
 begin
   if Sel <> -1 then begin
     Line(Canvas, Sel, false);
     Sel := -1
+    Line(Canvas, Sel, False);
+    Sel := -1;
   end;
 end;
 …
 end;
 procedure THelpDlg.Line(ca: TDpiCanvas; i: Integer; lit: Boolean);
+procedure THelpDlg.Line(ACanvas: TDpiCanvas; I: Integer; Lit: Boolean);
 var
+  TextColor, x, y: Integer;
+  TextColor: TColor;
+  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;
   if ca = Canvas then
   begin
     x := x + SideFrame;
     y := y + WideFrame
   end;
   if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format
+  X := x0[I];
+  Y := 2 + I * 24;
+  if ACanvas = Canvas then
+  begin
+    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.Brush.Style:=bsClear; }
     DpiBitCanvas(ca, x, y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
+    ACanvas.Font.Assign(CaptionFont);
+    { ACanvas.brush.color:=CaptionColor;
+      ACanvas.FillRect(rect(X,I*24,X+24,I*24+24));
+      ACanvas.Brush.Color:=$FFFFFF;
+      ACanvas.FrameRect(rect(X+1,I*24+1,X+24-1,I*24+24-1));
+      ACanvas.Brush.Style:=bsClear; }
+    DpiBitBltCanvas(ACanvas, X, Y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
 );
     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]);
+    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.Textwidth(S[1]) div 2,
+      Y - 3, S[1]);
+    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X + 24, Y - 3, Copy(S, 2, 255));
+    ACanvas.Font.Assign(UniFont[ftNormal]);
   end
+  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format = pkSection
+  then
+  begin
+    ca.Font.Assign(CaptionFont);
+    BiColorTextOut(ca, CaptionColor, $7F007F, x, y - 3, s);
+    ca.Font.Assign(UniFont[ftNormal]);
+  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + I]).Format = pkSection then
+  begin
+    ACanvas.Font.Assign(CaptionFont);
+    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X, Y - 3, S);
+    ACanvas.Font.Assign(UniFont[ftNormal]);
   end
   else
   begin
     if (Kind = hkMisc) and (no = miscMain) then
       ca.Font.Assign(CaptionFont);
+    if (Kind = hkMisc) and (No = Integer(miscMain)) then
+      ACanvas.Font.Assign(CaptionFont);
     TextColor := Colors.Canvas.Pixels[clkMisc, cliPaperText];
     if ca = Canvas then
+    if ACanvas = 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(ACanvas, S);
+      TextSize.cy := ACanvas.TextHeight(S);
+      if Y + TextSize.cy >= WideFrame + InnerHeight then
+        TextSize.cy := WideFrame + InnerHeight - Y;
+      FillSeamless(ACanvas, X, Y, TextSize.cx, TextSize.cy, -SideFrame,
         ScrollBar.Position * 24 - WideFrame, Paper);
     end;
     BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
+    BiColorTextOut(ACanvas, TextColor, $7F007F, X, Y, S);
     if lit then
       with ca do
+      with ACanvas do
       begin
         Assert(ca = Canvas);
+        Assert(ACanvas = 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
       ca.Font.Assign(UniFont[ftNormal]);
   end;
 end;
 procedure THelpDlg.WaterSign(x0, y0, iix: integer);
+    if (Kind = hkMisc) and (No = Integer(miscMain)) then
+      ACanvas.Font.Assign(UniFont[ftNormal]);
+  end;
+end;
+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;
 …
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
   PaintPtr := PixelPointer(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
   CoalPtr := PixelPointer(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
+  PaintPtr := TPixelPointer.Create(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
+  CoalPtr := TPixelPointer.Create(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
   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
+    ImpPtr[dy] := TPixelPointer.Create(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 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
 …
           end;
         end;
         if Sum < MaxSum then begin // no saturation
+        if Sum < MaxSum then begin // No saturation
           Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
           PaintPtr.Pixel^.B := Min(PaintPtr.Pixel^.B * Sum shr 22, 255);
 …
 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;
 …
 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
 …
   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);
           DpiBitCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+          if 4 + I * 24 + yl > InnerHeight then
+            yl := InnerHeight - (4 + I * 24);
+          DpiBitBltCanvas(OffScreen.Canvas, 8, 4 + I * 24, ExtPic.Width, yl, ExtPic.Canvas,
 , 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]);
         if HelpLineInfo.Link <> 0 then
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + I]);
+        if (HelpLineInfo.Category <> hkNoLink) or (HelpLineInfo.Index <> 0) then
         begin
           if (Kind = hkMisc) and (no = miscSearchResult) then
             Sprite(OffScreen, HGrSystem, 18, 9 + i * 24, 8, 8, 90, 16)
+          if (Kind = hkMisc) and (No = Integer(miscSearchResult)) then
+            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)
           else if HelpLineInfo.Link and (hkCrossLink shl 8) <> 0 then
             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, 12, I * 24 + 5, 14, 14, 65, 20)
+          else if HelpLineInfo.CrossLink then
+            Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 80, 1)
+          else if not((Kind = hkMisc) and (No = Integer(miscMain))) then
+            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,
 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
++ xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
               if HelpLineInfo.Picpix = imPalace then
                 DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
 * xSizeSmall, 1 * ySizeSmall)
               else
                 DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(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,
 , 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:
 …
 :
                   FrameImage(OffScreen.Canvas, HGrSystem2.Data,
 + x0[i], -7 + i * 24, 56, 40, 137, 127);
++ x0[I], -7 + I * 24, 56, 40, 137, 127);
 :
                   with NoMap do begin
                     PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
 + 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,
 , 2 * yyt, 1 + 3 * (xxt * 2 + 1) + xxt - 28,
 + 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;
 :
                   with NoMap do begin
                     PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
 + 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,
 , 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
 + 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,
 , 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
 + 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,
 + 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,
++ 36 + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 8 + x0[I], 2 + I * 24, 36, 20,
 + 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,
 + xSizeSmall + x0[i], 2 + ySizeSmall + i * 24,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
++ xSizeSmall + x0[I], 2 + ySizeSmall + I * 24,
                 $000000, $000000);
               if AdvIcon[HelpLineInfo.Picpix] < 84 then
                 DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 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,
 + (AdvIcon[HelpLineInfo.Picpix] - 84) mod 8 * 37,
 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
               j := AdvValue[HelpLineInfo.Picpix] div 1000;
               DpiBitCanvas(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,
 + j * 15, 85);
               x0[i] := x0[i] + (8 + 8 + 36);
+              J := AdvValue[HelpLineInfo.Picpix] div 1000;
+              DpiBitBltCanvas(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,
++ 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,
 + 23 + i * 24));
+                Brush.Color := $C0C0C0;
+                FrameRect(Rect(ofs, 1 + 23 + I * 24, ofs + 14,
++ 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,
 + HelpLineInfo.Picpix mod 11 * 11,
 + 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
 …
               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),
 + 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),
 + 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),
 + 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),
 + (HelpLineInfo.Picpix - 2 * 12) * (yyt * 3 + 1))
 …
                   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),
 + srcno div 9 * (yyt * 3 + 1));
 …
               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),
 + yyt + 2 * (yyt * 3 + 1));
 …
               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),
 + 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),
 + 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))
 …
               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),
 + (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),
 + (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,
 , 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,
 + HelpLineInfo.Picpix mod 10 * 65,
 + 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,
 + i * 24 - 3, 16, 1);
               ScreenTools.Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
 + 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,
++ I * 24 - 3, 16, 1);
+              ScreenTools.Frame(OffScreen.Canvas, x0[I] + 8, 7 + I * 24 - 2, x0[I] + 8 + 13,
++ I * 24 - 2 + 13, $C0C0C0, $C0C0C0);
+              Sprite(OffScreen, HGrSystem, x0[I] + 8 + 2, 7 + I * 24, 10, 10,
 + HelpLineInfo.Picpix mod 11 * 11,
 + 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,
 + 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,
++ 11 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 20, 8 - 3 + I * 24, 12, 14,
 + 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,
 + 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,
 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
               DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24, xSizeSmall,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
++ xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              DpiBitBltCanvas(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,
 , 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;
 …
 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, I, True);
+  end;
+  procedure AddPreqAdv(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon_AsPreq, I,
+      hkAdv, I, True);
+  end;
+  procedure AddImprovement(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+      hkImp, I, True);
+  end;
+  procedure AddPreqImp(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon_AsPreq, I,
+      hkImp, I, True);
+  end;
+  procedure AddTerrain(I: Integer);
   begin
     if MainText.Count > 1 then
 …
       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, I, True);
+  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, I, True);
   end;
   procedure AddStandardBlock(Item: string);
   var
     i: integer;
+    I: Integer;
   begin
     with MainText do
 …
       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)
     end
   end;
   procedure DecodeItem(s: string; var Category, Index: Integer);
+        for I := 0 to 3 do
+          AddLine(Phrases2.Lookup('AITSTAT', I), pkAITStat, I)
+    end;
+  end;
+  procedure DecodeItem(S: string; var Category: TLinkCategory; var 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;
 …
         'E': Category := hkInternet;
         'S': Category := hkModel;
         'C': Index := miscCredits;
         'J': Index := miscJobList;
         'G': Index := miscGovList;
+        'C': Index := Integer(miscCredits);
+        'J': Index := Integer(miscJobList);
+        'G': Index := Integer(miscGovList);
       end;
       if (Category <> hkMisc) and (Index = 0) then
 …
     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;
     FollowFormat: Integer;
+    CurrentFormat: TTextFormat;
+    FollowFormat: TTextFormat;
     Picpix: Integer;
+    LinkCategory: Integer;
+    LinkCategory: TLinkCategory;
+    CrossLink: Boolean;
     LinkIndex: Integer;
     RightMargin: Integer;
 …
     Text: string;
   begin
+    CrossLink := False;
     RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
     FollowFormat := pkNormal;
     while s <> '' do
+    while S <> '' do
     begin
       Picpix := 0;
       LinkCategory := 0;
+      LinkCategory := hkNoLink;
       LinkIndex := 0;
       if s[1] = '$' then
       begin // window caption
         p := 1;
+      if S[1] = '$' then
+      begin // Window caption
+        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
       begin // standard block
         p := 1;
+      else if S[1] = '&' then
+      begin // Standard block
+        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
       begin // image
         if (Length(s) >= 2) and (s[2] = '@') then
         begin // generate from icon
+      else if S[1] = '@' then
+      begin // Image
+        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
 …
         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);
               CurrentFormat := 0;
+                Inc(P);
+              until (P > Length(S)) or (S[P] = '\') or (S[P] = ' ');
+              DecodeItem(Copy(S, 2, P - 2), LinkCategory, LinkIndex);
+              CurrentFormat := pkNormal;
               if (LinkCategory <> hkText) and (LinkIndex < 200) then
               // show icon
 …
                     begin
                       CurrentFormat := pkAdvIcon;
                       Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkImp:
                     begin
                       CurrentFormat := pkSmallIcon;
                       Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkTer:
 …
                     begin
                       CurrentFormat := pkFeature;
                       Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkModel:
 …
                     end;
                 end;
               if s[1] = ':' then
                 LinkCategory := LinkCategory + hkCrossLink;
               if (p > Length(s)) or (s[p] = ' ') then
                 Delete(s, 1, p)
+              if S[1] = ':' then
+                CrossLink := True;
+              if (P > Length(S)) or (S[P] = ' ') then
+                Delete(S, 1, P)
               else
                 Delete(s, 1, p - 1)
             end;
           '!': // highlited
             if (Length(s) >= 2) and (s[2] = '!') then
+                Delete(S, 1, P - 1)
+            end;
+          '!': // highlighted
+            if (Length(S) >= 2) and (S[2] = '!') then
             begin
               if MainText.Count > 1 then
 …
               FollowFormat := pkCaption;
               CurrentFormat := pkCaption;
               Delete(s, 1, 2);
+              Delete(S, 1, 2);
             end
             else
 …
               FollowFormat := pkSection;
               CurrentFormat := pkSection;
               Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
           '-':
 …
               FollowFormat := pkNormal_Dot;
               CurrentFormat := pkDot;
               Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
         else
 …
         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 = hkInternet then begin
           if LinkIndex = 1 then Text := AITemplateManual
           else if LinkIndex = 2 then Text := CevoHomepageShort
 …
         end;
         MainText.AddLine(Text, CurrentFormat, Picpix, LinkCategory,
           LinkIndex);
         if (l < Length(s)) and (s[l + 1] = '\') then
+          LinkIndex, CrossLink);
+        if (L < Length(S)) and (S[L + 1] = '\') then
           FollowFormat := pkNormal;
         Delete(s, 1, l + 1);
       end
     end
+        Delete(S, 1, L + 1);
+      end;
+    end;
   end;
 …
   end;
   procedure AddModelText(i: Integer);
+  procedure AddModelText(I: Integer);
   var
     pix: Integer;
     s: string;
+    S: string;
   begin
     with MainText do begin
 …
         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]]);
 …
   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 Length(JobHelp) - 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;
 …
         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]]);
 …
   procedure AddGraphicCredits;
   var
     i: Integer;
     s: string;
+    I: Integer;
+    S: string;
     sr: TSearchRec;
     List, Plus: TStringList;
 …
     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 -
         DpiGetSystemMetrics(SM_CXVSCROLL) do
         Delete(s, length(s), 1);
       MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
 …
   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 -
         DpiGetSystemMetrics(SM_CXVSCROLL) do
         Delete(s, length(s), 1);
       MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
 …
     Clear;
     Headline := -1;
     if (no >= 200) or not(Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
+    if (No >= 200) or not (Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
       LineFeed;
     case Kind of
       hkText:
         AddTextual(HelpText.LookupByHandle(no));
+        AddTextual(HelpText.LookupByHandle(No));
       hkMisc:
         begin
           case no of
             miscMain:
+          case No of
+            Integer(miscMain):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_MAIN');
                 AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'), pkSpecialIcon,
 , { pkBigIcon,22, } hkText, HelpText.Gethandle('QUICK'));
+, { pkBigIcon,22, } hkText, HelpText.GetHandle('QUICK'));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CONCEPTS'), pkBigIcon, 6,
 …
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkSpecialIcon, 2,
                   hkMisc, miscJobList);
+                  hkMisc, Integer(miscJobList));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_TECHLIST'), pkBigIcon, 39,
                   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;
 …
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkBigIcon,
                   gDemocracy + 6, hkMisc, miscGovList);
+                  gDemocracy + 6, hkMisc, Integer(miscGovList));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_KEYS'), pkBigIcon, 2, hkText,
 …
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CREDITS'), pkBigIcon, 22,
                   hkMisc, miscCredits);
+                  hkMisc, Integer(miscCredits));
               end;
             miscCredits:
+            Integer(miscCredits):
               begin
                 AddItem('CREDITS');
 …
                 AddItem('AUTHOR');
               end;
             miscJobList:
+            Integer(miscJobList):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_JOBLIST');
 …
                 AddItem('TERIMPCITY');
               end;
             miscGovList:
+            Integer(miscGovList):
               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;
 …
                 end;
               end;
             miscSearchResult:
+            Integer(miscSearchResult):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
 …
                 MainText.AppendList(SearchResult);
               end;
           end; // case no
+          end; // case No
         end;
       hkAdv:
         if no = 200 then
+        if No = 200 then
         begin // complete advance list
           Caption := HelpText.Lookup('HELPTITLE_TECHLIST');
           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);
 …
         else // single advance
         begin
           Caption := Phrases.Lookup('ADVANCES', no);
+          Caption := Phrases.Lookup('ADVANCES', No);
           LineFeed;
           AddLine(Phrases.Lookup('ADVANCES', no), pkCaption);
           if no in FutureTech then
+          AddLine(Phrases.Lookup('ADVANCES', No), pkCaption);
+          if No in FutureTech then
           begin
             AddLine(HelpText.Lookup('HELPSPEC_FUTURE'));
             LineFeed;
             if no = futResearchTechnology then
+            if No = futResearchTechnology then
               AddItem('FUTURETECHHELP100')
             else
 …
           else
             AddLine(HelpText.Lookup('HELPSPEC_ADV'));
           if AdvPreq[no, 2] <> preNone then
+          if AdvPreq[No, 2] <> preNone then
             NextSection('PREREQALT')
           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,
                 hkMisc + hkCrossLink, miscGovList);
+          for I := 2 to nGov - 1 do
+            if GovPreq[I] = No then
+              AddLine(Phrases.Lookup('GOVERNMENT', I), pkGov, I,
+                hkMisc, Integer(miscGovList), True);
           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
+                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;
       hkImp:
         if no = 200 then
+        if No = 200 then
         begin // complete city improvement list
           Caption := HelpText.Lookup('HELPTITLE_IMPLIST');
 …
           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);
           FreeAndNil(List);
         end
         else if no = 201 then
+        else if No = 201 then
         begin // complete nat. project list
           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
+        else if No = 202 then
         begin // complete wonder list
           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
         begin // single building
           Caption := Phrases.Lookup('IMPROVEMENTS', no);
+          Caption := Phrases.Lookup('IMPROVEMENTS', No);
           LineFeed;
           AddLine(Phrases.Lookup('IMPROVEMENTS', no), pkRightIcon, no);
           case Imp[no].Kind of
+          AddLine(Phrases.Lookup('IMPROVEMENTS', No), pkRightIcon, No);
+          case Imp[No].Kind of
             ikWonder: AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
             ikCommon: AddLine(HelpText.Lookup('HELPSPEC_IMP'));
 …
             AddLine(HelpText.Lookup('HELPSPEC_NAT'))
           end;
           if Imp[no].Kind <> ikShipPart then begin
+          if Imp[No].Kind <> ikShipPart then begin
             NextSection('EFFECT');
             AddTextual(HelpText.LookupByHandle(hIMPHELP, no));
+            AddTextual(HelpText.LookupByHandle(hIMPHELP, No));
           end;
           if no = woSun then begin
+          if No = woSun then begin
             AddFeature(mcFirst);
             AddFeature(mcWill);
             AddFeature(mcAcademy);
           end;
           if (no < nWonder) and not Phrases2FallenBackToEnglish then
+          if (No < nWonder) and not Phrases2FallenBackToEnglish then
           begin
             LineFeed;
             if Imp[no].Expiration >= 0 then
+            if Imp[No].Expiration >= 0 then
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE1'))
             else
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE2'));
           end;
           if Imp[no].Preq <> preNone then
+          if Imp[No].Preq <> preNone then
           begin
             NextSection('PREREQ');
             AddPreqAdv(Imp[no].Preq);
+            AddPreqAdv(Imp[No].Preq);
           end;
           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'),
               [Imp[no].Cost * BuildCostMod[Difficulty] div 12]);
           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
+            S := Format(HelpText.Lookup('BUILDCOST'),
+              [Imp[No].Cost * BuildCostMod[Difficulty] div 12]);
+          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
               begin
                 NextSection('REPLACE');
                 AddItem('REPLACETEXT');
                 j := 1;
+                J := 1;
               end;
               AddImprovement(ImpReplacement[i].OldImp);
             end;
           if Imp[no].Kind = ikShipPart then
+              AddImprovement(ImpReplacement[I].OldImp);
+            end;
+          if Imp[No].Kind = ikShipPart then
           begin
             LineFeed;
             if no = imShipComp then
               i := 1
             else if no = imShipPow then
               i := 2
             else { if no=imShipHab then }
               i := 3;
+            if No = imShipComp then
+              I := 1
+            else if No = imShipPow then
+              I := 2
+            else { if No=imShipHab then }
+              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
+          if (No < nWonder) and (Imp[No].Expiration >= 0) then
           begin
             NextSection('EXPIRATION');
             s := Format(HelpText.Lookup('EXPWITH'),
               [Phrases.Lookup('ADVANCES', Imp[no].Expiration)]);
             if no = woPyramids then
               s := s + ' ' + HelpText.Lookup('EXPSLAVE');
             AddTextual(s);
+            S := Format(HelpText.Lookup('EXPWITH'),
+              [Phrases.Lookup('ADVANCES', Imp[No].Expiration)]);
+            if No = woPyramids then
+              S := S + ' ' + HelpText.Lookup('EXPSLAVE');
+            AddTextual(S);
           end;
           NextSection('SEEALSO');
           if (no < nWonder) and (Imp[no].Expiration >= 0) then
+          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);
           if no = imSupermarket then
+          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;
+              hkMisc, Integer(miscJobList), True);
+          CheckSeeAlso := True;
         end;
       hkTer:
         if no = 200 then
+        if No = 200 then
         begin // complete terrain type list
           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 Length(TerrainHelp) - 1 do
+            AddTerrain(TerrainHelp[I]);
         end
         else
         begin // sigle terrain type
           TerrType := no mod 12;
+          TerrType := No mod 12;
           if TerrType = fJungle then
             TerrType := fForest;
           TerrSubType := no div 12;
           if no = 3 * 12 then
+          TerrSubType := No div 12;
+          if No = 3 * 12 then
           begin
             TerrType := fDesert;
 …
           with Terrain[TerrType] do
           begin
             Caption := Phrases.Lookup('TERRAIN', no);
+            Caption := Phrases.Lookup('TERRAIN', No);
             LineFeed;
             AddLine(Phrases.Lookup('TERRAIN', no), pkBigTer, no);
+            AddLine(Phrases.Lookup('TERRAIN', No), pkBigTer, No);
             AddLine(HelpText.Lookup('HELPSPEC_TER'));
             LineFeed;
 …
               AddLine(Format(HelpText.Lookup('RESPROD'),
                 [ProdRes[TerrSubType]]));
             if (no < 3 * 12) and (MineEff > 0) then
+            if (No < 3 * 12) and (MineEff > 0) then
               MainText[Count - 1] := MainText[Count - 1] + ' ' +
                 Format(HelpText.Lookup('MOREMINE'), [MineEff]);
 …
               AddLine(Format(HelpText.Lookup('RESFOOD'),
                 [FoodRes[TerrSubType]]));
             if (no < 3 * 12) and (IrrEff > 0) then
+            if (No < 3 * 12) and (IrrEff > 0) then
               MainText[Count - 1] := MainText[Count - 1] + ' ' +
                 Format(HelpText.Lookup('MOREIRR'), [IrrEff]);
 …
               else
                 AddLine(HelpText.Lookup('MOVEPLAIN'));
             if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
               AddTextual(HelpText.Lookup('DEADLANDS'));
             end;
             if (TerrType = fDesert) and (no <> fDesert + 12) then
+            if (TerrType = fDesert) and (No <> fDesert + 12) then
             begin
               LineFeed;
 …
               AddTextual(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
             end;
             if (no < 3 * 12) and (TransTerrain >= 0) then
+            if (No < 3 * 12) and (TransTerrain >= 0) then
             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);
               if no = fSwamp + 12 then
+                [Phrases.Lookup('TERRAIN', I)]), pkTer, I,
+                hkTer, I, True);
+              if No = fSwamp + 12 then
               begin
                 LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', TransTerrain + 24)]), pkTer,
                   TransTerrain + 24, hkTer + hkCrossLink, TransTerrain + 24);
+                  TransTerrain + 24, hkTer, TransTerrain + 24, True);
               end
               else if i = fGrass then
+              else if I = fGrass then
               begin
                 LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
                   hkTer + hkCrossLink, fGrass + 12);
+                  hkTer, fGrass + 12, True);
               end;
             end;
             NextSection('SPECIAL');
             if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
 …
               end;
             end
             else if (no < 12) and (no <> fGrass) and (no <> fOcean) then
+            else if (No < 12) and (No <> fGrass) and (No <> fOcean) then
             begin
               LineFeed;
               for Special := 1 to 2 do
                 if (no <> fArctic) and (no <> fSwamp) or (Special < 2) then
+                if (No <> fArctic) and (No <> fSwamp) or (Special < 2) then
                 begin
                   if Special > 1 then
                     LineFeed;
                   AddLine(Phrases.Lookup('TERRAIN', no + Special * 12), pkTer,
                     no + Special * 12);
                   i := FoodRes[Special] - FoodRes[0];
                   if i <> 0 then
+                  AddLine(Phrases.Lookup('TERRAIN', No + Special * 12), pkTer,
+                    No + Special * 12);
+                  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;
             if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
               AddTextual(HelpText.Lookup('RARE'));
             end;
             if (no < 3 * 12) and (TerrType in [fDesert, fArctic]) then
+            if (No < 3 * 12) and (TerrType in [fDesert, fArctic]) then
             begin
               NextSection('SEEALSO');
               AddImprovement(woGardens);
               CheckSeeAlso := true
+              CheckSeeAlso := True;
             end;
           end;
 …
       hkFeature:
         if no = 200 then
+        if No = 200 then
         begin // complete feature list
           Caption := HelpText.Lookup('HELPTITLE_FEATURELIST');
 …
             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;
 …
         else
         begin // single feature
           Caption := Phrases.Lookup('FEATURES', no);
+          Caption := Phrases.Lookup('FEATURES', No);
           LineFeed;
           AddLine(Phrases.Lookup('FEATURES', no), pkBigFeature, no);
           if no < mcFirstNonCap then
+          AddLine(Phrases.Lookup('FEATURES', No), pkBigFeature, No);
+          if No < mcFirstNonCap then
             AddLine(HelpText.Lookup('HELPSPEC_CAP'))
           else if no in AutoFeature then
+          else if No in AutoFeature then
             AddLine(HelpText.Lookup('HELPSPEC_STANDARD'))
           else
             AddLine(HelpText.Lookup('HELPSPEC_FEATURE'));
           NextSection('EFFECT');
           AddTextual(HelpText.LookupByHandle(hFEATUREHELP, no));
           if (Feature[no].Weight <> 0) or (Feature[no].Cost <> 0) then
+          AddTextual(HelpText.LookupByHandle(hFEATUREHELP, No));
+          if (Feature[No].Weight <> 0) or (Feature[No].Cost <> 0) then
           begin
             NextSection('COSTS');
             s := IntToStr(Feature[no].Cost);
             if Feature[no].Cost >= 0 then
               s := '+' + s;
             AddLine(Format(HelpText.Lookup('COSTBASE'), [s]));
             if Feature[no].Weight > 0 then
+            S := IntToStr(Feature[No].Cost);
+            if Feature[No].Cost >= 0 then
+              S := '+' + S;
+            AddLine(Format(HelpText.Lookup('COSTBASE'), [S]));
+            if Feature[No].Weight > 0 then
             begin
               AddLine(Format(HelpText.Lookup('WEIGHT'),
                 ['+' + IntToStr(Feature[no].Weight)]));
               if no = mcDefense then
+                ['+' + IntToStr(Feature[No].Weight)]));
+              if No = mcDefense then
                 AddLine(Format(HelpText.Lookup('WEIGHT'), ['+2']),
                   pkDomain, dGround);
             end;
           end;
           if Feature[no].Preq <> preNone then
+          if Feature[No].Preq <> preNone then
           begin
             LineFeed;
             if Feature[no].Preq = preSun then
+            if Feature[No].Preq = preSun then
               AddPreqImp(woSun) // sun tsu feature
             else
               AddPreqAdv(Feature[no].Preq);
+              AddPreqAdv(Feature[No].Preq);
             MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
               [MainText[Count - 1]]);
 …
         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');
 …
     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 Length(SeeAlso) - 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
 …
     ScrollBar.SetPos(sbPos);
     BackBtn.Visible := HistItems.Count > 1;
     TopBtn.Visible := (HistItems.Count > 1) or (Kind <> hkMisc) or (no <> miscMain);
+    TopBtn.Visible := (HistItems.Count > 1) or (Kind <> hkMisc) or (No <> Integer(miscMain));
     Sel := -1;
   end; // with MainText
 end;
+procedure THelpDlg.ShowNewContent(NewMode, Category, Index: Integer);
+begin
+  if (Category <> Kind) or (Index <> no) or (Category = hkMisc) and
+    (Index = miscSearchResult) then begin
+procedure THelpDlg.ShowNewContent(NewMode: TWindowMode; Category: TLinkCategory;
+  Index: Integer);
+begin
+  if (Category <> Kind) or (Index <> No) or (Category = hkMisc) and
+    (Index = Integer(miscSearchResult)) then begin
     if HistItems.Count = MaxHist then HistItems.Delete(0);
     if HistItems.Count = 0 then
 …
   end;
   Kind := Category;
   no := Index;
+  No := Index;
   SearchContent := NewSearchContent;
   Prepare;
 …
 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;
   if (Sel + i0 >= MainText.Count) or (Sel >= 0) and
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Link = 0) then
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Category = hkNoLink) and
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Index = 0)then
     Sel := -1;
   if Sel <> Sel0 then
 …
 procedure THelpDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if Sel >= 0 then
     with THelpLineInfo(MainText.Objects[Sel + ScrollBar.Position]) do
       if Link shr 8 and $3F = hkInternet then
         case Link and $FF of
+      if Category = hkInternet then
+        case Index of
 : OpenDocument(HomeDir + AITemplateFileName);
 : OpenURL(CevoHomepage);
 …
       else
       begin
+        if (Link >= $8000) and (Link and $3FFF = liInvalid) then
+          exit; // invalid link;
+        if Link >= $8000 then
+          ShowNewContent(FWindowMode, hkText, Link and $3FFF)
+        else
+          ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
+        if Index < 0 then Exit; // invalid link;
+        ShowNewContent(FWindowMode, Category, Index);
       end;
 end;
 …
     HistItem.Assign(HistItems.Last);
     HistItems.Delete(HistItems.Count - 1);
     if (HistItem.Kind = hkMisc) and (HistItem.No = miscSearchResult) and
+    if (HistItem.Kind = hkMisc) and (HistItem.No = Integer(miscSearchResult)) and
       (HistItem.SearchContent <> SearchContent) then
     begin
 …
     end;
     Kind := HistItem.Kind;
     no := HistItem.No;
+    No := HistItem.No;
     Prepare(HistItem.Pos);
     OffscreenPaint;
 …
   while HistItems.Count > 1 do HistItems.Delete(HistItems.Count - 1);
   Kind := hkMisc;
   no := miscMain;
+  No := Integer(miscMain);
   Prepare;
   OffscreenPaint;
 …
 function THelpDlg.TextIndex(Item: string): Integer;
 begin
   Result := HelpText.Gethandle(Item);
+  Result := HelpText.GetHandle(Item);
 end;
 …
 :
         with THelpLineInfo(SearchResult.Objects[0]) do
+          if Link >= $8000 then
+            ShowNewContent(FWindowMode, hkText, Link and $3FFF)
+          else
+            ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
+    else
+      begin
+          ShowNewContent(FWindowMode, Category, Index);
+      else begin
         NewSearchContent := InputDlg.EInput.Text;
         ShowNewContent(FWindowMode, hkMisc, miscSearchResult);
+        ShowNewContent(FWindowMode, hkMisc, Integer(miscSearchResult));
       end;
     end;
 …
 procedure THelpDlg.Search(SearchString: string);
 var
   h, i, PrevHandle, PrevIndex, p, RightMargin: Integer;
   s: string;
   mADVHELP, mIMPHELP, mFEATUREHELP: set of 0 .. 255;
+  H, I, PrevHandle, PrevIndex, P, RightMargin: Integer;
+  S: string;
+  mADVHELP, mIMPHELP, mFEATUREHELP: set of 0..255;
   bGOVHELP, bSPECIALMODEL, bJOBHELP: Boolean;
 begin
 …
   bJOBHELP := False;
   // search in generic reference
+  // 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, I, True)
       else
       begin
         SearchResult.AddLine(Phrases.Lookup('TERRAIN', 36) + ' ' +
           HelpText.Lookup('HELPSPEC_TER'), pkNormal, 0,
           hkTer + hkCrossLink, 36);
         if i > 36 then
+          hkTer, 36, True);
+        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, imShipComp + I - 37, True);
         Break;
       end;
   end;
   for i := 0 to nJobHelp - 1 do
     if pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[i]))) > 0
+  for I := 0 to Length(JobHelp) - 1 do
+    if Pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[I]))) > 0
     then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
         hkMisc + hkCrossLink, miscJobList);
+        hkMisc, Integer(miscJobList), True);
       bJOBHELP := True;
       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, I, True);
+      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,
         hkModel + hkCrossLink, 0);
+        hkModel, 0, True);
       bSPECIALMODEL := True;
       Break;
     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, I, True);
+      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, I, True);
+      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,
         hkMisc + hkCrossLink, miscGovList);
+        hkMisc, Integer(miscGovList), True);
       bGOVHELP := True;
       Break;
     end;
   // full text search
   h := -1;
+  // Full text search
+  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, I, True);
       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, I, True);
       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, I, True);
       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)
+          hkMisc, Integer(miscGovList), True);
     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,
 , hkModel + hkCrossLink, 0)
+, hkModel, 0, True);
     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)
+          hkMisc, Integer(miscJobList), True);
     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, H, True);
       end;
     end;
     until False;
     // cut lines to fit to window
     RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
     OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
     for i := 0 to SearchResult.Count - 1 do
     begin
       while BiColorTextWidth(OffScreen.Canvas, SearchResult[i]) >
         RightMargin - 32 do
         SearchResult[i] := copy(SearchResult[i], 1, length(SearchResult[i]) - 1)
     end;
   end;
+  until False;
+  // Cut lines to fit to window
+  RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
+  OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  for I := 0 to SearchResult.Count - 1 do
+  begin
+    while BiColorTextWidth(OffScreen.Canvas, SearchResult[I]) >
+      RightMargin - 32 do
+      SearchResult[I] := Copy(SearchResult[I], 1, Length(SearchResult[I]) - 1)
+  end;
+end;
 end.

branches/highdpi/LocalPlayer/IsoEngine.pas

-              r405
+              r465
 uses
   UDpiControls, Protocol, ClientTools, ScreenTools, Tribes,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, UPixelPointer, UGraphicSet;
+  UDpiControls, Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, PixelPointer, GraphicSet;
 const
 …
 type
   TInitEnemyModelEvent = function(emix: integer): boolean;
+  TInitEnemyModelEvent = function(emix: Integer): Boolean;
   TTileSize = (tsSmall, tsMedium, tsBig);
 …
       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: TDpiBitmap;
 …
     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
 …
     procedure Reset;
     procedure SetOutput(Output: TDpiBitmap);
     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: TDpiBitmap; 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: TDpiBitmap; 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;
 …
     (X: 72; Y: 36));
 function IsJungle(y: integer): boolean;
+function IsJungle(Y: Integer): Boolean;
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
 …
   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;
 …
   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] := TPixelPointer.Create(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;
 …
 procedure TIsoMap.ApplyTileSize(ATileSize: TTileSize);
 var
   x: Integer;
   y: Integer;
+  X: Integer;
+  Y: Integer;
   xSrc: Integer;
   ySrc: Integer;
 …
   DitherMask.SetSize(xxt * 2, yyt * 2);
   DitherMask.Canvas.FillRect(0, 0, DitherMask.Width, DitherMask.Height);
   DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
+  DpiBitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
     HGrTerrain.Mask.Canvas, 1 + 7 * (xxt * 2 + 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
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for Y := -1 to 6 do
+      DpiBitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc);
     for y := -2 to 6 do
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+    for Y := -2 to 6 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+    for Y := -2 to 6 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+    for Y := -2 to 6 do
+      DpiBitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt, xxt,
         yyt, DitherMask.Canvas, xxt, yyt, SRCAND);
     for y := -2 to 6 do
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+    for Y := -2 to 6 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for X := -2 to 6 do
+      DpiBitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2), (Y + 2) * yyt,
         xxt * 2, yyt, HGrTerrain.Data.Canvas, xSrc, ySrc);
     DpiBitCanvas(LandMore.Canvas, xxt * 2, (y + 2) * yyt, xxt, yyt,
+    DpiBitBltCanvas(LandMore.Canvas, xxt * 2, (Y + 2) * yyt, xxt, yyt,
       HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt, SRCPAINT);
     for x := 0 to 7 do
       DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+    for X := 0 to 7 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+    for X := -2 to 6 do
+      DpiBitBltCanvas(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
         DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      if (X >= 1) = (Y >= 2) then
+        DpiBitBltCanvas(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
         DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+        DpiBitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
         DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+        DpiBitBltCanvas(OceanPatch.Canvas, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
       DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+      DpiBitBltCanvas(OceanPatch.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
         DitherMask.Canvas, xxt, yyt, SRCAND);
       DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+      DpiBitBltCanvas(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
         DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      if (X < 1) or (Y >= 2) then
+        DpiBitBltCanvas(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
         DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+        DpiBitBltCanvas(OceanMore.Canvas, X * (xxt * 2), Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
         DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+        DpiBitBltCanvas(OceanMore.Canvas, X * (xxt * 2) + xxt, Y * yyt, xxt, yyt,
           HGrTerrain.Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
       DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+      DpiBitBltCanvas(OceanMore.Canvas, X * (xxt * 2), Y * yyt, xxt * 2, yyt,
         DitherMask.Canvas, 0, 0, SRCAND);
     end;
   end;
   DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
+  DpiBitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
     DitherMask.Canvas, 0, 0, DSTINVERT); { invert dither mask }
   DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
+  DpiBitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
     HGrTerrain.Mask.Canvas, 1, 1 + yyt, SRCPAINT);
   for x := -1 to 6 do
     for y := -2 to 6 do
       DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+  for X := -1 to 6 do
+    for Y := -2 to 6 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+  for Y := -1 to 6 do
+    for X := -2 to 7 do
+      DpiBitBltCanvas(LandMore.Canvas, (X + 2) * (xxt * 2) - xxt, (Y + 2) * yyt,
         xxt * 2, yyt, DitherMask.Canvas, 0, yyt, SRCAND);
   DpiBitCanvas(LandPatch.Canvas, 0, 0, (xxt * 2) * 9, yyt * 9,
+  DpiBitBltCanvas(LandPatch.Canvas, 0, 0, (xxt * 2) * 9, yyt * 9,
     LandMore.Canvas, 0, 0, SRCPAINT);
   for x := 0 to 3 do
     for y := 0 to 3 do
       DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+  for X := 0 to 3 do
+    for Y := 0 to 3 do
+      DpiBitBltCanvas(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
       DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2) - xxt, y * yyt, xxt * 2,
+  for Y := 0 to 3 do
+    for X := 0 to 4 do
+      DpiBitBltCanvas(OceanMore.Canvas, X * (xxt * 2) - xxt, Y * yyt, xxt * 2,
         yyt, DitherMask.Canvas, 0, yyt, SRCAND);
   DpiBitCanvas(OceanPatch.Canvas, 0, 0, (xxt * 2) * 4, yyt * 4,
+  DpiBitBltCanvas(OceanPatch.Canvas, 0, 0, (xxt * 2) * 4, yyt * 4,
     OceanMore.Canvas, 0, 0, SRCPAINT);
 …
     FillRect(Rect(0, 0, xxt * 2, yyt));
   end;
   DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt,
+  DpiBitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt,
     HGrTerrain.Mask.Canvas, 1, 1 + yyt);
   for x := 0 to 6 do
     DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), yyt, xxt * 2, yyt,
+  for X := 0 to 6 do
+    DpiBitBltCanvas(LandPatch.Canvas, (X + 2) * (xxt * 2), yyt, xxt * 2, yyt,
       DitherMask.Canvas, 0, 0, SRCAND);
   DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt, DitherMask.Canvas,
+  DpiBitBltCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt, DitherMask.Canvas,
 , 0, DSTINVERT);
   for y := 0 to 6 do
     DpiBitCanvas(LandPatch.Canvas, xxt * 2, (y + 2) * yyt, xxt * 2, yyt,
+  for Y := 0 to 6 do
+    DpiBitBltCanvas(LandPatch.Canvas, xxt * 2, (Y + 2) * yyt, xxt * 2, yyt,
       DitherMask.Canvas, 0, 0, SRCAND);
 …
 end;
 procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: integer);
+procedure TIsoMap.SetPaintBounds(Left, Top, Right, Bottom: Integer);
 begin
   FLeft := Left;
 …
 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: TDpiBitmap; 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: TDpiBitmap; 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;
   DpiBitCanvas(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;
+  DpiBitBltCanvas(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);
 …
 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;
 …
     Height := FBottom - yDst;
   if (Width <= 0) or (Height <= 0) then
     exit;
   DpiBitCanvas(FOutput.Canvas, xDst, yDst, Width, Height, MaskCanvas, xSrc, ySrc, SRCAND);
+    Exit;
+  DpiBitBltCanvas(FOutput.Canvas, xDst, yDst, Width, Height, MaskCanvas, xSrc, ySrc, SRCAND);
   if not PureBlack then
     DpiBitCanvas(FOutput.Canvas, xDst, yDst, Width, Height, DataCanvas, xSrc, ySrc, SRCPAINT);
 end;
 procedure TIsoMap.PaintUnit(x, y: integer; const UnitInfo: TUnitInfo;
   Status: integer);
 var
   xsh, ysh, xGr, yGr, j, mixShow: integer;
+    DpiBitBltCanvas(FOutput.Canvas, xDst, yDst, Width, Height, DataCanvas, xSrc, ySrc, SRCPAINT);
+end;
+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
 …
         (@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,
 + Tribe[Owner].sympix mod 10 * 65,
 + 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,
 + Tribe[Owner].sympix mod 10 * 65,
 + 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; { PaintUnit }
 procedure TIsoMap.PaintCity(x, y: integer; const CityInfo: TCityInfo;
   accessory: boolean);
+end;
+procedure TIsoMap.PaintCity(X, Y: Integer; const CityInfo: TCityInfo;
+  accessory: Boolean);
 var
   age: Integer;
 …
   LabelLength: Integer;
   cpic: TCityPicture;
   s: string;
+  S: string;
 begin
   age := GetAge(CityInfo.Owner);
 …
       (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
 …
   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,
 +Tribe[CityInfo.Owner].sympix mod 10 *65,
 +Tribe[CityInfo.Owner].sympix div 10 *49); {capital -- paint flag }
 …
     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
 …
       LabelTextColor := $000000;
     end;
     Textout(xShield + 2, yShield - 1, LabelTextColor, s);
   end;
 end; { PaintCity }
 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
 …
       (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
 …
     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
 …
     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
 …
       (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
 …
     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
 …
     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,
 + (Conn shr 6 + Conn and 1 shl 2) * (xxt * 2 + 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,
 + (Conn and 7) * (xxt * 2 + 1) + xxt,
 + 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,
 + (Conn shr 2 and 7) * (xxt * 2 + 1) + xxt,
 + 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,
 + (Conn shr 4 and 7) * (xxt * 2 + 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,
 + 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),
 + 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),
 + 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
 …
     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
 …
     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
 …
       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;
 …
     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
 …
       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;
 …
       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;
 …
       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;
 …
 // (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;
 …
   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;
 …
       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];
 …
     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);
           DpiBitCanvas(Borders.Canvas, 0, p1 * (yyt * 2), xxt * 2,
+          DpiBitBltCanvas(Borders.Canvas, 0, p1 * (yyt * 2), xxt * 2,
             yyt * 2, HGrTerrain.Data.Canvas,
 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
 …
               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,
 + 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;
 …
     (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
 …
     NameCity;
     ShowSpacePort;
     exit;
+    Exit;
   end; { square not discovered }
 …
   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)
 …
     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;
 …
   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
 …
   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),
 + 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),
 + 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
 …
     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}
 …
   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
 …
         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;
 …
   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; { PaintTileObjects }
 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
 …
         if dy0 < dymin then
         begin
           n := n - (dymin - dy0);
+          N := N - (dymin - dy0);
           dx0 := dx0 - (dymin - dy0);
           dy0 := dymin
 …
       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
 …
         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
 …
     if (ConnLoc < 0) or (ConnLoc >= G.lx * G.ly) or
       ((MyMap[ConnLoc] - 2) and fTerrain < 13) then
       result := true;
+      Result := True;
   end;
 end;
 …
 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;
 …
 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;
+  Line := TPixelPointer.Create(FOutput, ScaleToNative(x0), ScaleToNative(y0));
+  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
 …
 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
 …
       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);
 …
 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;
 …
   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) +
 ) * yyt;
     Brush.Color := EmptySpaceColor;
 …
                   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
 …
                 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,
 + 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;
 …
     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
 …
           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;
 …
       * 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);
 …
           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;
 …
     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;
   // frame(FOutput.Canvas,x+1,y+1,x+nx*33+33-2,y+ny*16+32-2,$FFFF,$FFFF);
 end; { Paint }
+end;
 procedure TIsoMap.AttackBegin(const ShowMove: TShowMove);

branches/highdpi/LocalPlayer/KeyBindings.pas

-              r464
+              r465
+unit UKeyBindings;
+{$mode delphi}
+unit KeyBindings;
 interface
 uses
+  Classes, SysUtils, fgl, LCLProc, LCLType, Menus, Registry;
+  Classes, SysUtils, Generics.Collections, Generics.Defaults, LCLProc, LCLType,
+  Menus, Registry;
 type
 …
   { TKeyBindings }
   TKeyBindings = class(TFPGObjectList<TKeyBinding>)
+  TKeyBindings = class(TObjectList<TKeyBinding>)
   private
   public
 …
     procedure ResetToDefault;
     procedure RemoveShortCut(ShortCut: TShortCut);
+    procedure SortAlpha;
   end;
 …
   Text: string;
 begin
+  Strings.Clear;
+  for I := 0 to Count - 1 do begin
+    Text:= '';
+    if Items[I].ShortCut <> 0 then
+      Text:= Text + ShortCutToText(Items[I].ShortCut);
+    if Items[I].ShortCut2 <> 0 then begin
+      if Text <> '' then Text := Text + ', ';
+      Text:= Text + ShortCutToText(Items[I].ShortCut2);
+  Strings.BeginUpdate;
+  try
+    Strings.Clear;
+    for I := 0 to Count - 1 do begin
+      Text := '';
+      if Items[I].ShortCut <> 0 then
+        Text := Text + ShortCutToText(Items[I].ShortCut);
+      if Items[I].ShortCut2 <> 0 then begin
+        if Text <> '' then Text := Text + ', ';
+        Text := Text + ShortCutToText(Items[I].ShortCut2);
+      end;
+      if Text <> '' then Text := Items[I].FullName + ' (' + Text + ')'
+        else Text := Items[I].FullName;
+      Strings.Add(Text);
     end;
+    if Text <> '' then Text := Items[I].FullName + ' (' + Text + ')'
+      else Text := Items[I].FullName;
+    Strings.Add(Text);
+  finally
+    Strings.EndUpdate;
   end;
 end;
 …
     if Items[I].ShortCut2 = ShortCut then Items[I].ShortCut2 := 0;
   end;
+end;
+function CompareAlpha(constref Item1, Item2: TKeyBinding): Integer;
+begin
+  Result := CompareStr(Item1.FullName, Item2.FullName);
+end;
+procedure TKeyBindings.SortAlpha;
+begin
+  Sort(TComparer<TKeyBinding>.Construct(CompareAlpha));
 end;
 …
   BMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
   BMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
+  SortAlpha;
 end;
 …
 end.

branches/highdpi/LocalPlayer/LocalPlayer.pas

-              r378
+              r465
 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
 uses
+  UDpiControls, Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
+  NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree, Forms;
+  UDpiControls, Term, CityScreen, Nego, BaseWin, Forms;
 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
 //    DpiApplication.MainForm := MainScreen;
+//    Application.MainForm := MainScreen;
     DpiApplication.CreateForm(TMainScreen, MainScreen);
-    DpiApplication.CreateForm(TCityDlg, CityDlg);
-    DpiApplication.CreateForm(TModalSelectDlg, ModalSelectDlg);
-    DpiApplication.CreateForm(TListDlg, ListDlg);
-    DpiApplication.CreateForm(TMessgExDlg, MessgExDlg);
-    DpiApplication.CreateForm(TDraftDlg, DraftDlg);
-    DpiApplication.CreateForm(TCityTypeDlg, CityTypeDlg);
-    DpiApplication.CreateForm(THelpDlg, HelpDlg);
-    DpiApplication.CreateForm(TUnitStatDlg, UnitStatDlg);
-    DpiApplication.CreateForm(TDiaDlg, DiaDlg);
-    DpiApplication.CreateForm(TNatStatDlg, NatStatDlg);
-    DpiApplication.CreateForm(TWondersDlg, WondersDlg);
-    DpiApplication.CreateForm(TNegoDlg, NegoDlg);
-    DpiApplication.CreateForm(TEnhanceDlg, EnhanceDlg);
-    DpiApplication.CreateForm(TBattleDlg, BattleDlg);
-    // DpiApplication.CreateForm(TAdvisorDlg, AdvisorDlg);
-    DpiApplication.CreateForm(TRatesDlg, RatesDlg);
-    DpiApplication.CreateForm(TTechTreeDlg, TechTreeDlg);
   end;
   MainScreen.Client(Command, Player, Data);
 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.

branches/highdpi/LocalPlayer/MessgEx.lfm

-              r349
+              r465
   BorderIcons = []
   BorderStyle = bsNone
   Caption = 'C-evo'
+  Caption = 'Message'
   ClientHeight = 134
   ClientWidth = 418
 …
   DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   FormStyle = fsStayOnTop
 …
   OnPaint = FormPaint
   OnShow = FormShow
   LCLVersion = '2.0.12.0'
+  LCLVersion = '2.2.2.0'
   Scaled = False
   object Button1: TButtonA
 …
   object EInput: TDpiEdit
     Left = 125
     Height = 26
+    Height = 27
     Top = 64
     Width = 168

branches/highdpi/LocalPlayer/MessgEx.pas

-              r412
+              r465
 uses
   UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
   ButtonB, StdCtrls, DrawDlg;
+  UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
+  SysUtils, Classes, Graphics, Controls, Forms, ButtonA, ButtonB, StdCtrls,
+  DrawDlg, Help;
 type
 …
     mikPureIcon, mikMyArmy, mikEnemyArmy, mikFullControl, mikShip, mikBigIcon,
     mikEnemyShipComplete);
+  { TMessgExDlg }
   TMessgExDlg = class(TBaseMessgDlg)
 …
     Kind: TMessageKind;
     IconIndex: Integer;
     HelpKind: Integer;
+    HelpKind: TLinkCategory;
     HelpNo: Integer;
     CenterTo: Integer;
     IconKind: TMessageIconKind;
     OpenSound: string;
     function ShowModal: integer; override;
+    function ShowModal: Integer; override;
     procedure CancelMovie;
   private
     MovieCancelled: boolean;
     procedure PaintBook(ca: TDpiCanvas; x, y, clPage, clCover: integer);
+    MovieCancelled: Boolean;
+    procedure PaintBook(ca: TDpiCanvas; X, Y, clPage, clCover: Integer);
     procedure PaintMyArmy;
     procedure PaintEnemyArmy;
 …
   end;
-var
-  MessgExDlg: TMessgExDlg;
 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: TLinkCategory; ContextNo: Integer);
 implementation
 uses
   ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
   IsoEngine, Diagram, Sound;
+  ClientTools, BaseWin, Term, UnitStat, Tribes, PixelPointer,
+  Diagram, Sound;
 {$R *.lfm}
 …
 procedure TMessgExDlg.FormShow(Sender: TObject);
 var
   i: integer;
+  I: Integer;
 begin
   if IconKind = mikEnemyArmy then
 …
   end;
   SplitText(true);
+  SplitText(True);
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
   if GameMode = cMovie then
 …
       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;
   Ticks: TDateTime;
 begin
+  Caption := Phrases.Lookup('TITLE_MESSAGE');
   if GameMode = cMovie then
   begin
     if not((GameMode = cMovie) and (MovieSpeed = 4)) then
     begin
       MovieCancelled := false;
+      MovieCancelled := False;
       Show;
       Ticks0 := NowPrecise;
 …
       Hide;
     end;
     result := mrOk;
+    Result := mrOk;
   end
   else
+    result := inherited;
+    Result := inherited;
+  //Gtk2Fix;
 end;
 procedure TMessgExDlg.CancelMovie;
 begin
   MovieCancelled := true;
 end;
 procedure TMessgExDlg.PaintBook(ca: TDpiCanvas; x, y, clPage, clCover: integer);
+  MovieCancelled := True;
+end;
+procedure TMessgExDlg.PaintBook(ca: TDpiCanvas; X, Y, clPage, clCover: Integer);
 const
   xScrewed = 77;
 …
   wScrewed = 43;
   hScrewed = 27;
+type
+  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;
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
+  x1, xR, yR, share: Single;
+  Screwed: TScrewed;
   SrcPtr: TPixelPointer;
   Width: Integer;
 …
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
     FillChar(Screwed, sizeof(Screwed), 0);
+    Screwed := Default(TScrewed);
     BigImp.BeginUpdate;
     SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    SrcPtr := TPixelPointer.Create(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
     for iy := 0 to ScaleToNative(Height) - 1 do begin
       for ix := 0 to ScaleToNative(Width) - 1 do begin
 …
     BookRect := SmallBook.BoundsRect;
   end;
   x := x - BookRect.Width div 2;
+  X := X - BookRect.Width div 2;
   // paint
   UnshareBitmap(LogoBuffer);
   DpiBitCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
+  DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, X, Y);
   if IconIndex >= 0 then
 …
   ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
   DpiBitCanvas(ca, x, y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
+  DpiBitBltCanvas(ca, X, Y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
 end;
 …
 procedure TMessgExDlg.PaintEnemyArmy;
 var
   emix, ix, iy, x, y, count, UnitsInLine: integer;
+  emix, ix, iy, X, Y, count, UnitsInLine: Integer;
 begin
   ix := 0;
 …
     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
         DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Mask.Canvas,
+        DpiBitBltCanvas(Canvas, X, Y, 64, 48, HGr.Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
         DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Data.Canvas,
+        DpiBitBltCanvas(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
 …
 procedure TMessgExDlg.FormPaint(Sender: TObject);
 var
   p1, clSaveTextLight, clSaveTextShade: integer;
+  p1, clSaveTextLight, clSaveTextShade: Integer;
 begin
   if (IconKind = mikImp) and (IconIndex = 27) then
 …
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
         UnshareBitmap(Buffer);
         DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
+        DpiBitBltCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,
           ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange);
         DpiBitCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
+        DpiBitBltCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
           BigImp.Canvas, IconIndex mod 7 * xSizeBig,
           (IconIndex + SystemIconLines * 7) div 7 * ySizeBig);
 …
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
         DpiBitCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
           Buffer.Canvas, 0, 0);
 …
       end;
     mikModel:
       with Tribe[me].ModelPicture[IconIndex] do
+      with Tribe[Me].ModelPicture[IconIndex] do
       begin
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
           HGr.Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
           HGr.Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
 …
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
         DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
           Tribe[IconIndex].faceHGr.Data.Canvas,
 + Tribe[IconIndex].facepix mod 10 * 65,
 …
     mikEnemyShipComplete:
       begin
         DpiBitCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
+        DpiBitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
           (ClientWidth - 140) div 2, 24);
         ImageOp_BCC(Buffer, Templates.Data, Point(0, 0), StarshipDeparted.BoundsRect, 0, $FFFFFF);
         DpiBitCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
+        DpiBitBltCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
           Buffer.Canvas, 0, 0);
       end;
 …
 begin
   if Kind = mkOkHelp then
     HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
+    MainScreen.HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
   else if Kind = mkModel then
     UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
+    MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
   else
     ModalResult := mrIgnore;
 …
 // because Messg.SoundMessage not capable of movie mode
 begin
   with MessgExDlg do
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
 …
 end;
 procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
 begin
   with MessgExDlg do
+procedure TribeMessage(P: Integer; SimpleText, SoundItem: string);
+begin
+  with MainScreen.MessgExDlg do
   begin
     OpenSound := SoundItem;
 …
     Kind := mkOk;
     IconKind := mikTribe;
     IconIndex := p;
+    IconIndex := P;
     ShowModal;
   end;
 …
 function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
   : integer;
 begin
   with MessgExDlg do
+  : Integer;
+begin
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
 …
     Kind := QueryKind;
     ShowModal;
     result := ModalResult;
+    Result := ModalResult;
   end;
 end;
 procedure ContextMessage(SimpleText, SoundItem: string;
   ContextKind, ContextNo: integer);
 begin
   with MessgExDlg do
+  ContextKind: TLinkCategory; ContextNo: Integer);
+begin
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
 …
 end;
-initialization
 end.

branches/highdpi/LocalPlayer/NatStat.pas

-              r361
+              r465
 uses
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  ButtonB, ButtonC, Menus, EOTButton;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, Menus, EOTButton;
 type
 …
     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);
     procedure ScrollDownBtnClick(Sender: TObject);
     procedure TellAIBtnClick(Sender: TObject);
   public
     procedure CheckAge;
     procedure ShowNewContent(NewMode: integer; p: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; P: Integer = -1);
     procedure EcoChange;
   protected
     procedure OffscreenPaint; override;
   private
+    pView, AgePrepared, LinesDown: integer;
+    SelfReport, CurrentReport: PEnemyReport;
+    ShowContact, ContactEnabled: boolean;
+    Back, Template: TDpiBitmap;
+    pView: Integer;
+    AgePrepared: Integer;
+    LinesDown: Integer;
+    SelfReport: PEnemyReport;
+    CurrentReport: PEnemyReport;
+    ShowContact: Boolean;
+    ContactEnabled: Boolean;
+    Back: TDpiBitmap;
+    Template: TDpiBitmap;
     ReportText: TStringList;
     procedure GenerateReportText;
   end;
-var
-  NatStatDlg: TNatStatDlg;
 implementation
 …
 uses
   Messg, Tribes, Directories;
+  Term, Messg, Tribes, Directories;
 const
 …
   if MainTexture.Age <> AgePrepared then begin
     AgePrepared := MainTexture.Age;
     DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
       (MainTexture.Height - ClientHeight) div 2);
 …
 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
 …
 end;
 procedure TNatStatDlg.ShowNewContent(NewMode, 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
 …
       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;
 …
   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
+    end;
   end;
 var
   p1, Treaty: integer;
   s: string;
   HasContact, ExtinctPart: boolean;
+  p1, Treaty: Integer;
+  S: string;
+  HasContact, ExtinctPart: Boolean;
 begin
   GetMem(List, 4 * (MyRO.Turn + 2));
 …
     (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;
 …
   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;
 …
 procedure TNatStatDlg.OffscreenPaint;
 var
+  i, y: integer;
+  s: string;
+  ps: pchar;
+  Extinct: boolean;
+  I, Y: Integer;
+  S: string;
+  ps: PChar;
+  Extinct: Boolean;
 begin
   inherited;
 …
   Extinct := 1 shl pView and MyRO.Alive = 0;
   DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  DpiBitBltCanvas(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,
 { (ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2 } ,
 , Caption);
   offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   with offscreen do
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  with Offscreen do
   begin
     // show leader picture
 …
     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,
 + Tribe[pView].facepix mod 10 * 65,
 + 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,
 …
           Phrases.Lookup('FREXTINCT'));
         LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 28,
           TurnToString(CurrentReport.TurnOfCivilReport))
+          TurnToString(CurrentReport.TurnOfCivilReport));
       end
       else
 …
       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
 …
         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,
 *(CurrentReport.Government-1),40,
           ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact)) };
 …
       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);
         end
+          Inc(Y);
+        end;
       end;
     end
     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
 …
         Phrases2.Lookup('MENU_TELLAI'));
   end;
+  ContactBtn.SetBack(offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
+  ContactBtn.SetBack(Offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
   MarkUsedOffscreen(ClientWidth, ClientHeight);
 end; { OffscreenPaint }
+end;
 procedure TNatStatDlg.CloseBtnClick(Sender: TObject);
 begin
   Close
+  Close;
 end;
 procedure TNatStatDlg.DialogBtnClick(Sender: TObject);
 var
   ContactResult: integer;
+  ContactResult: Integer;
 begin
   ContactResult := MainScreen.DipCall(scContact + pView shl 4);
 …
       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
       begin
         if MainScreen.ContactRefused(pView, 'FRANARCHY') then
           SmartUpdateContent
+          SmartUpdateContent;
       end
       else
 …
   end
   else
     Close
+    Close;
 end;
 procedure TNatStatDlg.ToggleBtnClick(Sender: TObject);
 var
   p1, StartCount: integer;
   m: TDpiMenuItem;
   ExtinctPart: boolean;
+  p1, StartCount: Integer;
+  M: TDpiMenuItem;
+  ExtinctPart: Boolean;
 begin
   EmptyMenu(Popup.Items);
   // own nation
   if G.Difficulty[me] <> 0 then
   begin
     m := TDpiMenuItem.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 := TDpiMenuItem.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;
 …
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] >= trNone) then
       begin
         m := TDpiMenuItem.Create(Popup);
         m.RadioItem := true;
         m.Caption := Tribe[p1].TPhrase('TITLE_NATION');
+        M := TDpiMenuItem.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 := TDpiMenuItem.Create(Popup);
       m.Caption := '-';
       Popup.Items.Insert(StartCount, m);
+      M := TDpiMenuItem.Create(Popup);
+      M.Caption := '-';
+      Popup.Items.Insert(StartCount, M);
     end;
   end;
 …
 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
   end
   else
     inherited
+    inherited;
 end;
 procedure TNatStatDlg.EcoChange;
 begin
   if Visible and (pView = me) then
+  if Visible and (pView = Me) then
   begin
     SelfReport.Government := MyRO.Government;
     SelfReport.Money := MyRO.Money;
     SmartUpdateContent
   end
+    SmartUpdateContent;
+  end;
 end;
 …
   if LinesDown > 0 then
   begin
     dec(LinesDown);
+    Dec(LinesDown);
     SmartUpdateContent;
   end
+  end;
 end;
 …
   if LinesDown + ReportLines < ReportText.Count then
   begin
     inc(LinesDown);
+    Inc(LinesDown);
     SmartUpdateContent;
   end
+  end;
 end;
 …
   else
     TellAIBtn.ButtonIndex := 2;
   SmartUpdateContent
+  SmartUpdateContent;
 end;

branches/highdpi/LocalPlayer/Nego.pas

-              r361
+              r465
 uses
   UDpiControls, ScreenTools, BaseWin, Protocol, Term, LCLType, SysUtils, Classes, Graphics,
+  UDpiControls, ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonA, ButtonB, ButtonN;
 …
 type
   THistory = record
     n: Integer;
+    N: Integer;
     Text: array[0 .. MaxHistory - 1] of ansistring;
   end;
   TCommandAllowedEnum = scDipNoticeStart..scDipBreakStart;
+  TPriceSet = set of $00..$FF;
   { TNegoDlg }
 …
     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);
 …
     procedure OfferClick(Sender: TObject);
     procedure FastBtnClick(Sender: TObject);
   public
     procedure Initiate; // first turn of negotiation, initiate
 …
     procedure Start; // next turn of negotiation
     procedure OffscreenPaint; override;
+    procedure ShowNewContent(NewMode: integer);
+    procedure ShowNewContent(NewMode: TWindowMode);
   private
     Page, DipCommand: integer;
+    Page, DipCommand: Integer;
     CurrentOffer: TOffer;
     MyAllowed, OppoAllowed: TPriceSet;
 …
     History: array [0 .. nPl - 1] of THistory;
     RomanFont: TDpiFont;
     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;
-var
-  NegoDlg: TNegoDlg;
 implementation
 uses
   Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx;
+  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx, Term;
 {$R *.lfm}
 …
     'VII', 'VIII', 'IX', 'X', 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI');
   ButtonPrice: array [0 .. 11] of cardinal = (opChoose, opCivilReport,
+  ButtonPrice: array [0 .. 11] of Cardinal = (opChoose, opCivilReport,
     opMilReport, opMap, opAllTech, opAllTech, opAllModel, opMoney, opTreaty,
     opLowTreaty, opShipParts, opShipParts);
 …
 procedure TNegoDlg.FormCreate(Sender: TObject);
 var
   cix: integer;
+  cix: Integer;
 begin
   InitButtons;
 …
         BackGraphic := HGrSystem2.Data;
         case Tag shr 8 of
+:
+            SmartHint := Phrases.Lookup('WANT', ButtonIndex - 6);
+:
+            SmartHint := Phrases.Lookup('OFFER', ButtonIndex - 6);
+: SmartHint := Phrases.Lookup('WANT', ButtonIndex - 6);
+: SmartHint := Phrases.Lookup('OFFER', ButtonIndex - 6);
         end;
       end;
   fillchar(History, sizeof(History), 0);
+  FillChar(History, SizeOf(History), 0);
   RomanFont := TDpiFont.Create;
   RomanFont.Name := 'Times New Roman';
 …
 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;
 end;
 procedure TNegoDlg.ShowNewContent(NewMode: integer);
+  for I := 0 to 11 do
+    Costs[I] := $FFFFFFFF;
+  for I := 0 to 11 do
+    Delivers[I] := $FFFFFFFF;
+end;
+procedure TNegoDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
 …
   else
     PassBtn.SmartHint := Phrases.Lookup('BTN_PASS');
   case MyRO.Treaty[DipMem[me].pContact] of
+  case MyRO.Treaty[DipMem[Me].pContact] of
     trNone:
       begin
 …
 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;
 …
 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;
 …
     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
 …
       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;
 …
         while (Text[OrdinaryStop + 1] <> ' ') and
           (Text[OrdinaryStop + 1] <> '\') do
           dec(OrdinaryStop);
+          Dec(OrdinaryStop);
         if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
           Stop := OrdinaryStop
 …
           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;
 …
 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];
 …
   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];
 …
   else
   begin
     if ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
       MyAllowed := MyAllowed + [opAllModel shr 24];
     if ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
       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];
 …
     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,
 + 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,
++ Tribe[P].facepix mod 10 * 65, 1 + Tribe[P].facepix div 10 * 49)
     else
       FillRect(Rect(X, Y, X + 64, Y + 48));
 …
 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
 …
                 (ButtonPrice[Tag and $FF] shr 24 in MyAllowed);
               Lit := Delivers[Tag and $FF] <> $FFFFFFFF;
             end
+            end;
         end;
 end;
 …
 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
 …
   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;
 …
     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,
 …
   { 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
 .. 49:
       i := 3;
+      I := 3;
 .. 90:
       i := 0;
+      I := 0;
 .. 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,
 , 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
 .. 49:
       i := 3;
+      I := 3;
 .. 90:
       i := 0;
+      I := 0;
 .. 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);
 end; { OffscreenPaint }
+end;
 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(FWindowMode or wmPersistent, DipMem[me].pContact)
+    MainScreen.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(FWindowMode or wmPersistent, me)
+    MainScreen.NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), Me)
 end;
 procedure TNegoDlg.BwdBtnClick(Sender: TObject);
 begin
   dec(Page, 2);
+  Dec(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
 …
 procedure TNegoDlg.FwdBtnClick(Sender: TObject);
 begin
   inc(Page, 2);
+  Inc(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
 …
 procedure TNegoDlg.OkBtnClick(Sender: TObject);
 begin
   inc(History[me].n);
+  Inc(History[Me].N);
   if DipCommand = scDipOffer then
     MainScreen.OfferCall(CurrentOffer)
 …
 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;
 …
 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
 …
     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:
 …
           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:
         begin // choose type and number
           if MyRO.NatBuilt[imSpacePort] = 0 then
             with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               OpenSound := 'WARNING_LOWSUPPORT';
 …
               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];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[DipMem[Me].pContact].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
 …
           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
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
             Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
           ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
           if ModalSelectDlg.result < 0 then
             exit;
           if ModalSelectDlg.result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
             Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.result].mix;
+            Price := OpModel + MyRO.EnemyModel[MainScreen.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;
 …
 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
 …
     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
 …
           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];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[Me].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
 …
           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
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
             Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
           ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
           if ModalSelectDlg.result < 0 then
             exit;
           if ModalSelectDlg.result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
             Price := OpModel + ModalSelectDlg.result
+            Price := OpModel + MainScreen.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;
 …
 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

branches/highdpi/LocalPlayer/PVSB.pas

-              r349
+              r465
 uses
+  UDpiControls, {$IFDEF WINDOWS}
+  Windows,
+  {$ENDIF}
+  UDpiControls, {$IFDEF WINDOWS}Windows,{$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
   StdCtrls, Math;
 …
     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);
 …
 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
 …
         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
 …
 function TPVScrollBar.ProcessMouseWheel(Delta: Integer): Boolean;
 var
   NewPos: integer;
+  NewPos: Integer;
 begin
     if Max < ScrollBar.PageSize then Result := False
 …
 end;
 procedure TPVScrollBar.Show(Visible: boolean);
+procedure TPVScrollBar.Show(Visible: Boolean);
 begin
   if not Visible or (Max < ScrollBar.PageSize) then

branches/highdpi/LocalPlayer/Rates.pas

-              r361
+              r465
 uses
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms,
+  ButtonB, ButtonC;
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, ButtonC;
 type
 …
   public
     procedure OffscreenPaint; override;
+    procedure ShowNewContent(NewMode: integer);
+  end;
+var
+  RatesDlg: TRatesDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
 implementation
 …
 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
 …
   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,
 - 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,
 …
   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);
     DpiBitCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
+      ySizeBig, Tribe[Me].Color);
+    DpiBitBltCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
       xSizeBig, ySizeBig, BigImp.Canvas, (woLiberty mod 7) * xSizeBig,
       (woLiberty div 7 + SystemIconLines) * ySizeBig);
 …
     // ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
     s := Phrases.Lookup('SCIENCE');
     RisedTextOut(Offscreen.Canvas,
 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 44, s);
     s := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
     RisedTextOut(Offscreen.Canvas,
 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 60, s);
+    S := Phrases.Lookup('SCIENCE');
+    RisedTextOut(Offscreen.Canvas,
++ 120 - BiColorTextWidth(Offscreen.Canvas, S), 44, S);
+    S := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
++ 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
         DpiBitCanvas(Offscreen.Canvas, x + max - 8 - i * 8, y, 8, 7,
+      for I := 0 to current div 8 - 1 do
+        DpiBitBltCanvas(Offscreen.Canvas, X + Max - 8 - I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
       DpiBitCanvas(Offscreen.Canvas, x + max - current, y, current - 8 * (current div 8), 7,
+      DpiBitBltCanvas(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,
 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, s);
+    S := Format('%d%%', [MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
++ 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, S);
     PaintProgressBar(Offscreen.Canvas, 5, 16 + 160, 81,
       MyRO.LuxRate * 120 div 100, 0, 120, MainTexture);
 …
     MainTexture.ColorBevelLight);
   RisedTextOut(Offscreen.Canvas, 16 + 80, 164, Phrases.Lookup('TAXRATE'));
   s := Format('%d%%', [MyRO.TaxRate]);
+  S := Format('%d%%', [MyRO.TaxRate]);
   RisedTextOut(Offscreen.Canvas,
 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, s);
++ 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, S);
   PaintProgressBar(Offscreen.Canvas, 0, 16 + 80, 201,
     MyRO.TaxRate * 120 div 100, 0, 120, MainTexture);
 …
 end;
 procedure TRatesDlg.ShowNewContent(NewMode: integer);
+procedure TRatesDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
 …
 procedure TRatesDlg.FormShow(Sender: TObject);
 begin
+  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  begin
+    ScienceBtn.Visible := false;
+    LuxBtn.Visible := false;
+  Caption := Phrases.Lookup('TITLE_RATES');
+  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;
 …
 procedure TRatesDlg.TaxLuxBtnClick(Sender: TObject);
 var
   NewTax, NewLux: integer;
+  NewTax, NewLux: Integer;
 begin
   NewTax := MyRO.TaxRate div 10;
 …
   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;

branches/highdpi/LocalPlayer/Select.lfm

-              r246
+              r465
 object ListDlg: TListDlg
   Left = 290
+  Height = 262
   Top = 145
+  Width = 381
   BorderIcons = []
   BorderStyle = bsNone
 …
   ClientWidth = 381
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
+  DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
   OnCloseQuery = FormCloseQuery
 …
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
-  OnMouseWheel = FormMouseWheel
   OnMouseDown = PaintBox1MouseDown
   OnMouseMove = PaintBox1MouseMove
+  OnMouseWheel = FormMouseWheel
   OnPaint = FormPaint
   OnShow = FormShow
   PixelsPerInch = 96
+  LCLVersion = '2.2.2.0'
   Scaled = False
   object CloseBtn: TButtonB
     Left = 343
+    Height = 25
     Top = 6
     Width = 25
-    Height = 25
     Down = False
     Permanent = False
 …
     Tag = 2
     Left = 344
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
 …
     Tag = 1
     Left = 312
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
 …
   object Layer0Btn: TButtonB
     Left = 280
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
 …
   object ToggleBtn: TButtonB
     Left = 13
+    Height = 25
     Top = 6
     Width = 25
-    Height = 25
     Down = False
     Permanent = False

branches/highdpi/LocalPlayer/Select.pas

-              r378
+              r465
 uses
   UDpiControls, Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+  UDpiControls, Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
 …
     ToggleBtn: TButtonB;
     Popup: TDpiPopupMenu;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       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
 …
     cixProject: Integer;
     pView: Integer;
     Sel: Integer;
+    Selected: Integer;
     DispLines: Integer;
     Layer: Integer;
 …
     TechNameSpace: Integer;
     ScienceNation: Integer;
+    sb: TPVScrollbar;
+    Lines, FirstShrinkedLine: array [0 .. MaxLayer - 1] of integer;
+    code: array [0 .. MaxLayer - 1, 0 .. 4095] of integer;
+    Column: array [0 .. nPl - 1] of integer;
+    ScrollBar: TPVScrollbar;
+    Lines: array [0 .. MaxLayer - 1] of Integer;
+    FirstShrinkedLine: array [0 .. MaxLayer - 1] of Integer;
+    Code: array [0 .. MaxLayer - 1, 0 .. 4095] of Integer;
+    Column: array [0 .. nPl - 1] of Integer;
     Closable: Boolean;
     MultiPage: Boolean;
 …
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
     procedure line(ca: TDpiCanvas; l: integer; NonText, lit: boolean);
     function RenameCity(cix: integer): boolean;
     function RenameModel(mix: integer): boolean;
+    procedure Line(ca: TDpiCanvas; 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: integer; ListKind: TListKind);
     procedure ShowNewContent_CityProject(NewMode, cix: integer);
     procedure ShowNewContent_MilReport(NewMode, p: integer);
+    procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
+    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
     procedure EcoChange;
     procedure TechChange;
 …
   adAll = $10000;
-var
-  ListDlg: TListDlg;
-  ModalSelectDlg: TModalSelectDlg;
 implementation
 uses
   CityScreen, Help, UnitStat, Tribes, Inp;
+  Term, CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
 {$R *.lfm}
 …
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
   sb := TPVScrollbar.Create(Self);
   sb.SetBorderSpacing(36, 10, 36);
   sb.OnUpdate := ScrollBarUpdate;
+  ScrollBar := TPVScrollbar.Create(Self);
+  ScrollBar.SetBorderSpacing(36, 10, 36);
+  ScrollBar.OnUpdate := ScrollBarUpdate;
   InitButtons;
   Kind := kMission;
 …
 procedure TListDlg.FormDestroy(Sender: TObject);
 begin
   FreeAndNil(sb);
+  FreeAndNil(ScrollBar);
   FreeAndNil(ScienceNationDotBuffer);
 end;
 …
 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);
 …
 begin
   { TODO: Handled by MouseWheel event
   if sb.Process(Msg) then  begin
     Sel := -2;
     SmartUpdateContent(true);
+  if ScrollBar.Process(Msg) then  begin
+    Selected := -2;
+    SmartUpdateContent(True);
   end;
+  }
 …
 procedure TListDlg.OnMouseLeave(var Msg: TMessage);
 begin
   if not Closable and (Sel <> -2) then
   begin
     line(Canvas, Sel, false, false);
     Sel := -2;
+  if not Closable and (Selected <> -2) then
+  begin
+    Line(Canvas, Selected, False, False);
+    Selected := -2;
   end;
 end;
 …
 procedure TListDlg.FormPaint(Sender: TObject);
 var
   s: string;
+  S: string;
 begin
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
   if Sel <> -2 then
     line(Canvas, Sel, false, true);
   s := '';
+  if Selected <> -2 then
+    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: TDpiCanvas; l: integer; NonText, lit: boolean);
+      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, ClientHeight - 29, S);
+  end;
+end;
+procedure TListDlg.Line(ca: TDpiCanvas; 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
           DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          DpiBitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
             ySizeSmall, SmallImp.Canvas, (MyRO.Government - 1) *
             xSizeSmall, ySizeSmall)
         else
           DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          DpiBitBltCanvas(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
         DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+        DpiBitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
           ySizeSmall, SmallImp.Canvas, (3 + pix and cpIndex) *
           xSizeSmall, 0);
 …
   end;
   procedure ReplaceText(x, y, Color: integer; s: string);
+  procedure ReplaceText(X, Y, Color: Integer; S: string);
   var
     TextSize: TSize;
 …
     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, sb.Position + l];
   y0 := 2 + (l + 1) * LineDistance;
   if sb.Position + l >= FirstShrinkedLine[Layer] then
     ofs := (sb.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;
 …
     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
 …
       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;
 …
       begin
         first := -1;
         for j := 0 to nCityEventPriority - 1 do
           if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
           begin
             first := j;
             Break
+        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,
 + i mod 3 * 19, 1 + i div 3 * 19);
                 dec(x, 20)
               end
           end
         end
+                  I := 17;
+                Sprite(Offscreen, HGrSystem, X, y0 + 1, 18, 18,
++ I mod 3 * 19, 1 + I div 3 * 19);
+                Dec(X, 20);
+              end;
+          end;
+        end;
       end
       else
 …
         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
+          end;
         end
         else
         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, 88, 115);
           end
         end;
         s := inttostr(CityTaxBalance(lix, CityReport));
         ReplaceText(x + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, s), y,
           TextColor, s);
+          end;
+        end;
+        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, 132, 115);
 …
             ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
             (Size < NeedSewerSize) or (Built[imSewer] = 1));
           PaintRelativeProgressBar(offscreen.Canvas, 1, x + 15 + CityNameSpace +
 , y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
+          PaintRelativeProgressBar(Offscreen.Canvas, 1, X + 15 + CityNameSpace +
+, Y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
             (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
             MyRO.Government, Size), CityReport.Storage, CanGrow, MainTexture);
 …
           if Project <> cpImp + imTrGoods then
           begin
             DisplayProject(ofs + 104 - 76 + x - 28 + CityNameSpace + 4 + 206 -
+            DisplayProject(ofs + 104 - 76 + X - 28 + CityNameSpace + 4 + 206 -
 , y0 - 15, Project);
 …
               (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);
           end;
         end
+            PaintRelativeProgressBar(Offscreen.Canvas, 4,
+              X + CityNameSpace + 4 + 304 - 60 + 9, Y + 7, 68, TrueProd, growth,
+              CityReport.ProjectCost, True, MainTexture);
+          end;
+        end;
       end;
     end
   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
 …
     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);
 …
       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
 …
       kAllEModels, kChooseEModel:
         if lix = mixAll then
           s := Phrases.Lookup('PRICECAT_ALLMODEL')
+          S := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
         begin
 …
           if MainScreen.mNames.Checked then
           begin
             s := Tribe[mox.Owner].ModelName[mox.mix];
             if (Kind = kAllEModels) and (code[1, sb.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);
 …
         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
 …
               (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
 …
         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;
 …
               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
                   DpiBitCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
+                  DpiBitBltCanvas(Offscreen.Canvas, (8 + 16), y0, xSizeSmall,
                     ySizeSmall, SmallImp.Canvas,
                     (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
 …
                     ySizeSmall)
                 else
                   Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
+                  Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20,
 + (AdvIcon[lix] - 84) mod 8 * 37,
 + (AdvIcon[lix] - 84) div 8 * 21);
                 j := AdvValue[lix] div 1000;
                 DpiBitCanvas(offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
                   HGrSystem.Mask.Canvas, 127 + j * 15,
+                J := AdvValue[lix] div 1000;
+                DpiBitBltCanvas(Offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                  HGrSystem.Mask.Canvas, 127 + J * 15,
 , SRCAND);
                 Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
 + j * 15, 85);
+                Sprite(Offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
++ J * 15, 85);
               end;
             end;
 …
           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
 …
                   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
 …
                     icon := 4 + ResearchDone div 25;
                     if icon > 4 + 3 then
                       icon := 4 + 3
+                      icon := 4 + 3;
                   end
                   else if lix = adMilitary then
 …
                     icon := -1;
               if icon >= 0 then
                 Sprite(offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
 * j, y0 + 3, 14, 14, 67 + icon * 15, 85)
+                Sprite(Offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
+* 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
             end
+              end;
+            end;
           end;
         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);
 …
       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);
 …
       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),
 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
               MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
             DpiBitCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
+            DpiBitBltCanvas(Offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
               (lix - 1) * xSizeSmall, ySizeSmall);
           end
+          end;
         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 - DpiGetSystemMetrics(SM_CXVSCROLL)) div 2 -
             BiColorTextWidth(ca, s) div 2
+          X := (InnerWidth - DpiGetSystemMetrics(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
 …
       TextColor := -1;
     { if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
       integer(TribeNames.Objects[lix]),s)
       else } ReplaceText(x, y, TextColor, s);
   end
+      Integer(TribeNames.Objects[lix]),S)
+      else } ReplaceText(X, Y, TextColor, S);
+  end;
 end;
 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'),
 …
   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,
 - 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,
+- 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 + sb.Position >= 0) and (i + sb.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);
 …
 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 := sb.Position;
   Sel0 := Sel;
   if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
     (y < InnerHeight) and (y mod LineDistance >= 4) and (y mod LineDistance < 20)
+  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)
   then
     Sel := y div LineDistance - 1
+    Selected := Y div LineDistance - 1
   else
     Sel := -2;
   if (Sel < -1) or (Sel > DispLines) or (Sel + i0 < 0) or
     (Sel + i0 >= Lines[Layer]) then
     Sel := -2;
   if Sel <> Sel0 then
+    Selected := -2;
+  if (Selected < -1) or (Selected > DispLines) or (Selected + i0 < 0) or
+    (Selected + i0 >= Lines[Layer]) then
+    Selected := -2;
+  if Selected <> Sel0 then
   begin
     if Sel0 <> -2 then
       line(Canvas, Sel0, false, false);
     if Sel <> -2 then
       line(Canvas, Sel, false, true)
+      Line(Canvas, Sel0, False, False);
+    if Selected <> -2 then
+      Line(Canvas, Selected, False, True);
   end;
 …
     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];
 …
       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);
         DpiBitCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
+          ClientHeight - 29, S);
+        DpiBitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
           ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
           ScienceNationDot.BoundsRect, MainTexture.ColorBevelShade, Tribe[ScienceNation].Color);
         DpiBitCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
+        DpiBitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
           ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
       end;
 …
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
   if sb.ProcessMouseWheel(WheelDelta) then begin
+  if ScrollBar.ProcessMouseWheel(WheelDelta) then begin
     PaintBox1MouseMove(nil, [], MousePos.X - Left,
       MousePos.Y - Top);
 …
 end;
+function TListDlg.RenameCity(cix: integer): boolean;
+procedure TListDlg.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  //Gtk2Fix;
+end;
+function TListDlg.RenameCity(cix: Integer): Boolean;
 var
   CityNameInfo: TCityNameInfo;
 …
     CityNameInfo.ID := MyCity[cix].ID;
     CityNameInfo.NewName := InputDlg.EInput.Text;
+    Server(cSetCityName + (length(CityNameInfo.NewName) + 8) div 4, me, 0,
+      CityNameInfo);
+    if CityDlg.Visible then
+    if CityNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(CityNameInfo.NewName, Length(CityNameInfo.NewName) -
+        (CityNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
+      Me, 0, CityNameInfo);
+    if MainScreen.CityDlg.Visible then
     begin
       CityDlg.FormShow(nil);
       CityDlg.Invalidate;
+      MainScreen.CityDlg.FormShow(nil);
+      MainScreen.CityDlg.Invalidate;
     end;
     result := true;
+    Result := True;
   end
   else
     result := false;
 end;
 function TListDlg.RenameModel(mix: integer): boolean;
+    Result := False;
+end;
+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;
     ModelNameInfo.NewName := InputDlg.EInput.Text;
+    Server(cSetModelName + (length(ModelNameInfo.NewName) + 1 + 4 + 3) div 4,
+      me, 0, ModelNameInfo);
+    if UnitStatDlg.Visible then
+    if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+        (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+      Me, 0, ModelNameInfo);
+    if MainScreen.UnitStatDlg.Visible then
     begin
       UnitStatDlg.FormShow(nil);
       UnitStatDlg.Invalidate;
+      MainScreen.UnitStatDlg.FormShow(nil);
+      MainScreen.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;
 begin
   if sb.Position + Sel >= 0 then
     lix := code[Layer, sb.Position + Sel];
+  lix: Integer;
+begin
+  if ScrollBar.Position + Selected >= 0 then
+    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 Sel <> -2 then
+    if Selected <> -2 then
     begin
       result := lix;
       Closable := true;
+      Result := lix;
+      Closable := True;
       Close;
     end;
 …
   else if (ssLeft in Shift) and (ssShift in Shift) then
   begin // show help/info popup
     if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities:
           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:
           if lix <> mixAll then
+            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or
+              wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
         kEModels:
           UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
             code[1, sb.Position + Sel]);
+          MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
+            Code[1, ScrollBar.Position + Selected]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
+            UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or
+              wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
         kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
           if lix = adMilitary then
             HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
               HelpDlg.TextIndex('MILRES'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('MILRES'))
           else if lix < adMilitary then
             HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
         kProject:
           if lix = cpImp + imTrGoods then
             HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
               HelpDlg.TextIndex('TRADINGGOODS'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('TRADINGGOODS'))
           else if lix and (cpImp + cpType) = 0 then
             UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent,
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
               lix and cpIndex)
           else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
             HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
         kGov:
           HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc,
             miscGovList);
+          MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkMisc,
+            Integer(miscGovList));
         kShipPart, kEShipPart:
+          ;
 …
   else if ssRight in Shift then
   begin
     if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities, kCityEvents:
 …
 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;
 …
   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;
 …
   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
 …
       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
 …
                     ((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;
 …
           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;
 …
     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;
 …
     kScience:
       begin
         Column[0] := me;
+        Column[0] := Me;
         nColumn := 1;
         for EnemyType := 0 to 2 do
 …
               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;
 …
         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;
 …
       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;
 …
     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;
 …
     { 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; }
 …
         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;
 …
         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;
 …
         // 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;
 …
       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
 …
           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;
 …
     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;
 …
     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
 …
             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;
 …
             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;
 …
       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;
 …
       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;
 …
     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;
     end;
 end; // InitLines
 function TListDlg.OnlyChoice(TestKind: TListKind): integer;
+end;
+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
 …
   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
 …
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
     (Kind = kEModels) then begin
     sb.SetBorderSpacing(56, 10, 10);
+    ScrollBar.SetBorderSpacing(56, 10, 10);
     TitleHeight := WideFrame + 20;
   end else begin
     sb.SetBorderSpacing(36, 10, 34);
+    ScrollBar.SetBorderSpacing(36, 10, 34);
     TitleHeight := WideFrame;
   end;
   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
 …
     ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
   end;
   assert(ClientHeight <= Maintexture.Height);
+  Assert(ClientHeight <= Maintexture.Height);
   TechNameSpace := 224;
 …
   CaptionRight := CloseBtn.Left;
   { TODO:
   SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(ScrollBar.ScrollBar.Handle, 0, SideFrame + InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, DpiGetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);
 …
     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;
   Layer := 0;
   Sel := -2;
+  Selected := -2;
   ScienceNation := -1;
   sb.Init(Lines[Layer] - 1, DispLines);
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
 end;
 procedure TListDlg.ShowNewContent(NewMode: integer; ListKind: TListKind);
+procedure TListDlg.ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
 var
   i: integer;
   ShowFocus, forceclose: boolean;
+  I: Integer;
+  ShowFocus, forceclose: Boolean;
 begin
   forceclose := (ListKind <> Kind) and
 …
   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);
   inherited ShowNewContent(NewMode, forceclose);
 end; // ShowNewContent
 procedure TListDlg.ShowNewContent_CityProject(NewMode, cix: integer);
+end;
+procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
 begin
   cixProject := cix;
 …
 end;
 procedure TListDlg.ShowNewContent_MilReport(NewMode, 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
 …
 procedure TListDlg.PlayerClick(Sender: TObject);
 begin
   if TComponent(Sender).Tag = me then
+  if TComponent(Sender).Tag = Me then
     Kind := kModels
   else
 …
   end;
   InitLines;
   Sel := -2;
   sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
   Invalidate;
 …
   Layer := TComponent(Sender).Tag;
   Sel := -2;
   sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   SmartUpdateContent;
 end;
 …
 procedure TListDlg.ToggleBtnClick(Sender: TObject);
 var
   p1: integer;
   m: TDpiMenuItem;
+  p1: Integer;
+  M: TDpiMenuItem;
 begin
   case Kind of
     kAdvance:
       begin
         result := adFar;
         Closable := true;
+        Result := adFar;
+        Closable := True;
         Close;
       end;
 …
       begin
         EmptyMenu(Popup.Items);
         if G.Difficulty[me] > 0 then
         begin
           m := TDpiMenuItem.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 := TDpiMenuItem.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 := TDpiMenuItem.Create(Popup);
             m.RadioItem := true;
             m.Caption := Tribe[p1].TPhrase('SHORTNAME');
             m.Tag := p1;
             m.OnClick := PlayerClick;
+            M := TDpiMenuItem.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 +
 …
 end;
 procedure TListDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TListDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
 …
 procedure TListDlg.RemoveUnit;
 begin
   if ListDlg.Visible and (Kind = kModels) then
+  if Visible and (Kind = kModels) then
     SmartUpdateContent;
 end;
 …
 procedure TListDlg.ScrollBarUpdate(Sender: TObject);
 begin
   Sel := -2;
   SmartUpdateContent(true);
+  Selected := -2;
+  SmartUpdateContent(True);
 end;

branches/highdpi/LocalPlayer/TechTree.pas

-              r349
+              r465
   end;
-var
-  TechTreeDlg: TTechTreeDlg;
 implementation
 …
   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;
 …
 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,
 …
         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;
   DpiBitCanvas(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));
+  DpiBitBltCanvas(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;
 …
 var
   X, Y, ad: Integer;
   s: string;
+  S: string;
   NewWidth: Integer;
   NewHeight: Integer;
 begin
+  Caption := Phrases2.Lookup('MENU_ADVTREE');
   if Image = nil then begin
     Image := TDpiBitmap.Create;
 …
     with Image.Canvas do begin
       // write advance names
+      // Write advance names
       Font.Assign(UniFont[ftSmall]);
       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
+      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
         begin
           ad := Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1];
           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;
           end
+          end;
         end;
       // write legend
+      // Write legend
       TextOut(xLegend, yLegend, Phrases2.Lookup('ADVTREE_UP0'));
       TextOut(xLegend, yLegend + yLegendPitch, Phrases2.Lookup('ADVTREE_UP1'));
 …
   end;
   // fit window to image, center image in window, center window to screen
+  // Fit window to image, center image in window, center window to screen
   NewWidth := Min(DpiScreen.Width - 40, Image.Width + LeftBorder + RightBorder + 2 * BlackBorder);
   NewHeight := Min(DpiScreen.Height - 40, Image.Height + TopBorder + BottomBorder + 2 * BlackBorder);
 …
   if Button = mbLeft then
   begin
     dragging := true;
+    Dragging := True;
     xDown := X;
     yDown := Y;
 …
   Shift: TShiftState; X, Y: Integer);
 begin
   dragging := false;
+  Dragging := False;
 end;
 …
   X, Y: Integer);
 begin
   if dragging then
+  if Dragging then
   begin
     xOffset := xOffset + X - xDown;

branches/highdpi/LocalPlayer/Term.lfm

-              r405
+              r465
 object MainScreen: TMainScreen
   Left = 516
+  Left = 469
   Height = 480
   Top = 834
+  Top = 251
   Width = 800
   HorzScrollBar.Visible = False
 …
   DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   KeyPreview = True
 …
   OnShow = FormShow
   Position = poDefault
   LCLVersion = '2.0.12.0'
+  LCLVersion = '2.2.0.4'
   Scaled = False
   WindowState = wsMaximized
 …
       Tag = 7
       ShortCut = 112
       OnClick = MenuClick
+      OnClick = mHelpClick
     end
     object mTechTree: TDpiMenuItem
       GroupIndex = 1
       ShortCut = 84
       OnClick = MenuClick
+      OnClick = mTechTreeClick
     end
     object N12: TDpiMenuItem
 …
       object mOwnMovement: TDpiMenuItem
         Tag = 30
-        GroupIndex = 1
-        RadioItem = True
         object mSlowMoves: TDpiMenuItem
           Tag = 75
 …
       object mAllyMovement: TDpiMenuItem
         Tag = 90
-        GroupIndex = 1
-        RadioItem = True
         object mAlSlowMoves: TDpiMenuItem
           Tag = 91
 …
       object mEnemyMovement: TDpiMenuItem
         Tag = 74
-        GroupIndex = 1
-        RadioItem = True
         object mEnMoves: TDpiMenuItem
           Tag = 78
 …
       object mRep: TDpiMenuItem
         Tag = 34
-        GroupIndex = 1
         object mRep0: TDpiMenuItem
           OnClick = mRepClicked
 …
         Caption = '-'
         GroupIndex = 1
+        RadioItem = True
       end
       object mWaitTurn: TDpiMenuItem
         Tag = 32
-        GroupIndex = 1
         OnClick = Toggle
       end
       object mScrolling: TDpiMenuItem
         Tag = 84
-        GroupIndex = 1
         object mScrollSlow: TDpiMenuItem
           Tag = 85
 …
       object mTileSize: TDpiMenuItem
         Tag = 96
-        GroupIndex = 1
         object mSmallTiles: TDpiMenuItem
           Tag = 97
 …
       object mSound: TDpiMenuItem
         Tag = 80
-        GroupIndex = 1
         object mSoundOn: TDpiMenuItem
           Tag = 82
 …
         Caption = '-'
         GroupIndex = 1
+        RadioItem = True
       end
       object mTest: TDpiMenuItem
         Tag = 8
-        GroupIndex = 1
         object mJump: TDpiMenuItem
           Tag = 54
           ShortCut = 16458
           OnClick = MenuClick
+          OnClick = mJumpClick
         end
         object mRun: TDpiMenuItem
           Tag = 63
           ShortCut = 16466
           OnClick = MenuClick
+          OnClick = mRunClick
         end
         object mNames: TDpiMenuItem
 …
       object mEnhanceDef: TDpiMenuItem
         Tag = 40
         OnClick = MenuClick
+        OnClick = mEnhanceDefClick
       end
       object mCityTypes: TDpiMenuItem
         Tag = 11
         OnClick = MenuClick
+        OnClick = mCityTypesClick
       end
     end
 …
       GroupIndex = 1
       ShortCut = 16466
       OnClick = MenuClick
+      OnClick = mRandomMapClick
     end
     object N3: TDpiMenuItem
 …
       Tag = 88
       GroupIndex = 1
       OnClick = MenuClick
+      OnClick = mWebsiteClick
     end
     object N2: TDpiMenuItem
 …
       GroupIndex = 1
       ShortCut = 16465
       OnClick = MenuClick
+      OnClick = mResignClick
     end
   end
 …
       Tag = 72
       ShortCut = 16452
       OnClick = MenuClick
+      OnClick = mDisbandOrUtilizeClick
     end
     object mUtilize: TDpiMenuItem
       ShortCut = 90
       OnClick = MenuClick
+      OnClick = mDisbandOrUtilizeClick
     end
     object N1: TDpiMenuItem
 …
     object mcity: TDpiMenuItem
       ShortCut = 66
       OnClick = MenuClick
+      OnClick = mcityClick
     end
     object mPillage: TDpiMenuItem
       Tag = 19
       ShortCut = 16464
       OnClick = MenuClick
+      OnClick = mPillageClick
     end
     object N5: TDpiMenuItem
 …
     object mhome: TDpiMenuItem
       ShortCut = 72
       OnClick = MenuClick
+      OnClick = mhomeClick
     end
     object mLoad: TDpiMenuItem
       Tag = 24
       ShortCut = 76
       OnClick = MenuClick
+      OnClick = mLoadClick
     end
     object mUnload: TDpiMenuItem
       Tag = 70
       ShortCut = 85
       OnClick = MenuClick
+      OnClick = mUnloadClick
     end
     object mSelectTransport: TDpiMenuItem
       Tag = 73
       ShortCut = 16468
       OnClick = MenuClick
+      OnClick = mSelectTransportClick
     end
     object mGoOn: TDpiMenuItem
       Tag = 13
       ShortCut = 71
       OnClick = MenuClick
+      OnClick = mGoOnClick
     end
     object mCancel: TDpiMenuItem
       Tag = 1
       ShortCut = 16451
       OnClick = MenuClick
+      OnClick = mCancelClick
     end
     object mRecover: TDpiMenuItem
       Tag = 69
       ShortCut = 86
       OnClick = MenuClick
+      OnClick = mRecoverClick
     end
     object mwait: TDpiMenuItem
       Tag = 25
       ShortCut = 87
       OnClick = MenuClick
+      OnClick = mwaitClick
     end
     object mnoorders: TDpiMenuItem
       Tag = 26
       ShortCut = 32
       OnClick = MenuClick
+      OnClick = mnoordersClick
     end
     object mstay: TDpiMenuItem
       Tag = 22
       ShortCut = 83
       OnClick = MenuClick
+      OnClick = mstayClick
     end
     object mCentre: TDpiMenuItem
       Tag = 12
       ShortCut = 67
       OnClick = MenuClick
+      OnClick = mCentreClick
     end
     object N13: TDpiMenuItem
 …
       Tag = 100
       ShortCut = 46
       OnClick = MenuClick
+      OnClick = mPrevUnitClick
     end
     object mNextUnit: TDpiMenuItem
       Tag = 101
       ShortCut = 45
       OnClick = MenuClick
+      OnClick = mNextUnitClick
     end
   end
 …
       Tag = 9
       ShortCut = 113
       OnClick = MenuClick
+      OnClick = mUnitStatClick
     end
     object mCityStat: TDpiMenuItem
       Tag = 37
       ShortCut = 114
       OnClick = MenuClick
+      OnClick = mCityStatClick
     end
     object mScienceStat: TDpiMenuItem
       Tag = 38
       ShortCut = 115
       OnClick = MenuClick
+      OnClick = mScienceStatClick
     end
     object mEUnitStat: TDpiMenuItem
       Tag = 50
       ShortCut = 116
       OnClick = MenuClick
+      OnClick = mEUnitStatClick
     end
     object mDiagram: TDpiMenuItem
       Tag = 21
       ShortCut = 117
       OnClick = MenuClick
+      OnClick = mDiagramClick
     end
     object mWonders: TDpiMenuItem
       Tag = 6
       ShortCut = 118
       OnClick = MenuClick
+      OnClick = mWondersClick
     end
     object mShips: TDpiMenuItem
       Tag = 41
       ShortCut = 119
       OnClick = MenuClick
+      OnClick = mShipsClick
     end
     object N4: TDpiMenuItem
 …
       Tag = 55
       ShortCut = 120
       OnClick = MenuClick
+      OnClick = mNationsClick
     end
     object mEmpire: TDpiMenuItem
       Tag = 3
       ShortCut = 121
       OnClick = MenuClick
+      OnClick = mEmpireClick
     end
     object mRevolution: TDpiMenuItem
       Tag = 89
       OnClick = MenuClick
+      OnClick = mRevolutionClick
     end
   end
 …
       Tag = 273
       ShortCut = 79
       OnClick = MenuClick
+      OnClick = mtransClick
     end
     object mAfforest: TDpiMenuItem
       Tag = 301
       ShortCut = 77
       OnClick = MenuClick
+      OnClick = mAfforestClick
     end
     object mClear: TDpiMenuItem
       Tag = 298
       ShortCut = 73
       OnClick = MenuClick
+      OnClick = mClearClick
     end
     object mfort: TDpiMenuItem
       Tag = 276
       ShortCut = 70
       OnClick = MenuClick
+      OnClick = mfortClick
     end
     object mAirBase: TDpiMenuItem
       Tag = 272
       ShortCut = 65
       OnClick = MenuClick
+      OnClick = mAirBaseClick
     end
     object mCanal: TDpiMenuItem
       Tag = 279
       ShortCut = 78
       OnClick = MenuClick
+      OnClick = mCanalClick
     end
     object mmine: TDpiMenuItem
       Tag = 302
       ShortCut = 77
       OnClick = MenuClick
+      OnClick = mmineClick
     end
     object mFarm: TDpiMenuItem
       Tag = 300
       ShortCut = 73
       OnClick = MenuClick
+      OnClick = mFarmClick
     end
     object mirrigation: TDpiMenuItem
       Tag = 299
       ShortCut = 73
       OnClick = MenuClick
     end
     object mrr: TDpiMenuItem
+      OnClick = mirrigationClick
+    end
+    object mRailRoad: TDpiMenuItem
       Tag = 297
       ShortCut = 82
       OnClick = MenuClick
+      OnClick = mRailRoadClick
     end
     object mroad: TDpiMenuItem
       Tag = 296
       ShortCut = 82
       OnClick = MenuClick
+      OnClick = mroadClick
     end
     object mpollution: TDpiMenuItem
       Tag = 274
       ShortCut = 80
       OnClick = MenuClick
+      OnClick = mpollutionClick
     end
     object mEnhance: TDpiMenuItem
       Tag = 295
       ShortCut = 69
       OnClick = MenuClick
+      OnClick = mEnhanceClick
     end
   end

branches/highdpi/LocalPlayer/Term.pas

-              r405
+              r465
 uses
   UDpiControls, {$IFDEF Windows}
+  UDpiControls, {$IFDEF WINDOWS}
   Windows,
 {$ENDIF}
 {$IFDEF Linux}
+{$IFDEF UNIX}
   LMessages, Messages,
 {$ENDIF}
 …
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
+  UGraphicSet, UMiniMap, IsoEngine;
+  GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
+  Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
+  Help;
 const
 …
     mWonders: TDpiMenuItem;
     mScienceStat: TDpiMenuItem;
     mRR: TDpiMenuItem;
+    mRailRoad: TDpiMenuItem;
     mClear: TDpiMenuItem;
     mFarm: TDpiMenuItem;
 …
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
+    procedure mAfforestClick(Sender: TObject);
+    procedure mAirBaseClick(Sender: TObject);
+    procedure mCanalClick(Sender: TObject);
+    procedure mCancelClick(Sender: TObject);
+    procedure mCentreClick(Sender: TObject);
+    procedure mcityClick(Sender: TObject);
+    procedure mCityStatClick(Sender: TObject);
+    procedure mCityTypesClick(Sender: TObject);
+    procedure mClearClick(Sender: TObject);
+    procedure mDiagramClick(Sender: TObject);
+    procedure mEmpireClick(Sender: TObject);
+    procedure mEnhanceClick(Sender: TObject);
+    procedure mEnhanceDefClick(Sender: TObject);
+    procedure mEUnitStatClick(Sender: TObject);
+    procedure mFarmClick(Sender: TObject);
+    procedure mfortClick(Sender: TObject);
+    procedure mGoOnClick(Sender: TObject);
+    procedure mHelpClick(Sender: TObject);
+    procedure mhomeClick(Sender: TObject);
+    procedure mirrigationClick(Sender: TObject);
+    procedure mirrigationDrawItem(Sender: TObject; ACanvas: TDpiCanvas;
+      ARect: TRect; AState: TOwnerDrawState);
+    procedure mJumpClick(Sender: TObject);
+    procedure mLoadClick(Sender: TObject);
+    procedure mmineClick(Sender: TObject);
+    procedure mNationsClick(Sender: TObject);
+    procedure mNextUnitClick(Sender: TObject);
+    procedure mnoordersClick(Sender: TObject);
+    procedure mPillageClick(Sender: TObject);
+    procedure mpollutionClick(Sender: TObject);
+    procedure mPrevUnitClick(Sender: TObject);
+    procedure mRandomMapClick(Sender: TObject);
+    procedure mRecoverClick(Sender: TObject);
+    procedure mResignClick(Sender: TObject);
+    procedure mRevolutionClick(Sender: TObject);
+    procedure mroadClick(Sender: TObject);
+    procedure mRailRoadClick(Sender: TObject);
+    procedure mRunClick(Sender: TObject);
+    procedure mScienceStatClick(Sender: TObject);
+    procedure mSelectTransportClick(Sender: TObject);
+    procedure mShipsClick(Sender: TObject);
+    procedure mstayClick(Sender: TObject);
+    procedure mTechTreeClick(Sender: TObject);
+    procedure mtransClick(Sender: TObject);
+    procedure mUnitStatClick(Sender: TObject);
+    procedure mUnloadClick(Sender: TObject);
+    procedure mwaitClick(Sender: TObject);
+    procedure mWebsiteClick(Sender: TObject);
+    procedure mWondersClick(Sender: TObject);
     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);
     procedure MenuClick(Sender: TObject);
+      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);
 …
     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);
 …
     NoMap: TIsoMap;
     NoMapPanel: TIsoMap;
+    function ChooseUnusedTribe: integer;
+    // Forms
+    FWondersDlg: TWondersDlg;
+    FTechTreeDlg: TTechTreeDlg;
+    FEnhanceDlg: TEnhanceDlg;
+    FNegoDlg: TNegoDlg;
+    FCityTypeDlg: TCityTypeDlg;
+    FDiaDlg: TDiaDlg;
+    FCityDlg: TCityDlg;
+    FRatesDlg: TRatesDlg;
+    FBattleDlg: TBattleDlg;
+    FNatStatDlg: TNatStatDlg;
+    FUnitStatDlg: TUnitStatDlg;
+    FDraftDlg: TDraftDlg;
+    FModalSelectDlg: TModalSelectDlg;
+    FListDlg: TListDlg;
+    FMessgExDlg: TMessgExDlg;
+    FHelpDlg: THelpDlg;
+    procedure ArrangeDialogs;
+    procedure ArrangeDialog(Form: TBufferedDrawDlg);
+    function ChooseUnusedTribe: Integer;
+    function DoJob(j0: Integer): Integer;
+    function GetBattleDlg: TBattleDlg;
+    function GetCityDlg: TCityDlg;
+    function GetCityTypeDlg: TCityTypeDlg;
+    function GetDiaDlg: TDiaDlg;
+    function GetDraftDlg: TDraftDlg;
+    function GetEnhanceDlg: TEnhanceDlg;
+    function GetHelpDlg: THelpDlg;
+    function GetListDlg: TListDlg;
+    function GetMessgExDlg: TMessgExDlg;
+    function GetModalSelectDlg: TModalSelectDlg;
+    function GetNatStatDlg: TNatStatDlg;
+    function GetNegoDlg: TNegoDlg;
+    function GetRatesDlg: TRatesDlg;
+    function GetTechTreeDlg: TTechTreeDlg;
     procedure GetTribeList;
+    function GetUnitStatDlg: TUnitStatDlg;
+    function GetWondersDlg: TWondersDlg;
     procedure InitModule;
     procedure DoneModule;
     procedure InitTurn(NewPlayer: integer);
+    procedure InitTurn(NewPlayer: Integer);
     procedure SaveMenuItemsState;
     procedure ScrollBarUpdate(Sender: TObject);
 …
     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: TDpiPopupMenu);
     procedure SetMapOptions;
 …
     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;
 …
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
     procedure PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
+    procedure PaintZoomedTile(dst: TDpiBitmap; X, Y, Loc: Integer);
   public
+    UsedOffscreenWidth, UsedOffscreenHeight: integer;
+    UsedOffscreenWidth: Integer;
+    UsedOffscreenHeight: Integer;
     Offscreen: TDpiBitmap;
     OffscreenUser: TDpiForm;
+    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;
+    // Forms
+    property WondersDlg: TWondersDlg read GetWondersDlg;
+    property TechTreeDlg: TTechTreeDlg read GetTechTreeDlg;
+    property EnhanceDlg: TEnhanceDlg read GetEnhanceDlg;
+    property NegoDlg: TNegoDlg read GetNegoDlg;
+    property CityTypeDlg: TCityTypeDlg read GetCityTypeDlg;
+    property DiaDlg: TDiaDlg read GetDiaDlg;
+    property CityDlg: TCityDlg read GetCityDlg;
+    property RatesDlg: TRatesDlg read GetRatesDlg;
+    property BattleDlg: TBattleDlg read GetBattleDlg;
+    property NatStatDlg: TNatStatDlg read GetNatStatDlg;
+    property UnitStatDlg: TUnitStatDlg read GetUnitStatDlg;
+    property DraftDlg: TDraftDlg read GetDraftDlg;
+    property ModalSelectDlg: TModalSelectDlg read GetModalSelectDlg;
+    property ListDlg: TListDlg read GetListDlg;
+    property MessgExDlg: TMessgExDlg read GetMessgExDlg;
+    property HelpDlg: THelpDlg read GetHelpDlg;
   end;
 …
 type
+  { TTribeInfo }
   TTribeInfo = record
     trix: integer;
+    trix: Integer;
     FileName: ShortString;
+  end;
+    function GetCommandDataSize: Byte;
+  end;
+  { TCityNameInfo }
   TCityNameInfo = record
     ID: integer;
+    ID: Integer;
     NewName: ShortString;
+  end;
+    function GetCommandDataSize: Byte;
+  end;
+  { TModelNameInfo }
   TModelNameInfo = record
     mix: integer;
+    mix: Integer;
     NewName: ShortString;
+  end;
+  TPriceSet = set of $00 .. $FF;
+    function GetCommandDataSize: Byte;
+  end;
+  TFormAction = (faClose, faEnable, faDisable, faUpdate, faSmartUpdateContent);
 const
 …
   usToldNoReturn = $100;
   usPersistent = usStay or usGoto or usEnhance or usRecover or
     integer($FFFF0000);
+    Integer($FFFF0000);
   { model status flags }
 …
   adNexus = $803;
   SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of integer = (10,
+  SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of Integer = (10,
 , 40, 41, 21, 30, { 50,51, } 64, 74, { 71, } 73);
 …
   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,
 …
   DestinationMarkON: Boolean;
   StartRunning: Boolean;
-  StayOnTop_Ensured: Boolean;
   Supervising: Boolean;
   UnusedTribeFiles: TStringList;
 …
   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: TDpiCanvas; x, y, iix: integer; Government: integer = -1;
+  IsControl: boolean = false);
+procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure InitMyModel(Mix: Integer; Final: Boolean);
+procedure ImpImage(ca: TDpiCanvas; X, Y, iix: Integer; Government: Integer = -1;
+  IsControl: Boolean = False);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
+function AlignUp(Value, Alignment: Integer): Integer;
 …
 uses
+  Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
+  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
+  Directories, Log, PixelPointer, Sound, Registry, Global, KeyBindings, CmdList;
 {$R *.lfm}
 …
   lxmax_xxx = 130;
   LeftPanelWidth = 70;
-  LeftPanelWidth_Editor = 46;
   overlap = PanelHeight - MidPanelHeight;
   yTroop = PanelHeight - 83;
   xPalace = 66;
   yPalace = 24; // 120;
   xAdvisor = 108;
   yAdvisor = 48;
+{  xAdvisor = 108;
+  yAdvisor = 48;}
   xUnitText = 80;
-  PaperShade = 3;
   BlinkOnTime = 12;
   BlinkOffTime = 6;
   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;
 …
   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;
 …
   TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
+  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch: Integer;
+  Sum: Int64;
+  Cnt, dx, dy, nx, ny, ix, iy, ir, X, Y, C, ch: Integer;
   xdivider, ydivider: Integer;
   Resampled: ^TBuffer;
 …
 begin
   nx := BigImp.Width div xSizeBig * xSizeSmall;
-  ny := BigImp.Height div ySizeBig * ySizeSmall;
-  SmallImp.SetSize(nx, ny);
-  SmallImp.Canvas.StretchDraw(Rect(0, 0, SmallImp.Width, SmallImp.Height), BigImp);
-{  nx := BigImp.Width div xSizeBig * xSizeSmall;
   ny := BigImp.Height div ySizeBig * ySizeSmall;
 …
   for ix := 0 to BigImp.Width div xSizeBig - 1 do
     for iy := 0 to BigImp.Height div ySizeBig - 1 do begin
       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;
+      PixelPtr := TPixelPointer.Create(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;
         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) *
             ySizeSmall div (ySizeBig - 2 * cut) * nx;
           xdivider := (ScaleFromNative(x) * xSizeSmall div xSizeBig + 1) *
             xSizeBig - ScaleFromNative(x) * xSizeSmall;
+        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;
           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;
 …
   SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
   PixelPtr := PixelPointer(SmallImp);
   for y := 0 to ScaleToNative(ny) - 1 do begin
     for x := 0 to ScaleToNative(nx) - 1 do begin
+  PixelPtr := TPixelPointer.Create(SmallImp);
+  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 *
           Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
+        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;
         if Sum > 255 then Sum := 255;
 …
   SmallImp.EndUpdate;
   FreeMem(Resampled);
+  }
+end;
+procedure ImpImage(ca: TDpiCanvas; x, y, iix: integer; Government: integer;
+  IsControl: boolean);
+end;
+procedure ImpImage(ca: TDpiCanvas; X, Y, iix: Integer; Government: Integer;
+  IsControl: Boolean);
 begin
   if Government < 0 then
 …
   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;
 procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
 begin
   if MyMap[Loc] and fDeadLands <> 0 then
     HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
   else if (MyMap[Loc] and fTerrain = fForest) and IsJungle(Loc div G.lx) then
     HelpDlg.ShowNewContent(NewMode, hkTer,
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer,
       fJungle + (MyMap[Loc] shr 5 and 3) * 12)
   else
     HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
       (MyMap[Loc] shr 5 and 3) * 12);
 end;
+function AlignUp(Value, Alignment: Integer): Integer;
+begin
+  Result := Value or (Alignment - 1);
+end;
 { *** tribe management procedures *** }
 function RoughCredibility(Credibility: integer): integer;
+function RoughCredibility(Credibility: Integer): Integer;
 begin
   case Credibility of
 .. 69:
       result := 0;
+      Result := 0;
 .. 89:
       result := 1;
+      Result := 1;
 .. 99:
       result := 2;
+      Result := 2;
 :
       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
 …
     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(cSetNewModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4,
+      Server(CommandWithData(cSetNewModelPicture, Picture.GetCommandDataSize),
 , 0, Picture)
     else
       Server(cSetModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4, 0,
 , Picture)
+      Server(CommandWithData(cSetModelPicture, Picture.GetCommandDataSize),
+, 0, Picture)
   else
     with Tribe[p].ModelPicture[mix] do
+    with Tribe[P].ModelPicture[mix] do
     begin
       HGr := LoadGraphicSet(Picture.GrName);
 …
 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
 …
 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
 …
 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 +
 …
   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
         TribeMessage(p1, Tribe[p1].TPhrase('FRNEWNATION'), '');
         MyData.ToldContact := MyData.ToldContact or (1 shl p1);
       end
+      end;
 end;
 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 }
 …
       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
+      with MainScreen.MessgExDlg do
       begin
         { MakeModelInfo(me,MyData.ToldModels,MyModel[MyData.ToldModels],mi);
 …
           ModelNameInfo.mix := MyData.ToldModels;
           ModelNameInfo.NewName := EInput.Text;
+          Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
+            div 4, me, 0, ModelNameInfo);
+          if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+            Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+             (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+          Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+            Me, 0, ModelNameInfo);
         end;
       end;
 …
             MyModel[mix].Status := MyModel[mix].Status or msObsolete;
       end;
+      inc(MyData.ToldModels);
+    end;
+end;
+procedure TMainScreen.PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
+  procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
+      Inc(MyData.ToldModels);
+    end;
+end;
+{ TTribeInfo }
+function TTribeInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + 1 + Length(FileName)
+end;
+{ TModelNameInfo }
+function TModelNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(mix) + 1 + Length(NewName);
+end;
+{ TCityNameInfo }
+function TCityNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(ID) + 1 + Length(NewName);
+end;
+procedure TMainScreen.PaintZoomedTile(dst: TDpiBitmap; 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,
 + 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,
 + 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,
 + 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,
 + 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,
 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
     end;
 …
 var
   cix, ySrc, Tile: integer;
+  cix, ySrc, Tile: Integer;
 begin
   with NoMapPanel do begin
 …
         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
 …
 end;
 function ChooseResearch: boolean;
+function ChooseResearch: Boolean;
 var
   ChosenResearch: integer;
+  ChosenResearch: Integer;
 begin
   if (MyData.FarTech <> adNone) and (MyRO.Tech[MyData.FarTech] >= tsApplicable)
 …
     { research complete -- select new }
     repeat
       ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
       if ModalSelectDlg.result < 0 then
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
+      if MainScreen.ModalSelectDlg.Result < 0 then
       begin
         result := false;
         exit;
       end;
       ChosenResearch := ModalSelectDlg.result;
+        Result := False;
+        Exit;
+      end;
+      ChosenResearch := MainScreen.ModalSelectDlg.Result;
       if ChosenResearch = adMilitary then
       begin
         DraftDlg.ShowNewContent(wmModal);
         if DraftDlg.ModalResult <> mrOK then
           Tribe[me].ModelPicture[MyRO.nModel].HGr := nil
       end;
     until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
+        MainScreen.DraftDlg.ShowNewContent(wmModal);
+        if MainScreen.DraftDlg.ModalResult <> mrOK then
+          Tribe[Me].ModelPicture[MyRO.nModel].HGr := nil;
+      end;
+    until (ChosenResearch <> adMilitary) or (MainScreen.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^) <
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
+      if MainScreen.ModalSelectDlg.Result >= 0 then
+        if (MainScreen.ModalSelectDlg.Result = adNone) or
+          (Server(sSetResearch - sExecute, Me, MainScreen.ModalSelectDlg.Result, nil^) <
           rExecuted) then
           MyData.FarTech := ModalSelectDlg.result
+          MyData.FarTech := MainScreen.ModalSelectDlg.Result
         else
         begin
           ChosenResearch := ModalSelectDlg.result;
+          ChosenResearch := MainScreen.ModalSelectDlg.Result;
           // can be researched immediately
           MyData.FarTech := adNone
+          MyData.FarTech := adNone;
         end;
     end;
 …
     MyData.FarTech := adNexus
   else
+    Server(sSetResearch, me, ChosenResearch, nil^);
+  ListDlg.TechChange;
+  result := true;
+    Server(sSetResearch, Me, ChosenResearch, nil^);
+  MainScreen.ListDlg.TechChange;
+  Result := True;
+end;
+procedure ApplyToVisibleForms(FormAction: TFormAction);
+var
+  I: Integer;
+  Form: TDpiForm;
+begin
+  for I := 0 to DpiScreen.FormCount - 1 do begin
+    Form := DpiScreen.Forms[I];
+    if Form.Visible and (Form is TBufferedDrawDlg) then begin
+      case FormAction of
+        faClose: Form.Close;
+        faEnable: Form.Enabled := True;
+        faDisable: Form.Enabled := False;
+        faUpdate: begin
+          if @Form.OnShow <> nil then Form.OnShow(nil);
+            Form.Invalidate;
+            Form.Update;
+        end;
+        faSmartUpdateContent: TBufferedDrawDlg(Form).SmartUpdateContent(False);
+      end;
+    end;
+  end;
 end;
 (* ** 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')
 …
     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
+      for i := 0 to DpiScreen.FormCount - 1 do
+        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
+        then
+          DpiScreen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
 …
 end;
+function TMainScreen.OfferCall(var Offer: TOffer): integer;
+var
+  i: 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
+      for i := 0 to DpiScreen.FormCount - 1 do
+        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
+        then
+          DpiScreen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
 …
 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
 …
 procedure TMainScreen.CheckTerrainBtnVisible;
 var
   Tile: integer;
+  Tile: Integer;
   mox: ^TModel;
 begin
 …
   end
   else
     TerrainBtn.Visible := false;
+    TerrainBtn.Visible := False;
 end;
 …
   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;
 …
 end;
 procedure TMainScreen.UpdateViews(UpdateCityScreen: boolean);
+procedure TMainScreen.UpdateViews(UpdateCityScreen: Boolean);
 begin
   SumCities(TaxSum, ScienceSum);
 …
 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
+    if AILogo[P] <> nil then
     begin
       FreeAndNil(AILogo[p]);
+      FreeAndNil(AILogo[P]);
     end;
   end
   else
   begin
     if AILogo[p] = nil then
       AILogo[p] := TDpiBitmap.Create;
     if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', [gfNoError]) then
+    if AILogo[P] = nil then
+      AILogo[P] := TDpiBitmap.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;
+      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;
 …
 procedure TMainScreen.RememberPeaceViolation;
 var
   uix, p1: integer;
+  uix, p1: Integer;
 begin
   MyData.PeaceEvaHappened := 0;
 …
       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);
 …
 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;
 …
   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;
 …
       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;
 …
   Color: TColor;
   Name: string;
   ok: boolean;
+  ok: Boolean;
 begin
   UnusedTribeFiles.Clear;
 …
 end;
+function TMainScreen.ChooseUnusedTribe: integer;
+function TMainScreen.GetUnitStatDlg: TUnitStatDlg;
+begin
+  if not Assigned(FUnitStatDlg) then begin
+    FUnitStatDlg := TUnitStatDlg.Create(nil);
+    ArrangeDialog(FUnitStatDlg);
+    FUnitStatDlg.CheckAge;
+  end;
+  Result := FUnitStatDlg;
+end;
+function TMainScreen.GetWondersDlg: TWondersDlg;
+begin
+  if not Assigned(FWondersDlg) then FWondersDlg := TWondersDlg.Create(nil);
+  Result := FWondersDlg;
+end;
+function TMainScreen.ChooseUnusedTribe: Integer;
 var
   i: Integer;
   j: Integer;
+  I: Integer;
+  J: Integer;
   ColorDistance: Integer;
   BestColorDistance: Integer;
 …
   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
+    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;
+        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;
 …
     if ColorDistance = BestColorDistance then
     begin
       inc(CountBest);
+      Inc(CountBest);
       if DelphiRandom(CountBest) = 0 then
         result := j;
+        Result := J;
     end;
   end;
 …
 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
 …
         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
 …
     begin
       MostCost := 0;
       for i := 0 to nShipPart - 1 do
+      for I := 0 to nShipPart - 1 do
       begin
         TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
+        TestCost := abs(Ship1Change[I]) * Imp[imShipComp + I].Cost;
         if TestCost > MostCost then
         begin
           MostCost := TestCost;
           IconIndex := imShipComp + i;
+          IconIndex := imShipComp + I;
         end;
       end;
 …
 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');
 …
   InitSmallImp;
   SoundPreloadDone := [];
+  StartRunning := false;
+  StayOnTop_Ensured := false;
+  StartRunning := False;
   sb := TPVScrollbar.Create(Self);
 …
   FreeAndNil(UnusedTribeFiles);
   FreeAndNil(TribeNames);
+  // AdvisorDlg.DeInit;
+end;
+procedure TMainScreen.InitTurn(NewPlayer: integer);
+end;
+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;
 …
   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
 …
     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
 …
       else }
     begin
       Age := GetAge(me);
+      Age := GetAge(Me);
       if MainTexture.Age <> Age then begin
         MainTexture.Age := Age;
 …
   end;
   InitCityMark(MainTexture);
   CityDlg.CheckAge;
   NatStatDlg.CheckAge;
   UnitStatDlg.CheckAge;
   HelpDlg.Difficulty := G.Difficulty[me];
+  if Assigned(FCityDlg) then FCityDlg.CheckAge;
+  if Assigned(FNatStatDlg) then FNatStatDlg.CheckAge;
+  if Assigned(FUnitStatDlg) then FUnitStatDlg.CheckAge;
+  if Assigned(FHelpDlg) then FHelpDlg.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
 …
           Hash := 0;
           GrName := 'StdUnits.png';
           Tribe[p1].SetModelPicture(Picture, true);
         end
   end;
   if not supervising and (ClientMode = cTurn) then
+          Tribe[p1].SetModelPicture(Picture, True);
+        end;
+  end;
+  if not Supervising and (ClientMode = cTurn) then
   begin
     for cix := 0 to MyRO.nCity - 1 do
 …
   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
 …
     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
 …
       begin
         NewAgeCenterTo := -1;
         Loc1 := dLoc(Loc1, -dx, -dy)
+        Loc1 := dLoc(Loc1, -dx, -dy);
       end
       else
 …
       end
     end;
+    Centre(Loc1)
+  end;
+  for i := 0 to DpiScreen.FormCount - 1 do
+    if DpiScreen.Forms[i] is TBufferedDrawDlg then
+      DpiScreen.Forms[i].Enabled := true;
+    Centre(Loc1);
+  end;
+  ApplyToVisibleForms(faEnable);
   if ClientMode <> cResume then
 …
     // first turn after anarchy -- don't show despotism palace!
     Update;
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if (DpiScreen.Forms[i].Visible) and (DpiScreen.Forms[i] is TBufferedDrawDlg)
+      then
+      begin
+        if @DpiScreen.Forms[i].OnShow <> nil then
+          DpiScreen.Forms[i].OnShow(nil);
+        DpiScreen.Forms[i].Invalidate;
+        DpiScreen.Forms[i].Update;
+      end;
+    ApplyToVisibleForms(faUpdate);
     if MyRO.Happened and phGameEnd <> 0 then
 …
         begin
           OpenSound := 'MSG_GAMEOVER';
           MessgText := Tribe[me].TPhrase('GAMEOVER');
+          MessgText := Tribe[Me].TPhrase('GAMEOVER');
           IconKind := mikBigIcon;
           IconIndex := 8;
 …
             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;
 …
           else
           begin
             assert(me = 0);
+            Assert(Me = 0);
             OpenSound := 'MSG_GAMEOVER';
             MessgText := '';
 …
         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');
 …
           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
+        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 (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
 …
           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)]);
           end
+            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;
 …
         CenterTo := NewAgeCenterTo;
         OpenSound := 'AGE_' + char(48 + Age);
+        DpiApplication.ProcessMessages;
         ShowModal;
         MyData.ToldAge := Age;
 …
           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;
 …
             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) <>
 …
         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;
 …
     end;
     for i := 0 to nWonder - 1 do
+    for I := 0 to nWonder - 1 do
     begin
       OwnWonder := false;
+      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
+          OwnWonder := True;
+      if MyRO.Wonder[I].CityID <> MyData.ToldWonders[I].CityID then
       begin
         if MyRO.Wonder[i].CityID = WonderDestroyed then
+        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
 …
             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]
                   .TPhrase('WONDERBUILT')
+                S := Tribe[MyRO.Wonder[I].EffectiveOwner]
+                  .TPhrase('WONDERBUILT');
               end
               else
               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;
+        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;
         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;
 …
     begin
       SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
       MyData.ColdWarStart := -ColdWarTurns - 1
+      MyData.ColdWarStart := -ColdWarTurns - 1;
     end;
 …
   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;
 …
           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
 …
       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
 …
   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
 …
               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;
 …
                 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
 …
                 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
 …
                   CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
                     Flags and CityRepMask);
                   UpdatePanel := true;
+                  UpdatePanel := True;
                 end;
               end
 …
               begin
                 if Flags and CityRepMask <> 0 then
                   ShowCityList := true
+                  ShowCityList := True;
               end;
             end;
 …
         begin
           Play('REVOLUTION');
           Server(sRevolution, me, 0, nil^);
+          Server(sRevolution, Me, 0, nil^);
         end;
       end;
 …
     DpiApplication.ProcessMessages;
     if not supervising then
+    if not Supervising then
       for uix := 0 to MyRO.nUn - 1 do
         with MyUn[uix] do
 …
               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
 …
                   // don't attack during auto move
                   begin
                     ok := false;
+                    ok := False;
                     Break
                   end
 …
                     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;
 …
               begin
                 MoveResult := eOK;
                 Stop := true;
+                Stop := True;
               end;
 …
   end; // ClientMode=cTurn
+  HaveStrategyAdvice := false;
+  // (GameMode<>cMovie) and not supervising
+  // and AdvisorDlg.HaveStrategyAdvice;
+  GoOnPhase := true;
+  if supervising or (GameMode = cMovie) then
+  HaveStrategyAdvice := False;
+  GoOnPhase := True;
+  if Supervising or (GameMode = cMovie) then
   begin
     SetTroopLoc(-1);
 …
       SetUnFocus(-1)
     else
       NextUnit(-1, false);
+      NextUnit(-1, False);
     if UnFocus < 0 then
     begin
 …
 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
 …
   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;
 …
       begin
         Server := TInitModuleData(Data).Server;
-        // AdvisorDlg.Init;
         InitModule;
         TInitModuleData(Data).DataSize := SizeOf(TPersistentData);
 …
           MainTexture.Age := -1;
         Tribes.Init;
         HelpDlg.UserLeft := (DpiScreen.width - HelpDlg.width) div 2;
         HelpDlg.UserTop := (DpiScreen.height - HelpDlg.height) div 2;
+        HelpDlg.UserLeft := (DpiScreen.Width - HelpDlg.Width) div 2;
+        HelpDlg.UserTop := (DpiScreen.Height - HelpDlg.Height) div 2;
         HelpDlg.Difficulty := 0;
         if Command = cStartCredits then
           HelpDlg.ShowNewContent(wmModal, hkMisc, miscCredits)
+          HelpDlg.ShowNewContent(wmModal, hkMisc, Integer(miscCredits))
         else
           HelpDlg.ShowNewContent(wmModal, hkMisc, miscMain);
+          HelpDlg.ShowNewContent(wmModal, hkMisc, Integer(miscMain));
         Tribes.Done;
       end;
 …
     cNewGame, cLoadGame, cMovie, cNewMap:
       begin
-        { if (Command=cNewGame) or (Command=cLoadGame) then
-          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
 …
               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;
                   EffectiveOwner := -1
+                  EffectiveOwner := -1;
                 end;
               FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
 …
             end;
+        // arrange dialogs
+        ListDlg.UserLeft := 8;
+        ListDlg.UserTop := TopBarHeight + 8;
+        HelpDlg.UserLeft := DpiScreen.width - HelpDlg.width - 8;
+        HelpDlg.UserTop := TopBarHeight + 8;
+        UnitStatDlg.UserLeft := 397;
+        UnitStatDlg.UserTop := TopBarHeight + 64;
+        DiaDlg.UserLeft := (DpiScreen.width - DiaDlg.width) div 2;
+        DiaDlg.UserTop := (DpiScreen.height - DiaDlg.height) div 2;
+        NatStatDlg.UserLeft := DpiScreen.width - NatStatDlg.width - 8;
+        NatStatDlg.UserTop := DpiScreen.height - PanelHeight -
+          NatStatDlg.height - 8;
+        if NatStatDlg.UserTop < 8 then
+          NatStatDlg.UserTop := 8;
+        ArrangeDialogs;
         Age := 0;
         MovieSpeed := 1;
         LogDlg.mSlot.Visible := true;
         LogDlg.Host := self;
         HelpDlg.ClearHistory;
         CityDlg.Reset;
+        LogDlg.mSlot.Visible := True;
+        LogDlg.Host := Self;
+        if Assigned(FHelpDlg) then FHelpDlg.ClearHistory;
+        if Assigned(FCityDlg) then FCityDlg.Reset;
         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;
 …
       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
 …
               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);
               DpiApplication.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(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
 , 0, TribeInfo);
             end;
 …
             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(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
 , 0, TribeInfo);
             end;
 …
         SaveSettings;
         CityDlg.CloseAction := None;
+        for i := 0 to DpiScreen.FormCount - 1 do
+          if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
+          then
+            DpiScreen.Forms[i].Close;
+        ApplyToVisibleForms(faClose);
         if LogDlg.Visible then
           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
 …
             FreeAndNil(Tribe[p1]);
         Tribes.Done;
         RepaintOnResize := false;
         Closable := true;
+        RepaintOnResize := False;
+        Closable := True;
         Close;
-        { if (GameMode=cNewGame) or (GameMode=cLoadGame) then
-          AdvisorDlg.BreakGame; }
       end;
 …
         Show;
         Update;
         RepaintOnResize := true;
+        RepaintOnResize := True;
         xw := 0;
         yw := ywcenter;
-        if not StayOnTop_Ensured then
-        begin
-          StayOnTop_Ensured := true;
-          CityDlg.StayOnTop_Workaround;
-          CityTypeDlg.StayOnTop_Workaround;
-          DiaDlg.StayOnTop_Workaround;
-          DraftDlg.StayOnTop_Workaround;
-          EnhanceDlg.StayOnTop_Workaround;
-          HelpDlg.StayOnTop_Workaround;
-          NatStatDlg.StayOnTop_Workaround;
-          NegoDlg.StayOnTop_Workaround;
-          ModalSelectDlg.StayOnTop_Workaround;
-          ListDlg.StayOnTop_Workaround;
-          UnitStatDlg.StayOnTop_Workaround;
-          WondersDlg.StayOnTop_Workaround;
-          RatesDlg.StayOnTop_Workaround;
-        end;
       end;
     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
             if AILogo[pLogo] <> nil then
               DpiBitCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
+              DpiBitBltCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
                 ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas,
 , 0);
           end
         end
+          end;
+        end;
       end;
 …
               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;
 …
             Jump[pTurn] := 0
           else
             dec(Jump[pTurn]);
+            Dec(Jump[pTurn]);
         SkipTurn := Jump[pTurn] > 0;
         if SkipTurn then
 …
           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
 …
             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'); *)
 …
         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);
 …
         pTurn := -1;
         pLogo := -1;
         MapValid := false;
+        MapValid := False;
         ClientMode := -1;
         idle := false;
         skipped := false;
+        Idle := False;
+        Skipped := False;
       end;
 …
         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;
 …
     scContact:
       begin
         DipMem[NewPlayer].pContact := integer(Data);
+        DipMem[NewPlayer].pContact := Integer(Data);
         if Jump[NewPlayer] > 0 then
           DipCall(scReject)
 …
           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
 …
         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')
 …
         end;
         NegoDlg.Start;
         idle := true;
+        Idle := True;
       end;
 …
       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');
 …
     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
           DpiApplication.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
 …
         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
 …
         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
 …
             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
           DpiApplication.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);
 …
                 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
 …
             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
 …
                   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
 …
                   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;
 …
           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
           DpiApplication.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
 …
               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;
 …
             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
 …
               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;
 …
       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;
 …
         begin
           MessgText := Format(Phrases.Lookup('GRLIB_GENERAL'),
             [Phrases.Lookup('ADVANCES', integer(Data))]);
+            [Phrases.Lookup('ADVANCES', Integer(Data))]);
           OpenSound := 'NEWADVANCE_GRLIB';
           Kind := mkOk;
 …
     cRefreshDebugMap:
       begin
         if integer(Data) = MainMap.pDebugMap then
+        if Integer(Data) = MainMap.pDebugMap then
         begin
           MapValid := false;
+          MapValid := False;
           MainOffscreenPaint;
           Update;
         end
+        end;
       end;
   else
     if Command >= cClientEx then
+      case Command and $FFF0 of
+      case Command and (not Integer(CommandDataElementCountMask)) of
         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);
+          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);
           end;
+        cSetNewModelPicture, cSetModelPicture:
+        cSetNewModelPicture:
           if TribeOriginal[TModelPictureInfo(Data).trix] then
             Tribe[TModelPictureInfo(Data).trix].SetModelPicture
+              (TModelPictureInfo(Data), Command and
+              $FFF0 = cSetNewModelPicture);
+        cSetSlaveIndex and $FFF0:
+          Tribe[integer(Data) shr 16].mixSlaves := integer(Data) and $FFFF;
+              (TModelPictureInfo(Data), True);
+        cSetModelPicture:
+          if TribeOriginal[TModelPictureInfo(Data).trix] then
+            Tribe[TModelPictureInfo(Data).trix].SetModelPicture
+              (TModelPictureInfo(Data), False);
+        cSetSlaveIndex:
+          Tribe[Integer(Data) shr 16].mixSlaves := Integer(Data) and $FFFF;
         cSetCityName:
           with TCityNameInfo(Data) do
             if TribeOriginal[ID shr 12] then
               Tribe[ID shr 12].SetCityName(ID and $FFF, NewName);
         cSetModelName:
           with TModelNameInfo(Data) do
 …
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
   i, j: integer;
+  I, J: Integer;
 begin
   NoMap := TIsoMap.Create;
 …
   // tag-controlled language
   for i := 0 to ComponentCount - 1 do
     if Components[i].Tag and $FF <> 0 then
       if Components[i] is TDpiMenuItem then begin
         TDpiMenuItem(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
             TDpiMenuItem(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 TDpiMenuItem then begin
+        TDpiMenuItem(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
+            TDpiMenuItem(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;
 …
     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;
 …
     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;
 …
   I: Integer;
 begin
+  if Assigned(FWondersDlg) then FreeAndNil(FWondersDlg);
+  if Assigned(FTechTreeDlg) then FreeAndNil(FTechTreeDlg);
+  if Assigned(FEnhanceDlg) then FreeAndNil(FEnhanceDlg);
+  if Assigned(FNegoDlg) then FreeAndNil(FNegoDlg);
+  if Assigned(FCityTypeDlg) then FreeAndNil(FCityTypeDlg);
+  if Assigned(FDiaDlg) then FreeAndNil(FDiaDlg);
+  if Assigned(FCityDlg) then FreeAndNil(FCityDlg);
+  if Assigned(FRatesDlg) then FreeAndNil(FRatesDlg);
+  if Assigned(FBattleDlg) then FreeAndNil(FBattleDlg);
+  if Assigned(FNatStatDlg) then FreeAndNil(FNatStatDlg);
+  if Assigned(FUnitStatDlg) then FreeAndNil(FUnitStatDlg);
+  if Assigned(FDraftDlg) then FreeAndNil(FDraftDlg);
+  if Assigned(FModalSelectDlg) then FreeAndNil(FModalSelectDlg);
+  if Assigned(FListDlg) then FreeAndNil(FListDlg);
+  if Assigned(FMessgExDlg) then FreeAndNil(FMessgExDlg);
+  if Assigned(FHelpDlg) then FreeAndNil(FHelpDlg);
   MainFormKeyDown := nil;
   FreeAndNil(sb);
 …
   FreeAndNil(Panel);
   for I := 0 to nPl - 1 do
     if AILogo[i] <> nil then
+    if AILogo[I] <> nil then
       FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
 …
 end;
+procedure TMainScreen.mAfforestClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jAfforest);
+end;
+procedure TMainScreen.mAirBaseClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jBase);
+end;
+procedure TMainScreen.mCanalClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jCanal);
+end;
+procedure TMainScreen.mCancelClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
+    if Job > jNone then
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+  end;
+end;
+procedure TMainScreen.mCentreClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    Centre(Loc);
+    PaintAllMaps;
+  end;
+end;
+procedure TMainScreen.mcityClick(Sender: TObject);
+var
+  Loc0: Integer;
+  cix: Integer;
+  ServerResult: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    Loc0 := Loc;
+    if MyMap[Loc] and fCity = 0 then
+    begin // build city
+      if DoJob(jCity) = eCity then
+      begin
+        MapValid := False;
+        PaintAll;
+        ZoomToCity(Loc0, True, chFounded);
+      end;
+    end else begin
+      CityOptimizer_BeforeRemoveUnit(UnFocus);
+      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);
+        CityOptimizer_CityChange(cix);
+        CityOptimizer_AfterRemoveUnit; // does nothing here
+        SetTroopLoc(Loc0);
+        UpdateViews(True);
+        DestinationMarkON := False;
+        PaintDestination;
+        UnFocus := -1;
+        PaintLoc(Loc0);
+        NextUnit(UnStartLoc, True);
+      end
+      else if ServerResult = eMaxSize then
+        SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
+    end;
+  end;
+end;
+procedure TMainScreen.mCityStatClick(Sender: TObject);
+begin
+  ListDlg.ShowNewContent(wmPersistent, kCities);
+end;
+procedure TMainScreen.mCityTypesClick(Sender: TObject);
+begin
+  CityTypeDlg.ShowNewContent(wmModal);
+  // must be modal because types are not saved before closing
+end;
+procedure TMainScreen.mClearClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jClear);
+end;
+procedure TMainScreen.mDiagramClick(Sender: TObject);
+begin
+  DiaDlg.ShowNewContent_Charts(wmPersistent);
+end;
+procedure TMainScreen.mEmpireClick(Sender: TObject);
+begin
+  RatesDlg.ShowNewContent(wmPersistent);
+end;
+procedure TMainScreen.mEnhanceClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(-1);
+end;
+procedure TMainScreen.mEnhanceDefClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    EnhanceDlg.ShowNewContent(wmPersistent,
+      MyMap[MyUn[UnFocus].Loc] and fTerrain)
+  else
+    EnhanceDlg.ShowNewContent(wmPersistent);
+end;
+procedure TMainScreen.mEUnitStatClick(Sender: TObject);
+begin
+  if MyRO.nEnemyModel > 0 then
+    ListDlg.ShowNewContent(wmPersistent, kAllEModels);
+end;
+procedure TMainScreen.mFarmClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jFarm);
+end;
+procedure TMainScreen.mfortClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jFort);
+end;
+procedure TMainScreen.mGoOnClick(Sender: TObject);
+var
+  Destination: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if Status shr 16 = $7FFF then
+      Destination := maNextCity
+    else
+      Destination := Status shr 16;
+    Status := Status and not(usStay or usRecover) or usWaiting;
+    MoveToLoc(Destination, True);
+  end;
+end;
+procedure TMainScreen.mHelpClick(Sender: TObject);
+begin
+  if ClientMode = cEditMap then
+    HelpDlg.ShowNewContent(wmPersistent, hkText, HelpDlg.TextIndex('MAPEDIT'))
+  else
+    HelpDlg.ShowNewContent(wmPersistent, hkMisc, Integer(miscMain));
+end;
+procedure TMainScreen.mhomeClick(Sender: TObject);
+var
+  cixOldHome: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if MyMap[Loc] and fCity <> 0 then
+    begin
+      cixOldHome := Home;
+      if Server(sSetUnitHome, Me, UnFocus, nil^) >= rExecuted then
+      begin
+        CityOptimizer_CityChange(cixOldHome);
+        CityOptimizer_CityChange(Home);
+        UpdateViews(True);
+      end
+      else
+        Play('INVALID');
+    end
+    else
+    begin
+      Status := Status and not(usStay or usRecover or usEnhance);
+      MoveToLoc(maNextCity, True);
+    end;
+  end;
+end;
+procedure TMainScreen.mirrigationClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+        DoJob(jIrr);
+end;
+procedure TMainScreen.mirrigationDrawItem(Sender: TObject; ACanvas: TDpiCanvas;
+  ARect: TRect; AState: TOwnerDrawState);
+begin
+end;
+procedure TMainScreen.mJumpClick(Sender: TObject);
+begin
+  if Supervising then
+    Jump[0] := 20
+  else
+    Jump[Me] := 20;
+  EndTurn(True);
+end;
+procedure TMainScreen.mLoadClick(Sender: TObject);
+var
+  I: Integer;
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    I := Server(sLoadUnit, Me, UnFocus, nil^);
+    if I >= rExecuted then
+    begin
+      if MyModel[mix].Domain = dAir then
+        Play('MOVE_PLANELANDING')
+      else
+        Play('MOVE_LOAD');
+      DestinationMarkON := False;
+      PaintDestination;
+      Status := Status and ($FFFF - usWaiting - usStay - usRecover - usGoto - usEnhance);
+      NextUnit(UnStartLoc, True);
+    end
+    else if I = eNoTime_Load then
+      if MyModel[mix].Domain = dAir then
+        SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+      else
+        SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+          [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+  end;
+end;
+procedure TMainScreen.mmineClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jMine);
+end;
+procedure TMainScreen.mNationsClick(Sender: TObject);
+begin
+  NatStatDlg.ShowNewContent(wmPersistent);
+end;
+procedure TMainScreen.mNextUnitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    FocusNextUnit(1);
+  end;
+end;
+procedure TMainScreen.mnoordersClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    NextUnit(UnStartLoc, True);
+  end;
+end;
+procedure TMainScreen.mPillageClick(Sender: TObject);
+begin
+  DoJob(jPillage);
+end;
+procedure TMainScreen.mpollutionClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jPoll);
+end;
+procedure TMainScreen.mPrevUnitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    FocusNextUnit(-1);
+  end;
+end;
+procedure TMainScreen.mRandomMapClick(Sender: TObject);
+begin
+  if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
+      = mrOK) then begin
+    Server(sRandomMap, Me, 0, nil^);
+    Edited := True;
+    MapValid := False;
+    PaintAllMaps;
+  end;
+end;
+procedure TMainScreen.mRecoverClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    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);
+  end;
+end;
+procedure TMainScreen.mResignClick(Sender: TObject);
+var
+  QueryText: string;
+begin
+  if ClientMode = cEditMap then begin
+    if Edited then begin
+      QueryText := Phrases.Lookup('MAP_CLOSE');
+      case SimpleQuery(mkYesNoCancel, QueryText, '') of
+        mrIgnore: Server(sAbandonMap, Me, 0, nil^);
+        mrOK: Server(sSaveMap, Me, 0, nil^);
+      end;
+    end else
+      Server(sAbandonMap, Me, 0, nil^);
+  end else begin
+    if Server(sGetGameChanged, 0, 0, nil^) = eOK then begin
+      QueryText := Phrases.Lookup('RESIGN');
+      case SimpleQuery(mkYesNoCancel, QueryText, '') of
+        mrIgnore: Server(sResign, 0, 0, nil^);
+        mrOK: Server(sBreak, 0, 0, nil^);
+      end;
+    end else
+      Server(sResign, 0, 0, nil^);
+  end;
+end;
+procedure TMainScreen.mRevolutionClick(Sender: TObject);
+var
+  AltGovs: Boolean;
+  RevolutionChanged: Boolean;
+  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;
+    if not AltGovs then
+      SoundMessage(Phrases.Lookup('NOALTGOVS'), 'MSG_DEFAULT')
+    else
+    begin
+      RevolutionChanged := False;
+      if MyRO.Happened and phChangeGov <> 0 then
+      begin
+        ModalSelectDlg.ShowNewContent(wmModal, kGov);
+        if ModalSelectDlg.Result >= 0 then
+        begin
+          Play('NEWGOV');
+          Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
+          CityOptimizer_BeginOfTurn;
+          RevolutionChanged := True;
+        end;
+      end
+      else
+      with MessgExDlg do
+      begin // revolution!
+        MessgExDlg.MessgText := Tribe[Me].TPhrase('REVOLUTION');
+        MessgExDlg.Kind := mkYesNo;
+        MessgExDlg.IconKind := mikPureIcon;
+        MessgExDlg.IconIndex := 72; // anarchy palace
+        MessgExDlg.ShowModal;
+        if ModalResult = mrOK then
+        begin
+          Play('REVOLUTION');
+          Server(sRevolution, Me, 0, nil^);
+          RevolutionChanged := True;
+          if NatStatDlg.Visible then
+            NatStatDlg.Close;
+          if CityDlg.Visible then
+            CityDlg.Close;
+        end
+      end;
+      if RevolutionChanged then
+        UpdateViews(True);
+    end;
+end;
+procedure TMainScreen.mroadClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jRoad);
+end;
+procedure TMainScreen.mRailRoadClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jRR);
+end;
+procedure TMainScreen.mRunClick(Sender: TObject);
+begin
+  if Supervising then
+    Jump[0] := 999999
+  else
+    Jump[Me] := 999999;
+  EndTurn(True);
+end;
+procedure TMainScreen.mScienceStatClick(Sender: TObject);
+begin
+  ListDlg.ShowNewContent(wmPersistent, kScience);
+end;
+procedure TMainScreen.mSelectTransportClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      Server(sSelectTransport, Me, UnFocus, nil^);
+end;
+procedure TMainScreen.mShipsClick(Sender: TObject);
+begin
+  DiaDlg.ShowNewContent_Ship(wmPersistent);
+end;
+procedure TMainScreen.mstayClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    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);
+  end;
+end;
+procedure TMainScreen.mTechTreeClick(Sender: TObject);
+begin
+  TechTreeDlg.ShowModal;
+end;
+procedure TMainScreen.mtransClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jTrans);
+end;
+procedure TMainScreen.mUnitStatClick(Sender: TObject);
+var
+  I: Integer;
+begin
+  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);
+  end;
+end;
+procedure TMainScreen.mUnloadClick(Sender: TObject);
+var
+  I: Integer;
+  OldMaster: Integer;
+  NewFocus: Integer;
+  uix: Integer;
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    if Master >= 0 then begin
+      OldMaster := Master;
+      I := Server(sUnloadUnit, Me, UnFocus, nil^);
+      if I >= rExecuted then
+      begin
+        if MyModel[mix].Domain = dAir then
+          Play('MOVE_PLANESTART')
+        else if (MyModel[MyUn[OldMaster].mix].Domain = dAir) and
+          (MyMap[Loc] and fCity = 0) and (MyMap[Loc] and fTerImp <> tiBase)
+        then
+          Play('MOVE_PARACHUTE')
+        else
+          Play('MOVE_UNLOAD');
+        Status := Status and not usWaiting;
+        if MyModel[mix].Domain <> dAir then
+          NextUnit(Loc, True)
+        else
+          PanelPaint;
+      end
+      else if I = eNoTime_Load then
+        if MyModel[mix].Domain = dAir then
+          SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+        else
+          SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+            [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+    end else begin
+      NewFocus := -1;
+      uix := UnFocus;
+      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
+        begin
+          MyUn[uix].Status := MyUn[uix].Status or usWaiting;
+          NewFocus := uix;
+        end;
+      end;
+      if NewFocus >= 0 then
+      begin
+        SetUnFocus(NewFocus);
+        SetTroopLoc(Loc);
+        PanelPaint;
+      end;
+    end;
+  end;
+end;
+procedure TMainScreen.mwaitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+  end;
+  NextUnit(-1, False);
+end;
+procedure TMainScreen.mWebsiteClick(Sender: TObject);
+begin
+  OpenURL(CevoHomepage);
+end;
+procedure TMainScreen.mWondersClick(Sender: TObject);
+begin
+  WondersDlg.ShowNewContent(wmPersistent);
+end;
 procedure TMainScreen.FormResize(Sender: TObject);
 var
   MiniFrame, MaxMapWidth: integer;
+  MiniFrame, MaxMapWidth: Integer;
 begin
   SmallScreen := ClientWidth < 1024;
 …
   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
     MenuClick(mResign);
+  if not Closable and Idle and (Me = 0) and (ClientMode < scContact) then
+    mResign.Click;
 end;
 …
   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)
 …
   begin
     Jump[pTurn] := 0;
     StartRunning := false;
+    StartRunning := False;
   end
   else
 …
   else
   with MainMap do begin
     if supervising then
+    if Supervising then
       xTerrain := xMidPanel + 2 * xxt + 14
     else if ClientWidth < 1280 then
 …
       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 -
         DpiGetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
 …
 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
 …
           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
   i, 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
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close; // close windows
+    Exit;
+  if Supervising and (Me <> 0) then begin
+    ApplyToVisibleForms(faClose);
     ItsMeAgain(0);
   end;
 …
           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);
 …
               SetTroopLoc(Loc);
               PanelPaint;
               exit;
+              Exit;
             end;
             MyUn[uix].Status := MyUn[uix].Status or usToldNoReturn;
           end
+          end;
         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!
 …
         ShowModal;
         if ModalResult <> mrOK then
           exit
+          Exit;
       end;
 …
           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
 …
             begin // zoom to city
               ZoomToCity(Loc);
               exit
             end
+              Exit;
+            end;
           end;
 …
       (MyData.FarTech <> adNexus) then
       if not ChooseResearch then
         exit;
+        Exit;
   end;
 …
   CityDlg.CloseAction := None;
+  if IsMultiPlayerGame then
+  begin // close windows for next player
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close;
+  end
+  else
+  begin
+  if IsMultiPlayerGame then begin
+    // Close windows for next player
+    ApplyToVisibleForms(faClose);
+  end else begin
     if CityDlg.Visible then
       CityDlg.Close;
 …
       UnitStatDlg.Close;
   end;
+  for i := 0 to DpiScreen.FormCount - 1 do
+    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+      DpiScreen.Forms[i].Enabled := false;
+  ApplyToVisibleForms(faDisable);
   if Server(sTurn, pTurn, 0, nil^) >= rExecuted then
 …
     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;
     skipped := WasSkipped;
+    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
     PanelPaint
 end; // EndTurn
+    PanelPaint;
+end;
 procedure TMainScreen.EndNego;
 …
   if NegoDlg.Visible then
     NegoDlg.Close;
+  HaveStrategyAdvice := false;
+  // AdvisorDlg.HaveStrategyAdvice;
+  // negotiation might have changed advices
+  HaveStrategyAdvice := False;
   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
 …
     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
 …
       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
 …
 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);
 …
 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;
 …
     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);
 …
 // 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
 …
   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,
 …
   begin
     if xMap < 0 then
       DpiBitCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
+      DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
         height + yMap, Buffer.Canvas, -xMap, -yMap)
     else
       DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
+      DpiBitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
         height + yMap, Buffer.Canvas, 0, -yMap);
   end
 …
   begin
     if xMap < 0 then
       DpiBitCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
+      DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
         height, Buffer.Canvas, -xMap, 0)
     else
       DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
+      DpiBitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
         height, Buffer.Canvas, 0, 0);
   end;
 end;
 procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: integer);
+procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: Integer);
 var
   yLoc, x0: integer;
+  yLoc, x0: Integer;
 begin
   if MapValid then
 …
     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
 …
 procedure TMainScreen.PaintDestination;
 var
   Destination: integer;
+  Destination: Integer;
 begin
   if (UnFocus >= 0) and (MyUn[UnFocus].Status and usGoto <> 0) then
 …
 end;
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 // Can't do scrolling of DC under Linux, then fallback into BitBlt.
 function DpiScrollDC(Canvas: TDpiCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
   Result := DpiBitCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+  Result := DpiBitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top);
 end;
 …
 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;
 …
       Brush.Style := bsClear;
       OffscreenUser := self;
       exit;
+      Exit;
     end;
 …
     if MapValid and (xwd = xw) and (ywd = yw) then
       MainMap.SetPaintBounds(0, 0, UsedOffscreenWidth, UsedOffscreenHeight);
     MapValid := false;
+    MapValid := False;
     OffscreenUser := self;
   end;
 …
       (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}
       DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+      DpiScrollDC(Offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
 {$ENDIF}
 {$IFDEF LINUX}
       DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+{$IFDEF UNIX}
+      DpiScrollDC(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;
 {$IFDEF WINDOWS}
           DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+          DpiScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
             rec, 0, nil);
 {$ENDIF}
 {$IFDEF LINUX}
+{$IFDEF UNIX}
           DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
             rec, rec, 0, nil);
 …
   xwd := xw;
   ywd := yw;
   MapValid := true;
+  MapValid := True;
 end;
 …
 begin
   with MainMap do begin
     DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+    DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
       MiniMap.Bitmap.Canvas, 0, 0);
     if MarkCityLoc >= 0 then
 …
   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;
 …
     if ClientMode <> cEditMap then
     begin
       if supervising then
+      if Supervising then
       begin
         ScreenTools.Frame(Panel.Canvas, ClientWidth - xPalace - 1, yPalace - 1,
 …
           ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
           $FFFFFF, $B0B0B0);
         DpiBitCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
+        DpiBitBltCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
           ySizeBig, HGrSystem2.Data.Canvas, 70, 123);
       end
 …
     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, 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, 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
 .. 8:
               begin
                 xSrc := BrushTypes[i];
+                xSrc := BrushTypes[I];
                 ySrc := 0
               end;
 …
                 ySrcBase := 2;
                 xSrc := 0;
                 ySrc := 2 * integer(BrushTypes[i]) - 15
+                ySrc := 2 * Integer(BrushTypes[I]) - 15
               end;
             fRiver:
 …
                 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;
 …
           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),
 + 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
 …
       Brush.Style := bsClear;
       if UnFocus >= 0 then
         with MyUn[UnFocus] do
         with MyModel[mix] do
+        with MyUn^[UnFocus] do
+        with MyModel^[mix] do
         begin { display info about selected unit }
           if Job = jCity then
 …
           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,
 …
           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);
 …
               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,
 …
 + 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,
 …
           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
 …
             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
 …
                     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
 …
                         (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
 …
           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
 …
         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
 …
               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;
 …
   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
 …
   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,
 …
     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
 …
     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
 …
         $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 +
 , 18, s);
+, 18, S);
     end;
 …
       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
 …
       ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11,
 ), 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;
 …
   begin
     TopBar.Canvas.Font.Assign(UniFont[ftCaption]);
     s := TurnToString(MyRO.Turn);
+    S := TurnToString(MyRO.Turn);
     RisedTextOut(TopBar.Canvas,
 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, s))
       div 2, 6, s);
++ (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, S))
+      div 2, 6, S);
     TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
   end;
 …
 procedure TMainScreen.FocusNextUnit(Dir: Integer);
 var
   i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
 begin
   if ClientMode >= scContact then
 …
   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;
 …
 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
 …
       (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
   end;
   Changed := true;
+  Changed := True;
   if Outside then begin
     Centre(Loc);
 …
     PaintAllMaps
   else
     Changed := false;
+    Changed := False;
   if Options and flRepaintPanel <> 0 then
     PanelPaint;
 …
 var
   Dist, TestDist: Single;
   i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
   GotoOnly: Boolean;
 begin
 …
   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)
 …
 end;
 procedure TMainScreen.Scroll(dx, dy: integer);
+procedure TMainScreen.Scroll(dx, dy: Integer);
 begin
   xw := (xw + G.lx + dx) mod G.lx;
 …
 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 DpiScreen.ActiveForm.FormState) or
       (DpiScreen.ActiveForm is TBufferedDrawDlg) and
 …
       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;
 …
         dx := 0;
         dy := 0;
         if DpiMouse.CursorPos.y < DpiScreen.height - PanelHeight then
           if DpiMouse.CursorPos.x = 0 then
+        if DpiMouse.CursorPos.Y < DpiScreen.height - PanelHeight then
+          if DpiMouse.CursorPos.X = 0 then
             dx := -ScrollSpeed // scroll left
           else if DpiMouse.CursorPos.x = DpiScreen.width - 1 then
+          else if DpiMouse.CursorPos.X = DpiScreen.width - 1 then
             dx := ScrollSpeed; // scroll right
         if DpiMouse.CursorPos.y = 0 then
+        if DpiMouse.CursorPos.Y = 0 then
           dy := -ScrollSpeed // scroll up
         else if (DpiMouse.CursorPos.y = DpiScreen.height - 1) and
           (DpiMouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
           (DpiMouse.CursorPos.x < xRightPanel + 10 - 8) then
+        else if (DpiMouse.CursorPos.Y = DpiScreen.height - 1) and
+          (DpiMouse.CursorPos.X >= TerrainBtn.Left + TerrainBtn.width) and
+          (DpiMouse.CursorPos.X < xRightPanel + 10 - 8) then
           dy := ScrollSpeed; // scroll down
         if (dx <> 0) or (dy <> 0) then
 …
       BlinkTime := (BlinkTime + 1) mod (BlinkOnTime + BlinkOffTime);
       BlinkON := BlinkTime >= BlinkOffTime;
       DestinationMarkON := true;
+      DestinationMarkON := True;
       if UnFocus >= 0 then
       begin
 …
         end;
       end
       else if TurnComplete and not supervising then
+      else if TurnComplete and not Supervising then
       begin
         if BlinkTime = 0 then
 …
 end;
 procedure TMainScreen.SetMapPos(Loc: integer; MapPos: TPoint);
+procedure TMainScreen.SetMapPos(Loc: Integer; MapPos: TPoint);
 begin
   with MainMap do begin
 …
 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
 …
 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 *
 …
 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: TDpiMenuItem;
+  M, m2: TDpiMenuItem;
   MoveAdviceData: TMoveAdviceData;
   DoCenter: boolean;
+  DoCenter: Boolean;
 begin
   if GameMode = cMovie then
     exit;
   if CityDlg.Visible then
+    Exit;
+  if Assigned(FCityDlg) and CityDlg.Visible then
     CityDlg.Close;
   if UnitStatDlg.Visible then
+  if Assigned(FUnitStatDlg) and 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
 …
       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);
       MiniMapPaint;
       DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         MiniMap.Bitmap.Canvas, 0, 0);
       with MainMap do begin
 …
       begin
         ZoomToCity(MouseLoc);
         DoCenter := false;
+        DoCenter := False;
       end
       else
       begin
         UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
         DoCenter := false;
+        DoCenter := False;
       end;
     end
 …
       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
 …
                 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;
 …
       else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift) then
       begin
         DoCenter := false;
+        DoCenter := False;
         SetTroopLoc(MouseLoc);
         PanelPaint;
 …
       else
       begin
         DoCenter := false;
+        DoCenter := False;
         UnitStatDlg.ShowNewContent_EnemyLoc(wmPersistent, MouseLoc);
       end;
 …
     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 := TDpiMenuItem.Create(mCreateUnit);
           m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+          M := TDpiMenuItem.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 := TDpiMenuItem.Create(m);
+              m2 := TDpiMenuItem.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 + DpiGetSystemMetrics(SM_CYCAPTION) + 4);
+        EditPopup.Popup(Left + X + 4,
+          Top + Y + DpiGetSystemMetrics(SM_CYCAPTION) + 4);
     end
     else if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> MouseLoc) then
 …
         if abs(dx) + abs(dy) < 3 then
         begin
           DestinationMarkON := false;
+          DestinationMarkON := False;
           PaintDestination;
           Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance)
 …
             with MyUn[UnFocus], BattleDlg.Forecast do
             begin
               pAtt := me;
+              pAtt := Me;
               mixAtt := mix;
               HealthAtt := Health;
 …
             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;
 …
     (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
   begin
     DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     MyUn[UnFocus].Status := MyUn[UnFocus].Status and
 …
     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
       MenuClick(mEnhance);
+      mEnhance.Click;
   end
   else if (Button = mbLeft) and (ssShift in Shift) and
 …
     with MyUn[UnFocus], BattleDlg.Forecast do
     begin
       pAtt := me;
+      pAtt := Me;
       mixAtt := mix;
       HealthAtt := Health;
 …
     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 > DpiScreen.width then
         BattleDlg.Left := DpiScreen.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 > DpiScreen.height then
         BattleDlg.Top := DpiScreen.height - BattleDlg.height;
       BattleDlg.IsSuicideQuery := false;
+      BattleDlg.IsSuicideQuery := False;
       BattleDlg.Show;
     end;
 …
 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;
 …
   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;
 …
     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
 …
             (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
 …
       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
 …
       [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
 …
       begin
         QueryItem := 'UNREST_NOTOWN';
         p1 := me;
+        p1 := Me;
       end
       else
 …
         if ModalResult <> mrOK then
         begin
           result := eInvalid;
           exit;
+          Result := eInvalid;
+          Exit;
         end;
       end;
       Update; // remove message box from screen
     end
   end;
   if (result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
+    end;
+  end;
+  if (Result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
     (MyUn[UnFocus].Status and usToldNoReturn = 0) then
   begin // can plane return?
 …
         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
 …
         <> mrOK then
       begin
         result := eInvalid;
         exit;
+        Result := eInvalid;
+        Exit;
       end;
       Update; // remove message box from screen
       MyUn[UnFocus].Status := MyUn[UnFocus].Status or usToldNoReturn;
     end
   end;
   if result = eMissionDone then
+    end;
+  end;
+  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
 …
       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
             Play('NOMOVE_SUBMARINE');
             PaintLoc(ToLoc)
+            PaintLoc(ToLoc);
           end;
         eStealthUnit:
           begin
             Play('NOMOVE_STEALTH');
             PaintLoc(ToLoc)
+            PaintLoc(ToLoc);
           end;
         eZOC_EnemySpotted:
           begin
             Play('NOMOVE_ZOC');
             PaintLoc(ToLoc, 1)
+            PaintLoc(ToLoc, 1);
           end;
         rExecuted .. maxint:
+        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);
 …
               begin // borders have moved, unrest might have changed in any city
                 CityOptimizer_BeginOfTurn;
                 NeedEcoUpdate := true;
+                NeedEcoUpdate := True;
               end
               else
 …
                     if MyUn[uix].Master = UnFocus then
                       CityOptimizer_CityChange(MyUn[uix].Home);
                   NeedEcoUpdate := true;
+                  NeedEcoUpdate := True;
                 end;
                 if (MyRO.Government = gDespotism) and
 …
                     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;
 …
                     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;
 …
           end;
       else
         assert(false);
+        Assert(False);
       end;
       SetTroopLoc(ToLoc);
 …
     else
     begin { enemy unit -- attack }
       if result = eBombarded then
+      if Result = eBombarded then
         Defender := MyRO.Territory[ToLoc]
       else
 …
         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;
 …
         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
 …
         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
+      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
+        LostArmy[I] := MyRO.EnemyModel[I].Lost - LostArmy[I];
+        Inc(nLostArmy, LostArmy[I]);
+      end;
+      if Result and rUnitRemoved <> 0 then
       begin
         UnFocus := -1;
 …
       begin // city was destroyed, borders have moved, unrest might have changed in any city
         CityOptimizer_BeginOfTurn;
+        NeedEcoUpdate := true;
+      end
+      else
+      begin
+        NeedEcoUpdate := True;
+      end else begin
         if cixChanged >= 0 then
         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;
 …
             MyRO.EnemyModel[MyRO.EnemyUn[euix].emix].Domain));
           ShowModal;
         end
       end
     end;
     if result and rUnitRemoved <> 0 then
+        end;
+      end;
+    end;
+    if Result and rUnitRemoved <> 0 then
     begin
       CityOptimizer_AfterRemoveUnit;
       ListDlg.RemoveUnit;
       NeedEcoUpdate := true;
+      NeedEcoUpdate := True;
     end;
     if NeedEcoUpdate then
     begin
       UpdateViews(true);
       Update
     end
   end;
   if result = eMissionDone then
+      UpdateViews(True);
+      Update;
+    end;
+  end;
+  if Result = eMissionDone then
   begin
     p1 := MyRO.Territory[ToLoc];
 …
       smStealMap:
         begin
           MapValid := false;
+          MapValid := False;
           PaintAllMaps
         end;
 …
     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];
           end
+            MyData.ToldWonders[I] := MyRO.Wonder[I];
+          end;
     end;
     if CityCaptured and (MyMap[ToLoc] and fCity <> 0) then
     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;
 …
       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;
 …
       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;
 …
   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)
 …
         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;
 …
     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)
+      FocusOnLoc(ToLoc, flRepaintPanel or flImmUpdate);
+    end;
+  if (Result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
   then
     ZoomToCity(ToLoc, UnFocus < 0, chCaptured); // show captured city
 end; // moveunit
+end;
 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
 …
     UnitInfo.Job := jNone;
     UnitInfo.Flags := Flags;
     if Owner <> me then
+    if Owner <> Me then
       UnitInfo.emix := emix;
 …
         * 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);
 …
       if xFrom < xTo then begin
         xMin := xFrom;
         xRange := xTo - xFrom
+        xRange := xTo - xFrom;
       end else begin
         xMin := xTo;
         xRange := xFrom - xTo
+        xRange := xFrom - xTo;
       end;
       if yFrom < yTo then begin
         yMin := yFrom;
         yRange := yTo - yFrom
+        yRange := yTo - yFrom;
       end else begin
         yMin := yTo;
         yRange := yFrom - yTo
       end;
       inc(xRange, xxt * 2);
       inc(yRange, yyt * 3);
+        yRange := yFrom - yTo;
+      end;
+      Inc(xRange, xxt * 2);
+      Inc(yRange, yyt * 3);
     end;
 …
     for Step := 0 to abs(Step1 - Step0) do
     begin
       DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
         offscreen.Canvas, xMin, yMin);
+      DpiBitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
+        Offscreen.Canvas, xMin, yMin);
       if Step1 <> Step0 then
       begin
 …
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
       {$IFDEF LINUX}
       // TODO: Force animation under linux
+      {$IFDEF UNIX}
+      // TODO: Force animation under UNIX
       DpiApplication.ProcessMessages;
       {$ENDIF}
 …
           < MoveTime) then
         begin
           if not idle or (GameMode = cMovie) then
+          if not Idle or (GameMode = cMovie) then
             DpiApplication.ProcessMessages;
           Sleep(1);
           inc(SliceCount)
+          Inc(SliceCount)
         end;
         Ticks := NowPrecise;
       until (((Ticks - Ticks0) * 12) / OneMillisecond) >= MoveTime;
       Ticks0 := Ticks
+      Ticks0 := Ticks;
     end;
   end;
   if Restore then
   begin
     DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange, offscreen.Canvas, xMin, yMin);
+    DpiBitBltCanvas(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
 …
     StopReason := None;
     repeat
       for i := 0 to MoveAdviceData.nStep - 1 do
+      for I := 0 to MoveAdviceData.nStep - 1 do
       begin
         if i = MoveAdviceData.nStep - 1 then
+        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
 …
         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
 …
       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
 …
       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
 …
         begin
           MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
           NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
         end;
       end;
 …
 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;
 …
         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);
 …
           DpiGetSystemMetrics(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
+    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
+      I := (X - xTroop - 1) div TrPitch;
+      if trix[I] >= 0 then
         if ClientMode = cEditMap then
         begin
           BrushType := trix[i];
           PanelPaint
+          BrushType := trix[I];
+          PanelPaint;
         end
         else if (TroopLoc >= 0) then
 …
             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
 …
               begin
                 if CityDlg.Visible and (CityDlg.RestoreUnFocus < 0) then
                   CityDlg.RestoreUnFocus := trix[i];
+                  CityDlg.RestoreUnFocus := trix[I];
                 PanelPaint;
               end
 …
             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
 …
                 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;
 …
             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;
 …
     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
 …
             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)
 …
 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;
 …
   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;
 …
   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)
 …
   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);
 …
   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
+  begin
+    for i := 0 to DpiScreen.FormCount - 1 do
+      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+        DpiScreen.Forms[i].Close; // close windows
+    ItsMeAgain(p);
+  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);
     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);
 …
   MTrans.ShortCut := BTrans.ShortCut;
   mPollution.ShortCut := BPollution.ShortCut;
   mRR.ShortCut := BRailRoad.ShortCut;
+  mRailRoad.ShortCut := BRailRoad.ShortCut;
   mRoad.ShortCut := BRailRoad.ShortCut;
   mUnload.ShortCut := BUnload.ShortCut;
 …
 end;
 procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
+procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 …
     InitPopup(Popup);
     if Item.Visible and Item.Enabled then
       MenuClick(Item);
   end;
   procedure SetViewpointMe(p: Integer);
   begin
     if p = me then SetViewpoint(p)
       else SetViewpoint(p);
+      Item.Click;
+  end;
+  procedure SetViewpointMe(P: Integer);
+  begin
+    if P = Me then SetViewpoint(P)
+      else SetViewpoint(P);
   end;
 …
   if ClientMode = cEditMap then begin
     if BResign.Test(ShortCut) then MenuClick(mResign)
     else if BRandomMap.Test(ShortCut) then MenuClick(mRandomMap)
     else if BHelp.Test(ShortCut) then MenuClick(mHelp);
+    if BResign.Test(ShortCut) then mResign.Click
+    else if BRandomMap.Test(ShortCut) then mRandomMap.Click
+    else if BHelp.Test(ShortCut) then mHelp.Click;
     (*if Shift = [ssCtrl] then
       case char(Key) of
          'A':
           begin // auto symmetry
           Server($7F0,me,0,nil^);
           MapValid:=false;
+          Server($7F0,Me,0,nil^);
+          MapValid:=False;
           PaintAll;
           end;
 …
           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;
 …
     SetFullScreen(FullScreen);
   end
   else if BHelp.Test(ShortCut) then MenuClick(mHelp)
+  else if BHelp.Test(ShortCut) then mHelp.Click
   else if BUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mUnitStat)
   else if BCityStat.Test(ShortCut) then MenuClick_Check(StatPopup, mCityStat)
 …
   else if BSetDebugMap9.Test(ShortCut) then SetDebugMap(9)
   else if BJump.Test(ShortCut) then MenuClick(mJump)
+  else if BJump.Test(ShortCut) then mJump.Click
   else if BDebugMap.Test(ShortCut) then mShowClick(mDebugMap)
   else if BLocCodes.Test(ShortCut) then mShowClick(mLocCodes)
 …
   else if BNames.Test(ShortCut) then mNamesClick(mNames)
   else if BResign.Test(ShortCut) then MenuClick_Check(GamePopup, mResign)
   else if BRun.Test(ShortCut) then MenuClick(mRun)
+  else if BRun.Test(ShortCut) then mRun.Click
   else if BTestMapRepaint.Test(ShortCut) then begin // test map repaint time
     Time0 := NowPrecise;
 …
   else if BMapBtn5.Test(ShortCut) then MapBtnClick(MapBtn5)
   else if BMapBtn6.Test(ShortCut) then MapBtnClick(MapBtn6)
   else if BTechTree.Test(ShortCut) then MenuClick(mTechTree)
   else if BWait.Test(ShortCut) then MenuClick(mWait);
+  else if BTechTree.Test(ShortCut) then mTechTree.Click
+  else if BWait.Test(ShortCut) then mWait.Click;
   if UnFocus >= 0 then begin
     if BDisbandUnit.Test(ShortCut) then MenuClick(mDisband)
+    if BDisbandUnit.Test(ShortCut) then mDisband.Click
     else if BFortify.Test(ShortCut) then MenuClick_Check(TerrainPopup, mFort)
     else if BCenterUnit.Test(ShortCut) then MenuClick(mCentre)
     else if BStay.Test(ShortCut) then MenuClick(mStay)
     else if BNoOrders.Test(ShortCut) then MenuClick(mNoOrders)
     else if BPrevUnit.Test(ShortCut) then MenuClick(mPrevUnit)
     else if BNextUnit.Test(ShortCut) then MenuClick(mNextUnit)
+    else if BCenterUnit.Test(ShortCut) then mCentre.Click
+    else if BStay.Test(ShortCut) then mStay.Click
+    else if BNoOrders.Test(ShortCut) then mNoOrders.Click
+    else if BPrevUnit.Test(ShortCut) then mPrevUnit.Click
+    else if BNextUnit.Test(ShortCut) then mNextUnit.Click
     else if BCancel.Test(ShortCut) then MenuClick_Check(UnitPopup, mCancel)
     else if BPillage.Test(ShortCut) then MenuClick_Check(UnitPopup, mPillage)
 …
     else if BEnhance.Test(ShortCut) then begin
       InitPopup(TerrainPopup);
       if mEnhance.Visible and mEnhance.Enabled then MenuClick(mEnhance)
         else MenuClick(mEnhanceDef)
+      if mEnhance.Visible and mEnhance.Enabled then mEnhance.Click
+        else mEnhanceDef.Click
     end
     else if BGoOn.Test(ShortCut) then MenuClick_Check(UnitPopup, mGoOn)
 …
     else if BFarmClearIrrigation.Test(ShortCut) then begin
       if JobTest(UnFocus, jFarm, [eTreaty]) then
         MenuClick(mFarm)
+        mFarm.Click
       else if JobTest(UnFocus, jClear, [eTreaty]) then
         MenuClick(mClear)
+        mClear.Click
       else MenuClick_Check(TerrainPopup, mIrrigation);
     end
     else if BLoad.Test(ShortCut) then MenuClick_Check(UnitPopup, mLoad)
     else if BAfforestMine.Test(ShortCut) then begin
       if JobTest(UnFocus, jAfforest, [eTreaty]) then MenuClick(mAfforest)
+      if JobTest(UnFocus, jAfforest, [eTreaty]) then mAfforest.Click
         else MenuClick_Check(TerrainPopup, mMine);
     end
 …
     else if BPollution.Test(ShortCut) then MenuClick_Check(TerrainPopup, mPollution)
     else if BRailRoad.Test(ShortCut) then begin
       if JobTest(UnFocus, jRR, [eTreaty]) then MenuClick(mRR)
+      if JobTest(UnFocus, jRR, [eTreaty]) then mRailRoad.Click
         else MenuClick_Check(TerrainPopup, mRoad);
     end
 …
 end;
+procedure TMainScreen.MenuClick(Sender: TObject);
+  function DoJob(j0: integer): integer;
+  var
+    Loc0, Movement0: integer;
+  begin
+    with MyUn[UnFocus] do
+function TMainScreen.DoJob(j0: Integer): Integer;
+var
+  Loc0, Movement0: Integer;
+begin
+  with MyUn[UnFocus] do
+  begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Loc0 := Loc;
+    Movement0 := Movement;
+    if j0 < 0 then
+      Result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
+      // terrain enhancement
+    else
+      Result := Server(sStartJob + j0 shl 4, Me, UnFocus, nil^);
+    if Result >= rExecuted then
     begin
+      DestinationMarkON := false;
+      PaintDestination;
+      Loc0 := Loc;
+      Movement0 := Movement;
+      if j0 < 0 then
+        result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
+        // terrain enhancement
+      else
+        result := Server(sStartJob + j0 shl 4, me, UnFocus, nil^);
+      if result >= rExecuted then
+      if Result = eDied then
+        UnFocus := -1;
+      PaintLoc(Loc0);
+      if UnFocus >= 0 then
       begin
+        if result = eDied then
+          UnFocus := -1;
+        PaintLoc(Loc0);
+        if UnFocus >= 0 then
+        if (j0 < 0) and (Result <> eJobDone) then
+          // multi-turn terrain enhancement
+          Status := Status and ($FFFF - usStay - usRecover - usGoto) or
+            usEnhance
+        else
+          Status := Status and
+            ($FFFF - usStay - usRecover - usGoto - usEnhance);
+        if (Job <> jNone) or (Movement0 < 100) then
         begin
+          if (j0 < 0) and (result <> eJobDone) then
+            // multi-turn terrain enhancement
+            Status := Status and ($FFFF - usStay - usRecover - usGoto) or
+              usEnhance
+          else
+            Status := Status and
+              ($FFFF - usStay - usRecover - usGoto - usEnhance);
+          if (Job <> jNone) or (Movement0 < 100) then
+          begin
+            Status := Status and not usWaiting;
+            NextUnit(UnStartLoc, true);
+          end
+          else
+            PanelPaint;
+          Status := Status and not usWaiting;
+          NextUnit(UnStartLoc, True);
         end
         else
+          NextUnit(UnStartLoc, true);
+      end;
+    end;
+    case result of
+      eNoBridgeBuilding:
+        SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
+      eNoCityTerrain:
+        SoundMessage(Phrases.Lookup('NOCITY'), 'INVALID');
+      eTreaty:
+        SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),
+          'NOMOVE_TREATY');
+    else
+      if result < rExecuted then
+        Play('INVALID')
+    end;
+  end;
+var
+  i, uix, NewFocus, Loc0, OldMaster, Destination, cix, cixOldHome,
+    ServerResult: integer;
+  AltGovs, RevolutionChanged: boolean;
+  QueryText: string;
+begin
+  if Sender = mResign then
+    if ClientMode = cEditMap then
+    begin
+      if Edited then
+      begin
+        QueryText := Phrases.Lookup('MAP_CLOSE');
+        case SimpleQuery(mkYesNoCancel, QueryText, '') of
+          mrIgnore:
+            Server(sAbandonMap, me, 0, nil^);
+          mrOK:
+            Server(sSaveMap, me, 0, nil^);
+        end
+          PanelPaint;
       end
       else
+        Server(sAbandonMap, me, 0, nil^)
+    end
+        NextUnit(UnStartLoc, True);
+    end;
+  end;
+  case Result of
+    eNoBridgeBuilding:
+      SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
+    eNoCityTerrain:
+      SoundMessage(Phrases.Lookup('NOCITY'), 'INVALID');
+    eTreaty:
+      SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),
+        'NOMOVE_TREATY');
+  else
+    if Result < rExecuted then
+      Play('INVALID');
+  end;
+end;
+function TMainScreen.GetBattleDlg: TBattleDlg;
+begin
+  if not Assigned(FBattleDlg) then FBattleDlg := TBattleDlg.Create(nil);
+  Result := FBattleDlg;
+end;
+function TMainScreen.GetCityDlg: TCityDlg;
+begin
+  if not Assigned(FCityDlg) then begin
+    FCityDlg := TCityDlg.Create(nil);
+    FCityDlg.CheckAge;
+  end;
+  Result := FCityDlg;
+end;
+function TMainScreen.GetCityTypeDlg: TCityTypeDlg;
+begin
+  if not Assigned(FCityTypeDlg) then FCityTypeDlg := TCityTypeDlg.Create(nil);
+  Result := FCityTypeDlg;
+end;
+function TMainScreen.GetDiaDlg: TDiaDlg;
+begin
+  if not Assigned(FDiaDlg) then begin
+    FDiaDlg := TDiaDlg.Create(nil);
+    ArrangeDialog(FDiaDlg);
+  end;
+  Result := FDiaDlg;
+end;
+function TMainScreen.GetDraftDlg: TDraftDlg;
+begin
+  if not Assigned(FDraftDlg) then FDraftDlg := TDraftDlg.Create(nil);
+  Result := FDraftDlg;
+end;
+function TMainScreen.GetEnhanceDlg: TEnhanceDlg;
+begin
+  if not Assigned(FEnhanceDlg) then FEnhanceDlg := TEnhanceDlg.Create(nil);
+  Result := FEnhanceDlg;
+end;
+function TMainScreen.GetHelpDlg: THelpDlg;
+begin
+  if not Assigned(FHelpDlg) then begin
+    FHelpDlg := THelpDlg.Create(nil);
+    ArrangeDialog(FHelpDlg);
+    FHelpDlg.Difficulty := G.Difficulty[Me];
+  end;
+  Result := FHelpDlg;
+end;
+function TMainScreen.GetListDlg: TListDlg;
+begin
+  if not Assigned(FListDlg) then begin
+    FListDlg := TListDlg.Create(nil);
+    ArrangeDialog(FListDlg);
+  end;
+  Result := FListDlg;
+end;
+function TMainScreen.GetMessgExDlg: TMessgExDlg;
+begin
+  if not Assigned(FMessgExDlg) then FMessgExDlg := TMessgExDlg.Create(nil);
+    Result := FMessgExDlg;
+end;
+function TMainScreen.GetModalSelectDlg: TModalSelectDlg;
+begin
+  if not Assigned(FModalSelectDlg) then FModalSelectDlg := TModalSelectDlg.Create(nil);
+  Result := FModalSelectDlg;
+end;
+function TMainScreen.GetNatStatDlg: TNatStatDlg;
+begin
+  if not Assigned(FNatStatDlg) then begin
+    FNatStatDlg := TNatStatDlg.Create(nil);
+    ArrangeDialog(FNatStatDlg);
+    FNatStatDlg.CheckAge;
+  end;
+  Result := FNatStatDlg;
+end;
+function TMainScreen.GetNegoDlg: TNegoDlg;
+begin
+  if not Assigned(FNegoDlg) then FNegoDlg := TNegoDlg.Create(nil);
+  Result := FNegoDlg;
+end;
+function TMainScreen.GetRatesDlg: TRatesDlg;
+begin
+  if not Assigned(FRatesDlg) then begin
+    //FRatesDlg := TRatesDlg.Create(nil);
+    DpiApplication.CreateForm(TRatesDlg, FRatesDlg);
+    FRatesDlg.Show;
+  end;
+  Result := FRatesDlg;
+end;
+function TMainScreen.GetTechTreeDlg: TTechTreeDlg;
+begin
+  if not Assigned(FTechTreeDlg) then FTechTreeDlg := TTechTreeDlg.Create(nil);
+  Result := FTechTreeDlg;
+end;
+procedure TMainScreen.mDisbandOrUtilizeClick(Sender: TObject);
+var
+  Loc0: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if (Sender = mUtilize) and
+      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;
+    end;
+    if (Sender = mUtilize) and (Health < 100) then
+      if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
+      then
+        Exit;
+    Loc0 := Loc;
+    CityOptimizer_BeforeRemoveUnit(UnFocus);
+    if Server(sRemoveUnit, Me, UnFocus, nil^) = eUtilized then
+      Play('CITY_UTILIZE')
     else
+    begin
+      if Server(sGetGameChanged, 0, 0, nil^) = eOK then
+      begin
+        QueryText := Phrases.Lookup('RESIGN');
+        case SimpleQuery(mkYesNoCancel, QueryText, '') of
+          mrIgnore:
+            Server(sResign, 0, 0, nil^);
+          mrOK:
+            Server(sBreak, 0, 0, nil^)
+        end
+      end
+      else
+        Server(sResign, 0, 0, nil^)
+    end
+  else if Sender = mEmpire then
+    RatesDlg.ShowNewContent(wmPersistent)
+  else if Sender = mRevolution then
+  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;
+    if not AltGovs then
+      SoundMessage(Phrases.Lookup('NOALTGOVS'), 'MSG_DEFAULT')
+    else
+    begin
+      RevolutionChanged := false;
+      if MyRO.Happened and phChangeGov <> 0 then
+      begin
+        ModalSelectDlg.ShowNewContent(wmModal, kGov);
+        if ModalSelectDlg.result >= 0 then
+        begin
+          Play('NEWGOV');
+          Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+          CityOptimizer_BeginOfTurn;
+          RevolutionChanged := true;
+        end
+      end
+      else
+      with MessgExDlg do
+      begin // revolution!
+        MessgExDlg.MessgText := Tribe[me].TPhrase('REVOLUTION');
+        MessgExDlg.Kind := mkYesNo;
+        MessgExDlg.IconKind := mikPureIcon;
+        MessgExDlg.IconIndex := 72; // anarchy palace
+        MessgExDlg.ShowModal;
+        if ModalResult = mrOK then
+        begin
+          Play('REVOLUTION');
+          Server(sRevolution, me, 0, nil^);
+          RevolutionChanged := true;
+          if NatStatDlg.Visible then
+            NatStatDlg.Close;
+          if CityDlg.Visible then
+            CityDlg.Close;
+        end
+      end;
+      if RevolutionChanged then
+        UpdateViews(true);
+    end
+  end
+  else if Sender = mWebsite then
+    OpenURL(CevoHomepage)
+  else if Sender = mRandomMap then
+  begin
+    if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
+      = mrOK) then
+    begin
+      Server(sRandomMap, me, 0, nil^);
+      Edited := true;
+      MapValid := false;
+      PaintAllMaps;
+    end
+  end
+  else if Sender = mJump then
+  begin
+    if supervising then
+      Jump[0] := 20
+    else
+      Jump[me] := 20;
+    EndTurn(true);
+  end
+  else if Sender = mRun then
+  begin
+    if supervising then
+      Jump[0] := 999999
+    else
+      Jump[me] := 999999;
+    EndTurn(true);
+  end
+  else if Sender = mEnhanceDef then
+  begin
+    if UnFocus >= 0 then
+      EnhanceDlg.ShowNewContent(wmPersistent,
+        MyMap[MyUn[UnFocus].Loc] and fTerrain)
+    else
+      EnhanceDlg.ShowNewContent(wmPersistent)
+  end
+  else if Sender = mCityTypes then
+    CityTypeDlg.ShowNewContent(wmModal)
+    // must be modal because types are not saved before closing
+  else if Sender = mUnitStat then
+  begin
+    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);
+    end;
+  end
+  else if Sender = mEUnitStat then
+  begin
+    if MyRO.nEnemyModel > 0 then
+      ListDlg.ShowNewContent(wmPersistent, kAllEModels);
+  end
+  else if Sender = mCityStat then
+    ListDlg.ShowNewContent(wmPersistent, kCities)
+  else if Sender = mScienceStat then
+    ListDlg.ShowNewContent(wmPersistent, kScience)
+  else if Sender = mNations then
+    NatStatDlg.ShowNewContent(wmPersistent)
+  else if Sender = mHelp then
+    if ClientMode = cEditMap then
+      HelpDlg.ShowNewContent(wmPersistent, hkText, HelpDlg.TextIndex('MAPEDIT'))
+    else
+      HelpDlg.ShowNewContent(wmPersistent, hkMisc, miscMain)
+  else if Sender = mTechTree then
+    TechTreeDlg.ShowModal
+  else if Sender = mWonders then
+    WondersDlg.ShowNewContent(wmPersistent)
+  else if Sender = mDiagram then
+    DiaDlg.ShowNewContent_Charts(wmPersistent)
+  else if Sender = mShips then
+    DiaDlg.ShowNewContent_Ship(wmPersistent)
+  else if Sender = mWait then
+  begin
+    if UnFocus >= 0 then
+    begin
+      DestinationMarkON := false;
+      PaintDestination;
+      MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+        ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+    end;
+    NextUnit(-1, false);
+  end
+  else if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      if Sender = mGoOn then
+      begin
+        if Status shr 16 = $7FFF then
+          Destination := maNextCity
+        else
+          Destination := Status shr 16;
+        Status := Status and not(usStay or usRecover) or usWaiting;
+        MoveToLoc(Destination, true);
+      end
+      else if Sender = mHome then
+        if MyMap[Loc] and fCity <> 0 then
+        begin
+          cixOldHome := Home;
+          if Server(sSetUnitHome, me, UnFocus, nil^) >= rExecuted then
+          begin
+            CityOptimizer_CityChange(cixOldHome);
+            CityOptimizer_CityChange(Home);
+            UpdateViews(true);
+          end
+          else
+            Play('INVALID');
+        end
+        else
+        begin
+          Status := Status and not(usStay or usRecover or usEnhance);
+          MoveToLoc(maNextCity, true)
+        end
+      else if Sender = mCentre then
+      begin
+        Centre(Loc);
+        PaintAllMaps;
+      end
+      else if Sender = mCity then
+      begin
+        Loc0 := Loc;
+        if MyMap[Loc] and fCity = 0 then
+        begin // build city
+          if DoJob(jCity) = eCity then
+          begin
+            MapValid := false;
+            PaintAll;
+            ZoomToCity(Loc0, true, chFounded);
+          end;
+        end
+        else
+        begin
+          CityOptimizer_BeforeRemoveUnit(UnFocus);
+          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);
+            CityOptimizer_CityChange(cix);
+            CityOptimizer_AfterRemoveUnit; // does nothing here
+            SetTroopLoc(Loc0);
+            UpdateViews(true);
+            DestinationMarkON := false;
+            PaintDestination;
+            UnFocus := -1;
+            PaintLoc(Loc0);
+            NextUnit(UnStartLoc, true);
+          end
+          else if ServerResult = eMaxSize then
+            SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
+        end
+      end
+      else if Sender = mRoad then
+        DoJob(jRoad)
+      else if Sender = mRR then
+        DoJob(jRR)
+      else if Sender = mClear then
+        DoJob(jClear)
+      else if Sender = mIrrigation then
+        DoJob(jIrr)
+      else if Sender = mFarm then
+        DoJob(jFarm)
+      else if Sender = mAfforest then
+        DoJob(jAfforest)
+      else if Sender = mMine then
+        DoJob(jMine)
+      else if Sender = mCanal then
+        DoJob(jCanal)
+      else if Sender = MTrans then
+        DoJob(jTrans)
+      else if Sender = mFort then
+        DoJob(jFort)
+      else if Sender = mAirBase then
+        DoJob(jBase)
+      else if Sender = mPollution then
+        DoJob(jPoll)
+      else if Sender = mPillage then
+        DoJob(jPillage)
+      else if Sender = mEnhance then
+        DoJob(-1)
+      else if Sender = mStay then
+      begin
+        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);
+      end
+      else if Sender = mRecover then
+      begin
+        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);
+      end
+      else if Sender = mNoOrders then
+      begin
+        Status := Status and not usWaiting;
+        NextUnit(UnStartLoc, true);
+      end
+      else if Sender = mPrevUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(-1);
+      end
+      else if Sender = mNextUnit then
+      begin
+        Status := Status and not usWaiting;
+        FocusNextUnit(1);
+      end
+      else if Sender = mCancel then
+      begin
+        DestinationMarkON := false;
+        PaintDestination;
+        Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
+        if Job > jNone then
+          Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+      end
+      else if (Sender = mDisband) or (Sender = mUtilize) then
+      begin
+        if (Sender = mUtilize) and
+          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
+        end;
+        if (Sender = mUtilize) and (Health < 100) then
+          if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
+          then
+            exit;
+        Loc0 := Loc;
+        CityOptimizer_BeforeRemoveUnit(UnFocus);
+        if Server(sRemoveUnit, me, UnFocus, nil^) = eUtilized then
+          Play('CITY_UTILIZE')
+        else
+          Play('DISBAND');
+        CityOptimizer_AfterRemoveUnit;
+        SetTroopLoc(Loc0);
+        UpdateViews(true);
+        DestinationMarkON := false;
+        PaintDestination;
+        UnFocus := -1;
+        PaintLoc(Loc0);
+        NextUnit(UnStartLoc, true);
+      end
+      else if Sender = mLoad then
+      begin
+        i := Server(sLoadUnit, me, UnFocus, nil^);
+        if i >= rExecuted then
+        begin
+          if MyModel[mix].Domain = dAir then
+            Play('MOVE_PLANELANDING')
+          else
+            Play('MOVE_LOAD');
+          DestinationMarkON := false;
+          PaintDestination;
+          Status := Status and ($FFFF - usWaiting - usStay - usRecover - usGoto
+            - usEnhance);
+          NextUnit(UnStartLoc, true);
+        end
+        else if i = eNoTime_Load then
+          if MyModel[mix].Domain = dAir then
+            SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+          else
+            SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+              [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+      end
+      else if Sender = mUnload then
+        if Master >= 0 then
+        begin
+          OldMaster := Master;
+          i := Server(sUnloadUnit, me, UnFocus, nil^);
+          if i >= rExecuted then
+          begin
+            if MyModel[mix].Domain = dAir then
+              Play('MOVE_PLANESTART')
+            else if (MyModel[MyUn[OldMaster].mix].Domain = dAir) and
+              (MyMap[Loc] and fCity = 0) and (MyMap[Loc] and fTerImp <> tiBase)
+            then
+              Play('MOVE_PARACHUTE')
+            else
+              Play('MOVE_UNLOAD');
+            Status := Status and not usWaiting;
+            if MyModel[mix].Domain <> dAir then
+              NextUnit(Loc, true)
+            else
+              PanelPaint;
+          end
+          else if i = eNoTime_Load then
+            if MyModel[mix].Domain = dAir then
+              SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+            else
+              SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+                [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+        end
+        else
+        begin
+          NewFocus := -1;
+          uix := UnFocus;
+          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
+            begin
+              MyUn[uix].Status := MyUn[uix].Status or usWaiting;
+              NewFocus := uix
+            end;
+          end;
+          if NewFocus >= 0 then
+          begin
+            SetUnFocus(NewFocus);
+            SetTroopLoc(Loc);
+            PanelPaint
+          end;
+        end
+      else if Sender = mSelectTransport then
+        Server(sSelectTransport, me, UnFocus, nil^)
+      Play('DISBAND');
+    CityOptimizer_AfterRemoveUnit;
+    SetTroopLoc(Loc0);
+    UpdateViews(True);
+    DestinationMarkON := False;
+    PaintDestination;
+    UnFocus := -1;
+    PaintLoc(Loc0);
+    NextUnit(UnStartLoc, True);
+  end;
 end;
 procedure TMainScreen.InitPopup(Popup: TDpiPopupMenu);
 var
   i, p1, Tile, Test: integer;
   NoSuper, extended, Multi, NeedSep, HaveCities: boolean;
   LastSep, m: TDpiMenuItem;
+  I, p1, Tile, Test: Integer;
+  NoSuper, Extended, Multi, NeedSep, HaveCities: Boolean;
+  LastSep, M: TDpiMenuItem;
   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
+  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;
+      HaveCities := True;
       Break;
     end;
 …
   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;
 …
       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;
 …
     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);
 …
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
           m := TDpiMenuItem.Create(mViewpoint);
+          M := TDpiMenuItem.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);
 …
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
           m := TDpiMenuItem.Create(mDebugMap);
+          M := TDpiMenuItem.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;
 …
       (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)
 …
     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
 …
     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');
 …
     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
+      (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
     begin
       mDisband.Visible := false;
       mUtilize.Visible := true;
+      mDisband.Visible := False;
+      mUtilize.Visible := True;
       if mox.Kind = mkFreight then
         mUtilize.Caption := Phrases.Lookup('UTILIZE')
 …
     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
 …
     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
 …
     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));
 …
       (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
 …
     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)
 …
     begin
       mRoad.Caption := Phrases.Lookup('BTN_BUILDBRIDGE');
       mRR.Caption := Phrases.Lookup('BTN_BUILDRRBRIDGE');
+      mRailRoad.Caption := Phrases.Lookup('BTN_BUILDRRBRIDGE');
     end
     else
     begin
       mRoad.Caption := Phrases.Lookup('BTN_BUILDROAD');
       mRR.Caption := Phrases.Lookup('BTN_BUILDRR');
+      mRailRoad.Caption := Phrases.Lookup('BTN_BUILDRR');
     end;
     if Tile and fTerrain = fForest then
 …
       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]);
       mRR.Visible := JobTest(UnFocus, jRR, [eNoBridgeBuilding, eTreaty]);
+      mRailRoad.Visible := JobTest(UnFocus, jRR, [eNoBridgeBuilding, eTreaty]);
       mClear.Visible := JobTest(UnFocus, jClear, [eTreaty]);
       mIrrigation.Visible := JobTest(UnFocus, jIrr, [eTreaty]);
 …
     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;
 …
   // set menu seperators
   LastSep := nil;
   NeedSep := false;
   for i := 0 to Popup.Items.Count - 1 do
     if Popup.Items[i].Caption = '-' then
+  NeedSep := False;
+  for I := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[I].Caption = '-' then
     begin
       Popup.Items[i].Visible := NeedSep;
+      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;
 …
 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);
 …
     end
     else if StepFocus then
       NextUnit(TroopLoc, true)
+      NextUnit(TroopLoc, True)
     else
     begin
 …
 procedure TMainScreen.Toggle(Sender: TObject);
 begin
   TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked
+  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
 end;
 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
+    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 +
+      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
 …
           yw := ywmax;
       end;
       DpiBitCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
+      DpiBitBltCanvas(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 -
 , MainTexture.ColorMark, MainTexture.ColorMark);
       DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         Buffer.Canvas, 0, 0);
       MainOffscreenPaint;
 …
   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;
 …
 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;
 …
   TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
   SetMapOptions;
   MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
 …
 procedure TMainScreen.mNamesClick(Sender: TObject);
 var
   p1: integer;
+  p1: Integer;
 begin
   mNames.Checked := not mNames.Checked;
 …
       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
 …
       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;
 …
     with Canvas do
     begin // pillarbox, make left and right border black
       if me < 0 then
+      if Me < 0 then
         Brush.Color := $000000
       else
 …
       Brush.Style := bsClear;
     end;
   DpiBitCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
     offscreen.Canvas, 0, 0);
   DpiBitCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
+  DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+    Offscreen.Canvas, 0, 0);
+  DpiBitBltCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
 , 0);
   if xMidPanel > MapOffset then
     DpiBitCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
       ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas,
+    DpiBitBltCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - xMidPanel, overlap, Offscreen.Canvas,
       xMidPanel - MapOffset, MapHeight - overlap)
   else
     DpiBitCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
       ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas, 0,
+    DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - MapOffset, overlap, Offscreen.Canvas, 0,
       MapHeight - overlap);
   if xRightPanel < MapOffset + MapWidth then
     DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas,
+    DpiBitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+      xRightPanel - ClientWidth div 2, overlap, Offscreen.Canvas,
       ClientWidth div 2 - MapOffset, MapHeight - overlap)
   else
     DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+    DpiBitBltCanvas(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);
   DpiBitCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
+  DpiBitBltCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
     overlap, Panel.Canvas, 0, 0);
   DpiBitCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
+  DpiBitBltCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
     Panel.width - xRightPanel, overlap, Panel.Canvas, xRightPanel, 0);
   DpiBitCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.width,
+  DpiBitBltCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.width,
     PanelHeight - overlap, Panel.Canvas, 0, overlap);
   if (pLogo >= 0) and (G.RO[pLogo] = nil) and (AILogo[pLogo] <> nil) then
     DpiBitCanvas(Canvas, xRightPanel + 10 - (16 + 64),
+    DpiBitBltCanvas(Canvas, xRightPanel + 10 - (16 + 64),
       ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas, 0, 0);
 end;
 procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: integer);
+procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: Integer);
 var
   r0: HRgn;
 begin
   r0 := DpiCreateRectRgn(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 := DpiCreateRectRgn(Left, Top, Rigth, Bottom);
   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 := DpiCreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);
     end;
   InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
 …
 procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Timer1.Enabled := false;
+  Timer1.Enabled := False;
 end;
 procedure TMainScreen.Radio(Sender: TObject);
 begin
   TDpiMenuItem(Sender).Checked := true;
+  TDpiMenuItem(Sender).Checked := True;
 end;
 procedure TMainScreen.mManipClick(Sender: TObject);
 var
   Flag: integer;
+  Flag: Integer;
 begin
   with TDpiMenuItem(Sender) do
 …
       Play('CHEAT');
     end;
     if not supervising then
+    if not Supervising then
     begin
       if Flag = tfUncover then
       begin
         MapValid := false;
+        MapValid := False;
         PaintAllMaps;
       end
 …
   else
   begin
     MapValid := false;
+    MapValid := False;
     PaintAllMaps;
   end; // update main map
 …
   end;
   SetMapOptions;
   MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
 …
   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);
 …
       GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
     exit;
+    Exit;
   end; // windows menu button calls game menu
 end;
 …
 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;
 …
   SoundMode := smOnAlt;
 end;
-{ procedure TMainScreen.AdviceBtnClick;
-  var
-  OldAdviceLoc: integer;
-  begin
-  DestinationMarkON:=false;
-  PaintDestination;
-  AdvisorDlg.GiveStrategyAdvice;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=-1;
-  PaintLoc(OldAdviceLoc);
-  end; }
-{ procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
-  var
-  OldAdviceLoc,x,y: integer;
-  begin
-  if Loc<>MainMap.AdviceLoc then
-  begin
-  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);
-  PaintAllMaps;
-  end;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=Loc;
-  PaintLoc(OldAdviceLoc);
-  PaintLoc(MainMap.AdviceLoc);
-  end;
-  end; }
 procedure TMainScreen.UnitInfoBtnClick(Sender: TObject);
 …
 procedure TMainScreen.SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
-var
-  i: integer;
 begin
   MainMap.TileSize := TileSize;
 …
   SetMapPos(Loc, MapPos);
   PaintAllMaps;
+  for i := 0 to DpiScreen.FormCount - 1 do
+    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
+      TBufferedDrawDlg(DpiScreen.Forms[i]).SmartUpdateContent(false);
+  ApplyToVisibleForms(faSmartUpdateContent);
 end;
 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 TDpiMenuItem then
       for j := 0 to Length(SaveOption) - 1 do
         if TDpiMenuItem(Components[i]).Checked and
           (TDpiMenuItem(Components[i]).Tag = SaveOption[j]) then
           OptionChecked := OptionChecked + [TSaveOption(j)];
+  for I := 0 to ComponentCount - 1 do
+    if Components[I] is TDpiMenuItem then
+      for J := 0 to Length(SaveOption) - 1 do
+        if TDpiMenuItem(Components[I]).Checked and
+          (TDpiMenuItem(Components[I]).Tag = SaveOption[J]) then
+          OptionChecked := OptionChecked + [TSaveOption(J)];
 end;
 …
   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;
 …
 end;
+procedure TMainScreen.ArrangeDialogs;
+begin
+  ArrangeDialog(FListDlg);
+  ArrangeDialog(FHelpDlg);
+  ArrangeDialog(FUnitStatDlg);
+  ArrangeDialog(FDiaDlg);
+  ArrangeDialog(FNatStatDlg);
+end;
+procedure TMainScreen.ArrangeDialog(Form: TBufferedDrawDlg);
+begin
+  if not Assigned(Form) then Exit;
+  if Form is TListDlg then begin;
+    ListDlg.UserLeft := 8;
+    ListDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is THelpDlg then begin
+   HelpDlg.UserLeft := DpiScreen.Width - HelpDlg.Width - 8;
+    HelpDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is TUnitStatDlg then begin
+    UnitStatDlg.UserLeft := 397;
+    UnitStatDlg.UserTop := TopBarHeight + 64;
+  end;
+  if Form is TDiaDlg then begin
+    DiaDlg.UserLeft := (DpiScreen.Width - DiaDlg.Width) div 2;
+    DiaDlg.UserTop := (DpiScreen.Height - DiaDlg.Height) div 2;
+  end;
+  if Form is TNatStatDlg then begin
+    NatStatDlg.UserLeft := DpiScreen.Width - NatStatDlg.Width - 8;
+    NatStatDlg.UserTop := DpiScreen.Height - PanelHeight - NatStatDlg.Height - 8;
+    if NatStatDlg.UserTop < 8 then
+      NatStatDlg.UserTop := 8;
+  end;
+end;
 procedure TMainScreen.ScrollBarUpdate(Sender: TObject);
 begin

branches/highdpi/LocalPlayer/Tribes.pas

-              r349
+              r465
 uses
   Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global,
   UGraphicSet;
+  GraphicSet;
 type
 …
     yShield: Integer;
   end;
+  { TModelPictureInfo }
   TModelPictureInfo = record
 …
     Hash: Integer;
     GrName: ShortString;
+    function GetCommandDataSize: Byte;
   end;
 …
     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}
 …
 function CityName(Founder: Integer): string;
 function ModelCode(const ModelInfo: TModelInfo): Integer;
 procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
+procedure FindStdModelPicture(Code: Integer; out pix: Integer; out 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);
 …
 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;
 procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
 var
   i: Integer;
 begin
   for i := 0 to StdUnitScript.Count - 1 do
+procedure FindStdModelPicture(Code: Integer; out pix: Integer; out Name: string);
+var
+  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
 …
   CloseFile(TribeScript);
   Result := Found = 3;
+end;
+{ TModelPictureInfo }
+function TModelPictureInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + SizeOf(mix) + SizeOf(pix) + SizeOf(Hash) + 1 +
+    Length(GrName);
 end;
 …
 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);
 …
 {$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'),
 …
     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;
 …
   TLine = array [0 .. 649, 0 .. 2] of Byte;
 var
   i, x, Gray: Integer;
+  I, X, Gray: Integer;
   Item: string;
 begin
 …
   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;
 …
         if CompareText(Item, 'stdcities') = 0 then
           case cpix of
+:
+              cpix := 0;
+:
+            begin
+: cpix := 0;
+: begin
               cpix := 0;
               Item := 'Nation2';
             end
+            end;
           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);
 …
 procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
 var
   i: Integer;
+  I: Integer;
   ok: Boolean;
 begin
 …
     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
 …
       // 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
 …
       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
 …
   Code, Turn: Integer; ForceNew: Boolean): Boolean;
 var
   i: Integer;
+  I: Integer;
   Cnt: Integer;
   HGr: TGraphicSet;
 …
   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;
 …
   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

branches/highdpi/LocalPlayer/UnitStat.pas

-              r405
+              r465
 uses
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  ButtonB, ButtonC, IsoEngine;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, IsoEngine;
 type
+  TUnitStatDialogKind = (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit,
+    dkEnemyCityDefense, dkEnemyCity);
   TUnitStatDlg = class(TBufferedDrawDlg)
     SwitchBtn: TButtonB;
 …
   private
     NoMap: TIsoMap;
+  protected
+    mixShow, // for dkOwnModel
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: Integer;
+    // for dkEnemyUnit, euixShow=-1 ->
+    mox: ^TModelInfo; // for dkEnemyModel
+    Kind: TUnitStatDialogKind;
+    Back: TDpiBitmap;
+    Template: TDpiBitmap;
+    procedure OffscreenPaint; override;
   public
     procedure CheckAge;
+    procedure ShowNewContent_OwnModel(NewMode, mix: integer);
+    procedure ShowNewContent_OwnUnit(NewMode, uix: integer);
+    procedure ShowNewContent_EnemyUnit(NewMode, euix: integer);
+    procedure ShowNewContent_EnemyLoc(NewMode, Loc: integer);
+    procedure ShowNewContent_EnemyModel(NewMode, emix: integer);
+    procedure ShowNewContent_EnemyCity(NewMode, Loc: integer);
+  protected
+    mixShow, // for dkOwnModel
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: integer;
+    // for dkEnemyUnit, euixShow=-1 ->
+    mox: ^TModelInfo; // for dkEnemyModel
+    Kind: (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit, dkEnemyCityDefense,
+      dkEnemyCity);
+    Back, Template: TDpiBitmap;
+    procedure OffscreenPaint; override;
+  end;
+var
+  UnitStatDlg: TUnitStatDlg;
+    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);
+  end;
 implementation
 uses
   Tribes, Help, Directories, UTexture;
+  Term, Tribes, Help, Directories, Texture;
 {$R *.lfm}
 …
   Back.PixelFormat := pf24bit;
   Back.SetSize(5 * wCommon, hMax);
   Back.Canvas.FillRect(0, 0, Back.Width,Back.Height);
+  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
 …
   if MainTexture.Age <> AgePrepared then begin
     AgePrepared := MainTexture.Age;
     DpiBitCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hOwnModel) div 2);
     DpiBitCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
+    DpiBitBltCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyModel) div 2);
     DpiBitCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
+    DpiBitBltCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyUnit) div 2);
     DpiBitCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
+    DpiBitBltCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyCityDefense) div 2);
     DpiBitCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
+    DpiBitBltCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyCity) div 2);
 …
 procedure TUnitStatDlg.FormShow(Sender: TObject);
 var
   owner, mix: integer;
   IsSpecialUnit: boolean;
+  Owner, mix: Integer;
+  IsSpecialUnit: Boolean;
 begin
   if Kind in [dkEnemyUnit, dkEnemyCityDefense, dkEnemyCity] then
 …
         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
       begin
         mox := @MyRO.EnemyModel[emix];
         if not Assigned(Tribe[owner].ModelPicture[mix].HGr) then
+        if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
           InitEnemyModel(emix);
       end
+      end;
     end
     else
 …
       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;
   case Kind of
+    dkOwnModel:
+      ClientHeight := hOwnModel;
+    dkOwnUnit:
+      ClientHeight := hEnemyUnit;
+    dkEnemyModel:
+      ClientHeight := hEnemyModel;
+    dkEnemyUnit:
+      ClientHeight := hEnemyUnit;
+    dkEnemyCityDefense:
+      ClientHeight := hEnemyCityDefense;
+    dkEnemyCity:
+      ClientHeight := hEnemyCity;
+    dkOwnModel: ClientHeight := hOwnModel;
+    dkOwnUnit: ClientHeight := hEnemyUnit;
+    dkEnemyModel: ClientHeight := hEnemyModel;
+    dkEnemyUnit: ClientHeight := hEnemyUnit;
+    dkEnemyCityDefense: ClientHeight := hEnemyCityDefense;
+    dkEnemyCity: ClientHeight := hEnemyCity;
   end;
 …
     Left := UserLeft;
     Top := UserTop;
+  end
+  else
+  begin
+  end else begin
     Left := (DpiScreen.Width - Width) div 2;
     Top := (DpiScreen.Height - Height) div 2;
   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)
 …
   begin
     case Kind of
+      dkOwnModel:
+        begin
+          owner := me;
+          mix := mixShow;
+          IsSpecialUnit := MyModel[mix].Kind >= $10;
+        end;
+      dkOwnUnit:
+        begin
+          owner := me;
+          mix := MyUn[uixShow].mix;
+          IsSpecialUnit := MyModel[mix].Kind >= $10;
+        end
+    else
+      begin
+        owner := mox.owner;
+      dkOwnModel: begin
+        Owner := Me;
+        mix := mixShow;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      dkOwnUnit: begin
+        Owner := Me;
+        mix := MyUn[uixShow].mix;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      else begin
+        Owner := mox.Owner;
         mix := mox.mix;
         IsSpecialUnit := mox.Kind >= $10;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode, mix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode: TWindowMode; mix: Integer);
 begin
   Kind := dkOwnModel;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode, uix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: Integer);
 begin
   Kind := dkOwnUnit;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode, euix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: Integer);
 begin
   Kind := dkEnemyUnit;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: Integer);
 begin
   Kind := dkEnemyUnit;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode, emix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
 begin
   Kind := dkEnemyModel;
 …
 end;
 procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
 begin
   if MyMap[Loc] and fUnit <> 0 then
 …
   begin
     UserLeft := Left;
     UserTop := Top
   end;
   if OffscreenUser = self then
+    UserTop := Top;
+  end;
+  if OffscreenUser = Self then
     OffscreenUser := nil;
 end;
 …
   PPicture: ^TModelPicture;
   function IsToCount(emix: integer): boolean;
+  function IsToCount(emix: Integer): Boolean;
   var
     PTestPicture: ^TModelPicture;
 …
       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: TDpiBitmap; x, y: integer; const mi: TModelInfo;
+  procedure FeatureBar(dst: TDpiBitmap; 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
 …
         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
 …
                 num := mi.TTrans;
             mcFirstNonCap .. nFeature - 1:
               if mi.Cap and (1 shl (i - mcFirstNonCap)) <> 0 then
                 num := 1
+              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,
 + i mod 11 * 11, 137 + i div 11 * 11);
             inc(dx, 15)
+            Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
++ I mod 11 * 11, 137 + I div 11 * 11);
+            Inc(dx, 15);
           end;
         end;
       end;
   end; { featurebar }
   procedure NumberBarS(dst: TDpiBitmap; 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;
+  procedure NumberBarS(dst: TDpiBitmap; 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;
 …
   case Kind of
+    dkOwnModel:
+      begin
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+          Back.Canvas, 0, 0);
+        yView := 13;
+        yTotal := 92;
+      end;
+    dkEnemyModel:
+      begin
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+          Back.Canvas, wCommon, 0);
+        yView := 13;
+        yTotal := 92;
+      end;
+    dkEnemyUnit, dkOwnUnit:
+      begin
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+          Back.Canvas, 2 * wCommon, 0);
+        yView := 13;
+        yTotal := 123;
+      end;
+    dkEnemyCityDefense:
+      begin
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+          Back.Canvas, 3 * wCommon, 0);
+        yView := 171;
+        yTotal := 231;
+      end;
+    dkEnemyCity:
+      begin
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+          Back.Canvas, 4 * wCommon, 0);
+      end;
+    dkOwnModel: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+        Back.Canvas, 0, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyModel: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+        Back.Canvas, wCommon, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyUnit, dkOwnUnit: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+        Back.Canvas, 2 * wCommon, 0);
+      yView := 13;
+      yTotal := 123;
+    end;
+    dkEnemyCityDefense: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+        Back.Canvas, 3 * wCommon, 0);
+      yView := 171;
+      yTotal := 231;
+    end;
+    dkEnemyCity: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+        Back.Canvas, 4 * wCommon, 0);
+    end;
   end;
   MarkUsedOffscreen(ClientWidth, ClientHeight);
 …
   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
 : j := imWalls;
 : j := imCoastalFort;
 : j := imMissileBat;
 : 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
+: J := imWalls;
+: J := imCoastalFort;
+: J := imMissileBat;
+: 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);
         DpiBitCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
           SmallImp.Canvas, j mod 7 * xSizeSmall,
           (j + SystemIconLines * 7) div 7 * ySizeSmall);
         inc(x, xSizeSmall + 4);
+        DpiBitBltCanvas(Offscreen.Canvas, X, yImp, xSizeSmall, ySizeSmall,
+          SmallImp.Canvas, J mod 7 * xSizeSmall,
+          (J + SystemIconLines * 7) div 7 * ySizeSmall);
+        Inc(X, xSizeSmall + 4);
       end;
   end;
 …
     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
 …
         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
 …
     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;
 …
   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
 …
           { 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;
 …
           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,
 + 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,
 + 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,
 + 7 * (xxt * 2 + 1),
 + yyt + 2 * integer(2 + MyMap[Loc] and fTerrain - fForest)
++ yyt + 2 * Integer(2 + MyMap[Loc] and fTerrain - fForest)
                     * (yyt * 3 + 1));
               end;
           DpiBitCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
+          DpiBitBltCanvas(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,
 + 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,
 , 88, 115);
 …
         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);
 …
       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;
 …
   end;
   offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   case Kind of
     dkOwnModel, dkEnemyModel:
 …
       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; { OffscreenPaint }
+end;
 procedure TUnitStatDlg.ModelBoxChange(Sender: TObject);
 …
 procedure TUnitStatDlg.HelpBtnClick(Sender: TObject);
 begin
   HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
+  MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
 end;

branches/highdpi/LocalPlayer/Wonders.pas

-              r361
+              r465
     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
     procedure OffscreenPaint; override;
+    procedure ShowNewContent(NewMode: Integer);
+  end;
+var
+  WondersDlg: TWondersDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
 …
 uses
   Term, ClientTools, Help, Tribes, UPixelPointer;
+  Term, ClientTools, Help, Tribes, PixelPointer;
 {$R *.lfm}
 …
 procedure TWondersDlg.FormShow(Sender: TObject);
 begin
+  Caption := Phrases.Lookup('TITLE_WONDERS');
   Selection := -1;
   OffscreenPaint;
 end;
 procedure TWondersDlg.ShowNewContent(NewMode: Integer);
+procedure TWondersDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
 …
   Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
   Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
   Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
   Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
   Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
+  Line[0] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   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;
 …
 end;
 procedure TWondersDlg.DarkIcon(i: Integer);
+procedure TWondersDlg.DarkIcon(I: Integer);
 var
   X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
+  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;
   Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
   Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  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 := TPixelPointer.Create(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := TPixelPointer.Create(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
   for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
     for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
 …
 + (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;
 …
 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;
 …
         WonderDestroyed: begin
           HaveWonder := True;
           DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig,
 …
         else begin
           HaveWonder := True;
           DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig, ySizeBig,
 …
   MarkUsedOffscreen(ClientWidth, ClientHeight);
 end; { OffscreenPaint }
+end;
 procedure TWondersDlg.CloseBtnClick(Sender: TObject);
 …
 begin
   if Selection >= 0 then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
+    MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Selection);
 end;

branches/highdpi/Localization/cs/Help/Help.txt

-              r464
+              r465
 #HELPTITLE_MAIN Manuál
+#HELPTITLE_MAIN Příručka
 #HELPTITLE_QUICKSTART Rychlý start
 #HELPTITLE_CONCEPTS Koncepce hry
 …
 #DEFBONUS Bonus k obraně: %d%%
 #JOBCOST -Cena konstrukce: %s MP
 #JOBCOSTVAR -Cena konstrukce: proměnná (viz okno Vylepšení terénu v Makro managementu)
+#JOBCOSTVAR -Cena konstrukce: proměnná (viz okno Vylepšení terénu v Makro správy)
 #TERIMPEXCLUDE Zavlažování, důl, pevnost a vojenská základna se navzájem vylučují.
 Například pokud postavíte vojenskou základnu na čtverci s pevností,
 …
 !Pokročilé\
 ;MACRO Makro Management\
+;MACRO Makro správa\
 ;MAPEDIT Editor map\
 ;AIT Turnaj AI
 …
 hře. Nejjednodušším způsobem jak vyvinout vlastní AI je použít šablonu C#. Můžete ji najít ve složce s
 nainstalovanou hrou.\
 ::E1 Manuál návrhu AI\\
+::E1 Příručka návrhu AI\\
 !Systémové požadavky\
 …
 !Parametry příkazové řádky\
 --man ... zobrazí pouze manuál\\
+--man ... zobrazí pouze příručku\\
 !Odinstalace\
 …
 -se podívat, zda nebyla uvolněna novější verze programu, než kterou máte. V ní totiž
 může být problém odstraněn, především jedná-li se o významnou chybu.\
 -si prečíst příslušnou stránku manuálu. Možná se nejedná o chybu. (Tato hra není
+-si prečíst příslušnou stránku příručky. Možná se nejedná o chybu. (Tato hra není
 klon Civilization II!)\
 -se ujistit, že se nejedná o problém s instalací nebo s některým doplňkem hry vytvořeným
 …
 !!Rychlý start\
 Základní tipy pro zahájení hraní bez čtení manuálu:\\
+Základní tipy pro zahájení hraní bez čtení příručky:\\
 -Toto je tahová hra. Zatímco jeden národ vykonává činnosti v rámci svého tahu, všechny ostatní
 …
 je stavba městských projektů. Klikněte na obrázek projektu uprostřed okna
 a vyberte nový projekt, např. začněte vyrábět nové Osadníky pro založení nových měst.\
 -Na vašem managementu závisí, jak rychle města produkují, jak rychle rostou a kolik daní odvádějí
+-Na vaší správě závisí, jak rychle města produkují, jak rychle rostou a kolik daní odvádějí
 do vaší pokladnice, jak rychle probíhá vědecký výzkum.\
 -Kliknutím na položku se zmáčknutou klávesou Shift zobrazíte nápovědu o dané položce.\\
 …
 Na konci návrhu je síla útoku, síla obrany a transportní kapacita nové
 třídy jednotek vypočítána podle vzorce "základní hodnota × modifikátor". Pokud hrajete na nízké
+třídy jednotek vypočítána podle vzorce "základní hodnota × modifikátor". Pokud hrajete na nízké
 resp. vysoké úrovni obtížnosti, jsou náklady na výrobu jednotek sníženy resp.
 zvýšeny o 25%.
 …
 !Obchod\
 Tento zdroj (symbol: %t) zastupuje vše, co má hodnotu při obchodování.
 Obchod je
+Obchod je
 produkován pouze na čtvercích na městském území, ne na samotném čtverci
 s městem - ani v případě, že na tomto čtverci je umístěn zdroj se zlatem.
 …
 v dalším tahu.\\
 !Automatický management populace\
+!Automatická správa populace\
 Přidělování skupin městského obyvatelstva ke čtvercům na městském území a
 do civilní služby se děje automaticky a optimálně. Hráč potřebuje pouze nastavit
+do civilní služby se děje automaticky a optimálně. Hráč potřebuje pouze nastavit
 priority pomocí primárního přepínače (9). K dispozici je 5
 pozic:\
 …
 !Plná kontrola\
 Pokud z nějakých důvodů nechcete používat automatický management populace,
+Pokud z nějakých důvodů nechcete používat automatickou správu populace,
 můžete jej vypnout kliknutím na primární přepínač ve spodní části nebo
 kliknutím na území města. Tím je vám umožněno ručně vybrat čtverce, které se budou
 …
 krocích.\\
 Pokud je automatický management vypnutý, musíte se starat o vše
+Pokud je automatická správa vypnutá, musíte se starat o vše
 sami: zásobu jídla, podporu jednotek, civilní nepokoje. Můžete narazit na
 problémy, které jste předtím neměli.\\
 …
 podporu, dokud není ve městě nastolen pořádek.\\
 Automatický management populace obvykle zabraňuje civilním nepořádkům. Nedokáže
+Automatická správa populace obvykle zabraňuje civilním nepořádkům. Nedokáže
 ale zvládnout situaci, kdy je ve městě už příliš mnoho nespokojenosti. Pokud
 zaznamenáte nepokoje v automaticky spravovaném městě, zmenšete nespokojenost přesunem jednotek
 způsobujících nepokoje do oblasti, kde tento jev zmizí, nebo tyto jednotky rozpusťte.\\
 Pokud vypnete automatický management, je pouze na vás, jak udržíte dostatečnou míru spokojenosti
+Pokud vypnete automatickou správu, je pouze na vás, jak udržíte dostatečnou míru spokojenosti
 ve městě. Nejčastější reakcí na potlačení nepokojů je
 posílení policejních sil.
 …
 Korupce ve městě je vypočítávána podle tohoto vzorce:\
 @CORRUPTION\
+@Corruption\
 -T - obchod produkovaný městem\
 -C - korupční faktor daný formou vlády\
 …
 !Vzorce pro optimalizaci správy města\
 Pět primárních nastavení automatického managementu populace
+Pět základních nastavení automatické správy populace
 se z matematického hlediska odlišuje pouze v hodnotě m, která je
 maximalizována. Výpočet hodnoty m bere v úvahu jídlo (f), produkci (p),
 …
 náhodná budova prodána.\\
 V obrazovce managementu města klikněte na tlačítko "Zobrazit vylepšení" a zobrazí se vám seznam vylepšení
+V obrazovce správy města klikněte na tlačítko "Zobrazit vylepšení" a zobrazí se vám seznam vylepšení
 vybudovaných ve městě. Přejete-li si prodat nebo přestavět některé z nich, klikněte na jeho
 obrázek. Zisk z prodeje stavby je totožný s produkčními náklady
 …
 Zpočátku je domovským městem jednotky to město, v němž byla vyrobena. Chcete-li
 změnit domovské město, přesuňte jednotku do daného města a zvolte příkaz
 "Podpora odtud". V obrazovce managementu města klikněte na tlačítko "Zobrazit podporu" a
+"Podpora odtud". V obrazovce správy města klikněte na tlačítko "Zobrazit podporu" a
 zobrazí se seznam jednotek podporovaných daným městem.\\
 …
 #MACRO
 $Makro management\
 !!Makro Management\
 Hraní této hry by měla být zábava, ne dřina. Makro management vám pomůže zbavit se
+$Makro správa\
+!!Makro správa\
+Hraní této hry by měla být zábava, ne dřina. Makro správa vám pomůže zbavit se
 opakujících se činností, takže se můžete koncentrovat na strategii. Makro
 management neumožňuje dělat zcela všechny věci, ale
+správa neumožňuje dělat zcela všechny věci, ale
 umožňuje hrát mnohem efektivněji. Není však doporučováno
 používat makro management dříve, než porozumíte základům toho, co
+používat makro správu dříve, než porozumíte základům toho, co
 chcete manažovat.\\

branches/highdpi/Localization/cs/Language.txt

-              r405
+              r465
 #UNITSPEED Rychlost
 #UNITSTRENGTH Síla
 #UNITTRANSPORT Transport
+#UNITTRANSPORT Doprava
 #UNITCOST Cena
 #UNITBUILT Vytvořeno
 …
 #RANMAP Náhodná mapa
 #TWOTERRAINS %s / %s
 #MPMAP Multi Player
+#MPMAP Více Hráčů
 #NOGAMES Žádné knihy
 #AIT_ROUND Kolo %d,
 …
 #TITLE_SPYMISSION Špionážní operace
 #TITLE_SUICIDE Sebevražedná mise
+#TITLE_MESSAGE Sdělení
 #FRMILREP Vojenské hlášení
 …
 #ZOC Tento typ jednotky se nemůže pohybovat v zónách pod cizí kontrolou.
 #FASTATTACK Chcete útočit se silou pouze %d%%?
 #NOTIMELOADGROUND Tento typ jednotky potřebuje %s MP bodů, aby mohl být naložen nebo vyložen z transportu.
+#NOTIMELOADGROUND Tento typ jednotky potřebuje %s MP bodů, aby mohl být naložen nebo vyložen z přepravy.
 #NOTIMELOADAIR Letadlo potřebuje 100 MP bodů, aby je bylo možné naložit nebo vyložit z nosiče.
 #NOTIMEBOMBARD Bombardování města vyžaduje 100 MP bodů.
 …
 #NOROAD Tato jednotka se může pohybovat jen po cestách nebo železnici.
 #NONAV Tato loď nemá schopnost navigace.
 #NOTRANSPORT tato loď nemá transportní schopnost.
+#NOTRANSPORT tato loď nemá přepravní schopnost.
 #FULLTRANSPORT Tento transport je plně naložen.
 #LOWFUEL Toto letadlo má nyní nedostatek paliva. Pokud se pohne dále, nebude se moci vrátit do města nebo vojenské základny. Pokračovat?
 …
 #MISSDEACT Hráč %d ukončen bez správné deaktivace.
 #CLIENTERROR Nemohu najít klienta %s.
 #LOADERROR Tato kniha obsahuje interní chybu a nelze pokračovat v jejím hraní.\\Pro posouzení chyby můžete zaslat soubor s knihou autorovi hry.\Chcete otevřít webovou stránku pro hlášení chyb?
+#LOADERROR Tato kniha obsahuje vnitřní chybu a nelze pokračovat v jejím hraní.\\Pro posouzení chyby můžete zaslat soubor s knihou autorovi hry.\Chcete otevřít webovou stránku pro hlášení chyb?
 #NOSTARTPOS Tato mapa nemá definovány žádné startovní pozice. Není možné ji hrát.
 #TOOFEWTRIBES Počet účastníků nemůže převýšit počet nasazených národů ve hře.
 …
 #FRBREAK Toto jednání je ztrátou času. Přijděte jindy, až přehodnotíte svůj postoj.
 #FROFFER Nabízíme\-%s\výměnou za\-%s
 #FRPRESENT Nabízíme vám tento dárek:\-%s
+#FRPRESENT Nabízíme vám tento dar:\-%s
 #FRDEMAND_STRONG Dejte nám\-%s\nebo ponesete následky!
 #FRDONE Chcete mluvit o něčem dalším?
 …
 #FRACCEPTDEMAND_STRONG Pro zachování našich dobrých vztahů jsme se rozhodli vyhovět vašim přáním.
 #FRNOTACCEPTOFFER Tato nabídka nám nepřipadá výhodná.
 #FRNOTACCEPTPRESENT #F nepotřebují takovéto dárky.
+#FRNOTACCEPTPRESENT #F nepotřebují takovéto dary.
 #FRNOTACCEPTDEMAND_STRONG Požadujete příliš mnoho.
 #FRDELCHOICE Zajímá nás\-%s\Co můžeme na oplátku nabídnout?
 …
 Pouze terén
 Divy světa
+Manuál
+Příručka
 Test
 Vojenské hlášení
 …
 Vylepšení terénu
 Kolonizační lodě
 Makro management
+Makro správa
 Postavit zavlažování
 Postavit farmu
 …
 Vytvořit jednotku
 Mřížka
 AI Debug Mapa
+AI Ladící Mapa
 Třídy cizích jednotek
 Politická mapa
 …
 Zapnutý (Výchozí implementace)
 Zapnutý (Alternativní implementace)
+Scrolling
+Rolování
 Pomalý
 Rychlý

branches/highdpi/Localization/cs/Language2.txt

-              r349
+              r465
 #MENU_DEBUGMAPOFF Vypnuto
 #MENU_TELLAI Jaká AI?
 #BTN_MENU Hlavní menu
 #BTN_MANAGE Management říše
+#BTN_MENU Hlavní nabídka
+#BTN_MANAGE Správa říše
 'Tooltips
 …
 #ACTIONHEADER_CONFIG Konfigurátor
 #ACTION_CONFIG Změna jazyka, přidání map a AI
 #ACTIONHEADER_MANUAL Manuál
+#ACTIONHEADER_MANUAL Příručka
 #ACTION_MANUAL Popis pravidel a uživatelského rozhraní
 #ACTIONHEADER_CREDITS Autoři

branches/highdpi/Localization/cs/readme!!!.txt

-              r64
+              r465
 . Obsah tohoto balíku
 ----------------------
 Všechny texty jsou přeloženy do češtiny. Včetně dvou obrázků v manuálu.
+Všechny texty jsou přeloženy do češtiny. Včetně dvou obrázků v příručce.
 Dále byla přeložena jména a jednotky národů, které jsou standardně dodávány se hrou.
 Jako bonus byl přidán nový národ Čechů (o něm více na konci tohoto souboru).
 …
 . Autoři
 ---------
 Autor lokalizace textů a manuálu:
+Autor lokalizace textů a příručky:
  "tyllanthor" <tyl.lanthor@gmail.com> (dříve používající přezdívku "LFK")

branches/highdpi/Localization/de/Help/Help.txt

-              r464
+              r465
 Ein Vertrag kann nur während einer diplomatischen Verhandlung aufgelöst werden, es sei denn, die Nation weist die Verhandlung zurück. Mögliche Verträge sind:\
 -Friedensvertrag:
+-Friedensvertrag:
 Die Einheiten beider Nationen dürfen sich nicht angreifen oder sich in das Gebiet des Vertragspartners begeben.\
 -Freundschaftsvertrag:
+-Freundschaftsvertrag:
 Zusätzlich zum Friedensvertrag tauschen beide Nationen jede Runde Zivilberichte aus.\
 -Bündnisvertrag:
+-Bündnisvertrag:
 Wenn zwei Nationen sich verbünden, dürfen sie gegenseitig ihr Gebiet betreten und Kontrollzonen üben keine Wirkung aus. Alliierte teilen alle Informationen (Zivilberichte, Militärberichte, Weltkarten) und kennen die Bewegungen der alliierten Einheiten.\\
 …
 -5: Zusammenfassung der neuen Einheitenklasse\\
 Die Eigenschaften einer Einheit hängen von zwei Dingen ab: Erstens davon, welche Fortschritte Du bislang erforscht hast. Manche Fortschritte verbessern eine oder mehrere Waffengattungen durch die Erhöhung des entsprechenden Kampfwertfaktors - und natürlich gibt es auch einen Kostenfaktor.
+Die Eigenschaften einer Einheit hängen von zwei Dingen ab: Erstens davon, welche Fortschritte Du bislang erforscht hast. Manche Fortschritte verbessern eine oder mehrere Waffengattungen durch die Erhöhung des entsprechenden Kampfwertfaktors - und natürlich gibt es auch einen Kostenfaktor.
 Ebenso gibt es Transportfaktoren, die die Ladekapazität von Einheiten verändern.\\
 …
 Die genaue Formel für die Berechnung der Korruption in einer Stadt sieht folgendermaßen aus:\
 @CORRUPTION\
+@Corruption\
 -T - Handelseinkommen der Stadt\
 -C - Korruptionsfaktor der Regierungsform\
 …
 -beschleunigte Produktion: m = sqrt(f) * (8p + 2t + r)\
 -beschleunigte Forschung: m = sqrt(f) * (r + t + p)\
 …
 !!Unterhalt von Einheiten\
 In der Regel muss jede Einheit von ihrer Heimatstadt pro Runde mit 1 %p unterstützt werden. Die Heimatstadt ist zunächst die Stadt, in der die Einheit gebildet wurde. Wenn Du den Heimatstandort ändern möchtest, kannst Du die Einheit in die gewünschte Stadt ziehen
+In der Regel muss jede Einheit von ihrer Heimatstadt pro Runde mit 1 %p unterstützt werden. Die Heimatstadt ist zunächst die Stadt, in der die Einheit gebildet wurde. Wenn Du den Heimatstandort ändern möchtest, kannst Du die Einheit in die gewünschte Stadt ziehen
 und den Befehl 'Hier unterstützen' (H) aus dem Kommandomenü wählen. Klicke auf den Schaltfläche 'Einheiten' um die Einheiten zu sehen, die von einer Stadt unterstützt werden.\\
 …
 !!Das Startfenster\
 Das Startfenster hat drei Register, zwischen denen Du mit einem Klick auf die oberen Laschen hin- und herschalten kannst. Um
+Das Startfenster hat drei Register, zwischen denen Du mit einem Klick auf die oberen Laschen hin- und herschalten kannst. Um
 ein neues Spiel zu beginnen, gehe in's Register 'Neues Buch'. Wähle die Anzahl Gegner und deren Schwierigkeitsgrad. Falls alternative KIs installiert sind, können diese gegen die Standard-KI getauscht werden. Klicke dann auf die Schaltfläche 'Start' .\\
 !Auswahl der Spieler\
 Verwende das Feld 'Gegner' mit den neun Fenstern, um die Art und Anzahl der gegnerischen Spieler genauer festzulegen. Nur dieser Modus erlaubt Multiplayer Spiele, gegen verschiedene KIs zu spielen oder KI-Games als Supervisor oder KI-Tunier zu starten.
 Klicke auf die Boxen und wähle jeweils einen menschlichen oder einen KI-Gegner aus der Liste.
+Klicke auf die Boxen und wähle jeweils einen menschlichen oder einen KI-Gegner aus der Liste.
 Die drei linken Boxen haben zusätzlich noch eine Schaltfläche die eine "3" enthält.
 Hier kann die Auswahl für jeweils 2 oder 3 zusätzlich Gegenspieler getroffen werden,
+Hier kann die Auswahl für jeweils 2 oder 3 zusätzlich Gegenspieler getroffen werden,
 die die gleiche Konfiguration erhalten. Damit können insgesamt bis zu 14 Nationen am Spiel teilnehmen.\\
 Jedem Gegner wird ein eigener Schwierigkeitsgrad zugewiesen, den Du mit den +/- Tasten links der Fenster
+Jedem Gegner wird ein eigener Schwierigkeitsgrad zugewiesen, den Du mit den +/- Tasten links der Fenster
 auswählen kannst. Ein Strich steht für den einfachen Level, drei Striche für den schwierigen.\
 Wenn Du zum Beispiel gegen die KI spielst und es so schwer wie möglich haben möchtest,
+Wenn Du zum Beispiel gegen die KI spielst und es so schwer wie möglich haben möchtest,
 setze Deinen eigenen Schwierigkeitsgrad (Lokaler Spieler) auf das Maximum und den der KI-Gegner auf das Minimum.\\
 Ein höherer Schwierigkeitsgrad bedeutet langsamere Entwicklung der Bevölkerung,
+Ein höherer Schwierigkeitsgrad bedeutet langsamere Entwicklung der Bevölkerung,
 langsamere Produktion und langsamerer Fortschritt bis die Produktions- und Fortschrittskosten und natürlich auch die Grösse des Nahrungsmittelspeichers angewachsen sind.\\
 …
 Alle gespeicherten Spiele erscheinen in der 'Bibliothek'. Wähle eines davon aus und klicke auf 'Öffnen' um weiterzuspielen.
 Ein Buch enthält alle Runden eines Spiels. Möchtest Du das Spiel zu einem früheren Zeitpunkt fortführen
 als in der zuletzt gespeicherten Runde, benutze die Jahreszahl rechts
+Ein Buch enthält alle Runden eines Spiels. Möchtest Du das Spiel zu einem früheren Zeitpunkt fortführen
+als in der zuletzt gespeicherten Runde, benutze die Jahreszahl rechts
 um den gewünschten Zeitpunkt einzustellen, bevor Du das Spiel öffnest.\\
 !Weltkarten\
 Standardmäßig spielst Du auf zufälligen Weltkarten, die automatisch am Anfang eines neuen Spiels
 generiert werden. Im 'Karten'-Register können zwei
+Standardmäßig spielst Du auf zufälligen Weltkarten, die automatisch am Anfang eines neuen Spiels
+generiert werden. Im 'Karten'-Register können zwei
 Parameter eingestellt werden: Größe und Prozentanteil der Landmasse.\\
 Alternativ ist es möglich auf einer editierten Karte zu spielen, die für C-evo
 entworfen wurde, z.B. eine Karte der Erde. Das Grundpaket enthält keine solcher Karten,
 jedoch können verschiedene solcher Karten von der Projekt-homepage heruntergeladen werden.
 Verschiebe die Kartendateien in den 'Maps'-Ordner. Du benötigst die Karte nur zum Starten des Spiels.
+Alternativ ist es möglich auf einer editierten Karte zu spielen, die für C-evo
+entworfen wurde, z.B. eine Karte der Erde. Das Grundpaket enthält keine solcher Karten,
+jedoch können verschiedene solcher Karten von der Projekt-homepage heruntergeladen werden.
+Verschiebe die Kartendateien in den 'Maps'-Ordner. Du benötigst die Karte nur zum Starten des Spiels.
 Die Karte ist nicht erforderlich um das Spiel später wieder öffnen zu können, da sie im Buch mit abgespeichert wird.\\
 …
 !!Der Kartograf\
 Es gibt einen einfachen Karteneditor für Karten in diesem Spiel. Um ihn zu starten,
 klicke auf 'Karten' im Startfenster. Wähle die gewünschte Karte aus und klicke dann auf
 die Schaltfläche 'Kartograf'. Möchtest Du eine neue Karte erstellen,
+Es gibt einen einfachen Karteneditor für Karten in diesem Spiel. Um ihn zu starten,
+klicke auf 'Karten' im Startfenster. Wähle die gewünschte Karte aus und klicke dann auf
+die Schaltfläche 'Kartograf'. Möchtest Du eine neue Karte erstellen,
 wähle 'Zufallskarte', stelle Größe und Landmasse ein und starte dann den Kartografen.\\
 Die Bedienung des Editors ist sehr einfach. Wähle eine Landschaft oder ein Objekt
 aus der Liste unten am Bildschirm und zeichne sie mittels der Maus in die
 Karte. Die Grenzen zwischen Ozean und Küste und die Verteilung von Ressourcen werden
 automatisch festgelegt. Vergiss nicht zumindest
 eine Lagerstelle jeder besonderen Ressource festzulegen,
+Die Bedienung des Editors ist sehr einfach. Wähle eine Landschaft oder ein Objekt
+aus der Liste unten am Bildschirm und zeichne sie mittels der Maus in die
+Karte. Die Grenzen zwischen Ozean und Küste und die Verteilung von Ressourcen werden
+automatisch festgelegt. Vergiss nicht zumindest
+eine Lagerstelle jeder besonderen Ressource festzulegen,
 da sonst das Raumschiff nicht gebaut werden kann.\\
 Es ist wichtig die Startpunkte der Nationen zu markieren. Eine Karte kann nicht
 von mehr Nationen bespielt werden als es Startpositionen gibt. Sind keine Startpositionen vorhanden,
 ist die Karte leider nicht spielbar.
+Es ist wichtig die Startpunkte der Nationen zu markieren. Eine Karte kann nicht
+von mehr Nationen bespielt werden als es Startpositionen gibt. Sind keine Startpositionen vorhanden,
+ist die Karte leider nicht spielbar.
 Möchtest Du eine besondere Startposition für den oder die menschlichen Spieler, markiere sie durch eine 'Bevorzugte Startposition'.\\
 Karten werden im Startfenster nicht angezeigt. Stattdessen kann ein
 Symbol eingefügt werden. Dieses muss eine *.bmp-Datei sein und denselben Namen wie die
+Karten werden im Startfenster nicht angezeigt. Stattdessen kann ein
+Symbol eingefügt werden. Dieses muss eine *.bmp-Datei sein und denselben Namen wie die
 Karte besitzen. Speichere die Datei im 'Maps'-Ordner. Die maximale Grösse des Symbols beträgt 192 x 96 pixel.
 …
 !!KI-Wettkampf\
 Hast Du mehrere verschiedene KI-Module installiert, kannst Du sie in einem Wettkampf
+Hast Du mehrere verschiedene KI-Module installiert, kannst Du sie in einem Wettkampf
 gegeneinander antreten lassen. Wähle hierfür
 KI-Wettkampf' im zentralen Feld der neun Gegner und klicke
+KI-Wettkampf' im zentralen Feld der neun Gegner und klicke
 auf 'Start'. Das Spiel selbst wird auf ein kleines Dialogfenster reduziert.
 Mit dem Klicken auf die Schaltfläche Abspielen' beginnt C-evo eine endlose Reihe an Spielen
 rundenweise ablaufen zu lassen. Das Ergebnis besteht aus einer einfachen Statistik, die nach jeder
+Mit dem Klicken auf die Schaltfläche Abspielen' beginnt C-evo eine endlose Reihe an Spielen
+rundenweise ablaufen zu lassen. Das Ergebnis besteht aus einer einfachen Statistik, die nach jeder
 Runde aktualisiert wird.\\
 @AITShot\
 -1: Anzahl der Runden, die diese KI gewonnen hat, was bedeutet, dass sie entweder
+-1: Anzahl der Runden, die diese KI gewonnen hat, was bedeutet, dass sie entweder
 als erste das Raumschiff fertiggestellt oder alle anderen Nationen beseitigt hat.\
 -2: Anzahl der Runden, in denen diese Nation zerstört wurde.
 …
 !!Militärische Forschung\
 Eine Nation muss militärische Forschung betreiben, um neue Einheitenklassen in Dienst stellen
+Eine Nation muss militärische Forschung betreiben, um neue Einheitenklassen in Dienst stellen
 zu können.\
 :CLASSES Einheitenklassen\\
 …
 Verhindert, dass die Weltwunder dieser Nation ihre Wirkung verlieren. Veraltete Weltwunder werden wieder aktiv.
 Zählt als Wasserkraftwerk in allen Städten.\(Kann nur in Städten an einem Fluss oder einem Gebirge gebaut werden).
 Bewegung auf Schienen kostet innerhalb des eigenen Territoriums keine Aktionspunkte mehr.
+Bewegung auf Schienen kostet innerhalb des eigenen Territoriums keine Aktionspunkte mehr.
 Löst den kalten Krieg aus. In dieser Zeit können keine diplomatischen Verhandlungen geführt werden.\Der kalte Krieg dauert 40 Runden.
 Die gesamte Welt wird für eine Runde sichtbar. Zivil- und Militärberichte von allen Nationen werden verfügbar.\\Um dieses Weltwunder zu errichten benötigt die Nation einen\::B66 Weltraumbahnhof

branches/highdpi/Localization/de/Language.txt

r405	r465
144	144	#TITLE_SPYMISSION Verdeckte Operation
145	145	#TITLE_SUICIDE Himmelfahrtskommando
	146	#TITLE_MESSAGE Message
146	147
147	148	'Message Text

branches/highdpi/Localization/it/Help/Help.txt

-              r464
+              r465
 !Il progetto\
 C-evo è un gioco non commerciale, basato sul famoso "Sid Meier's Civilization" della
 Microprose. L'ambizione del progetto non è competere con i giochi commerciali per la
 presentazione più entusiasmante. Inoltre, non punta a divertire introducendo un sacco
 di nuovi, realistici elementi a ogni versione. Invece l'obiettivo è di creare un gioco
 di pura strategia, che diverta per una cosa soprattutto: la sfida. Quindi l'interesse
+C-evo è un gioco non commerciale, basato sul famoso "Sid Meier's Civilization" della
+Microprose. L'ambizione del progetto non è competere con i giochi commerciali per la
+presentazione più entusiasmante. Inoltre, non punta a divertire introducendo un sacco
+di nuovi, realistici elementi a ogni versione. Invece l'obiettivo è di creare un gioco
+di pura strategia, che diverta per una cosa soprattutto: la sfida. Quindi l'interesse
 centrale è la definizione delle regole e delle IA. Per maggiori informazioni, visita:\
 ::E2 c-evo.org\\
 !Licenza d'uso\
 C-evo è frutto del lavoro di numerosi autori. Hai il permesso di usare il gioco e
 distribuirlo gratuitamente anche senza autorizzazione esplicita. Il gioco stesso e
 tutte le sue parti, eccetto la grafica e i suoni, sono di pubblico dominio. Ovvero puoi farne
 quello che ti pare. Questo vale anche per il codice binario e i sorgenti, che sono
 disponibili nel sito del progetto. Per quanto riguarda grafica e suoni, dovresti chiedere
+C-evo è frutto del lavoro di numerosi autori. Hai il permesso di usare il gioco e
+distribuirlo gratuitamente anche senza autorizzazione esplicita. Il gioco stesso e
+tutte le sue parti, eccetto la grafica e i suoni, sono di pubblico dominio. Ovvero puoi farne
+quello che ti pare. Questo vale anche per il codice binario e i sorgenti, che sono
+disponibili nel sito del progetto. Per quanto riguarda grafica e suoni, dovresti chiedere
 ai rispettivi autori prima di usarli per un qualunque scopo che non sia giocare.\
 ::C Ringraziamenti\\
 !Programmazione I.A.\
 Il gioco ha un'interfaccia aperta per l'intelligenza artificiale, cioè è possibile rimpiazzare
 l'I.A. ufficiale con altri algoritmi, per tutte o solo per alcune nazioni.
+Il gioco ha un'interfaccia aperta per l'intelligenza artificiale, cioè è possibile rimpiazzare
+l'I.A. ufficiale con altri algoritmi, per tutte o solo per alcune nazioni.
 E' possibile giocare con fino a 8 I.A. diverse nella stessa partita.
 Se sei un vero nerd e vuoi programmare un'I.A., il modo più semplice è usare il modello in C#
 …
 Quando il gioco inizia, ti verrà chiesto il primo progresso da ricercare. Per avere aiuto su un certo progresso della lista cliccalo tenendo premuto Shift.
 La velocità di scoperta dipende dal numero di punti ricerca (%r) che la tua nazione produce. Quando avrai raccolto abbastanza %r scoprirai il progresso e potrai scegliere la ricerca successiva.
+La velocità di scoperta dipende dal numero di punti ricerca (%r) che la tua nazione produce. Quando avrai raccolto abbastanza %r scoprirai il progresso e potrai scegliere la ricerca successiva.
 C'è sempre una sola ricerca alla volta, e non è possibile cambiare l'oggetto della ricerca una volta scelto.
 Il costo di un progresso aumenta col numero di scoperte che la tua nazione ha già fatto.\\
 …
 !!Combattimento\
 Puoi attaccare le unità nemiche nelle caselle adiacenti usando la tastiera o il mouse,
+Puoi attaccare le unità nemiche nelle caselle adiacenti usando la tastiera o il mouse,
 esattamente come per entrare nelle caselle. Ma non tutti gli attacchi sono permessi.
 Normalmente, le unità di terra non possono attaccare le navi e viceversa. Le navi non
 possono attaccare direttamente da una città o da un canale.
 Gli aerei possono essere attaccati solo da altri aerei, eccetto quando si trovano in una
 città o base militare. L'unità più debole è sempre distrutta in battaglia, la più forte
+Gli aerei possono essere attaccati solo da altri aerei, eccetto quando si trovano in una
+città o base militare. L'unità più debole è sempre distrutta in battaglia, la più forte
 rimane danneggiata: maggiore è la superiorità, minore è il danno. Puoi avere una previsione esatta del risultato di un attacco tenendo premuto il tasto shift e cliccando col destro sul bersaglio.\\
 …
 -Stendere rapporto militare.\\
 Un trattato di pace tra due nazioni impedisce azioni di spionaggio reciproco. Comunque, gli agenti segreti possono infiltrarsi in ogni territorio, ignorando i trattati.
+Un trattato di pace tra due nazioni impedisce azioni di spionaggio reciproco. Comunque, gli agenti segreti possono infiltrarsi in ogni territorio, ignorando i trattati.
 #CLASSES
 …
 !Cibo\
 Il cibo (%f) rappresenta ogni tipo di alimenti. Lo stato di questa risorsa è mostrato nel pannello del cibo (4). E' necessario per mantenere la popolazione, poiché ogni gruppo di cittadini consuma 2%f ogni turno. Anche alcune unità come i coloni consumano cibo nella città di appartenenza. Il cibo che manca viene tolto dalle riserve della città. Se le riserve si esauriscono, la città è colpita dalla carestia: un cittadino o un'unità che consuma cibo muore. Ma di solito le città producono più cibo del necessario: quello che avanza viene immagazzinato nelle riserve.
+Il cibo (%f) rappresenta ogni tipo di alimenti. Lo stato di questa risorsa è mostrato nel pannello del cibo (4). E' necessario per mantenere la popolazione, poiché ogni gruppo di cittadini consuma 2%f ogni turno. Anche alcune unità come i coloni consumano cibo nella città di appartenenza. Il cibo che manca viene tolto dalle riserve della città. Se le riserve si esauriscono, la città è colpita dalla carestia: un cittadino o un'unità che consuma cibo muore. Ma di solito le città producono più cibo del necessario: quello che avanza viene immagazzinato nelle riserve.
 Fanno eccezione le grandi città (dimensione 8 o più) quando hanno 1 solo cibo di avanzo: lo convertono in denaro. Quando le riserve sono piene e la dimensione non ha ancora raggiunto il massimo, la città cresce, ovvero aumenta di 1 gruppo di cittadini.\\
 …
 !Commercio\
 Il commercio (simbolo: %t) rappresenta ciò che ha un valore mercantile.
+Il commercio (simbolo: %t) rappresenta ciò che ha un valore mercantile.
 Solo le caselle intorno alla città producono commercio, non la casella in cui la città stessa è situata, nemmeno se contiene oro. Lo stato del commercio è mostrato nel relativo pannello (8).
 Parte del rendimento del commercio si perde per via della corruzione, che dipende dal tipo di governo e in generale aumenta con la distanda della città dalla capitale. Il resto dei %t viene prima tassato secondo l'attuale rateo di tasse, impostato in "Economia e tasse". Il rimanente viene diviso tra ricerca e ricchezza, come impostato sempre in "Economia e tasse".
 …
 L'ammontare esatto della corruzione si calcola con questa formula:\
 @CORRUPTION\
+@Corruption\
 -T - Commercio prodotto dalla città\
 -C - Fattore di corruzione dipendente dal governo\
 …
 I tre riquadri di sinistra hanno ciascuno una ulteriore casellina etichettata "3", che serve per definire 3 nazioni con un solo riquadro, quindi in totale puoi avere fino a 14 avversari.\\
 Ogni partecipante ha il suo livello di difficoltà personale, impostabile sulla sinistra
 del riquadro. Una linea è il livello più facile, 3 il più difficile. Se ad esempio vuoi
 che il gioco sia il più duro possibile per te, imposta la tua difficoltà a 3 e quella degli
+Ogni partecipante ha il suo livello di difficoltà personale, impostabile sulla sinistra
+del riquadro. Una linea è il livello più facile, 3 il più difficile. Se ad esempio vuoi
+che il gioco sia il più duro possibile per te, imposta la tua difficoltà a 3 e quella degli
 avversari a 1.\\
 …
 Raddoppia l'effetto di fabbrica e stabilimento.\(ogni città può sfruttare un solo tipo di centrale)\Non aumenta l'inquinamento.
 +1%p nelle caselle di mare.\\Questo edificio si può costruire solo in città costiere.
 Permette di produrre fino a 3%t per casella.
+Permette di produrre fino a 3%t per casella.
 Aumenta la grandezza massima della città a 30.
 Permette di sfruttare le fattorie.
 …
 +12%f nella città.
 Raddoppia l'effetto di tutte le banche.
 Rendimento delle risorse speciali +100%.\Rende possibile la costruzione dell'astronave. La perdita della base aerospaziale causa la perdita dell'astronave. Quando una nazione che possiede già una base aerospaziale conquista quella di un'altra, si impadronisce anche della sua astronave.
+Rendimento delle risorse speciali +100%.\Rende possibile la costruzione dell'astronave. La perdita della base aerospaziale causa la perdita dell'astronave. Quando una nazione che possiede già una base aerospaziale conquista quella di un'altra, si impadronisce anche della sua astronave.
+*
+*

branches/highdpi/Localization/it/Language.txt

r405	r465
140	140	#TITLE_SPYMISSION Servizi segreti
141	141	#TITLE_SUICIDE Missione suicida
	142	#TITLE_MESSAGE Message
142	143	#FRMILREP Rapporto militare
143	144

branches/highdpi/Localization/ru/Help/Help.txt

-              r464
+              r465
 #TERIMPCITY Квадрат с городом автоматически имеет следующие улучшения местности:\-Дорога\-Железная дорога (после открытия знания Жедезная дорога)\-Канал\-Орошение\-Ферма.
 #HOSTILE Это враждебная территория. Юниты, проходящие эту местность получают повреждения, пропорциональные очкам MP. Полный ход по территории дает %d%% повреждений.
 Враждебность территории может быть нейтрализована рекой, оазисом, каналом, или военной базой.
+Враждебность территории может быть нейтрализована рекой, оазисом, каналом, или военной базой.
 #DEADLANDS Мертвые земли не могут быть улучшены.
 #RARE На произвольной карте всегда имеется 12 мертвых земель. Половина из них содержат специальные ресурсы, по два ресурса каждого типа.
 …
 Точное вычисление уровня Коррупции в городе производится по такой формуле:\
 @CORRUPTION\
+@Corruption\
 -T - Торговля, производимая городом\
 -C - Показатель коррупции текущей формы правления\
 …
 Также можно выбрать для игры специальную карту, созданную кем-то для C-evo,
 например настоящую карту Земли. Стандартная установка не содержит дополнительных
 карт, но их можно скачать на домашней странице игры.
 Все карты должны быть расположены в папке "Maps".
+карт, но их можно скачать на домашней странице игры.
+Все карты должны быть расположены в папке "Maps".
 Карта нужна только чтобы начать игру, а затем
 сохраняется вместе с ней.
 …
 !!Редактор карт\
 Вместе с игрой есть простой редактор для карт. Карту для редактирования
+Вместе с игрой есть простой редактор для карт. Карту для редактирования
 можно выбрать на закладке "Карты" и нажать кнопку "Редактировать". Или
 можно создать случайную карту, указав её размер и процент суши, и затем
 …
 и "обычный участок/особые ресурсы" происходит автоматически, Вы не можете
 на это повлиять. Не забудьте добавить хотябы по одному участку с редкими
 видами ресурсов, иначе игроки не смогут построить космический
+видами ресурсов, иначе игроки не смогут построить космический
 корабль.\\
 …
 соперника "Компьютер против компьютера" и нажать "Начало". Игра превратится
 в простой диалог, C-evo начнёт бесконечную серию игр (раундов). И в результате
 после каждого раунда будет выдаваться
+после каждого раунда будет выдаваться
 статистика:\\
 …
 Влияние Фабрики и Завода на рост производства увеличивается в два раза.\(Строить более одного Завода в городе бесполезно.)\Не увеличивает загрязнение.
 +1%p на прибрежных участках.\\Может быть построена только в городах, имеющих выход к морю.
 Позволяет собирать до 3%t с участка.
+Позволяет собирать до 3%t с участка.
 Размер города может расти больше 12.
 Появляется возможность использовать Фермы.

branches/highdpi/Localization/ru/Language.txt

r405	r465
143	143	#TITLE_SPYMISSION Шпионская операция
144	144	#TITLE_SUICIDE Миссия самоубийства
	145	#TITLE_MESSAGE Message
145	146	#FRMILREP Военное сообщение
146	147

branches/highdpi/Localization/zh-Hans/Fonts.txt

-              r464
+              r465
 #NORMAL
 Î¢ÈíÑÅºÚ, 15
+微软雅黑, 15
 #SMALL
 Î¢ÈíÑÅºÚ, 13
+微软雅黑, 13
 #TINY
 Î¢ÈíÑÅºÚ, 11B
+微软雅黑, 11B
 #CAPTION
 Î¢ÈíÑÅºÚ, 17
+微软雅黑, 17
 #BUTTON
 Î¢ÈíÑÅºÚ, 17B
+微软雅黑, 17B

branches/highdpi/Localization/zh-Hans/Help/Help.txt

-              r464
+              r465
 #HELPTITLE_MAIN ÓÎÏ·Ö¸ÄÏ
 #HELPTITLE_QUICKSTART ¿ìËÙÉÏÊÖ
 #HELPTITLE_CONCEPTS ¸ÅÄî½âËµ
 #HELPTITLE_TECHLIST ¿Æ¼¼Ò»ÀÀ
 #HELPTITLE_IMPLIST ³ÇÊÐÉèÊ©
 #HELPTITLE_UNIQUELIST ¹ú¼Ò¹¤³Ì
 #HELPTITLE_WONDERLIST ÊÀ½çÆæ¼£
 #HELPTITLE_TERLIST µØÐÎÖÖÀà
 #HELPTITLE_JOBLIST µØÐÎ½¨Éè
 #HELPTITLE_MODELLIST ÌØÊâ²¿¶Ó
 #HELPTITLE_FEATURELIST ²¿¶ÓÊôÐÔ
 #HELPTITLE_FEATURE1LIST »ù±¾ÊôÐÔ
 #HELPTITLE_FEATURE2LIST ÌØÊâÊôÐÔ
 #HELPTITLE_FEATURE3LIST ¿Æ¼¼ÊôÐÔ
 #HELPTITLE_GOVLIST ÕþÌåÒ»ÀÀ
 #HELPTITLE_KEYS ¿ì½Ý²Ù×÷
 #HELPTITLE_ABOUT ¹ØÓÚÓÎÏ·
 #HELPTITLE_CREDITS ÖÆ×÷Ãûµ¥
 #HELPTITLE_SEARCHRESULTS ËÑË÷½á¹û
 #HELPSPEC_TER (µØÐÎÖÖÀà)
 #HELPSPEC_ADV (¿Æ¼¼³É¹û)
 #HELPSPEC_FUTURE (Î´À´¿Æ¼¼)
 #HELPSPEC_IMP (³ÇÊÐÉèÊ©)
 #HELPSPEC_NAT (¹ú¼Ò¹¤³Ì)
 #HELPSPEC_WONDER (ÊÀ½çÆæ¼£)
 #HELPSPEC_SHIPPART (·É´¬²¿¼þ)
 #HELPSPEC_CAP (²¿¶Ó»ù±¾ÊôÐÔ)
 #HELPSPEC_FEATURE (²¿¶ÓÌØÊâÊôÐÔ)
 #HELPSPEC_STANDARD (²¿¶Ó¿Æ¼¼ÊôÐÔ)
+#HELPTITLE_MAIN 游戏指南
+#HELPTITLE_QUICKSTART 快速上手
+#HELPTITLE_CONCEPTS 概念解说
+#HELPTITLE_TECHLIST 科技一览
+#HELPTITLE_IMPLIST 城市设施
+#HELPTITLE_UNIQUELIST 国家工程
+#HELPTITLE_WONDERLIST 世界奇迹
+#HELPTITLE_TERLIST 地形种类
+#HELPTITLE_JOBLIST 地形建设
+#HELPTITLE_MODELLIST 特殊部队
+#HELPTITLE_FEATURELIST 部队属性
+#HELPTITLE_FEATURE1LIST 基本属性
+#HELPTITLE_FEATURE2LIST 特殊属性
+#HELPTITLE_FEATURE3LIST 科技属性
+#HELPTITLE_GOVLIST 政体一览
+#HELPTITLE_KEYS 快捷操作
+#HELPTITLE_ABOUT 关于游戏
+#HELPTITLE_CREDITS 制作名单
+#HELPTITLE_SEARCHRESULTS 搜索结果
+#HELPSPEC_TER (地形种类)
+#HELPSPEC_ADV (科技成果)
+#HELPSPEC_FUTURE (未来科技)
+#HELPSPEC_IMP (城市设施)
+#HELPSPEC_NAT (国家工程)
+#HELPSPEC_WONDER (世界奇迹)
+#HELPSPEC_SHIPPART (飞船部件)
+#HELPSPEC_CAP (部队基本属性)
+#HELPSPEC_FEATURE (部队特殊属性)
+#HELPSPEC_STANDARD (部队科技属性)
 #TECHFORMULA %.6g*n*EXP(n/%.6g)
 #PREREQ ÏÈÆÚËùÐè¿Æ¼¼
 #PREREQALT ÏÈÆÚËùÐè¿Æ¼¼ (ÈýÏîÖÐÐè¾ß±¸Á½Ïî)
 #BASETECH (»®Ê±´ú¿Æ¼¼)
 #STRENGTHUP %s: Õ½¶·Á¦±¶ÔöÒò×Ó +%d
 #COSTUP (Ôì¼Û±¶ÔöÒò×Ó +%d)
 #COSTMIN (Ôì¼Û±¶ÔöÒò×Ó ÉÏÉýÖÁ %d)
 #TRANSUP %s: ÔËÊäÁ¦±¶ÔöÒò×Ó +%d
 #ADVEFFECT ¹¦Ð§
 #EFFECT Ð§¹û
 #COSTS Ôì¼Û
 #BUILDCOST Éú²úÔì¼Û: %d%%p
 #MAINTCOST Î¬»¤·ÑÓÃ: Ã¿»ØºÏ %d%%c
 #REPLACE ¸üÌæ
 #REPLACETEXT ´ËÉèÊ©½¨³Éºó, ÏÂÁÐÉèÊ©½«×Ô¶¯×÷·Ï, ±äÂôÕÛÏÖ:
 #EXPIRATION ¹ýÆÚ
 #EXPWITH %s·¢ÏÖÖ®ºó, ¸ÃÐ§¹û½«¹ýÆÚ.
 #EXPSLAVE ËùÓÐÅ«Á¥³ÉÎª×ÔÓÉÈË, ²¢Í£Ö¹¹¤×÷.
 #REQUIRED ËùÐè¿Æ¼¼: %s
 #RAREREQUIRED Éú²úÐèÒª %s
 #RESFOOD Á¸Ê³: %d%%f
 #RESPROD Éú²ú: %d%%p
 #RESTRADE Ã³Ò×: %d%%t
 #MOREIRR (¹à¸Èºó +%d%%f)
 #MOREMINE (²É¿óºó +%d%%p)
 #MOREROAD (ÐÞÂ·ºó +%d%%t)
 #SPECIAL ÌØÊâ×ÊÔ´
+#PREREQ 先期所需科技
+#PREREQALT 先期所需科技 (三项中需具备两项)
+#BASETECH (划时代科技)
+#STRENGTHUP %s: 战斗力倍增因子 +%d
+#COSTUP (造价倍增因子 +%d)
+#COSTMIN (造价倍增因子 上升至 %d)
+#TRANSUP %s: 运输力倍增因子 +%d
+#ADVEFFECT 功效
+#EFFECT 效果
+#COSTS 造价
+#BUILDCOST 生产造价: %d%%p
+#MAINTCOST 维护费用: 每回合 %d%%c
+#REPLACE 更替
+#REPLACETEXT 此设施建成后, 下列设施将自动作废, 变卖折现:
+#EXPIRATION 过期
+#EXPWITH %s发现之后, 该效果将过期.
+#EXPSLAVE 所有奴隶成为自由人, 并停止工作.
+#REQUIRED 所需科技: %s
+#RAREREQUIRED 生产需要 %s
+#RESFOOD 粮食: %d%%f
+#RESPROD 生产: %d%%p
+#RESTRADE 贸易: %d%%t
+#MOREIRR (灌溉后 +%d%%f)
+#MOREMINE (采矿后 +%d%%p)
+#MOREROAD (修路后 +%d%%t)
+#SPECIAL 特殊资源
 #SPECIALFOOD , +%d%%f
 #SPECIALPROD , +%d%%p
 #SPECIALTRADE , +%d%%t
 #TRAFO µØÐÎ¿É±ä¸üÎª %s
 #MOVEPLAIN ²¿¶ÓÒÆ¶¯ÀàÐÍ: Æ½Ì¹µØÐÎ
 #MOVEHEAVY ²¿¶ÓÒÆ¶¯ÀàÐÍ: Æéá«µØÐÎ
 #DEFBONUS ·ÀÓù¼Ó³É: %d%%
 #JOBCOST -½¨ÉèÔì¼Û: %s ÐÐ¶¯µã
 #JOBCOSTVAR -½¨ÉèÔì¼Û: ÇëÔÚÓÎÏ·ÖÐÑ¡Ôñ"ÏµÍ³²Ëµ¥" - "¿ìËÙºê²Ù×÷" -  "µØÐÎ¸ÄÔì"
 #TERIMPEXCLUDE ¹à¸È¡¢²É¿ó¡¢ÒªÈûºÍ¾üÊÂ»ùµØ²»¿É¹²´æÓÚÍ¬Ò»µØ¿é. ÀýÈç, ÈôÔÚÒÑ½¨ÓÐÒªÈûµÄµØ¿é½¨Éè¾üÊÂ»ùµØ, ÔòÒªÈû½«ÏûÊ§, ¾üÊÂ»ùµØÈ¡¶ø´úÖ®.
 #TERIMPCITY ³ÇÊÐËùÔÚµÄµØ¿é, Í¬Ê±°üº¬ÒÔÏÂÐ§¹û:\-µÀÂ·\-ÌúÂ· (ÌúÂ·¿Æ¼¼·¢ÏÖºó)\-ÔËºÓ\-¹à¸È\-Å©³¡.
 #HOSTILE ÔÚ¶ñÍÁÉÏÍ¨ÐÐ»ò×¤ÔúµÄ²¿¶Ó, Æä×´Ì¬»áÊÜµ½ËðÉË, ÊÜËð±ÈÀýÓëÏûºÄµÄÐÐ¶¯µã³ÉÕý±È, ×¤ÔúÒ»»ØºÏ, ½«ËðÊ§%d%%µÄ×´Ì¬. ºÓÁ÷¡¢ÂÌÖÞ¡¢ÔËºÓ»ò¾üÊÂ»ùµØ¿ÉµÖÏû¶ñÍÁµÄ¸ºÃæÓ°Ïì.
 #DEADLANDS ¶ñÍÁÎÞ·¨½øÐÐÈÎºÎ¸ÄÔì.
 #RARE Ã¿Ò»ÕÅËæ»úµØÍ¼ÉÏ, ¶¼ÓÐ12¿é¶ñÍÁ, ÆäÖÐÒ»°ëÔÌ²Ø×ÅÌØÊâ×ÊÔ´, Ã¿ÖÖÌØÊâ×ÊÔ´¸÷ÓÐÁ½´¦.
 #STRENGTH Õ½¶·: %d/%d
 #SPEED »ú¶¯: %s
 #MODELNOTE (ÔÚ²»Í¬¹ú¼ÒÖÐ, Í¬ÖÖ²¿¶ÓµÄÍâ¹ÛºÍÃû³Æ¿ÉÄÜÓÐËù²îÒì.)
 #COSTBASE Éú²úÔì¼Û»ùÖµ %s%%p
 #WEIGHT ±àÖÆ %s%%w
 #BUILDALLOW ÐÂÔöÉèÊ©
 #MODELALLOW ¿ÉÕ÷ÌØÊâ²¿¶Ó
 #FEATALLOW ÐÂÔöÌØÊâÊôÐÔ
 #FOLLOWADV ºóÐø¿Æ¼¼
 #GOVALLOW ³öÏÖÐÂÉúÕþÌå
 #UPGRADEALLOW ¾üÊÂÓ°Ïì
 #SEEALSO ÁíÇë²ÎÔÄ:
 #FUTURETECHHELP25´ú±íÁËÎ´À´µÄ¿Æ¼¼ÁìÓò. ÔÚ´ËÁìÓòÏÂ, Ã¿¸ö¹ú¼Ò×î¶à¿ÉÑÐ·¢25Ïî¿ÆÑÐ³É¹û.\\
 Ã¿ÏîÎ´À´¿Æ¼¼ÐèÒªÔÏÈ4±¶µÄÑÐ·¢×Ê½ð. ÓëÆäËû¿Æ¼¼³É¹û²»Í¬, Î´À´¿Æ¼¼²»¿ÉÓÃ×÷Íâ½»½»ÉæµÄíÀÂë, Ò²ÎÞ·¨´Ó´óÍ¼Êé¹ÝÖÐÖ±½Ó»ñÈ¡.
 #FUTURETECHHELP100 ´ú±íÁËÎ´À´µÄ¿Æ¼¼ÁìÓò. ÔÚ´ËÁìÓòÏÂ, Ã¿¸ö¹ú¼Ò×î¶à¿ÉÑÐ·¢100Ïî¿ÆÑÐ³É¹û.\\
 Ã¿ÏîÎ´À´¿Æ¼¼ÐèÒªÔÏÈ4±¶µÄÑÐ·¢×Ê½ð. ÓëÆäËû¿Æ¼¼³É¹û²»Í¬, Î´À´¿Æ¼¼²»¿ÉÓÃ×÷Íâ½»½»ÉæµÄíÀÂë, Ò²ÎÞ·¨´Ó´óÍ¼Êé¹ÝÖÐÖ±½Ó»ñÈ¡.
 #CRED_CAPSOUND ÉùÒô
 #CRED_CAPAI ÈË¹¤ÖÇÄÜÄ£¿é
 #CRED_CAPLANG ÖÐÎÄ»¯°æ±¾
 #AUTHOR @NAPTID\¼òÌåÖÐÎÄ°æÓÉ NapTID(ÎÞÃû) ·ÒëÖÆ×÷.
 #MATCHES ·ûºÏ "%s"µÄËÑË÷½á¹û:
 #NOMATCHES Î´·¢ÏÖ°üº¬ "%s" µÄÈÎºÎËÑË÷½á¹û.
+#TRAFO 地形可变更为 %s
+#MOVEPLAIN 部队移动类型: 平坦地形
+#MOVEHEAVY 部队移动类型: 崎岖地形
+#DEFBONUS 防御加成: %d%%
+#JOBCOST -建设造价: %s 行动点
+#JOBCOSTVAR -建设造价: 请在游戏中选择"系统菜单" - "快速宏操作" -  "地形改造"
+#TERIMPEXCLUDE 灌溉、采矿、要塞和军事基地不可共存于同一地块. 例如, 若在已建有要塞的地块建设军事基地, 则要塞将消失, 军事基地取而代之.
+#TERIMPCITY 城市所在的地块, 同时包含以下效果:\-道路\-铁路 (铁路科技发现后)\-运河\-灌溉\-农场.
+#HOSTILE 在恶土上通行或驻扎的部队, 其状态会受到损伤, 受损比例与消耗的行动点成正比, 驻扎一回合, 将损失%d%%的状态. 河流、绿洲、运河或军事基地可抵消恶土的负面影响.
+#DEADLANDS 恶土无法进行任何改造.
+#RARE 每一张随机地图上, 都有12块恶土, 其中一半蕴藏着特殊资源, 每种特殊资源各有两处.
+#STRENGTH 战斗: %d/%d
+#SPEED 机动: %s
+#MODELNOTE (在不同国家中, 同种部队的外观和名称可能有所差异.)
+#COSTBASE 生产造价基值 %s%%p
+#WEIGHT 编制 %s%%w
+#BUILDALLOW 新增设施
+#MODELALLOW 可征特殊部队
+#FEATALLOW 新增特殊属性
+#FOLLOWADV 后续科技
+#GOVALLOW 出现新生政体
+#UPGRADEALLOW 军事影响
+#SEEALSO 另请参阅:
+#FUTURETECHHELP25代表了未来的科技领域. 在此领域下, 每个国家最多可研发25项科研成果.\\
+每项未来科技需要原先4倍的研发资金. 与其他科技成果不同, 未来科技不可用作外交交涉的砝码, 也无法从大图书馆中直接获取.
+#FUTURETECHHELP100 代表了未来的科技领域. 在此领域下, 每个国家最多可研发100项科研成果.\\
+每项未来科技需要原先4倍的研发资金. 与其他科技成果不同, 未来科技不可用作外交交涉的砝码, 也无法从大图书馆中直接获取.
+#CRED_CAPSOUND 声音
+#CRED_CAPAI 人工智能模块
+#CRED_CAPLANG 中文化版本
+#AUTHOR @NAPTID\简体中文版由 NapTID(无名) 翻译制作.
+#MATCHES 符合 "%s"的搜索结果:
+#NOMATCHES 未发现包含 "%s" 的任何搜索结果.
 #CONCEPTS
 $¸ÅÄî½âËµ\
 ;INTRO ÓÎÏ·½éÉÜ\\
 !ÓÎÏ·½âËµ\
 ;BASICS ¸ÅÂÛ\
 ;SCIENCE ¿Æ¼¼\
 ;DIPLOMACY Íâ½»\
 ;SHIP »ñÊ¤\\
 !²¿¶Ó½âËµ\
 ;MOVEMENT ²¿¶ÓÒÆ¶¯\
 ;COMMANDS ²¿¶ÓÖ¸Áî\
 ;SETTLE ÒÆÃñ¹¤×÷\
 ;COMBAT Õ½¶·´óÈ«\
 ;SPYMISSIONS ÃØÃÜÐÐ¶¯\
 ;CLASSES ²¿¶ÓÑÐ·¢\\
 !³ÇÊÐ½âËµ\
 ;CITIES ³ÇÊÐ¹ÜÀí\
 ;PRODUCTION Éú²úÏê½â\
 ;BUILDINGS ½¨Öþ½éÉÜ\
 ;SUPPORT ²¿¶ÓÁ¥Êô\\
 !ÆäËû¸ÅÄî\
 ;MACRO ¿ìËÙºê²Ù×÷\
 ;MAPEDIT µØÍ¼±à¼Æ÷\
 ;AIT µçÄÔ¶Ô¾ö
+$概念解说\
+;INTRO 游戏介绍\\
+!游戏解说\
+;BASICS 概论\
+;SCIENCE 科技\
+;DIPLOMACY 外交\
+;SHIP 获胜\\
+!部队解说\
+;MOVEMENT 部队移动\
+;COMMANDS 部队指令\
+;SETTLE 移民工作\
+;COMBAT 战斗大全\
+;SPYMISSIONS 秘密行动\
+;CLASSES 部队研发\\
+!城市解说\
+;CITIES 城市管理\
+;PRODUCTION 生产详解\
+;BUILDINGS 建筑介绍\
+;SUPPORT 部队隶属\\
+!其他概念\
+;MACRO 快速宏操作\
+;MAPEDIT 地图编辑器\
+;AIT 电脑对决
 #ABOUT
 $¹ØÓÚÓÎÏ·\
+$关于游戏\
 &LOGO\\
 !ÆðÔ´¼°Ä¿±ê\
+!起源及目标\
 C-evo is a non-commerical game project based on the famous "Sid Meier's
 Civilization" by Microprose. The ambition of C-evo is not, to compete with
 …
 ::E2 c-evo.org\\
 !ËùÓÐÈ¨Ðí¿É\
+!所有权许可\
 C-evo is a compilation of work by a number of authors. You are allowed
 to play the game and to distribute it without explicit permission. The compilation
 …
 the graphics, you should ask the author of an item before using it for another
 purpose than to play.\
 ::C ²é¿´ÖÆ×÷ÈËÔ±Ãûµ¥\\
 !AIÄ£¿é\
+::C 查看制作人员名单\\
+!AI模块\
 The game has an open AI interface, which means the player can replace the standard AI
 contained in the package by other AI algorithms, either for all or for single
 …
 you installed the game. Maybe competition will lead us to the first real good AI
 in modern strategy gaming.\
 ::E1 AIÄ£¿é¿ª·¢Ö¸ÄÏ\\
 !ÏµÍ³ÔËÐÐÐèÇó\
 -Ò»¿é¿ÉÏÔÊ¾16Î»É«»òÒÔÉÏµÄÏÔ¿¨\
 -ÍÆ¼ö¿ªÆô×ÖÌåÆ½»¬¹¦ÄÜ\\
 !ÃüÁîÐÐÔËÐÐ²ÎÊý\
 -cevo.exe -man ... ²»ÔËÐÐÓÎÏ·, ½öÏÔÊ¾Ö¸ÄÏ\\
 !É¾³ýÓÎÏ·\
 ÇëÔËÐÐ¿ØÖÆÃæ°åÖÐµÄÉ¾³ý³ÌÐòÏòµ¼.\\
 !´íÎó±¨¸æ\
+::E1 AI模块开发指南\\
+!系统运行需求\
+-一块可显示16位色或以上的显卡\
+-推荐开启字体平滑功能\\
+!命令行运行参数\
+-cevo.exe -man ... 不运行游戏, 仅显示指南\\
+!删除游戏\
+请运行控制面板中的删除程序向导.\\
+!错误报告\
 To support the progress of this project, please tell me about problems you have
 …
 #CREDITS
 $ÖÆ×÷ÈËÔ±\
+$制作人员\
 @@18\\
 !Éè¼Æ\
+Ô´´ÒâÀ´×ÔSid Meier & Brian ReynoldsÖÆ×÷µÄ
  "Sid Meier's Civilization" ¼° "Civilization II".\
 ¸ù¾ÝÍæ¼ÒÍ¬ºÃµÄÒâ¼û½¨ÒéÐÞ¸Ä¶ø³É.\\
 !³ÌÐò\
 Ö÷³ÌÐò: Steffen Gerlach.\
 PNGÍ¼Æ¬Ö§³Ö: Edmund H. Hand\\
 !²âÊÔ\
 ÎÞÊý²»ÖªÃûµÄ²âÊÔÕß, ¸ÐÐ»ÄãÃÇÃ¿Ò»¸öÈË!\\
 !ÆäËû\
 Ä³Ð©ÎÆÀíÍ¼Æ¬À´×Ô "Mayang's Free Textures".\
 ³ÇÊÐÃûµ¥Ìá¹©: Charles Nadolski..\\
 !ÃÀ¹¤\
+¾ø´ó²¿·ÖÍ¼Æ¬ÊÇ´ÓÍøÉÏÁ÷´«µÄ¸÷ÖÖÎÄÃ÷II×ÊÔ´°üÄÚÌáÈ¡µÄ,
+ÆäÖÐÒ»Ð©×÷ÕßÒÑ²»¿É¿¼, »¹ÓÐÒ»Ð©ÎÞ·¨ÁªÂç. Èô·¢ÏÖÉÌÒµ
+°æÈ¨Í¼Æ¬, »òÊÇ²»Ô¸ÄúµÄÀÍ¶¯³É¹û±»Ãâ·Ñ×ªÓÃ, »òÊÇ×÷Îª
 Í¼Æ¬×÷ÕßµÄÄúÏëÔÚÖÆ×÷ÈËÔ±Ãûµ¥ÖÐÁôÏÂÐÕÃû, ÇëÁªÏµÎÒÃÇ.
+!设计\
+原创意来自Sid Meier & Brian Reynolds制作的
+ "Sid Meier's Civilization" 及 "Civilization II".\
+根据玩家同好的意见建议修改而成.\\
+!程序\
+主程序: Steffen Gerlach.\
+PNG图片支持: Edmund H. Hand\\
+!测试\
+无数不知名的测试者, 感谢你们每一个人!\\
+!其他\
+某些纹理图片来自 "Mayang's Free Textures".\
+城市名单提供: Charles Nadolski..\\
+!美工\
+绝大部分图片是从网上流传的各种文明II资源包内提取的,
+其中一些作者已不可考, 还有一些无法联络. 若发现商业
+版权图片, 或是不愿您的劳动成果被免费转用, 或是作为
+图片作者的您想在制作人员名单中留下姓名, 请联系我们.
 #QUICK
 $¿ìËÙÉÏÊÖ\
 !¿ìËÙÉÏÊÖ\
 ÒÔÏÂÊÇÓÎÏ·»ù±¾µÄÒªµã, ¹©ÐÂÊÖ¿ìËÙÈëÃÅ:\
 -ÕâÊÇÒ»¿î»ØºÏÖÆÓÎÏ·, ÓÎÏ·ºËÐÄÔ´×ÔÎÄÃ÷ÏµÁÐ.\
 -µ±ËùÓÐ²¿¶ÓÐÐ¶¯½áÊøºó, ÄúµÄ»ØºÏ×Ô¶¯½áÊø. Èç¹ûÓÎÏ·
 Í£Ö¹ÔËÐÐ, Ò²ÐíÊÇÏµÍ³ÔÚµÈÄúÊÖ¶¯½áÊø»ØºÏ.\
 -´ó¶àÊý¿Éµã»÷µÄÏîÄ¿¶¼ÒÔ°×É«Íâ¿ò±íÊ¾.\
 -ÔÚÍ¬Ò»µØ¿éÉÏ, Ò²Ðí×¤ÓÐ¶àÖ§²¿¶Ó, µ«Ö»ÓÐ×îÇ¿´óµÄ²¿¶Ó
 ²Å»áÏÔÊ¾ÔÚµØÍ¼ÉÏ.\
 -ÓÃÊó±ê×ó¼üµ¥»÷Ñ¡Ôñ²¿¶Ó, . Ñ¡ÖÐµÄ²¿¶ÓÍ¼±ê½«»áÉÁË¸,
 ÆÁÄ»ÏÂ·½´ø¸ÐÌ¾ºÅµÄ°´Å¥, ÊÇ¸Ã²¿¶ÓÏà¹ØµÄ²Ù×÷²Ëµ¥.\
 -ÒªÒÆ¶¯²¿¶Ó, ÇëÊ¹ÓÃ¼üÅÌ·½Ïò¼ü¡¢Êý×Ö¼ü»òÊó±êÓÒ¼ü.\
 -Êó±êµ¥»÷³ÇÊÐÍ¼±ê, ¿ÉÏÔÊ¾¸Ã³ÇÊÐµÄ²Ù×÷´°¿Ú, ÆäÖÐ×î
+ÖØÒªµÄÊÇÉú²ú°´Å¥, µ¥»÷´°¿ÚÖÐ²¿µÄÉú²ú°´Å¥, ¿ÉÑ¡Ôñ
 ÐÂµÄ½¨ÉèÄ¿±ê, ÀýÈçÑ¡ÔñÍØ»ÄÕß, È¥±ð´¦½¨Á¢ÐÂµÄ³ÇÊÐ.\
 -³ÇÊÐ½¨Éè¡¢Ôö³¤µÄËÙ¶È, ÒÔ¼°¿ÆÑÐË°ÊÕµÄ¶àÉÙ,
 È«¶¼È¡¾öÓÚÄãµÄÑ¡Ôñ.\
 -ÔÚ¶àÊýÇé¿öÏÂ, ÔÚÊó±êµã»÷Ä³ÏîÄ¿µÄÍ¬Ê±°´×¡Shift¼ü,
 ¿ÉÏÔÊ¾Ïà¹ØµÄ°ïÖúÐÅÏ¢.\\\
+$快速上手\
+!快速上手\
+以下是游戏基本的要点, 供新手快速入门:\
+-这是一款回合制游戏, 游戏核心源自文明系列.\
+-当所有部队行动结束后, 您的回合自动结束. 如果游戏
+停止运行, 也许是系统在等您手动结束回合.\
+-大多数可点击的项目都以白色外框表示.\
+-在同一地块上, 也许驻有多支部队, 但只有最强大的部队
+才会显示在地图上.\
+-用鼠标左键单击选择部队, . 选中的部队图标将会闪烁,
+屏幕下方带感叹号的按钮, 是该部队相关的操作菜单.\
+-要移动部队, 请使用键盘方向键、数字键或鼠标右键.\
+-鼠标单击城市图标, 可显示该城市的操作窗口, 其中最
+重要的是生产按钮, 单击窗口中部的生产按钮, 可选择
+新的建设目标, 例如选择拓荒者, 去别处建立新的城市.\
+-城市建设、增长的速度, 以及科研税收的多少,
+全都取决于你的选择.\
+-在多数情况下, 在鼠标点击某项目的同时按住Shift键,
+可显示相关的帮助信息.\\\
 @@22\\
 !ÖÂÎÄÃ÷ÏµÁÐµÄÀÏÍæ¼Ò\
 ¾ÍµØÐÎºÍ²¿¶ÓÍ¼Æ¬µÄÏàËÆ³Ì¶È¶øÑÔ, C-evo(ÎÄÃ÷½ø»¯Ê·)
+ºÜÈÝÒ×±»¿´×÷ÊÇÎÄÃ÷II´ú¾µäµÄ¸´ÖÆ°æ. µ«ÉîÈëÓÎÏ·ºó,
+Äã¾Í»á·¢ÏÖÁ½ÕßÓÐÐí¶à²»Í¬. Æä²îÒì³Ì¶ÈÉõÖÁ¿ÉÓë
+ÎÄÃ÷IºÍII´úÖ®¼äµÄ²îÒìÏàÌá²¢ÂÛ. ²é¿´¾ßÌå²îÒì,
 Çëµã»÷ÏÂÁÐ±êÌâ:\
 :MOVEMENT ²¿¶ÓÒÆ¶¯\
 ::T µØÐÎÖÖÀà\
 ::B202 Ææ¼£Ó°Ïì\
 ::G ÕþÌåÐÎÊ½\
 ::A ¿Æ¼¼ÑÝ»¯\
 :DIPLOMACY ¶ÔÍâ½»Éæ\
 :SHIP Ö³Ãñ·É´¬\\
 ³ýÁËÉÏÊö²îÒìÖ®Íâ, »¹ÓÐÒÔÏÂÒªµãÌáÇë¸÷Î»Íæ¼ÒÁôÒâ:\
 -C-evo²»¿¿Ëæ»úÔËËã×÷ÎªÂôµã. Ã¿Ò»Ïî¼Æ»®µÄ½á¹û¶¼¿É
 Ô¤ÆÚ, ³ýÁËÊÀ½çµØÍ¼µÄÉú³ÉºÍÆäËûÊÆÁ¦µÄ¾Ù¶¯Ö®Íâ.\
 -µçÄÔ¼ÆËãËùÒÀ¾ÝµÄ¹æÔòÓëÕæÈËÍæ¼ÒÍêÈ«ÏàÍ¬. µçÄÔÍæ¼Ò
 ²¢ÎÞ¶îÍâµÄÓÅÊÆ, ÔÚ»ñµÃÇé±¨·½ÃæÒ²Ò»Ñù.\
 -³ÇÊÐ½á¹¹ÓëÎÄÃ÷ÏµÁÐÂÔÓÐ³öÈë. ÔÚ³ÇÊÐËùÔÚµÄµØ¿é, ÓÐ1¸ö
+ÊÐÃñ¸ºÔðÀÍ¶¯Éú²ú, µ«²»»á´ÓÊÂÉÌÒµÃ³Ò×; ´ËÍâ, ÊÐÃñ½á¹¹
 Ò²ÓÐËù¼ò»¯, ÈçÈ¥³ýÁËÒÕÈËºÍÊÕË°ÈËµÈµÈ.\
 -³ÇÊÐ×îÐ¡¹æÄ£Îª2¼¶, Éú²úÒ»Ö§ÍØ»ÄÕß, ÐëºÄ·Ñ2¸öÊÐÃñ.\
 -³ÇÊÐÁ¸Ê³´¢Á¿ÉÏÏÞ²¢·ÇÓÉ³ÇÊÐ¹æÄ£¾ö¶¨, Òò´Ë´ó³ÇÊÐµÄ
 Ôö³¤ËÙ¶È, ÍùÍùÔ¶¸ßÓÚ½ÏÐ¡µÄ³ÇÊÐ.\
 -ÎÞÐèÁÙ½üº£Ñó»òºÓÁ÷, ¼´¿É½øÐÐ¹à¸È.\
 -´ÓÆäËûÊÆÁ¦»ñµÃµÄÏÈ½ø¿Æ¼¼, ÎÞ·¨Ö±½ÓÀûÓÃ, ±ØÐëÏÈÕë¶Ô
+¸Ã¿Æ¼¼½øÐÐÆÊÎöÐÔÑÐ¾¿, ÑÐ¾¿ËÙ¶È½«ÊÇ¶À×ÔÑÐ¾¿µÄÁ½±¶,
 ÇÒ²»±ØÑÐ¾¿ÏÈÆÚËùÐè¿Æ¼¼.\
 -Ä³Ð©¸ß¼¶×÷Õ½²¿¶ÓÎÞ·¨Ö±½Ó½¨Éè, ±ØÐëÏÈ½øÐÐÑÐ·¢,
 ÑÐ·¢³É¹¦ºó²ÅÄÜ½¨Éè.\
 -Ä³Ð©µØÐÎ¶ÔµØÃæ²¿¶Ó»áÔì³ÉÉËº¦, Ïê¼û"µØÐÎÖÖÀà"ÖÐµÄ"¶ñÍÁ".\
+!致文明系列的老玩家\
+就地形和部队图片的相似程度而言, C-evo(文明进化史)
+很容易被看作是文明II代经典的复制版. 但深入游戏后,
+你就会发现两者有许多不同. 其差异程度甚至可与
+文明I和II代之间的差异相提并论. 查看具体差异,
+请点击下列标题:\
+:MOVEMENT 部队移动\
+::T 地形种类\
+::B202 奇迹影响\
+::G 政体形式\
+::A 科技演化\
+:DIPLOMACY 对外交涉\
+:SHIP 殖民飞船\\
+除了上述差异之外, 还有以下要点提请各位玩家留意:\
+-C-evo不靠随机运算作为卖点. 每一项计划的结果都可
+预期, 除了世界地图的生成和其他势力的举动之外.\
+-电脑计算所依据的规则与真人玩家完全相同. 电脑玩家
+并无额外的优势, 在获得情报方面也一样.\
+-城市结构与文明系列略有出入. 在城市所在的地块, 有1个
+市民负责劳动生产, 但不会从事商业贸易; 此外, 市民结构
+也有所简化, 如去除了艺人和收税人等等.\
+-城市最小规模为2级, 生产一支拓荒者, 须耗费2个市民.\
+-城市粮食储量上限并非由城市规模决定, 因此大城市的
+增长速度, 往往远高于较小的城市.\
+-无需临近海洋或河流, 即可进行灌溉.\
+-从其他势力获得的先进科技, 无法直接利用, 必须先针对
+该科技进行剖析性研究, 研究速度将是独自研究的两倍,
+且不必研究先期所需科技.\
+-某些高级作战部队无法直接建设, 必须先进行研发,
+研发成功后才能建设.\
+-某些地形对地面部队会造成伤害, 详见"地形种类"中的"恶土".\
 #INTRO
 $ÓÎÏ·½éÉÜ\
+$游戏介绍\
 @@56\
 !»¶Ó½øÈëC-evo(ÎÄÃ÷½ø»¯Ê·)µÄÊÀ½ç\
+±¾ÓÎÏ·´øÄúÁìÂÔÈËÀàÎÄÃ÷µÄ·¢Õ¹Ê·, Äú¿É´øÁìÒ»Ö§ÖÖ×å,
+Àú¾ÁùÇ§Äê²×É£±äÇ¨, ´ÓÈËÀà×î³õµÄ¶¨¾Ó¿ªÊ¼·Ü¶·, ÇóÉú,
+½ø»¯, Ö±ÖÁÊµÏÖÈËÀàµÄÖÕ¼«ÃÎÏë--Ö³ÃñÍâÐÇ. Ç°½øµÄµÀÂ·
+²¢²»×ÜÊÇÒ»·¬Ì¹Í¾: ¿ÉÓÃµÄ×ÊÔ´²¢²»³äÔ£, ÐèÒª¾«´òÏ¸Ëã;
+ÖÜÎ§µÄÒ°µØÃ£Ã£, ÉÙËµÒ²µÃ»¨¼¸Ç§Äê²ÅÄÜ±ä³ÉÎÄÃ÷ÀÖÍÁ;
+¸ü±ðÌá²»ÆÚ¶øÖÁµÄ¼¢»ÄºÍ±äÂÒÁË, ÌìÔÖÈË»öÊ¼ÖÕÊÇ³ÇÊÐ
 ·±ÈÙ·¢Õ¹µÄ×î´óÍþÐ²..\\
 ÖÖÖÖ²»ÀûÒòËØÖ®ÏÂ, Î¨ÓÐ¿¿ÉîÄ±Ô¶ÂÇ²ÅÄÜ´øÁìÈËÃñ×ßÏòÐÒ¸£.
 À©ÕÅµÛ¹úÁìÍÁ, ·¢Õ¹³ÇÊÐ½¨Éè, ÐÞ±øÓª, °ì´óÑ§, Ôì¹¤³§......
+ÔÚ½¨ÉèµÄÍ¬Ê±, Ò²±ðºöÊÓÁË¿ÆÑ§ÑÐ¾¿, ÑÐ·¢ÐÂÊ½²¿¶ÓºÍÎäÆ÷,
+ÅÉÇ²ÍØ»Ä²¿¶Ó¿ª±ÙÐÂµÄÎÖÍÁ, ÒýÁì´¬¶ÓÑ°ÕÒº£Ñó±Ë°¶µÄ´óÂ½,
 ½«Õû¸öÊÀ½ç¾¡ÊÕÑÛµ×.\\
+±ðÍüÁË, ÄãµÄ¹ú¼Ò²¢²»ÊÇÕâÊÀ½çÖÐÎ¨Ò»µÄÎÄÃ÷. Ã¿¿é´óÂ½ÉÏ
+¶¼ÓÐ²»Í¬µÄ²¿Âä, ´æÔÚÏàµ±µÄÎÄ»¯²îÒì. Òª¼Ç×¡, Ã»ÓÐÄÄ¸ö
+ÖÖ×åÊÇÌìÃüÓÀ´æµÄ, ÈÎºÎÒ»¸öµÛ¹ú¶¼ÓÐ¿ÉÄÜÔÚÒ»Ò¹¼äÇã¸²,
 ÄãµÄ¹ú¼ÒÒ²²»ÀýÍâ.\\
+ÓëËû¹úµÄµÚÒ»´Î½Ó´¥Ò²Ðí²¢²»»áÊÇÒ»´ÎÓä¿ìµÄ¾Àú, µ«Í¨¹ý
+²»Ð¸µÄÍâ½»½»Éæ, Ðí¶àÔÏÈµÄ²»¿ÉÄÜÒ²»á±ä³É¿ÉÄÜ. ÓëÆäËû
+ÎÄÃ÷½»»»¿Æ¼¼ÖªÊ¶, ÓÃÌõÔ¼±£»¤¸÷×ÔµÄÀûÒæ, »òÊÇ½¨Á¢¼á¹Ì
+µÄÃËÔ¼, ÔÚÏÝÈëÂé·³Ê±ÓÐ¸ö°ïÊÖÓ¦¸Ã²»ÊÇ»µÊÂ.  µ«Ò²±ðÌ«¹ý
+ÒÀÀµÌõÔ¼, ÒòÎªÕâ¸öÊÀ½çÃ»ÓÐÓÀÔ¶µÄÅóÓÑ, Ö»ÓÐÉú´æµÄ¶ÔÊÖ,
 ²»ÂÛÊÇÄÄ¸öÖÖ×å, ¶¼ÔÚÎªÁËÍ¬Ò»¸öÄ¿±ê¶ø¾ºÕù: ×îÖÕµÄÊ¤Àû.
+!欢迎进入C-evo(文明进化史)的世界\
+本游戏带您领略人类文明的发展史, 您可带领一支种族,
+历经六千年沧桑变迁, 从人类最初的定居开始奋斗, 求生,
+进化, 直至实现人类的终极梦想--殖民外星. 前进的道路
+并不总是一番坦途: 可用的资源并不充裕, 需要精打细算;
+周围的野地茫茫, 少说也得花几千年才能变成文明乐土;
+更别提不期而至的饥荒和变乱了, 天灾人祸始终是城市
+繁荣发展的最大威胁..\\
+种种不利因素之下, 唯有靠深谋远虑才能带领人民走向幸福.
+扩张帝国领土, 发展城市建设, 修兵营, 办大学, 造工厂......
+在建设的同时, 也别忽视了科学研究, 研发新式部队和武器,
+派遣拓荒部队开辟新的沃土, 引领船队寻找海洋彼岸的大陆,
+将整个世界尽收眼底.\\
+别忘了, 你的国家并不是这世界中唯一的文明. 每块大陆上
+都有不同的部落, 存在相当的文化差异. 要记住, 没有哪个
+种族是天命永存的, 任何一个帝国都有可能在一夜间倾覆,
+你的国家也不例外.\\
+与他国的第一次接触也许并不会是一次愉快的经历, 但通过
+不懈的外交交涉, 许多原先的不可能也会变成可能. 与其他
+文明交换科技知识, 用条约保护各自的利益, 或是建立坚固
+的盟约, 在陷入麻烦时有个帮手应该不是坏事.  但也别太过
+依赖条约, 因为这个世界没有永远的朋友, 只有生存的对手,
+不论是哪个种族, 都在为了同一个目标而竞争: 最终的胜利.
 #BASICS
 $¸ÅÂÛ\
 !¸ÅÂÛ\
+¹ú¼ÒµÄ×é³Éµ¥Î»ÊÇ²¿¶ÓºÍ³ÇÊÐ. ²¿¶ÓµÄÖ°ÔðÊÇÌ½ÏÕºÍ¹¥ÊØ,
 ¶ø³ÇÊÐµÄÖ°ÄÜÊÇÈË¿ÚÔö³¤, Éú²ú½¨ÉèºÍ¿ÆÑ§ÑÐ¾¿.\\
+ÊÀ½çµØÍ¼ÓÉËÄ±ßÐÎµØ¿é×é³É. Ã¿¸öµØ¿é¶¼ÓÐÆäµØÐÎÊôÐÔ,
+¸ù¾Ý²»Í¬µÄµØÐÎÖÖÀà, µØ¿éµÄÒÔÏÂÈýÖÖÊôÐÔ»áÓÐËù²»Í¬:
+×ÊÔ´²úÁ¿, ·ÀÓù¼Ó³É, ºÍÒÆ¶¯ÏûºÄ. Í¬Ò»µØ¿éÉÏ×î¶àÄÜ½¨
+Ò»×ù³ÇÊÐ, µ«¿ÉÈÝÄÉµÄÍ¬¹ú²¿¶ÓÊýÁ¿²¢ÎÞÏÞÖÆ. Òª»ñµÃ
 ÌØ¶¨µØ¿éµÄ°ïÖúÐÅÏ¢, ÇëÔÚµãÑ¡µØ¿éÊ±°´×¡Shift¼ü.\
 ::T µØÐÎÖÖÀà\\
+±¾ÓÎÏ·²ÉÓÃÁË»ØºÏÖÆ½øÐÐ·½Ê½£¬ÆäËû¶ÔÊÖ±ØÐëµÈ´ýÄúÈ«²¿
+ÐÐ¶¯Íê±Ï£¬½áÊø»ØºÏÖ®ºó·½¿ÉÒÀ´ÎÐÐ¶¯. ÔÚÄ¬ÈÏÅäÖÃÏÂ,
+ËùÓÐ²¿¶ÓÐÐ¶¯Íê³Éºó,»ØºÏ½«×Ô¶¯½áÊø, Èç¹ûÄú¿´µ½"µÈ´ý
 »ØºÏ½áÊø"µÄÌáÊ¾,Çëµã»÷ÆÁÄ»ÓÒÏÂ½ÇµÄ½áÊø»ØºÏ°´Å¥.\\
+$概论\
+!概论\
+国家的组成单位是部队和城市. 部队的职责是探险和攻守,
+而城市的职能是人口增长, 生产建设和科学研究.\\
+世界地图由四边形地块组成. 每个地块都有其地形属性,
+根据不同的地形种类, 地块的以下三种属性会有所不同:
+资源产量, 防御加成, 和移动消耗. 同一地块上最多能建
+一座城市, 但可容纳的同国部队数量并无限制. 要获得
+特定地块的帮助信息, 请在点选地块时按住Shift键.\
+::T 地形种类\\
+本游戏采用了回合制进行方式，其他对手必须等待您全部
+行动完毕，结束回合之后方可依次行动. 在默认配置下,
+所有部队行动完成后,回合将自动结束, 如果您看到"等待
+回合结束"的提示,请点击屏幕右下角的结束回合按钮.\\
 #SCIENCE
 $¿Æ¼¼\
+$科技\
 @@46\
 !¿Æ¼¼\
+ÓÎÏ·ÖÐ¹ú¼ÒÒªÏëÐÞ½¨ÐÂµÄÉèÊ©, ×é½¨ÐÂµÄ²¿¶Ó,
+»òÊÇ³ÉÁ¢ÐÂµÄÕþÌå, ±ØÐëÏÈÑÐ¾¿Ïà¹ØµÄ¿Æ¼¼.
+³ýÁË³õÊ¼Ê±µÄ¼¸Ïî¿Æ¼¼Ö®Íâ, ¾ø´ó²¿·Ö¿Æ¼¼Ðè
 ÏÈÑÐ¾¿1ÖÁ2ÏîÇ°µ¼ÐÔ¿Æ¼¼, ÏêÇéÇë¿´:\
 ::A ¿Æ¼¼Ò»ÀÀ\\
+ÓÎÏ·¿ªÊ¼ºóÒ»»ØºÏ, ÏµÍ³»áÌáÊ¾Íæ¼ÒÑ¡ÔñÏëÒª
+ÑÐ¾¿µÄµÚÒ»ÏîÐÂ¿Æ¼¼. Òª»ñÖªÏà¹Ø¿Æ¼¼µÄÏêÏ¸
 ÐÅÏ¢, ÇëÔÚµãÑ¡¿Æ¼¼Ãû³ÆµÄÍ¬Ê±°´×¡Shift¼ü.
 ¿Æ¼¼ÑÐ¾¿µÄ½ø¶ÈÈ¡¾öÓÚ¹ú¼ÒÀÛ»ýµÄ¿ÆÑ§×ÜÁ¿ (%r)
+Èç¹ûÀÛ»ýµÄ%r´ïµ½¹æ¶¨µÄË®Æ½, ¾ÍÄÜ»ñµÃÐÂµÄ
+¿ÆÑÐ³É¹û. Ã¿´ÎÖ»ÄÜÑÐ¾¿Ò»Ïî¿Æ¼¼, ¾ö¶¨Ö®ºó,
+ÑÐ¾¿¼Æ»®¾ÍÎÞ·¨¸ü¸ÄÁË.
+Ëæ×Å±¾¹ú¿Æ¼¼³É¹ûµÄ²»¶ÏÍÆ³ö, ÐÂ¿Æ¼¼µÄÑÐ¾¿
 ËùÐèÒªµÄ¿ÆÑ§×ÜÁ¿»áÖð²½Ôö¶à, ÏêÇéÇë¿´:\\
 ;SCIENCECOST ¿ÆÑÐ·ÑÓÃÏê½â
+!科技\
+游戏中国家要想修建新的设施, 组建新的部队,
+或是成立新的政体, 必须先研究相关的科技.
+除了初始时的几项科技之外, 绝大部分科技需
+先研究1至2项前导性科技, 详情请看:\
+::A 科技一览\\
+游戏开始后一回合, 系统会提示玩家选择想要
+研究的第一项新科技. 要获知相关科技的详细
+信息, 请在点选科技名称的同时按住Shift键.
+科技研究的进度取决于国家累积的科学总量 (%r)
+如果累积的%r达到规定的水平, 就能获得新的
+科研成果. 每次只能研究一项科技, 决定之后,
+研究计划就无法更改了.
+随着本国科技成果的不断推出, 新科技的研究
+所需要的科学总量会逐步增多, 详情请看:\\
+;SCIENCECOST 科研费用详解
 #SCIENCECOST
 $¿ÆÑÐ·ÑÓÃÏê½â\
 !¿ÆÑÐ·ÑÓÃÏê½â\
+Ëæ×Å¿Æ¼¼ÑÐ·¢ÊýÁ¿µÄÔö¶à, ¿ÆÑÐ·ÑÓÃÒ²»áËæÖ®Ìá¸ß.
 µ±Ç°ÄÑ¶ÈÏÂ, ¿ÆÑÐ·ÑÓÃµÄ¼ÆËã¹«Ê½Îª:\
+$科研费用详解\
+!科研费用详解\
+随着科技研发数量的增多, 科研费用也会随之提高.
+当前难度下, 科研费用的计算公式为:\
 &TECHFORMULA\\
 ±äÁ¿nµÄ³õÊ¼ÖµÎª4, ²¢¸ù¾ÝÒÔÏÂÌõ¼þ·¢ÉúÏàÓ¦±ä»¯:\
 -²¿¶ÓÑÐ·¢²»»áÓ°ÏìnÖµµÄ±ä»¯\
 -µçÄÔ¿Æ¼¼µÄÑÐ¾¿²»»áÓ°ÏìnÖµµÄ±ä»¯\
 -³É¹¦ÑÐµÃ´ÓÆäËûÊÆÁ¦»ñµÃµÄ¿Æ¼¼, nÖµ+1\
 -×ÔÐÐ³É¹¦ÑÐµÃÈÎºÎÆäËû¿Æ¼¼, °üÀ¨ÈýÖÖÎ´À´¿Æ¼¼, nÖµ+2\
 -´Ó´óÍ¼Êé¹ÝÖÐÖ±½Ó»ñµÃ¿Æ¼¼, nÖµ+1
+变量n的初始值为4, 并根据以下条件发生相应变化:\
+-部队研发不会影响n值的变化\
+-电脑科技的研究不会影响n值的变化\
+-成功研得从其他势力获得的科技, n值+1\
+-自行成功研得任何其他科技, 包括三种未来科技, n值+2\
+-从大图书馆中直接获得科技, n值+1
 #DIPLOMACY
 $Íâ½»\
 !¸ÅÂÛ\
+Á½¸öËØÎ´Ä±ÃæµÄ¹ú¼ÒÒª½¨Á¢Íâ½»¹ØÏµ, ±ØÐëµÈµ½ÆäÖÐÒ»¹ú
+µÄµØÃæ²¿¶Ó·¢ÏÖÁíÒ»¹úµÄµØÃæ²¿¶Ó»ò³ÇÊÐÖ®ºó·½¿É½øÐÐ.
+ÔÚ¹ú¼ÒÇé±¨»Ãæ, ¿É²é¿´ÒÑÖªÆäËûÊÆÁ¦µÄÏà¹ØÐÅÏ¢.
+ÔÚ¹ú¼ÒÇé±¨»ÃæÖÐ, ÏÔÊ¾ÁËÒ»¸ö¹ú¼ÒµÄÕþÌåÐÎÊ½, ÏÖÓÐ×Ê½ð,
 Íâ½»Á¢³¡, ÒÔ¼°ÈË¿Ú, ÁìÍÁ, ¿Æ¼¼, Ì½Ë÷µÈ¸Å¿ö. \\
 !½»Éæ\
+µ±Á½¹ú·¢Éú½Ó´¥Ö®ºó, ¿É¿ªÕ¹Íâ½»½»Éæ, ÔÚ½»ÉæÖÐ¿É½øÐÐ
+½»»»Ã³Ò×»òÇ©ÊðÐÔ¼. Õû¸ö½»Éæ¹ý³ÌÖ÷ÒªÓÉÖÆ¶¨ÌáÒé,
 ½ÓÊÜÌáÒé, ÒÔ¼°È¡ÏûÌõÔ¼Èý²¿·Ö×é³É.\\
+µ±½»ÉæË«·½¶¼Í£Ö¹ÌáÒéµÄÊ±ºò, ½»Éæ¾Í½«½áÊø. Èç¹ûÒ»·½
 Ñ¡ÔñÖÕÖ¹Ì¸ÅÐ, ½»ÉæÒ²»áÁ¢¼´ÖÕÖ¹.\\
 !ÌáÒé\
+Íâ½»½»ÉæÖ÷ÒªµÄ×é³É²¿·ÖÊÇ¸÷ÖÖÌáÒé. ÌáÒéµÄÄÚÈÝÖÐ°üº¬ÁË
+½»ÉæÒ»·½ÏòÁíÒ»·½Ìá³öµÄÒªÇó, ÒÔ¼°Ô¸ÒâÎªÖ®¸¶³öµÄÌõ¼þ.
 ¿ÉÄÜ°üº¬µÄÄÚÈÝÓÐ:\
 -Ò»ÏîÌõÔ¼\
 -¹ú¼ÒÇé±¨\
 -¾üÊÂÇé±¨\
 -Ò»±ÊÏÖ½ð\
 -¿Æ¼¼³É¹û\
 -²¿¶ÓÑÐ·¢\
 -Ì½Ë÷µØÍ¼\
 -Ö³Ãñ·É´¬²¿¼þ(Ì«¿Õ¸Û½¨³Éºó)\\
 Èç¹ûÌáÒéÖÐÎ´°üº¬Ïò¶Ô·½ÒªÇóµÄÄÚÈÝ, ¾ÍÏàµ±ÓÚÒ»·ÝÀñÎï.
+Ö»ÓÐ¶Ô·½½ÓÊÜ, ÀñÎï²ÅÓÐÐ§¹û. ÓëÖ®Ïà·´µÄÇé¿öÊÇ, Èç¹û
 ÌáÒéÖÐÎ´°üº¬Ïò¶Ô·½¸¶³öµÄÌõ¼þ, ¾ÍÊÇ³àÂãÂãµÄË÷È¡.\\
+´ÓÆäËûÊÆÁ¦»ñµÃµÄÏÈ½ø¿Æ¼¼, ÎÞ·¨Ö±½ÓÀûÓÃ, ±ØÐëÏÈÕë¶Ô
+¸Ã¿Æ¼¼½øÐÐÆÊÎöÐÔÑÐ¾¿, ÑÐ¾¿ËÙ¶È½«ÊÇ¶À×ÔÑÐ¾¿µÄÁ½±¶,
 ÇÒ²»±ØÑÐ¾¿ÏÈÆÚËùÐè¿Æ¼¼.\\
 !ÌõÔ¼\
 ÌõÔ¼·ÖÎªÒÔÏÂ¼¸ÖÖ:\\
 -ºÍÆ½ÌõÔ¼:
+Á½¹ú²»µÃÏà»¥¹¥»÷, Ò²²»µÃ½øÈë¶Ô·½µÄ¹ú¾³.
 ºÍÆ½¹ú¼ÒµÄ²¿¶Ó¶ÔÁíÒ»·½µÄ³ÇÊÐÃ»ÓÐÎ§¹¥Ð§Ó¦.\\
 -ÓÑºÃÌõÔ¼:
+³ýÁËºÍÆ½ÌõÔ¼µÄÉÏÊöÔ¼¶¨Ö®Íâ,
 Á½¹úÃ¿»ØºÏ½»»»¸÷×ÔµÄ¹ú¼ÒÇé±¨..\\
 -ÃËÔ¼:
+³ÉÎªÃË¹úÖ®ºó, ¼ºÊÆÁ¦²¿¶Ó¿ÉÔÚÃË¹ú¹ú½çÄÚ×ÔÓÉÒÆ¶¯,
+·´Ö®ÒàÈ». ÁíÍâ, ÃË¹ú¼ä¹²ÏíËùÓÐÇé±¨ (°üÀ¨µØÇø/¾üÊÂ
 ¼°µØÍ¼Çé±¨), ¶Ô·½²¿¶ÓµÄÒ»¾ÙÒ»¶¯Ò²½«È«²¿ÖªÏ¤.\\
+ÁíÍâ, Ã»ÓÐÇ©ÊðÈÎºÎÌõÔ¼µÄÁ½¸ö¹ú¼Ò, ¿ÉÒÔ´ï³ÉÍ£Õ½ÐÒé.
+Í£Õ½ÐÒé²»ÊôÓÚÌõÔ¼, ½öÊÇÒ»ÖÖÔÝÊ±²»¹¥»÷¶Ô·½µÄÔÊÅµ.
+µ±ÆäÖÐÒ»·½¿ªÕ½ºó, ÐÒé×Ô¶¯Ê§Ð§.
 ×ÛÉÏËùÊö, Á½¹ú¼ä¿ÉÄÜµÄ¹ØÏµÁÐ±íÈçÏÂ:\
+$外交\
+!概论\
+两个素未谋面的国家要建立外交关系, 必须等到其中一国
+的地面部队发现另一国的地面部队或城市之后方可进行.
+在国家情报画面, 可查看已知其他势力的相关信息.
+在国家情报画面中, 显示了一个国家的政体形式, 现有资金,
+外交立场, 以及人口, 领土, 科技, 探索等概况. \\
+!交涉\
+当两国发生接触之后, 可开展外交交涉, 在交涉中可进行
+交换贸易或签署协约. 整个交涉过程主要由制定提议,
+接受提议, 以及取消条约三部分组成.\\
+当交涉双方都停止提议的时候, 交涉就将结束. 如果一方
+选择终止谈判, 交涉也会立即终止.\\
+!提议\
+外交交涉主要的组成部分是各种提议. 提议的内容中包含了
+交涉一方向另一方提出的要求, 以及愿意为之付出的条件.
+可能包含的内容有:\
+-一项条约\
+-国家情报\
+-军事情报\
+-一笔现金\
+-科技成果\
+-部队研发\
+-探索地图\
+-殖民飞船部件(太空港建成后)\\
+如果提议中未包含向对方要求的内容, 就相当于一份礼物.
+只有对方接受, 礼物才有效果. 与之相反的情况是, 如果
+提议中未包含向对方付出的条件, 就是赤裸裸的索取.\\
+从其他势力获得的先进科技, 无法直接利用, 必须先针对
+该科技进行剖析性研究, 研究速度将是独自研究的两倍,
+且不必研究先期所需科技.\\
+!条约\
+条约分为以下几种:\\
+-和平条约:
+两国不得相互攻击, 也不得进入对方的国境.
+和平国家的部队对另一方的城市没有围攻效应.\\
+-友好条约:
+除了和平条约的上述约定之外,
+两国每回合交换各自的国家情报..\\
+-盟约:
+成为盟国之后, 己势力部队可在盟国国界内自由移动,
+反之亦然. 另外, 盟国间共享所有情报 (包括地区/军事
+及地图情报), 对方部队的一举一动也将全部知悉.\\
+另外, 没有签署任何条约的两个国家, 可以达成停战协议.
+停战协议不属于条约, 仅是一种暂时不攻击对方的允诺.
+当其中一方开战后, 协议自动失效.
+综上所述, 两国间可能的关系列表如下:\
 &TREATIES\\
+Ö»ÓÐÔÚÍâ½»½»ÉæÖÐ, »òÊÇÒ»¹ú¾Ü¾ø½Ó¼û
+±ð¹úÊ¹½ÚµÄÊ±ºò, ·½¿ÉÈ¡ÏûÔÏÈÇ©¶©µÄ
+ÌõÔ¼. È¡ÏûÌõÔ¼ºó, ÔÚ½ÓÏÂÀ´µÄÈý»ØºÏÄÚ
 ²»¿ÉÓëÍ¬Ò»¹ú¼ÒÔÙ´ÎÈ¡ÏûÆäËûÌõÔ¼.
+Èç¹ûA¹úÈ¡ÏûÓëB¹ú¼äµÄºÍÆ½ÌõÔ¼,
 ÔòB¹úµÄÍ¬ÃË¹úÒ²½«¶ÔA¹úÐûÕ½.\\
 !¿ÉÐÅ³Ì¶È\
+ÒªÅÐ¶ÏÒ»¸ö¹ú¼ÒÊÇ·ñÑÔ³ö±ØÐÐ, ¿ÉÐÅ¶ÈÊÇ
 ÖØÒª²Î¿¼ÒÀ¾Ý. ¿ÉÐÅ¶È·ÖÎªÒÔÏÂËÄ¸öµÈ¼¶:\
 -ÑÔ³ö±ØÐÐ (100%¿ÉÐÅ¶È)\
 -ÖØÅµÊØÐÅ (90%~99%¿ÉÐÅ¶È)\
 -×½Ãþ²»¶¨ (70%~89%¿ÉÐÅ¶È)\
 -ÑÔ¶øÎÞÐÅ (¿ÉÐÅ¶ÈµÍÓÚ70%)\\
+ÔÚºÍÆ½Ê±ÆÚ, Ã¿»ØºÏÃ¿¸ö¹ú¼ÒµÄ¿ÉÐÅ¶È+1, Ö±ÖÁ×î´óÖµ.
+ÓÎÏ·¿ªÊ¼Ê±, ËùÓÐ¹ú¼ÒµÄ×î´ó¿ÉÐÅ¶ÈÎª100, Ëº»ÙºÍÆ½ÌõÔ¼
+½«Ê¹µ±Ç°¿ÉÐÅ¶È¼õ°ë, ×î´ó¿ÉÐÅ¶È-10. Ëº»ÙÃËÔ¼½«Ê¹µ±Ç°
+¿ÉÐÅ¶È¼õÉÙËÄ·ÖÖ®Èý. ÎÞÂÛÊÇ·ñ½¨Á¢¹ýÍâ½»¹ØÏµ, Ò»¸ö¹ú¼Ò
 µÄ¿ÉÐÅ¶È, ¶ÔÆäËû¹ú¼Ò¶¼ÊÇ¹«¿ªÍ¸Ã÷µÄ.
+只有在外交交涉中, 或是一国拒绝接见
+别国使节的时候, 方可取消原先签订的
+条约. 取消条约后, 在接下来的三回合内
+不可与同一国家再次取消其他条约.
+如果A国取消与B国间的和平条约,
+则B国的同盟国也将对A国宣战.\\
+!可信程度\
+要判断一个国家是否言出必行, 可信度是
+重要参考依据. 可信度分为以下四个等级:\
+-言出必行 (100%可信度)\
+-重诺守信 (90%~99%可信度)\
+-捉摸不定 (70%~89%可信度)\
+-言而无信 (可信度低于70%)\\
+在和平时期, 每回合每个国家的可信度+1, 直至最大值.
+游戏开始时, 所有国家的最大可信度为100, 撕毁和平条约
+将使当前可信度减半, 最大可信度-10. 撕毁盟约将使当前
+可信度减少四分之三. 无论是否建立过外交关系, 一个国家
+的可信度, 对其他国家都是公开透明的.
 #SHIP
 $ÓÎÏ·»ñÊ¤\
 !»ñÊ¤·½Ê½\
+ÒªÏëÈ¡µÃ×îÖÕÊ¤Àû, Ö»ÓÐÒ»ÌõÍ¾¾¶: ÏòÍâÌ«¿ÕÖ³Ãñ! Èç¹û
+ÄãµÄÊÆÁ¦³ÉÎªÊ×¸öÅÉÇ²Ö³Ãñ·É´¬µÄ¹ú¼Ò, ÄÇÄã¾ÍÊÇ×îºó
 µÄÓ®¼Ò. Ò»ËÒÖ³Ãñ·É´¬Ðè12¸ö²¿¼þ×éºÏ¶ø³É:\\
 ;:B67 6¸öÖ³Ãñ·É´¬×é¼þ\
 ;:B68 4¸ö¶¯Á¦²Õ\
 ;:B69 2¸ö¾Ó×¡²Õ\\
+Òª×é½¨ÒÔÉÏÈýÖÖ·É´¬²¿¼þ, ±ØÐëÒÀ¿¿ÈýÖÖ¶ÔÓ¦µÄÌØÊâ×ÊÔ´.
+Ö»ÓÐÉú²ú¸ÃÖÖÌØÊâ×ÊÔ´µÄ³ÇÊÐ, ²ÅÄÜ×é½¨ÏàÓ¦µÄ·É´¬²¿¼þ.
+ÔÚ×é½¨·É´¬²¿¼þÊ±, ÎÞ·¨½èÖúÍ¨³£µÄÌáËÙÊÖ¶Î¼Ó¿ì½¨Éè.
 ÌØÊâ×ÊÔ´°üÀ¨:\
+$游戏获胜\
+!获胜方式\
+要想取得最终胜利, 只有一条途径: 向外太空殖民! 如果
+你的势力成为首个派遣殖民飞船的国家, 那你就是最后
+的赢家. 一艘殖民飞船需12个部件组合而成:\\
+;:B67 6个殖民飞船组件\
+;:B68 4个动力舱\
+;:B69 2个居住舱\\
+要组建以上三种飞船部件, 必须依靠三种对应的特殊资源.
+只有生产该种特殊资源的城市, 才能组建相应的飞船部件.
+在组建飞船部件时, 无法借助通常的提速手段加快建设.
+特殊资源包括:\
 &MODERN\\
 Òª·¢ÏÖÕâÐ©ÌØÊâ×ÊÔ´, ±ØÐëÏÈ»ñµÃÒÔÏÂ¿Æ¼¼:\
 ::A47 ¹æÄ£Á¿²ú
+要发现这些特殊资源, 必须先获得以下科技:\
+::A47 规模量产
 #MOVEMENT
 $²¿¶ÓÒÆ¶¯\
 !²¿¶ÓÒÆ¶¯\
+Òª¶Ô²¿¶ÓÏÂ´ïÃüÁî, ÇëÏÈÑ¡ÖÐÖ´ÐÐÃüÁîµÄ²¿¶Ó. ±»Ñ¡µÄ²¿¶Ó
+»áÒÔÉÁË¸±íÊ¾Ñ¡ÖÐ×´Ì¬, Í¬Ê±¸Ã²¿¶ÓµÄÏêÏ¸Çé¿ö»áÏÔÊ¾ÔÚ
+ÆÁÄ»ÏÂ·½. ÓÃ·½Ïò¼ü, Ð¡¼üÅÌÊý×Ö¼ü»òÊó±êÓÒ¼üÖ¸»Ó²¿¶ÓÏò
 Ä¿±êµØ¿éÒÆ¶¯.\\
 !ÒÆ¶¯ÏÞÖÆ\
 Í¨³£Çé¿öÏÂ, ²¿¶Ó×ÜÄÜÒÆ¶¯µ½ÁÚ½ÓµØ¿é, µ«ÒÔÏÂÇé¿ö³ýÍâ:\
 -Ä¿±êµØ¿éÉÏÓÐÆäËûÊÆÁ¦µÄ²¿¶Ó.\
 -ÒÆ¶¯²¿¶ÓµÄ»ú¶¯Á¦²»×ã, ÏêÇé¼ûÏÂÎÄ.\
 -µØÃæ²¿¶Ó²»¿ÉÔÚº£ÃæÒÆ¶¯, º£ÉÏ²¿¶Ó²»¿ÉÔÚÂ½µØÒÆ¶¯.\
 -Ã»ÓÐº£ÉÏµ¼º½ÄÜÁ¦µÄ½¢Ö»²»¿ÉÔÚÔ¶ÑóÒÆ¶¯.\
 -²»¿ÉÏòÆäËûÊÆÁ¦µÄ¿ØÖÆµØÓòÒÆ¶¯, ÏêÇé¼ûÏÂÎÄ.\\
 !¿ÕÖÐ²¿¶Ó\
+¿ÕÖÐ²¿¶ÓÔÚÃ¿»ØºÏ½áÊøÊ±±ØÐë»Øµ½±¾·½»ùµØ(°üÀ¨±¾·½³ÇÊÐ,
+¾üÊÂ»ùµØ, ¼°Ä¸½¢), Èç¹ûÎ´ÄÜ·µ»Ø»ùµØ, ¸Ã²¿¶Ó»á×¹»ÙÕóÍö.
 ÓÐÒ»ÖÖ·½·¨¿ÉÒÔ±ÜÃâÉÏÊöÇé¿öµÄ·¢Éú:\
 ::F7 ¸ø²¿¶ÓÔö¼ÓÈ¼ÓÍ\\
 !»ú¶¯ÏûºÄ\
+Ã¿´ÎÒÆ¶¯¶¼ÐèÏûºÄÒ»¶¨µÄ»ú¶¯Á¦(MP), º£ÉÏ²¿¶Ó, ¿ÕÖÐ²¿¶Ó,
+ÒÔ¼°ÏòÆ½Ì¹µØÐÎÒÆ¶¯µÄµØÃæ²¿¶Ó×÷Ð±ÏòÒÆ¶¯Ê±(ÈçÎ÷±±·½),
+ÐèÏûºÄµÄ»ú¶¯Á¦Îª1µã; ´¹Ö±»òË®Æ½·½ÏòÒÆ¶¯Ê±(ÈçÕý±±·½),
+ÐèÏûºÄµÄ»ú¶¯Á¦Îª1.5µã. ÏòÆéá«µØÐÎÒÆ¶¯Ê±, »ú¶¯Á¦Îª1.5µÄ
+µØÃæ²¿¶Ó, ËùºÄµÄ»ú¶¯Á¦ÊÇÆ½Ì¹µØÐÎµÄ120%, »ú¶¯Á¦ÔÚ1.5µã
+ÒÔÉÏµÄµØÃæ²¿¶Ó, ËùºÄµÄ»ú¶¯Á¦ÊÇÆ½Ì¹µØÐÎµÄ130%. Ïò¸ßÉ½
+µØ¿éÒÆ¶¯Ê±, µØÃæ²¿¶ÓÐèÏûºÄÁ½»ØºÏ»ú¶¯Á¦, ÒÆ¶¯Íê³ÉºóµÄ
 Ò»¸ö»ØºÏ½«ÎÞ·¨ÐÐ¶¯..\
 ::T ²é¿´µØÐÎÖÖÀà\\
 ÒÆ¶¯ËùºÄ»ú¶¯Á¦µÄÊ¾ÒâÍ¼ÈçÏÂ:\
+$部队移动\
+!部队移动\
+要对部队下达命令, 请先选中执行命令的部队. 被选的部队
+会以闪烁表示选中状态, 同时该部队的详细情况会显示在
+屏幕下方. 用方向键, 小键盘数字键或鼠标右键指挥部队向
+目标地块移动.\\
+!移动限制\
+通常情况下, 部队总能移动到邻接地块, 但以下情况除外:\
+-目标地块上有其他势力的部队.\
+-移动部队的机动力不足, 详情见下文.\
+-地面部队不可在海面移动, 海上部队不可在陆地移动.\
+-没有海上导航能力的舰只不可在远洋移动.\
+-不可向其他势力的控制地域移动, 详情见下文.\\
+!空中部队\
+空中部队在每回合结束时必须回到本方基地(包括本方城市,
+军事基地, 及母舰), 如果未能返回基地, 该部队会坠毁阵亡.
+有一种方法可以避免上述情况的发生:\
+::F7 给部队增加燃油\\
+!机动消耗\
+每次移动都需消耗一定的机动力(MP), 海上部队, 空中部队,
+以及向平坦地形移动的地面部队作斜向移动时(如西北方),
+需消耗的机动力为1点; 垂直或水平方向移动时(如正北方),
+需消耗的机动力为1.5点. 向崎岖地形移动时, 机动力为1.5的
+地面部队, 所耗的机动力是平坦地形的120%, 机动力在1.5点
+以上的地面部队, 所耗的机动力是平坦地形的130%. 向高山
+地块移动时, 地面部队需消耗两回合机动力, 移动完成后的
+一个回合将无法行动..\
+::T 查看地形种类\\
+移动所耗机动力的示意图如下:\
 @MoveShot\
 -×óÍ¼ - ³õÊ¼»ú¶¯Á¦1.5µÄ²¿¶Ó\
 -ÓÒÍ¼ - ³õÊ¼»ú¶¯Á¦3µÄ²¿¶Ó\\
+Èç¹û²¿¶ÓË³×ÅµÀÂ·, ºÓÁ÷»òÔËºÓÒÆ¶¯, ÎÞÂÛÔÊ¼µØÐÎÎªºÎ,
 »ú¶¯Á¦ÏûºÄ¶¼½«½µÎª0.4(Ð±ÏòÒÆ¶¯)ºÍ0.6(·ÇÐ±ÏòÒÆ¶¯).
 Èç¹ûË³×ÅÌúÂ·ÒÆ¶¯, »ú¶¯Á¦ÏûºÄ½«½µÎª³õÊ¼»ú¶¯Á¦µÄ8%
 (Ð±ÏòÒÆ¶¯)ºÍ12%(·ÇÐ±ÏòÒÆ¶¯).\\
 ÐÂ»ØºÏ¿ªÊ¼Ê±, ²¿¶ÓÏûºÄµÄ»ú¶¯Á¦½«»Ø¸´µ½³õÊ¼×î´óÖµ.
 º£ÉÏ²¿¶ÓÊÜËðºó, »ú¶¯Á¦ÎÞ·¨ÍêÈ«»Ø¸´, µ«²»»áµÍÓÚ2.5.\\
 ÒªÒÆ¶¯µ½¸üÔ¶´¦, ¿ÉÊ¹ÓÃÄ¿±êÒÆ¶¯¹¦ÄÜ, ÓÒ¼üµ¥»÷Ä¿±êµØ¿é,
 ²¿¶Ó¾Í»áÏò¸ÃµØ¿é³ÖÐøÒÆ¶¯.\\
 !¿ØÖÆµØÓò\
+²¿¶Ó·ÖÎªÁ½ÖÖ: Ò»ÖÖÓÐµØÓò¿ØÖÆÄÜÁ¦, ÁíÒ»ÖÖÔòÃ»ÓÐ. ÓÐ
 µØÓò¿ØÖÆÄÜÁ¦µÄ²¿¶ÓÔÚ½Ó½üÆäËûÊÆÁ¦µÄµØÓò¿ØÖÆ²¿¶ÓÊ±,
 ÎÞ·¨Ïò¶Ô·½¿ØÖÆµÄµØÓòÒÆ¶¯, ³ý·ÇÄ¿±êµØ¿éÊÇ±¾·½³ÇÊÐ,
 »ò¸ÃµØ¿é´æÔÚ±¾·½µÄµØÓò¿ØÖÆ²¿¶Ó. º£ÉÏ²¿¶Ó, ¿ÕÖÐ²¿¶Ó,
 ÌØÖÖ±øÒÔ¼°´¦ÓÚÔËÊä×´Ì¬µÄ²¿¶ÓÃ»ÓÐµØÓò¿ØÖÆÄÜÁ¦.\\
 !Õ¼Áì³ÇÊÐ\
+¹¥»÷ÐÍµØÃæ²¿¶Ó¿ÉÕ¼Áì²»Éè·ÀµÄµÐ·½³ÇÊÐ. Õ¼ÁìµÐ³Çºó,
+¸Ã³ÇÁ¥Êô²¢ÔÚÍâ×¤ÔúµÄµÐ¾ü²¿¶Ó½«È«ÊýÏûÍö, Õû¸ö³ÇÊÐ
 Ò²»áÏÝÈëÉ§ÂÒ×´Ì¬, ²¢³ÖÐøÈý¸ö»ØºÏ.
+-左图 - 初始机动力1.5的部队\
+-右图 - 初始机动力3的部队\\
+如果部队顺着道路, 河流或运河移动, 无论原始地形为何,
+机动力消耗都将降为0.4(斜向移动)和0.6(非斜向移动).
+如果顺着铁路移动, 机动力消耗将降为初始机动力的8%
+(斜向移动)和12%(非斜向移动).\\
+新回合开始时, 部队消耗的机动力将回复到初始最大值.
+海上部队受损后, 机动力无法完全回复, 但不会低于2.5.\\
+要移动到更远处, 可使用目标移动功能, 右键单击目标地块,
+部队就会向该地块持续移动.\\
+!控制地域\
+部队分为两种: 一种有地域控制能力, 另一种则没有. 有
+地域控制能力的部队在接近其他势力的地域控制部队时,
+无法向对方控制的地域移动, 除非目标地块是本方城市,
+或该地块存在本方的地域控制部队. 海上部队, 空中部队,
+特种兵以及处于运输状态的部队没有地域控制能力.\\
+!占领城市\
+攻击型地面部队可占领不设防的敌方城市. 占领敌城后,
+该城隶属并在外驻扎的敌军部队将全数消亡, 整个城市
+也会陷入骚乱状态, 并持续三个回合.
 #COMMANDS
 $²¿¶ÓÖ¸Áî\
+$部队指令\
 @@16\
 !²¿¶ÓÖ¸Áî\
 ²¿¶ÓÖÖÀà²»Í¬, ÒÔ¼°²¿¶ÓËù´¦µØÐÎ²»Í¬, ²¿¶ÓÖ¸ÁîÒ²ÓÐ²îÒì:\
 -½âÉ¢: ½âÉ¢¸Ã²¿¶Ó\
 -Õû±à: ½«²¿¶Ó±àÖÆ´òÉ¢, ¼ÓÈëµ½µ±Ç°³ÇÊÐ½¨ÉèµÄÐÂ²¿¶ÓÖÐ\
 -Ä¿±êÒÆ¶¯: ¼ÌÐøÏòÏÈÇ°Éè¶¨µÄÄ¿±êÒÆ¶¯\
 -ÉÔºóÐÐ¶¯: ÔÝÊ±Ìø¹ý, Ñ¡ÔñÏÂÒ»²¿¶Ó\
 -ÔµØµÈ´ý: ±¾»ØºÏ²»ÔÙÐÐ¶¯\
 -×¤ÊØ¾¯½ä: ³ÖÐø²»ÐÐ¶¯, Ö±ÖÁ±»ÔÙ´ÎÊÖ¶¯Ñ¡ÖÐ\
 -»Ö¸´ÐÝÕû: ÊÜËð²¿¶ÓÔÚÔµØÍ£Áô»Ö¸´×´Ì¬, Ö±ÖÁÍêÈ«¿µ¸´\
 -¸ÄÎª±¾³Ç²¿¶Ó: ½«ËùÔÚ³ÇÊÐÖ¸¶¨Îª¸Ã²¿¶ÓÐÂµÄÁ¥Êô³ÇÊÐ\
 -·µ»Ø×î½ü³ÇÊÐ: ¾¡¿ì·µ»Ø¾àÀë×î½üµÄ±¾·½³ÇÊÐ\
 -½çÃæ¾ÓÖÐ: ÒÔ¸Ã²¿¶ÓÎª´°¿ÚÖÐÐÄ, µ÷ÕûÓÎÏ·´°¿Ú\
 -ÂÓ¶á: ´Ý»Ùµ±Ç°µØ¿éµÄµØÐÎ½¨Éè(ÐèºÄ·Ñ1µã»ú¶¯Á¦)
+!部队指令\
+部队种类不同, 以及部队所处地形不同, 部队指令也有差异:\
+-解散: 解散该部队\
+-整编: 将部队编制打散, 加入到当前城市建设的新部队中\
+-目标移动: 继续向先前设定的目标移动\
+-稍后行动: 暂时跳过, 选择下一部队\
+-原地等待: 本回合不再行动\
+-驻守警戒: 持续不行动, 直至被再次手动选中\
+-恢复休整: 受损部队在原地停留恢复状态, 直至完全康复\
+-改为本城部队: 将所在城市指定为该部队新的隶属城市\
+-返回最近城市: 尽快返回距离最近的本方城市\
+-界面居中: 以该部队为窗口中心, 调整游戏窗口\
+-掠夺: 摧毁当前地块的地形建设(需耗费1点机动力)
 #SETTLE
 $ÒÆÃñ¹¤×÷\
+$移民工作\
 @@29\
 !ÒÆÃñ¹¤×÷\
 ÒÆÃñ²¿¶Ó, ÈçÍØ»ÄÕßºÍ¹¤³ÌÊ¦, ¿É¶ÔµØÐÎ½øÐÐ¸ÄÔì:\
 -¶¨¾Ó: ÔÚËùÔÚµØ¿é½¨Á¢ÐÂ³ÇÊÐ\
 -Çå³ýÉÁÖ: ¿³·¥ÉÁÖ, ±ÙÎª»ÄµØ\
 -³é¸ÉÕÓÔó: ½«ÕÓÔó±äÎª²Ý³¡»òÆ½Ô\
 -Ö²Ê÷ÔìÁÖ: ½«ËùÔÚµØÐÎ±äÎªÉÁÖ\
 -¸ü»»µØÐÎ: ¸ü»»µØÐÎÖÖÀà, Ïê¼ûÏà¹ØµØÐÎµÄ±ä¸üÐÅÏ¢\
 -Çå³ýÎÛÈ¾: Ïû³ýÒò¹ý¶ÈÉú²úÔì³ÉµÄµØ¿éÎÛÈ¾\\
 -µØÐÎ½¨Éè: ·ÖÎª¶àÖÖÀàÐÍ, Ïê¼û:\
 ::J µØÐÎ½¨ÉèÒ»ÀÀ\
+¸ÄÔìµØÐÎÐè»¨·ÑÒ»¶¨Á¿µÄ»ú¶¯Á¦, ¿ÉÄÜ³ÖÐøÊý¸öÉõÖÁÊýÊ®¸ö
+»ØºÏ·½ÄÜÍê³É.   Îª¼Ó¿ì¸ÄÔìËÙ¶È, ¿ÉÒÔÅÉÇ²¶àÖ§ÒÆÃñ²¿¶ÓÔÚ
+Í¬Ò»µØ¿éÉÏÖ´ÐÐÏàÍ¬µÄ¸ÄÔìÈÎÎñ.  Èç¹ûÊ£Óà»ú¶¯Á¦²»×ã1,
+¸ÄÔìÈÎÎñ½«ÍÆ³Ùµ½ÏÂ»ØºÏ²Å¿ªÊ¼.  ¹¤³ÌÊ¦Ö´ÐÐÈÎÎñµÄÐ§ÂÊÓë
+ÍØ»ÄÕßÏàÍ¬, µ«ÓÉÓÚ¹¤³ÌÊ¦ÓµÓÐ¸ü¸ßµÄ³õÊ¼»ú¶¯Á¦, Òò´Ë¹¤×÷
 ËÙ¶È±ÈÍØ»ÄÕß¸ü¿ì.\
 ::T ¿É²Î¿¼: µØÐÎÖÖÀàÒ»ÀÀ
+!移民工作\
+移民部队, 如拓荒者和工程师, 可对地形进行改造:\
+-定居: 在所在地块建立新城市\
+-清除森林: 砍伐森林, 辟为荒地\
+-抽干沼泽: 将沼泽变为草场或平原\
+-植树造林: 将所在地形变为森林\
+-更换地形: 更换地形种类, 详见相关地形的变更信息\
+-清除污染: 消除因过度生产造成的地块污染\\
+-地形建设: 分为多种类型, 详见:\
+::J 地形建设一览\
+改造地形需花费一定量的机动力, 可能持续数个甚至数十个
+回合方能完成.   为加快改造速度, 可以派遣多支移民部队在
+同一地块上执行相同的改造任务.  如果剩余机动力不足1,
+改造任务将推迟到下回合才开始.  工程师执行任务的效率与
+拓荒者相同, 但由于工程师拥有更高的初始机动力, 因此工作
+速度比拓荒者更快.\
+::T 可参考: 地形种类一览
 #COMBAT
 $Õ½¶·´óÈ«\
 !¹¥ÊØ¸ÅÂÛ\
+ÓÃ·½Ïò¼ü»òÊó±ê¿ÉÖ¸»Ó±¾·½²¿¶Ó¹¥»÷ÁÚ½ÓµÄµÐ·½²¿¶Ó, ·½·¨
+Óë²¿¶ÓÒÆ¶¯ÏàÍ¬. µ«¹¥»÷Ò²ÓÐÒ»¶¨µÄ¹æÔò, Í¨³£Çé¿öÏÂ, µØÃæ
+²¿¶ÓÎÞ·¨¹¥»÷º£ÉÏ²¿¶Ó, ·´Ö®ÒàÈ».  º£ÉÏ²¿¶Ó²»ÄÜ´Ó³ÇÊÐÄÚ
+»òÔËºÓÖÐ·¢Æð¹¥»÷; ¿ÕÖÐ²¿¶ÓÖ»Òª²»ÔÚ³ÇÊÐÄÚ»ò¾üÊÂ»ùµØÖÐ,
+¾ÍÖ»ÄÜ±»ÆäËû¿ÕÖÐ²¿¶Ó¹¥»÷. Õ½¶·ÖÐÈõÊÆÒ»·½»á±»ÏûÃð, Ç¿ÊÆ
+Ò»·½½«ÊÜµ½ËðÉË, Ç¿Èõ²î¾àÔ½´ó,Ç¿ÊÆ²¿¶ÓÊÜËðÔ½Ð¡.
 ÒªÔ¤Öª¹¥»÷µÄÐ§¹û, Çë°´×¡Shift¼ü, ÓÒ¼üµã»÷Òª¹¥»÷µÄÄ¿±ê.\\
+Ã¿Ö§²¿¶ÓµÄÕ½¶·Á¦·ÖÎª¹¥»÷ºÍ·ÀÓùÁ½ÖÖ. ²¿¶ÓÇé±¨ÖÐÏÔÊ¾µÄ
 /25, ÒâË¼¾ÍÊÇ¹¥»÷75, ·ÀÓù25. ÔÚÒ»³¡Õ½ÕùÖÐ, »¹ÓÐÒ»Ð©
 ÒòËØ»áÓ°ÏìÊµ¼ÊµÄÕ½¶·Á¦:\
 -²¿¶Ó¾Ñé: ¾ÑéÉÏÉýÒ»¼¶, Õ½¶·Á¦¾ÍÌáÉý25%, Ïê¼ûÏÂÎÄ.\
 -µØÐÎ·ÀÓù¼Ó³É: ½ö¶Ô±»¹¥»÷Ò»·½ÓÐÐ§, Ïê¼ûµØÐÎÀàÐÍÒ»ÀÀ.\
 -ÌØÊâ·ÀÓùÉèÊ©: Èç³ÇÇ½, ÒªÈûµÈµÈ; ½ö¶Ô±»¹¥»÷Ò»·½ÓÐÐ§.\
 -×¤ÊØ×´Ì¬: ½ö¶Ô±»¹¥»÷Ò»·½ÓÐÐ§; ²»´¦ÓÚÔËÊä×´Ì¬µÄ²¿¶Ó,
 ÈôÉÏ»ØºÏÃ»ÓÐÐÐ¶¯, ±¾»ØºÏ×Ô¶¯½øÈë×¤ÊØ×´Ì¬, ·ÀÓù+50%.\
 -ÔÚ³ÇÊÐÀï»ò¾üÊÂ»ùµØÖÐÍ£ÁôµÄ¿ÕÖÐ²¿¶Ó·ÀÓùÁ¦ÎªÁã, ÔÚ
 ³ÇÊÐÀï»òÔËºÓÖÐµÄº£ÉÏ²¿¶Ó·ÀÓùÁ¦¼õ°ë.\
 ×¢Òâ: ¶àÖÖ·ÀÓùÁ¦¼Ó³ÉµÄÐ§¹ûÊÇ»ýÀÛÏà¼Ó, ¶ø²»ÊÇ±¶ÊýÏà³Ë.\\
 Èô¹¥»÷·½»ú¶¯²»×ã1µã, ÔòÕ¹¿ª¹¥»÷Ê±ÎÞ·¨Ê¹³öÈ«²¿Õ½¶·Á¦,
 »á¸ù¾ÝÊ£ÓàµÄ»ú¶¯¶øÏàÓ¦Ï÷Èõ.\\
 !¹¥»÷³ÉÈº²¿¶Ó\
+Èç¹ûÁ½Ö§»òÁ½Ö§ÒÔÉÏµÄ²¿¶ÓÍ£ÁôÔÚÍ¬Ò»µØ¿é, ÔÚÔâÊÜ¹¥»÷Ê±,
+Ö»ÓÐÒ»Ö§²¿¶Ó³öÕó·ÀÊØ, ¾ÍÊÇÏÔÊ¾ÔÚµØÍ¼ÉÏµÄÄÇÖ§²¿¶Ó.
 Í¨³£Çé¿öÏÂ, ÏµÍ³»áÌôÑ¡·ÀÓù×îÇ¿µÄ²¿¶Ó, ÏêÇéÇëµã»÷:\\
 ;TILEDEF ³ÉÈº²¿¶ÓµÄ·ÀÊØ\\
+Èç¹ûÔÚ³ÇÊÐ, ÒªÈû»ò¾üÊÂ»ùµØÖ®ÍâµÄ³ÉÈº²¿¶ÓÔÚÕ½¶·ÖÐÂä°Ü,
 ¸ÃµØ¿éÉÏËùÓÐµÄ²¿¶Ó¶¼»á±»ÏûÃð, Ç±Í§ºÍÒþÐÎ·É»úÒ²²»ÀýÍâ.\\
 !¾ÑéµÈ¼¶\
 Ëæ×ÅÔÚÕ½¶·ÖÐÊÜËð×´Ì¬µÄ»ýÀÛ, ²¿¶ÓµÄ¾ÑéµÈ¼¶»áÖð¼¶ÌáÉý,
 Ã¿ËðÊ§100µã×´Ì¬, ²¿¶Ó¾ÑéÌáÉýÒ»¼¶. ¾ÑéµÈ¼¶ÏêÁÐÈçÏÂ:\
+$战斗大全\
+!攻守概论\
+用方向键或鼠标可指挥本方部队攻击邻接的敌方部队, 方法
+与部队移动相同. 但攻击也有一定的规则, 通常情况下, 地面
+部队无法攻击海上部队, 反之亦然.  海上部队不能从城市内
+或运河中发起攻击; 空中部队只要不在城市内或军事基地中,
+就只能被其他空中部队攻击. 战斗中弱势一方会被消灭, 强势
+一方将受到损伤, 强弱差距越大,强势部队受损越小.
+要预知攻击的效果, 请按住Shift键, 右键点击要攻击的目标.\\
+每支部队的战斗力分为攻击和防御两种. 部队情报中显示的
+/25, 意思就是攻击75, 防御25. 在一场战争中, 还有一些
+因素会影响实际的战斗力:\
+-部队经验: 经验上升一级, 战斗力就提升25%, 详见下文.\
+-地形防御加成: 仅对被攻击一方有效, 详见地形类型一览.\
+-特殊防御设施: 如城墙, 要塞等等; 仅对被攻击一方有效.\
+-驻守状态: 仅对被攻击一方有效; 不处于运输状态的部队,
+若上回合没有行动, 本回合自动进入驻守状态, 防御+50%.\
+-在城市里或军事基地中停留的空中部队防御力为零, 在
+城市里或运河中的海上部队防御力减半.\
+注意: 多种防御力加成的效果是积累相加, 而不是倍数相乘.\\
+若攻击方机动不足1点, 则展开攻击时无法使出全部战斗力,
+会根据剩余的机动而相应削弱.\\
+!攻击成群部队\
+如果两支或两支以上的部队停留在同一地块, 在遭受攻击时,
+只有一支部队出阵防守, 就是显示在地图上的那支部队.
+通常情况下, 系统会挑选防御最强的部队, 详情请点击:\\
+;TILEDEF 成群部队的防守\\
+如果在城市, 要塞或军事基地之外的成群部队在战斗中落败,
+该地块上所有的部队都会被消灭, 潜艇和隐形飞机也不例外.\\
+!经验等级\
+随着在战斗中受损状态的积累, 部队的经验等级会逐级提升,
+每损失100点状态, 部队经验提升一级. 经验等级详列如下:\
 &EXPERIENCE\\
 !×´Ì¬»Ö¸´\
+»ØºÏ½áÊøÊ±, ÊÜËð²¿¶Ó»á¸ù¾ÝÊ£ÓàµÄ»ú¶¯ÏàÓ¦»Ö¸´²¿·Ö×´Ì¬.
+Èç¹û±¾»ØºÏÎ´ÔøÒÆ¶¯, ²¿¶ÓµÄ×´Ì¬×î´ó»Ö¸´8µã, ÈôÔÚÎ´É§ÂÒ
+³ÇÊÐ»ò¾üÊÂ»ùµØÖÐ, ×´Ì¬×î´ó»Ö¸´20µã.  º£ÃæÉÏµÄÊÜËð²¿¶Ó
 ×´Ì¬²»»á»Ö¸´. ¿ÕÖÐ²¿¶ÓÖ»ÓÐÔÚ³ÇÊÐ»ò¾üÊÂ»ùµØÖÐ²ÅÄÜ»Ö¸´.\\
 !ºäÕ¨³ÇÊÐ\
+¾ß±¸ºäÕ¨ÄÜÁ¦µÄº£ÉÏºÍ¿ÕÖÐ²¿¶Ó¿É¹¥»÷ÁÚ½ÓµÄµÐ·½³ÇÊÐ,
+ºäÕ¨ÏûºÄ1µã»ú¶¯. ±»ºäÕ¨µÄ³ÇÊÐ¹æÄ£¼õÉÙ1¼¶, Ö±ÖÁ±»
 ÍêÈ«´Ý»Ù. Ö´ÐÐºäÕ¨µÄ²¿¶Ó²»»áÊÜËð, Ò²ÎÞ·¨»ñµÃ¾ÑéÖµ.
 ºäÕ¨·½·¨Óë¹¥»÷·½·¨ÏàÍ¬, ÓÃÊó±ê»ò¼üÅÌÖ¸»Ó²¿¶Ó¹¥»÷.\\
 !ÇýÖð²¿¶Ó\
+ÄãÒ²¿ÉÒÔÖ¸»ÓÒ»Ö§²¿¶Ó½«ÔÚ¼º·½ÁìÍÁÉÏ×¤ÔúµÄºÍÔ¼¹ú²¿¶Ó
+ÇýÖð³ö¾³.  Ö´ÐÐÇýÖðÖ¸ÁîµÄ²¿¶Ó±ØÐëÊÇµØÃæ»òº£ÉÏµÄ¹¥»÷ÐÔ
 ²¿¶Ó, ÇÒÊ£Óà»ú¶¯´óÓÚ1µã.  ÇýÖðµÄ·½·¨Óë¹¥»÷·½·¨ÏàÍ¬.
+!状态恢复\
+回合结束时, 受损部队会根据剩余的机动相应恢复部分状态.
+如果本回合未曾移动, 部队的状态最大恢复8点, 若在未骚乱
+城市或军事基地中, 状态最大恢复20点.  海面上的受损部队
+状态不会恢复. 空中部队只有在城市或军事基地中才能恢复.\\
+!轰炸城市\
+具备轰炸能力的海上和空中部队可攻击邻接的敌方城市,
+轰炸消耗1点机动. 被轰炸的城市规模减少1级, 直至被
+完全摧毁. 执行轰炸的部队不会受损, 也无法获得经验值.
+轰炸方法与攻击方法相同, 用鼠标或键盘指挥部队攻击.\\
+!驱逐部队\
+你也可以指挥一支部队将在己方领土上驻扎的和约国部队
+驱逐出境.  执行驱逐指令的部队必须是地面或海上的攻击性
+部队, 且剩余机动大于1点.  驱逐的方法与攻击方法相同.
 #TILEDEF
 $³ÉÈº²¿¶Ó\
 !³ÉÈº²¿¶Ó\
+Èç¹ûÁ½Ö§»òÁ½Ö§ÒÔÉÏµÄ²¿¶ÓÍ£ÁôÔÚÍ¬Ò»µØ¿é, ÔÚÔâÊÜ¹¥»÷Ê±,
 Ö»ÓÐ·ÀÓù×îÇ¿µÄÄÇÖ§²¿¶Ó»á³öÕó·ÀÊØ, µ«Ò²»á³öÏÖÀýÍâÇé¿ö.
 ÏµÍ³ÔÚÈ·¶¨·ÀÓù²¿¶ÓÊ±, ÒÀ´Î×ñÑÈçÏÂ¹æÔò:\
 -×îÓÅÏÈµÄ¹æÔòÊÇ¸ù¾Ý²¿¶ÓµÄÀà±ð. Ê×ÏÈÊÇ¾ß±¸¿ñÈÈ·Ö×ÓÊôÐÔ
+µÄµØÃæ²¿¶Ó, È»ºóÊÇ¾ßÓÐµØÓò¿ØÖÆÊôÐÔµÄ³£¹æµØÃæ²¿¶Ó, µÚÈý
 Ñ¡ÔñÊÇÃ»ÓÐµØÓò¿ØÖÆÊôÐÔµÄµØÃæ²¿¶Ó, ×îºóÊÇÇ±Í§ºÍÒþÐÎ·É»ú.
 ÔÚÔËÊä½¢ºÍÔËÊä»úÉÏµÄÔËÊä²¿¶ÓÓÀÔ¶²»»á×÷Îª·ÀÊØ²¿¶Ó³öÕó.\
 -Èç¹ûÓÐÁ½Ö§²¿¶ÓÀà±ðÏàÍ¬, ·ÀÓù½Ï¸ßµÄ²¿¶Ó½«µ£ÈÎ·ÀÊØÈÎÎñ.
+ÕâÀïµÄ·ÀÓùÁ¦Ö¸µÄÊÇ½«¾ÑéµÈ¼¶, µ±Ç°×´Ì¬ºÍ×¤ÊØ×´Ì¬µÈÒòËØ
 ×ÛºÏ¿¼ÂÇµÄ½á¹û. ¶ÔÌØ¶¨²¿¶ÓµÄÌØÊâ·ÀÓù¼Ó³É½«²»×÷¿¼ÂÇ.\
 -Èç¹ûÁ½Ö§»òÁ½Ö§ÒÔÉÏ¾ß±¸ÏàÍ¬µÄ·ÀÓùÁ¦(ÕâÖÖÇé¿ö¼«ÉÙ·¢Éú)
 Ôì¼Û½ÏµÍµÄÄÇÖ§²¿¶Ó½«µ£ÈÎ·ÀÊØÈÎÎñ.
+$成群部队\
+!成群部队\
+如果两支或两支以上的部队停留在同一地块, 在遭受攻击时,
+只有防御最强的那支部队会出阵防守, 但也会出现例外情况.
+系统在确定防御部队时, 依次遵循如下规则:\
+-最优先的规则是根据部队的类别. 首先是具备狂热分子属性
+的地面部队, 然后是具有地域控制属性的常规地面部队, 第三
+选择是没有地域控制属性的地面部队, 最后是潜艇和隐形飞机.
+在运输舰和运输机上的运输部队永远不会作为防守部队出阵.\
+-如果有两支部队类别相同, 防御较高的部队将担任防守任务.
+这里的防御力指的是将经验等级, 当前状态和驻守状态等因素
+综合考虑的结果. 对特定部队的特殊防御加成将不作考虑.\
+-如果两支或两支以上具备相同的防御力(这种情况极少发生)
+造价较低的那支部队将担任防守任务.
 #SPYMISSIONS
 $ÃØÃÜÐÐ¶¯\
+$秘密行动\
 @@28\
 !ÃØÃÜÐÐ¶¯\
+Ö»ÓÐÌØÖÖ±ø²ÅÄÜÖ´ÐÐÃØÃÜÐÐ¶¯. ½«ÌØÖÖ±øÅÉÇ²µ½µÐ·½³ÇÊÐ
 Ö®ºó, »áµ¯³öÒ»¸öÐÐ¶¯²Ëµ¥¹©Íæ¼ÒÑ¡Ôñ, Ñ¡ÏîÈçÏÂ:\
 -ÆÆ»µÉú²ú: ³ÇÊÐµÄ½¨ÉèÉú²úÍ£ÖÍÒ»»ØºÏ.\
 -ÇÔÈ¡µØÍ¼: »ñµÃµÐ·½×îÐÂµÄÊÀ½çµØÍ¼.\
 -»ñµÃµÚÈý¹úÇé±¨: ´ÓµÐ·½»ñÖªµÚÈý¹úµÄ¹ú¼ÒÇé±¨.\
 -´òÌý¹ú¼ÒÇé±¨: »ñÖªµÐ·½×îÐÂµÄ¹ú¼ÒÇé±¨.\
 -´òÌý¾üÊÂÇé±¨: »ñÖªµÐ·½×îÐÂµÄ¾üÊÂÇé±¨.\\
 Ç©ÊðºÍÆ½ÌõÔ¼µÄÁ½¸ö¹ú¼Ò, ÎÞ·¨ÔÚ¶Ô·½³ÇÊÐ¿ªÕ¹ÃØÃÜÐÐ¶¯.
 µ«ÌØÖÖ±øÒÀÈ»¿ÉÇ±ÈëÈÎºÎµØÇø, ÎÞÊÓÌõÔ¼µÄÔ¼Êø.
+!秘密行动\
+只有特种兵才能执行秘密行动. 将特种兵派遣到敌方城市
+之后, 会弹出一个行动菜单供玩家选择, 选项如下:\
+-破坏生产: 城市的建设生产停滞一回合.\
+-窃取地图: 获得敌方最新的世界地图.\
+-获得第三国情报: 从敌方获知第三国的国家情报.\
+-打听国家情报: 获知敌方最新的国家情报.\
+-打听军事情报: 获知敌方最新的军事情报.\\
+签署和平条约的两个国家, 无法在对方城市开展秘密行动.
+但特种兵依然可潜入任何地区, 无视条约的约束.
 #CLASSES
 $²¿¶ÓÑÐ·¢\
 !²¿¶ÓÑÐ·¢\
+ÓÎÏ·³õÊ¼Ê±, ÈÎºÎÊÆÁ¦¶¼¿ÉÖ±½ÓÉú²úÃñ±øºÍÍØ»ÄÕß,
 Ä³Ð©ÌØÊâ²¿¶ÓÐëÕÆÎÕÌØ¶¨µÄ¿Æ¼¼»òÆæ¼£, ·½¿ÉÉú²ú.\
 ::S ²Î¼û"ÌØÊâ²¿¶Ó"\\
+ÒªÉú²úÆäËûµÄÐÂÐÍ²¿¶Ó, ±ØÐë½èÖú¿Æ¼¼ÑÐ·¢·½ÄÜ´ï³É.
+µ±»ñµÃÁËÏà¹ØµÄ¿Æ¼¼ÖªÊ¶Ö®ºó, (ÀýÈçÕÆÎÕÉÐÎäÏ°Ë×ºó,
+¿ÉÑÐ·¢ÐÂµÄµØÃæ²¿¶Ó), ¿ÉÔÚÑÐ·¢´°¿ÚÑ¡Ôñ"²¿¶ÓÑÐ·¢",
 ´Ó¶ø¿ªÆô²¿¶ÓÑÐ·¢´°¿Ú:\\
+$部队研发\
+!部队研发\
+游戏初始时, 任何势力都可直接生产民兵和拓荒者,
+某些特殊部队须掌握特定的科技或奇迹, 方可生产.\
+::S 参见"特殊部队"\\
+要生产其他的新型部队, 必须借助科技研发方能达成.
+当获得了相关的科技知识之后, (例如掌握尚武习俗后,
+可研发新的地面部队), 可在研发窗口选择"部队研发",
+从而开启部队研发窗口:\\
 @DraftShot\
 Í¼Àý:\
 -1: µ±Ç°±àÖÆ\
 -2: ±¶ÔöÒò×Ó\
 -3: Ñ¡ÔñËùÐèµÄÊôÐÔ\
 -4: Ñ¡Ôñ±øÖÖ\
 -5: ÑÐ·¢±øÖÖµÄÖ¸Êý\\
+²¿¶ÓÑÐ·¢µÄ½á¹ûÈ¡¾öÓÚÁ½¸öÒòËØ: Ò»ÊÇµ±Ç°±¾¹úµÄ¿Æ¼¼·¢Õ¹
+Ë®Æ½.  Ä³Ð©¿Æ¼¼³É¹û¿É´øÀ´ÐÂµÄ²¿¶ÓÊôÐÔ, »òÌáÉý»ù±¾ÊôÐÔ
 µÄ±¶ÔöÒò×Ó, »ù±¾ÊôÐÔ°üÀ¨¹¥»÷, ·ÀÓù, ÔËÊä, Ôì¼ÛµÈµÈ.\\
+ÁíÒ»¸öÔòÊÇÍæ¼Ò×ÔÐÐµ÷ÅäµÄ¸÷ÏîÊôÐÔ±ÈÀý¼°ÌØÊâÐ§¹û¼Ó³É.
+¾ø´ó¶àÊýÊôÐÔÌáÉýÊ±, Éú²úÔì¼Û(%p)ºÍ²¿¶Ó±àÖÆ(%w)Ò²»á
+ÏàÓ¦ÌáÉý. ²¿¶Ó±øÖÖºÍ¿Æ¼¼³É¹û¾ö¶¨×Å²¿¶Ó±àÖÆµÄÉÏÏÞ.  Òª
 »ñÖªÄ³ÊôÐÔµÄÏêÏ¸ÐÅÏ¢, Çë°´×¡Shift¼üºóµ¥»÷ÊôÐÔÃû³Æ.\
 ::F ²¿¶ÓÊôÐÔ\\
+¸ù¾ÝÓÎÏ·ÄÑ¶ÈµÄ²»Í¬, ¹¥»÷, ·ÀÓùºÍÔËÊäÊôÐÔµÄÌáÉýËù´øÀ´
+µÄÔì¼Û±ä»¯Ò²»áÓÐ²îÒì. ÔÚ¼òµ¥ÄÑ¶ÈÏÂ, ²¿¶ÓÔì¼Û½«±ÈÕý³£
 ÄÑ¶ÈµÍ25%, ¶øÔÚÀ§ÄÑÄÑ¶ÈÏÂ, Ôì¼Û½«±ÈÕý³£ÄÑ¶È¸ß25%.
+图例:\
+-1: 当前编制\
+-2: 倍增因子\
+-3: 选择所需的属性\
+-4: 选择兵种\
+-5: 研发兵种的指数\\
+部队研发的结果取决于两个因素: 一是当前本国的科技发展
+水平.  某些科技成果可带来新的部队属性, 或提升基本属性
+的倍增因子, 基本属性包括攻击, 防御, 运输, 造价等等.\\
+另一个则是玩家自行调配的各项属性比例及特殊效果加成.
+绝大多数属性提升时, 生产造价(%p)和部队编制(%w)也会
+相应提升. 部队兵种和科技成果决定着部队编制的上限.  要
+获知某属性的详细信息, 请按住Shift键后单击属性名称.\
+::F 部队属性\\
+根据游戏难度的不同, 攻击, 防御和运输属性的提升所带来
+的造价变化也会有差异. 在简单难度下, 部队造价将比正常
+难度低25%, 而在困难难度下, 造价将比正常难度高25%.
 #CITIES
 $³ÇÊÐ¸ÅÂÛ\
+$城市概论\
 @@43\
 !³ÇÊÐ¸ÅÂÛ\
+³ÇÊÐµÄ»ù±¾¹¦ÄÜÊÇÊÕ¼¯ÁÚ½üµØ¿éµÄ×ÊÔ´, ²¢½«ÊÕ¼¯µÄ×ÊÔ´
+´¦Àíºó, ×ªÎª¿Æ¼¼, Éú²ú, »òÈË¿Ú.
+ÓÎÏ·³õÊ¼Ê±, Ò»¸ö¹ú¼ÒÖ»ÓÐÒ»¸ö³ÇÊÐ, ¸Ã³ÇÒ²ÊÇ¹ú¼ÒµÄÊ×¶¼.
+ÓÐÁ½ÖÖ·½·¨Ôö¼Ó³ÇÊÐÊýÁ¿, Ò»ÊÇÅÉÇ²ÒÆÃñ²¿¶Ó½¨Á¢ÐÂ³ÇÊÐ,
+¶þÊÇÅÉ±øÕ¼Áì±ð¹úµÄ³ÇÊÐ. ³ÇÊÐÖ»ÄÜ½¨Á¢ÔÚ¿É¹à¸ÈµÄÍÁµØÉÏ
 (²Ý³¡/Æ½Ô/»ÄµØ/ÇðÁê/Ì¦Ô).\\
+Ã¿¸ö³ÇÊÐÓÐ¸÷×Ô×¨ÊôµÄ»Ãæ, µ¥»÷µØÍ¼ÉÏµÄ³ÇÊÐÍ¼±ê,
 ¼´¿É´ò¿ª¸Ã³ÇÊÐµÄ×¨Êô»Ãæ: \\
+!城市概论\
+城市的基本功能是收集邻近地块的资源, 并将收集的资源
+处理后, 转为科技, 生产, 或人口.
+游戏初始时, 一个国家只有一个城市, 该城也是国家的首都.
+有两种方法增加城市数量, 一是派遣移民部队建立新城市,
+二是派兵占领别国的城市. 城市只能建立在可灌溉的土地上
+(草场/平原/荒地/丘陵/苔原).\\
+每个城市有各自专属的画面, 单击地图上的城市图标,
+即可打开该城市的专属画面: \\
 @CityShot\
 ÉÏÊö»ÃæÖÐ, Ö÷Òª°üº¬ÁËÈçÏÂ¼¸¸ö´óÏî:\\
 !ÊÐÃñ\
+³ÇÊÐ»Ãæ×óÉÏ½ÇµÄÈËÁ³´ú±í×Å¸Ã³ÇµÄÊÐÃñ. ³ÇÊÐ¹æÄ£µÄ
+ÏÂÏÞÎª2¼¶, Èç¹û¹æÄ£½µÖÁ2¼¶ÒÔÏÂ, Ôò¸Ã³Ç½«²»¸´´æÔÚ.
+Ä¬ÈÏÌõ¼þÏÂ, ³ÇÊÐ¹æÄ£ÉÏÏÞÎª8¼¶, µ«ÉÏÏÞÖµ¿ÉÍ¨¹ýÌØÊâ
 µÄ³ÇÊÐÉèÊ©ÌáÉý.\\
+Ã¿¸öÊÐÃñ¿ÉÊÕ¼¯Ò»¸öµØ¿é(¼ûÉÏÍ¼1)µÄ×ÊÔ´. Ò»¸öµØ¿éÉÏ
+×î¶àÈÝÄÉÒ»ÃûÊÐÃñ. ±»ÆäËû³ÇÊÐÕ¼ÓÃµÄµØ¿é½«±»±êÊ¾Îª
 ²»¿ÉÓÃµØ¿é.\\
 Î´±»Ö¸¶¨µÄ¿ÕÏÐÊÐÃñ, ½«±»ÓÃ×÷Îª³ÇÊÐ½äÑÏ²¿¶Ó(¼ûÉÏÍ¼2)
 ¿ÉÓÃÆäÀ´Î¬³Ö³ÇÊÐ°²¶¨µÄ±ÈÀý, Ê¹³ÇÊÐ²»ÖÁÓÚÏÝÈëÉ§ÂÒ.
 ÏêÏ¸ÐÅÏ¢Çë²ÎÕÕÏÂÎÄ°ïÖú²¿·Ö.\\
 !°²¶¨\
+³ÇÊÐ»ÃæµÄÓÒÉÏ·½ÏÔÊ¾ÁËµ±Ç°ÊÐÃñµÄ°²¶¨×´Ì¬.
 ¸Ã²¿·Ö·ÖÎªÈýÐÐ:\
 -ÉÝ³Þ (Í¼±ê: %l). Èç¹ûÔÚ"¾¼Ã¼°Ë°ÊÕ"²Ëµ¥ÖÐ
+Éè¶¨ÁËÉÝ³Þ±ÈÀý, ÔòÃ¿¸ö³ÇÊÐµÄÃ³Ò×ÊýÖÐ½«ÓÐ
 Ò»²¿·Ö×ª»¯ÎªÉÝ³Þ,Ïê¼ûÏÂÎÄÖÐµÄ"Ã³Ò×"²¿·Ö.\
 -°²¶¨ (%m). Ä¬ÈÏÇé¿öÏÂ, ³ÇÊÐÖÐÓÐËÄÃûÊÐÃñ
+ÊÇ°²¶¨µÄ, ÆäÓàÊÐÃñ¶¼ÊÇ²»°²µÄ. ½¨ÔìÌØ¶¨µÄ
+³ÇÊÐÉèÊ©»òÆæ¼£, ¿ÉÌáÉý°²¶¨ÊÐÃñµÄÊýÁ¿. Ã¿×ù
 Ææ¼£ÄÜÊ¹ËùÔÚ³ÇÊÐÖÐµÄÁ½Ãû²»°²ÊÐÃñ±äÎª°²¶¨.\
 -½äÑÏ (%o). Ã¿Ö§³ÇÊÐ½äÑÏ²¿¶Ó¿ÉÊ¹Á½Ãû²»°²
+ÊÐÃñ±äÎª°²¶¨. ÁíÍâ, ÌØÊâ²¿¶ÓÖÐµÄÊØ³ÇÎÀ±ø
 Ò²¿ÉÊ¹µÃ°²¶¨ÊÐÃñµÄÊýÁ¿Ôö¼Ó.\\
+Èç¹û²»°²ÊÐÃñÊý³¬Ô½ÁËÉÝ³ÞÊýÓë°²¶¨ÊÐÃñÊý
 Ö®ºÍ, ÔòÕû¸ö³ÇÊÐ½«ÏÝÈëÉ§ÂÒ.\\
+Ä³Ð©ÌØ¶¨µÄÕþÌåÐÎÊ½ÏÂ, ²»°²ÊÂ¼þµÄ·¢Éú»á½µµÍ
 ³ÇÊÐµÄ°²¶¨Öµ, ÏêÏ¸ÐÅÏ¢Çë²Î¿¼\
 ::G ÕþÌåÐÎÊ½\\
 !ÐÅÑö\
+ÔÚ×Ú½ÌÖÆ¹ú¼Ò,°²¶¨ÖµµÄ¼ÆËãÓëÆäËûÕþÌåÐÎÊ½²»Í¬.
+Ã¿¸öÊÐÃñ¶¼ÒòÐÅÑö¶ø±äµÃ°²¶¨, Òò´Ë×Ú½ÌÖÆ¹ú¼Ò
 ÎÞÐèµ£ÐÄ³ÇÊÐµÄ°²¶¨ÎÊÌâ, ¸ü²»»á³öÏÖ³ÇÊÐÉ§ÂÒ.\\
 !×ÊÔ´ÖÖÀà\
+³ÇÊÐ´ÓÖÜÎ§µØ¿éÖÐÊÕ¼¯µÄ×ÊÔ´, ¸ù¾ÝÀàÐÍ²»Í¬
 ·ÖÎªÈýÖÖ: Á¸Ê³(%f), ÔÁÏ(%p)ºÍÃ³Ò×(%t).
+上述画面中, 主要包含了如下几个大项:\\
+!市民\
+城市画面左上角的人脸代表着该城的市民. 城市规模的
+下限为2级, 如果规模降至2级以下, 则该城将不复存在.
+默认条件下, 城市规模上限为8级, 但上限值可通过特殊
+的城市设施提升.\\
+每个市民可收集一个地块(见上图1)的资源. 一个地块上
+最多容纳一名市民. 被其他城市占用的地块将被标示为
+不可用地块.\\
+未被指定的空闲市民, 将被用作为城市戒严部队(见上图2)
+可用其来维持城市安定的比例, 使城市不至于陷入骚乱.
+详细信息请参照下文帮助部分.\\
+!安定\
+城市画面的右上方显示了当前市民的安定状态.
+该部分分为三行:\
+-奢侈 (图标: %l). 如果在"经济及税收"菜单中
+设定了奢侈比例, 则每个城市的贸易数中将有
+一部分转化为奢侈,详见下文中的"贸易"部分.\
+-安定 (%m). 默认情况下, 城市中有四名市民
+是安定的, 其余市民都是不安的. 建造特定的
+城市设施或奇迹, 可提升安定市民的数量. 每座
+奇迹能使所在城市中的两名不安市民变为安定.\
+-戒严 (%o). 每支城市戒严部队可使两名不安
+市民变为安定. 另外, 特殊部队中的守城卫兵
+也可使得安定市民的数量增加.\\
+如果不安市民数超越了奢侈数与安定市民数
+之和, 则整个城市将陷入骚乱.\\
+某些特定的政体形式下, 不安事件的发生会降低
+城市的安定值, 详细信息请参考\
+::G 政体形式\\
+!信仰\
+在宗教制国家,安定值的计算与其他政体形式不同.
+每个市民都因信仰而变得安定, 因此宗教制国家
+无需担心城市的安定问题, 更不会出现城市骚乱.\\
+!资源种类\
+城市从周围地块中收集的资源, 根据类型不同
+分为三种: 粮食(%f), 原料(%p)和贸易(%t).
 \\
 Ã¿¸öµØ¿é³ö²ú×ÊÔ´µÄ¶àÉÙÈ¡¾öÓÚÒÔÏÂÈý¸öÌõ¼þ:\
 ::T µØÐÎÖÖÀà\
 ::J µØÐÎ¸ÄÔì\
 ::G ÕþÌåÐÎÊ½\\
 !Á¸Ê³\
+Á¸Ê³(·ûºÅÎª%f)´ú±íÁË¸÷ÖÖÊ³Îï. ³ÇÊÐÁ¸Ê³µÄÉú²úÏûºÄ
 Çé¿öÏÔÊ¾ÔÚÁ¸Ê³Ãæ°åÖÐ(¼ûÉÏÍ¼4).  Á¸Ê³ÊÇÈËÀàÃ¿ÈÕµÄ¸ù±¾,
+Ã¿¸öÊÐÃñÃ¿»ØºÏÐèÏûºÄ2%f. »¹ÓÐÒ»Ð©²¿¶ÓÐèÒª¶¨Á¿µÄÁ¸Ê³
+×÷Îª¹©¸ø, ÈçÁ¸Ê³¹©Ó¦²»×ã, ½«´Ó³ÇÊÐµÄ´æÁ¸ÖÐ¿Û³ý. Èç¹û
+´æÁ¸ºÄ¾¡, ³ÇÊÐÏÝÈë¼¢»Ä, »áÓÐÒ»ÃûÊÐÃñ»òÒ»Ö§²¿¶ÓÏûÊ§.
+µ«ÔÚÍ¨³£Çé¿öÏÂ, ³ÇÊÐÉú²úµÄÁ¸Ê³Á¿²»»áµÍÓÚÏûºÄÁ¿. Èç¹û
+Éú²úµÄÁ¸Ê³ÓÐÊ£Óà, ¶àÓàµÄÁ¸Ê³½«¼ÆÈë´æÁ¸, µ«ÓÐÒ»ÖÖÇé¿ö
+ÊôÓÚÀýÍâ: ¹æÄ£´ïµ½8µÄ´ó³ÇÊÐÃ¿»ØºÏÈç¹û¶àÓà1µ¥Î»µÄÁ¸Ê³,
+ÔòÕâ1µ¥Î»Á¸Ê³½«Ö±½Ó×ªÎª×Ê½ð, ²»¼ÆÈë´æÁ¸. Èç¹û´æÁ¸´ïµ½
+ÉÏÏÞ, ÇÒ³ÇÊÐ¹æÄ£Î´´ïÉÏÏÞ, ÄÇÃ´Õâ¸ö³ÇÊÐµÄ¹æÄ£»áÌáÉý1¼¶,
 ÊÐÃñÊýÁ¿¼Ó1.\\
 !ÔÁÏ\
+ÔÁÏ (·ûºÅÎª%p)ÊÇÒ»ÖÖ³éÏóµÄ×ÊÔ´, ÊÇ¸÷ÖÖÀÍ¶¯Éú²ú×ÊÔ´
+ÈçÄ¾Í·, ¿óÊ¯, Ê¯ÓÍµÈµÄ×Ü³Æ. ³ÇÊÐÔÁÏµÄÉú²úÏûºÄÇé¿öÏÔÊ¾
+ÔÚÔÁÏÃæ°åÖÐ(¼ûÉÏÍ¼5). ³ÇÊÐÖÐÄ³Ð©Á¥Êô²¿¶ÓÐèÏûºÄÒ»¶¨Á¿
+µÄÔÁÏÒÔÎ¬³ÖÈÕ³£¹©¸ø, Ê£ÓàÔÁÏ½«Í¶Èëµ½Éú²ú½¨ÉèÖ®ÖÐ.
 Äú¿É¸ü¸Ä³ÇÊÐµ±Ç°½¨ÉèµÄÏîÄ¿(¼ûÉÏÍ¼6). ³ÇÊÐµØÍ¼(¼ûÉÏÍ¼7)
+ÏÔÊ¾ÁË³ÇÊÐµ±Ç°ÉèÊ©µÄÎ»ÖÃ.
 ÓÐ¹Ø½¨ÉèµÄÏêÏ¸ÐÅÏ¢, Çë²Î¿¼ÏÂÒ»ÕÂ½Ú"Éú²úÏê½â".\\
 !Ã³Ò×\
+Ã³Ò×(·ûºÅÎª%t)´ú±í³ÇÊÐµÄÃ³Ò×ËùµÃ. Ö»ÓÐ³ÇÊÐÖÜÎ§µÄµØ¿é
+²ÅÄÜ½øÐÐÃ³Ò×, ³ÇÊÐ±¾ÉíËùÔÚµÄµØ¿é²»»á¹±Ï×ÈÎºÎÃ³Ò×Öµ,
+¼´±ã³ÇÊÐ½¨ÔÚ½ð¿óÉÏÒ²ÎÞ¼ÃÓÚÊÂ.  ³ÇÊÐÃ³Ò×µÄÉú²úÏûºÄÇé¿ö
+ÏÔÊ¾ÔÚÃ³Ò×Ãæ°åÖÐ(¼ûÉÏÍ¼8). ¸ù¾Ý¹ú¼Òµ±Ç°µÄÕþÌå±ä»¯,
+ÒÔ¼°ÓëÊ×¶¼µÄµØÀí¾àÀë, ³ÇÊÐÖÐÒ»¶¨±ÈÀýµÄÃ³Ò×ËùµÃ»áÒòÎª
+¸¯°Ü¶ø°×°×Á÷Ê§, Ê£ÓàµÄ%t½«°´¼Æ»®ÖÐµÄ±ÈÀý·ÖÅäºó, ·Ö±ð
+ÓÃÓÚ¹ú¼ÒË°ÊÕ, ÉÝ³ÞÏû·ÑºÍ¿ÆÑ§ÑÐ¾¿. Ë°ÊÕ²¿·Ö(%c)µÖÏûÖ§³ö
+Ö®ºóµÄÊ£ÓàËùµÃ½«³äÈë¹ú¿â; ¿ÆÑÐ²¿·Ö(%r)½«ÓÃ×÷¿ÆÑÐ¾·Ñ,
+¼Ó¿ìµ±Ç°¿ÆÑÐµÄ½ø¶È; ÉÝ³Þ²¿·Ö(%l)¿Éµ÷ÕûÊÐÃñµÄ°²¶¨³Ì¶È.
 ×¢: Òª»ñµÃÃ³Ò×ÀûÈó, ¸Ã³ÇÖÁÉÙÐëÓµÓÐÒÔÏÂ½¨Öþ:\
 ::B49 ÊÐÕþÌü\\
 ;CORRUPTION Ïà¹Ø×ÊÁÏ: ¼ÆËã¸¯°Ü±ÈÀý\\
 !×ÊÔ´×Ô¶¯·ÖÅä\
+Ö¸¶¨ÏµÍ³¶Ô²É¼¯×ÊÔ´ÒÔ¼°Ö´ÐÐ½äÑÏµÄÊÐÃñ½øÐÐ×Ô¶¯ÓÅ»¯·ÖÅä.
 Íæ¼ÒÖ»Ðè¸ù¾Ý¸öÈËÄ¿±ê, Ö¸¶¨×îÓÅÒò×Ó(¼ûÉÏÍ¼9).
 ×Ô¶¯·ÖÅäÓÐÒÔÏÂÎåÖÖÄ£Ê½:
 -Ôö³¤×î´ó»¯(Ä¬ÈÏÄ£Ê½). È«Á¦±£Ö¤³ÇÊÐÈË¿ÚÔö³¤, ¾¡Ò»ÇÐ¿ÉÄÜ
 ÊÕ¼¯Ê³Îï×ÊÔ´.\
 -Éú²ú×î´ó»¯. È«Á¦±£Ö¤³ÇÊÐÉèÊ©½¨Éè, ¾¡¿ÉÄÜÊÕ¼¯ÔÁÏ×ÊÔ´.
+¿¼ÂÇµ½Íæ¼ÒÔÚ¹ºÂòÉèÊ©Ê±ÐèÒªÒ»¶¨²ÆÁ¦Ö§³Ö, ´ËÄ£Ê½Ò²²»»á
 ºöÂÔÁËÃ³Ò××ÊÔ´µÄÊÕ¼¯, ¶øÁ¸Ê³Óë¿ÆÑÐ×ÊÔ´½«±»»ù±¾ºöÂÔ.\
 -¿ÆÑÐ×î´ó»¯. ×ÅÖØÊÕ¼¯Ã³Ò××ÊÔ´(¼´¿ÆÑÐ¼°Ë°ÊÕµÄÀ´Ô´). Á¸Ê³
 ×ÊÔ´½«±»»ù±¾ºöÂÔ.\
 -Éú²úÓÅÏÈ. Ôö³¤¼°ÆäËûÒòËØ¼æ¹ËµÄÄ£Ê½, ÓÅÏÈ¿¼ÂÇÔÁÏÊÕ¼¯.\
 -¿ÆÑÐÓÅÏÈ. Ôö³¤¼°ÆäËûÒòËØ¼æ¹ËµÄÄ£Ê½, ÓÅÏÈ¿¼ÂÇÃ³Ò×ÊÕ¼¯. \\
 ;OPTI Ïà¹Ø×ÊÁÏ: ×ÊÔ´×Ô¶¯·ÖÅä¹«Ê½\\
 ×¢Òâ, ÔÚÄ³Ð©Çé¿öÏÂ, ×Ô¶¯·ÖÅä¿ÉÄÜÎÞÐ§, ÀýÈç:
 ÔÚ³ÇÊÐ½¨Éè¶¨ÎªÉÌÆ·Ã³Ò×Ê±Ñ¡Ôñ"Éú²ú×î´ó»¯";
 ÔÚ³ÇÊÐ¹æÄ£·¢Õ¹ÒÑ´ïÉÏÏÞÊ±Ñ¡Ôñ"Ôö³¤×î´ó»¯";
 ÔÚ³ÇÊÐÎÞÊÐÕþÌüÊÕ¼¯Ã³Ò×Ê±Ñ¡Ôñ"¿ÆÑÐ×î´ó»¯";
+ÒÔÉÏÇé¿öÏÂ, ÔÚ×Ô¶¯·ÖÅäÄ£Ê½ÏÂµÄÏµÍ³Ö»ÄÜÍË¶ø
 ÇóÆä´Î, ¿ÉÄÜµ¼ÖÂµÄºó¹ûÄÑÒÔÔ¤ÁÏ.\\
+ÓÐÈýÏîÇ¿ÖÆÌõ¼þµÄÓÅÏÈ¼¶ÉõÓÚÍæ¼ÒÖ¸¶¨µÄ×îÓÅÒò×Ó,
 Íæ¼ÒÎÞ·¨¸Ä±äÕâÈýÏîÌõ¼þ:\
 -Ê×ÒªÌõ¼þ: ³ÇÊÐÎ¬³Ö°²¶¨, ²»ÖÂÏÝÈëÉ§ÂÒ\
 -´ÎÒªÌõ¼þ: ±£Ö¤Á¥Êô²¿¶ÓµÄÔÁÏ¹©¸ø\
 -µÚÈýÌõ¼þ: ±£Ö¤³ÇÊÐÈË¿ÚÒÔ¼°Á¥Êô²¿¶ÓµÄÁ¸Ê³¹©¸ø\\
 !ÊÖ¶¯·ÖÅä\
 Èç¹û²»ÏëÊ¹ÓÃ×ÊÔ´×Ô¶¯·ÖÅä, ÓÐÁ½ÖÖ·½Ê½ÇÐ»»ÖÁÊÖ¶¯·ÖÅä:
+¿Éµã»÷Ô²ÐÎ·ÖÅä°´Å¥µ×²¿µÄ»ÒÉ«°ë»·; »òÕßÖ±½Óµã»÷ÉÏ·½µÄ
+³ÇÊÐµØÍ¼. ÔÚÊÖ¶¯Ä£Ê½ÏÂ, Íæ¼Ò¿É×ÔÓÉ·ÖÅäÊÐÃñÔÚÖ¸¶¨µÄµØ¿é
 ÊÕ¼¯×ÊÔ´, »òÊÇ¸ÄÎª³ÇÊÐ½äÑÏ²¿¶Ó. µã»÷ÔÚµØ¿éÉÏ¹¤×÷µÄÊÐÃñ,
+¿É½«Æä¸ÄÎª³ÇÊÐ½äÑÏ²¿¶Ó; µã»÷ÎÞÈË¹¤×÷µÄµØ¿é, ¿É½«Ö´ÐÐ
+½äÑÏµÄÊÐÃñÖ¸ÅÉµ½¸ÃµØ¿é¹¤×÷. ½áºÏÒÔÉÏÁ½²½, ¼´¿É½«Ò»¸öµØ¿é
 ÉÏ¹¤×÷µÄÊÐÃñ×ªÒÆÖÁÁíÒ»µØ¿é.\\
+µ±×ÊÔ´×Ô¶¯·ÖÅäÄ£Ê½±»¹Ø±Õºó, ÇëÁôÐÄÒÔÏÂ¹©ÇóµÄÆ½ºâ:
+Á¸Ê³¹©¸ø, ²¿¶ÓÔÁÏ¹©¸ø, ÒÔ¼°³ÇÊÐ°²¶¨ÈË¿ÚµÄ±ÈÀý, ·ñÔò
 ¿ÉÄÜ³öÏÖÒâÁÏ²»µ½µÄºó¹û.\\
 !³ÇÊÐÉ§ÂÒ\
 Èç¹û³ÇÊÐµÄ²»°²ÈË¿ÚÊý³¬¹ýÁË°²¶¨ÈË¿ÚÊý, Õû¸ö³ÇÊÐ½«ÏÝÈëÉ§ÂÒ,
 ËùÓÐÉú²ú, ¿ÆÑÐ¼°Ë°ÊÕ»î¶¯Í£ÖÍ. ´ÓÉ§ÂÒ±¬·¢ºóµÄµÚ¶þ»ØºÏ¿ªÊ¼,
+³ÇÊÐ²»ÔÙ¸øÁ¥ÊôµÄ²¿¶Ó¹©¸ø×ÊÔ´, ÐèÒª×ÊÔ´Î¬³ÖµÄ²¿¶Ó½«ÖðÖ§
 ½âÉ¢, Ã¿»ØºÏ¼õÉÙÒ»Ö§, Ö±ÖÁÉ§ÂÒ½áÊø.\\
+ÔÚÍ¨³£Çé¿öÏÂ, ×Ô¶¯·ÖÅäÄ£Ê½×ÜÄÜ±ÜÃâ³ÇÊÐÉ§ÂÒµÄ·¢Éú, ³ý·Ç
+·¢Éú¹ý¶àµÄ²»°²ÊÂ¼þ. Èç¹ûÓöµ½ÉÏÊöÇé¿ö, Çë½«µ¼ÖÂ²»°²ÊÂ¼þ
 µÄ²¿¶Ó³·»Øµ½±¾ÍÁ, »ò½âÉ¢ÕâÐ©²¿¶Ó, ¼´¿ÉÊ¹³ÇÊÐ»Ö¸´ÖÈÐò.\\
 Èç¹û¹Ø±ÕÁË×Ô¶¯·ÖÅäÄ£Ê½, Çë±ðÍüÁË¿ØÖÆ³ÇÊÐ°²¶¨ÈË¿ÚµÄ±ÈÀý.
 ×î³£ÓÃµÄ·½·¨ÊÇ½«¸ü¶àÊÐÃñ¸ÄÎª³ÇÊÐ½äÑÏ²¿¶Ó.
+每个地块出产资源的多少取决于以下三个条件:\
+::T 地形种类\
+::J 地形改造\
+::G 政体形式\\
+!粮食\
+粮食(符号为%f)代表了各种食物. 城市粮食的生产消耗
+情况显示在粮食面板中(见上图4).  粮食是人类每日的根本,
+每个市民每回合需消耗2%f. 还有一些部队需要定量的粮食
+作为供给, 如粮食供应不足, 将从城市的存粮中扣除. 如果
+存粮耗尽, 城市陷入饥荒, 会有一名市民或一支部队消失.
+但在通常情况下, 城市生产的粮食量不会低于消耗量. 如果
+生产的粮食有剩余, 多余的粮食将计入存粮, 但有一种情况
+属于例外: 规模达到8的大城市每回合如果多余1单位的粮食,
+则这1单位粮食将直接转为资金, 不计入存粮. 如果存粮达到
+上限, 且城市规模未达上限, 那么这个城市的规模会提升1级,
+市民数量加1.\\
+!原料\
+原料 (符号为%p)是一种抽象的资源, 是各种劳动生产资源
+如木头, 矿石, 石油等的总称. 城市原料的生产消耗情况显示
+在原料面板中(见上图5). 城市中某些隶属部队需消耗一定量
+的原料以维持日常供给, 剩余原料将投入到生产建设之中.
+您可更改城市当前建设的项目(见上图6). 城市地图(见上图7)
+显示了城市当前设施的位置.
+有关建设的详细信息, 请参考下一章节"生产详解".\\
+!贸易\
+贸易(符号为%t)代表城市的贸易所得. 只有城市周围的地块
+才能进行贸易, 城市本身所在的地块不会贡献任何贸易值,
+即便城市建在金矿上也无济于事.  城市贸易的生产消耗情况
+显示在贸易面板中(见上图8). 根据国家当前的政体变化,
+以及与首都的地理距离, 城市中一定比例的贸易所得会因为
+腐败而白白流失, 剩余的%t将按计划中的比例分配后, 分别
+用于国家税收, 奢侈消费和科学研究. 税收部分(%c)抵消支出
+之后的剩余所得将充入国库; 科研部分(%r)将用作科研经费,
+加快当前科研的进度; 奢侈部分(%l)可调整市民的安定程度.
+注: 要获得贸易利润, 该城至少须拥有以下建筑:\
+::B49 市政厅\\
+;CORRUPTION 相关资料: 计算腐败比例\\
+!资源自动分配\
+指定系统对采集资源以及执行戒严的市民进行自动优化分配.
+玩家只需根据个人目标, 指定最优因子(见上图9).
+自动分配有以下五种模式:
+-增长最大化(默认模式). 全力保证城市人口增长, 尽一切可能
+收集食物资源.\
+-生产最大化. 全力保证城市设施建设, 尽可能收集原料资源.
+考虑到玩家在购买设施时需要一定财力支持, 此模式也不会
+忽略了贸易资源的收集, 而粮食与科研资源将被基本忽略.\
+-科研最大化. 着重收集贸易资源(即科研及税收的来源). 粮食
+资源将被基本忽略.\
+-生产优先. 增长及其他因素兼顾的模式, 优先考虑原料收集.\
+-科研优先. 增长及其他因素兼顾的模式, 优先考虑贸易收集. \\
+;OPTI 相关资料: 资源自动分配公式\\
+注意, 在某些情况下, 自动分配可能无效, 例如:
+在城市建设定为商品贸易时选择"生产最大化";
+在城市规模发展已达上限时选择"增长最大化";
+在城市无市政厅收集贸易时选择"科研最大化";
+以上情况下, 在自动分配模式下的系统只能退而
+求其次, 可能导致的后果难以预料.\\
+有三项强制条件的优先级甚于玩家指定的最优因子,
+玩家无法改变这三项条件:\
+-首要条件: 城市维持安定, 不致陷入骚乱\
+-次要条件: 保证隶属部队的原料供给\
+-第三条件: 保证城市人口以及隶属部队的粮食供给\\
+!手动分配\
+如果不想使用资源自动分配, 有两种方式切换至手动分配:
+可点击圆形分配按钮底部的灰色半环; 或者直接点击上方的
+城市地图. 在手动模式下, 玩家可自由分配市民在指定的地块
+收集资源, 或是改为城市戒严部队. 点击在地块上工作的市民,
+可将其改为城市戒严部队; 点击无人工作的地块, 可将执行
+戒严的市民指派到该地块工作. 结合以上两步, 即可将一个地块
+上工作的市民转移至另一地块.\\
+当资源自动分配模式被关闭后, 请留心以下供求的平衡:
+粮食供给, 部队原料供给, 以及城市安定人口的比例, 否则
+可能出现意料不到的后果.\\
+!城市骚乱\
+如果城市的不安人口数超过了安定人口数, 整个城市将陷入骚乱,
+所有生产, 科研及税收活动停滞. 从骚乱爆发后的第二回合开始,
+城市不再给隶属的部队供给资源, 需要资源维持的部队将逐支
+解散, 每回合减少一支, 直至骚乱结束.\\
+在通常情况下, 自动分配模式总能避免城市骚乱的发生, 除非
+发生过多的不安事件. 如果遇到上述情况, 请将导致不安事件
+的部队撤回到本土, 或解散这些部队, 即可使城市恢复秩序.\\
+如果关闭了自动分配模式, 请别忘了控制城市安定人口的比例.
+最常用的方法是将更多市民改为城市戒严部队.
 #CORRUPTION
 $¼ÆËã¸¯°Ü±ÈÀý\
 !¼ÆËã¸¯°Ü±ÈÀý\
 Ò»¸ö³ÇÊÐµÄ¸¯°Ü±ÈÀý, ¸ù¾ÝÒÔÏÂ¹«Ê½¼ÆËã:\
 @CORRUPTION\
 -T - ³ÇÊÐÃ³Ò××ÜÖµ\
 -C - ÕþÌå¸¯°ÜÒò×Ó\
 -D - ³ÇÊÐÓëÊ×¶¼µÄ¾àÀë\
 -Dmax - ÀíÂÛÉÏÏà¸ô×îÔ¶µÄÁ½×ù³ÇÊÐ¼äµÄ¾àÀë (¼´ÒÔµØÍ¼
 È«¸ßÓëµØÍ¼°ë¿íÎªÖ±½Ç±ß, ËùµÃµÄÈý½ÇÐÎÐ±±ß³¤¶È)\\
+Èç¹ûÒ»¸ö¹ú¼ÒÃ»ÓÐÊ×¶¼, ÔòÎÞÂÛÎªºÎÖÖÕþÌå, ¸Ã¹úËùÓÐ³ÇÊÐ
 ÖÐµÄ¸¯°Ü±ÈÀýÎª100%, ÓÐ·¨ÔºµÄ³ÇÊÐ¸¯°Ü±ÈÀýÎª50%.
+$计算腐败比例\
+!计算腐败比例\
+一个城市的腐败比例, 根据以下公式计算:\
+@Corruption\
+-T - 城市贸易总值\
+-C - 政体腐败因子\
+-D - 城市与首都的距离\
+-Dmax - 理论上相隔最远的两座城市间的距离 (即以地图
+全高与地图半宽为直角边, 所得的三角形斜边长度)\\
+如果一个国家没有首都, 则无论为何种政体, 该国所有城市
+中的腐败比例为100%, 有法院的城市腐败比例为50%.
 #OPTI
 $×ÊÔ´×Ô¶¯·ÖÅäÌõ¼þ¹«Ê½\
 !×ÊÔ´×Ô¶¯·ÖÅäÌõ¼þ¹«Ê½\
 ×Ô¶¯·ÖÅä×ÊÔ´¹²°üÀ¨ÎåÖÖÇé¿ö, ÆäÖÐµÄ²î±ðÔÚÓÚÓÅÏÈÒò×ÓmµÄÈ·¶¨¼°¼ÆËã. ÓÅÏÈÒò×ÓmµÄ¿¼Á¿·¶Î§°üÀ¨ÒÔÏÂËÄÀà: Á¸Ê³(f), ÔÁÏ(p),
 Ë°ÊÕ(t)ºÍ¿ÆÑÐ(r), m2Îª´ÎÓÅÒò×Ó, ÒÔ´ËÀàÍÆ\
 -Ôö³¤×î´ó»¯: m = f, m2 = 2p + t + r\
 -Éú²ú×î´ó»¯: m = 4p + t, m2 = r, m3 = f\
 -¿ÆÑÐ×î´ó»¯: m = 2r + t + p, m2 = f\
 -Éú²úÓÅÏÈ: m = sqrt(f) * (8p + 2t + r)\
 -¿ÆÑÐÓÅÏÈ: m = sqrt(f) * (r + t + p)
+$资源自动分配条件公式\
+!资源自动分配条件公式\
+自动分配资源共包括五种情况, 其中的差别在于优先因子m的确定及计算. 优先因子m的考量范围包括以下四类: 粮食(f), 原料(p),
+税收(t)和科研(r), m2为次优因子, 以此类推\
+-增长最大化: m = f, m2 = 2p + t + r\
+-生产最大化: m = 4p + t, m2 = r, m3 = f\
+-科研最大化: m = 2r + t + p, m2 = f\
+-生产优先: m = sqrt(f) * (8p + 2t + r)\
+-科研优先: m = sqrt(f) * (r + t + p)
 #PRODUCTION
 $Éú²úÏê½â\
 !Éú²úÄ¿±ê\
+½¨Á¢ÐÂ³Ç»òÕ¼ÁìµÐ³Çºó, µ±Ç°µÄ½¨ÉèÄ¿±ê½«¶¨Îª "ÉÌÆ·Ã³Ò×",
+Òâ¼´½«Éú²úÔÁÏÖ±½Ó×ª»»Îª½ðÇ®ÀûÈó. µã»÷Ä¿±êÍ¼Æ¬, ¿ÉÑ¡Ôñ
+ÆäËûÄ¿±ê, Ñ¡Ôñ·¶Î§È¡¾öÓÚ±¾¹úµÄ¿Æ¼¼·¢Õ¹Ë®Æ½. °´×¡Shift¼ü
 ºóµã»÷ÏîÄ¿, ¿ÉÏÔÊ¾Ïà¹Ø°ïÖú. ÓÐ3Àà½¨ÉèÄ¿±ê¿É¹©Ñ¡Ôñ:\
 -²¿¶Ó\
 -³ÇÊÐÉèÊ©\
 -Ææ¼£¼°¹ú¼Ò¹¤³Ì\\
+Èç¹û½«³ÇÊÐµ±Ç°µÄ½¨ÉèÄ¿±ê ¸ü¸ÄÎªÍ¬ÀàÖÐµÄÆäËûÉèÊ©»ò²¿¶Ó,
+ÀÛ»ýµÄÉú²úÔÁÏ½«ËðÊ§Èý·ÖÖ®Ò». Èç¹û¸ü¸ÄÎªÆäËûÀà±ðµÄÉèÊ©
+»ò²¿¶Ó, ÔòÀÛ»ýµÄÉú²úÔÁÏ½«Ö±½Ó±äÂôÎª½ðÇ®.  ÒªÏë¼Ó¿ìÉèÊ©
+½¨ÉèµÄËÙ¶È, ¿ÉÑ¡ÔñÒÑÓÐµÄÉèÊ©, ¶øºóÑ¡ÔñÍÆµ¹ÖØ½¨, ÔòÔÉèÊ©
+Èý·ÖÖ®¶þµÄÉú²úÔÁÏ½«±»»ØÊÕ, Ö±½ÓÌí¼Óµ½µ±Ç°½¨ÉèÉèÊ©µÄ
+Éú²úÔÁÏÖÐ; ÒªÏë¼Ó¿ì²¿¶Ó½¨ÉèµÄËÙ¶È (½¨Éè¶Ó³ýÍâ), ¿ÉÑ¡Ôñ
+³ÇÄÚ×¤ÊØµÄ²¿¶Ó, ¶øºóÑ¡ÔñÕû±à, ÔòÔ²¿¶ÓÈý·ÖÖ®¶þµÄÈËÔ±½«
 Ö±½Ó¼ÓÈëµ±Ç°½¨Éè²¿¶ÓÖ®ÖÐ.\\
 !ÒÆÃñ\
+ÍØ»ÄÕß¡¢¹¤³ÌÊ¦¡¢Å«Á¥ÒÔ¼°Õ÷Ä¼²¿¶Ó¶¼À´×ÔÓÚÊÐÃñ, Òò´ËÔÚ
+Éú²úÕâÐ©²¿¶Óºó, ³ÇÊÐ¹æÄ£½«»áËõÐ¡. Éú²úÕ÷Ä¼²¿¶ÓºÍÅ«Á¥,
+¹æÄ£½«ËõÐ¡Ò»¼¶; Éú²úÍØ»ÄÕßºÍ¹¤³ÌÊ¦, ³ÇÊÐ¹æÄ£½«ËõÐ¡Á½¼¶.
+ÒÆÃñ¹ý³ÌÊÇ¿ÉÄæµÄ: ½«ÒÔÉÏ²¿¶Ó¼ÓÈë³ÇÊÐ, ¿ÉÊ¹³ÇÊÐ¹æÄ£À©´ó,
 Ç°ÌáÊÇ³ÇÊÐ¹æÄ£Î´´ïµ½ÉÏÏÞ.\\
 !Õ÷Ä¼\
+¿ÉÒÔÓÃÕ÷Ä¼µÄ·½Ê½Éú²úÈÎºÎÒÑÖªµÄµØÃæ²¿¶Ó. Õ÷Ä¼µÄ²¿¶Ó
+½«¶àºÄ·Ñ1%fÊ³Îï. Õ÷Ä¼µÄºÃ´¦ÔÚÓÚ, ¿É½«²¿¶ÓµÄÉú²úÊ±¼ä
 Ëõ¼õµ½ÔÀ´µÄÈý·ÖÖ®Ò». ÒªÕ÷Ä¼²¿¶Ó, ÐëÏÈ»ñµÃÒÔÏÂ¿Æ¼¼:\
 ::A18 Õ÷±øÖÆ¶È\\
 !ÂòÂôÉú²úÔÁÏ\
+ÒªÑ¸ËÙÍê³ÉÉú²ú, ¿É»¨Ç®¹ºÂò, ¹ºÂòºóµÄÄ¿±ê½«ÓÚÏÂ»ØºÏ
+¿ªÊ¼Ê±Íê¹¤. ÒªÏë¿ì,µÃ»¨´ó¼ÛÇ®: Ã¿¸öÎ´Íê³ÉµÄÔÁÏ%p,
+ÐèÖ§¸¶4±¶µÄ½ðÇ®. ·´ÑÔÖ®, Ò²¿ÉÒÔ±äÂôÉú²úÔÁÏ, Ö»Ðè½«
 Ä¿±ê¸ÄÎª"ÉÌÆ·Ã³Ò×"¼´¿É. ÀÛ»ýµÄÉú²úÔÁÏ½«×ª»»Îª½ðÇ®.\\
 !ÎÛÈ¾\
+Ã¿1µãÔÁÏÉú²ú¶¼½«Ôì³É1µãÎÛÈ¾, ¶øÃ¿¸öÊÐÃñ¿ÉµÖÏû1µãÎÛÈ¾,
+¶àÓàµÄÎÛÈ¾½«ÂýÂý»ýÀÛÎª·ÏÁÏ, Èç¹û»ýÀÛµÄ·ÏÁÏÊýÁ¿´ïµ½240,
+³ÇÊÐ·¶Î§ÄÚ½«³öÏÖÒ»´¦ÎÛÈ¾Çø, ¸ÃµØ¿éµÄ×ÊÔ´²úÁ¿½«½µÎªÔÏÈ
 µÄÒ»°ë. ÍØ»ÄÕßºÍ¹¤³ÌÊ¦¿ÉÒÔÇåÀíÎÛÈ¾.
+$生产详解\
+!生产目标\
+建立新城或占领敌城后, 当前的建设目标将定为 "商品贸易",
+意即将生产原料直接转换为金钱利润. 点击目标图片, 可选择
+其他目标, 选择范围取决于本国的科技发展水平. 按住Shift键
+后点击项目, 可显示相关帮助. 有3类建设目标可供选择:\
+-部队\
+-城市设施\
+-奇迹及国家工程\\
+如果将城市当前的建设目标 更改为同类中的其他设施或部队,
+累积的生产原料将损失三分之一. 如果更改为其他类别的设施
+或部队, 则累积的生产原料将直接变卖为金钱.  要想加快设施
+建设的速度, 可选择已有的设施, 而后选择推倒重建, 则原设施
+三分之二的生产原料将被回收, 直接添加到当前建设设施的
+生产原料中; 要想加快部队建设的速度 (建设队除外), 可选择
+城内驻守的部队, 而后选择整编, 则原部队三分之二的人员将
+直接加入当前建设部队之中.\\
+!移民\
+拓荒者、工程师、奴隶以及征募部队都来自于市民, 因此在
+生产这些部队后, 城市规模将会缩小. 生产征募部队和奴隶,
+规模将缩小一级; 生产拓荒者和工程师, 城市规模将缩小两级.
+移民过程是可逆的: 将以上部队加入城市, 可使城市规模扩大,
+前提是城市规模未达到上限.\\
+!征募\
+可以用征募的方式生产任何已知的地面部队. 征募的部队
+将多耗费1%f食物. 征募的好处在于, 可将部队的生产时间
+缩减到原来的三分之一. 要征募部队, 须先获得以下科技:\
+::A18 征兵制度\\
+!买卖生产原料\
+要迅速完成生产, 可花钱购买, 购买后的目标将于下回合
+开始时完工. 要想快,得花大价钱: 每个未完成的原料%p,
+需支付4倍的金钱. 反言之, 也可以变卖生产原料, 只需将
+目标改为"商品贸易"即可. 累积的生产原料将转换为金钱.\\
+!污染\
+每1点原料生产都将造成1点污染, 而每个市民可抵消1点污染,
+多余的污染将慢慢积累为废料, 如果积累的废料数量达到240,
+城市范围内将出现一处污染区, 该地块的资源产量将降为原先
+的一半. 拓荒者和工程师可以清理污染.
 #BUILDINGS
 $½¨Öþ½éÉÜ\
+$建筑介绍\
 @@67\
 !½¨Öþ½éÉÜ\
+½¨Öþ»á¶ÔËùÔÚµÄ³ÇÊÐ, ÉõÖÁÕû¸ö¹ú¼Ò²úÉú»ý¼«µÄ×÷ÓÃ.
 ¹²ÓÐ3ÖÖ½¨Öþ, ËüÃÇÖ®¼äµÄÇø±ðÔÚÓÚ¿É½¨ÔìµÄÊýÁ¿:\
 -³ÇÊÐÉèÊ©: Ã¿¸ö³ÇÊÐ¶¼¿É½¨Éè.\
 -¹ú¼Ò¹¤³Ì: Ã¿Ïî¹ú¼Ò¹¤³Ì, Í¬Ò»¸ö¹ú¼ÒÖ»ÄÜ½¨ÉèÒ»´Î.
+ÈôÔÚÐÂµÄ³ÇÊÐ½¨ÉèÒÑÓÐµÄ¹ú¼Ò¹¤³Ì, ÔÚÐÂ½¨ÉèÍê¹¤Ê±,
 ÔÓÐµÄ¹ú¼Ò¹¤³Ì½«±»±äÂô.\
 -ÊÀ½çÆæ¼£: È«ÊÀ½çÖ»ÔÊÐíÓµÓÐÒ»×ù. Èç¹ûÄ³¹ú½¨³ÉÁË
+Ææ¼£, ÔòÆäËû¹ú¼Ò²»ÄÜÔÙ½¨ÏàÍ¬µÄÆæ¼£. Èç¹û½¨³ÉµÄ
+Ææ¼£Ëæ×ÅËùÔÚ³ÇÊÐÒ»Æð±»µÐ¾ü´Ý»Ù, ¾Í»áÓÀÔ¶ÏûÊ§,
+ÎÞ·¨¸´½¨. ³ýÁË¸÷×ÔµÄÌØÊâÐ§¹ûÖ®Íâ, Ã¿×ùÆæ¼£»¹ÄÜ
 Ê¹ËùÔÚ³ÇÊÐÖÐµÄÒ»Ãû²»°²ÊÐÃñ±äÎª°²¶¨.\\
 ::B ³ÇÊÐÉèÊ©\
 ::B201 ¹ú¼Ò¹¤³Ì\
 ::B202 ÊÀ½çÆæ¼£\\
+´ó²¿·Ö³ÇÊÐÉèÊ©ºÍ¹ú¼Ò¹¤³Ì¶¼ÐèÒªÏÖ½ðÎ¬³Ö, Ã¿»ØºÏ
+Ëù»¨·ÑµÄÏÖ½ð½«×Ô¶¯´Ó¹ú¿âÖÐ¿Û³ý. Èç¹û¹ú¿âºÄ¾¡,
 ½«Ëæ»ú±äÂôÒ»ÏîÉèÊ©, ÓÃÒÔµÖÕ®.\\
+ÔÚ³ÇÊÐ»ÃæÖÐ, °´"³ÇÊÐÉèÊ©"°´Å¥, ¿É²é¿´³ÇÊÐÖÐÏÖÓÐµÄ
+ÉèÊ©ÁÐ±í. Èç¹ûÒª½«Ä³ÏîÉèÊ©±äÂô, »òÍÆµ¹ÖØ½¨Ä³ÉèÊ©,
+ÒÔ¼Ó¿ìµ±Ç°ÉèÊ©µÄ½¨Éè½ø¶È, ×ó¼üµ¥»÷ÆäÍ¼±ê¼´¿É.
 ÉèÊ©±äÂôµÄ¼Û¸ñµÈÍ¬ÓÚÆäÉú²úÔÁÏ»»Ëã³ÉÏÖ½ðµÄ¼Û¸ñ.
+!建筑介绍\
+建筑会对所在的城市, 甚至整个国家产生积极的作用.
+共有3种建筑, 它们之间的区别在于可建造的数量:\
+-城市设施: 每个城市都可建设.\
+-国家工程: 每项国家工程, 同一个国家只能建设一次.
+若在新的城市建设已有的国家工程, 在新建设完工时,
+原有的国家工程将被变卖.\
+-世界奇迹: 全世界只允许拥有一座. 如果某国建成了
+奇迹, 则其他国家不能再建相同的奇迹. 如果建成的
+奇迹随着所在城市一起被敌军摧毁, 就会永远消失,
+无法复建. 除了各自的特殊效果之外, 每座奇迹还能
+使所在城市中的一名不安市民变为安定.\\
+::B 城市设施\
+::B201 国家工程\
+::B202 世界奇迹\\
+大部分城市设施和国家工程都需要现金维持, 每回合
+所花费的现金将自动从国库中扣除. 如果国库耗尽,
+将随机变卖一项设施, 用以抵债.\\
+在城市画面中, 按"城市设施"按钮, 可查看城市中现有的
+设施列表. 如果要将某项设施变卖, 或推倒重建某设施,
+以加快当前设施的建设进度, 左键单击其图标即可.
+设施变卖的价格等同于其生产原料换算成现金的价格.
 #SUPPORT
 $²¿¶ÓÁ¥Êô\
 !²¿¶ÓÁ¥Êô\
+Ã¿Ö§²¿¶ÓÃ¿»ØºÏÐèÏûºÄ1%pÉú²úÔÁÏ, ÏûºÄÔÁÏ´ÓÁ¥Êô³ÇÊÐ
+ÖÐ¿Û³ý. ±àÖÆÔÚ6%wÒÔÉÏµÄ´¬Ö», ÐèÏûºÄË«±¶µÄÉú²úÔÁÏ.
+²¿¶Ó×î³õÁ¥ÊôÓÚÉú²ú¸Ã²¿¶ÓµÄ³ÇÊÐ. Èç¹ûÏë¸Ä±äÁ¥Êô³ÇÊÐ,
+½«²¿¶ÓÒÆÖÁÒªÁ¥ÊôµÄ³ÇÊÐºó, Ñ¡Ôñ"¸ÄÎª±¾³Ç²¿¶Ó"¼´¿É.
 ³ÇÊÐ»ÃæÖÐÑ¡Ôñ"Á¥Êô²¿¶Ó"°´Å¥, ¿É²é¿´¸Ã³ÇµÄÁ¥Êô²¿¶Ó.\\
+Ò»Ð¡²¿·Ö²¿¶Ó²»ÐèÒªÉú²úÔÁÏ¹©¸ø, ÎÞÐè¹©¸øµÄ²¿·ÖÒÔ
+»ÒÉ«(%n)ÏÔÊ¾, ÐèÒª¹©¸øµÄ²¿·ÖÒÔÁÁÉ«(%p)ÏÔÊ¾. ÕâÅú
+²¿¶ÓµÄÊýÁ¿È¡¾öÓÚÕþÌåÐÎÊ½. Èç¹û³ÇÊÐÎÞ·¨Ìá¹©×ã¹»µÄ
 Éú²úÔÁÏ¹©¸ø²¿¶Ó, ÔòÆäÖÐ×îÁ®¼ÛµÄ²¿¶Ó½«±»Ç¿ÐÐ½âÉ¢.\\
+Èç¹û³ÇÊÐÉ§ÂÒ³¬¹ýÒ»¸ö»ØºÏ, Æä²¿¶Ó¹©¸ø½«È«²¿Í£ÖÍ,
+Èç¹û¸Ã³ÇÊÐ´æÔÚÁ¥Êô²¿¶Ó, ÔòÃ¿»ØºÏ½«ÓÐ1Ö§²¿¶Ó±»½âÉ¢,
 Ö±ÖÁÉ§ÂÒ½áÊø.
+$部队隶属\
+!部队隶属\
+每支部队每回合需消耗1%p生产原料, 消耗原料从隶属城市
+中扣除. 编制在6%w以上的船只, 需消耗双倍的生产原料.
+部队最初隶属于生产该部队的城市. 如果想改变隶属城市,
+将部队移至要隶属的城市后, 选择"改为本城部队"即可.
+城市画面中选择"隶属部队"按钮, 可查看该城的隶属部队.\\
+一小部分部队不需要生产原料供给, 无需供给的部分以
+灰色(%n)显示, 需要供给的部分以亮色(%p)显示. 这批
+部队的数量取决于政体形式. 如果城市无法提供足够的
+生产原料供给部队, 则其中最廉价的部队将被强行解散.\\
+如果城市骚乱超过一个回合, 其部队供给将全部停滞,
+如果该城市存在隶属部队, 则每回合将有1支部队被解散,
+直至骚乱结束.
 #MACRO
 $¿ìËÙºê²Ù×÷\
 !¿ìËÙºê²Ù×÷\
+ÓÎÏ·ÊÇÒ»ÖÖÀÖÈ¤, ¶ø²»ÊÇ¹¤×÷. ½èÖú¿ìËÙºê²Ù×÷, ´Ó·±Ëö
+µÄÖØ¸´ÃüÁîÖÐ½âÍÑ, ÌÚ³öÊÖÀ´×¨×¢·¢Õ¹ÓÎÏ·²ßÂÔ°É.
+¿ìËÙºê²Ù×÷²¢·Ç±Ø²»¿ÉÉÙµÄ¹¤¾ß, µ«ÓÐÖúÓÚ¼ò»¯ÓÎÏ·²Ù×÷.
 ½¨ÒéÔÚÊ¹ÓÃÖ®Ç°, ×îºÃÄÜÏÈÁË½âÒ»ÏÂÏà¹ØµÄÖªÊ¶Òªµã.\\
 !µØÐÎ¸ÄÔì\
+Õë¶ÔÄ³Ò»ÀàµØÐÎ, ¶¨Òå²Ù×÷µÄ´ÎÐò. ¶¨ÒåÍê³Éºó, ¿ÉÔÚ
+ÒÆÃñ²¿¶ÓµÄÐÐ¶¯ÃüÁîÖÐÑ¡Ôñ"µØÐÎ¸ÄÔì"(¿ì½Ý¼ü: E),
+ÒÆÃñ²¿¶Ó¾Í»áÒÀ´Î½øÐÐÒÑÉè¶¨µÄ¸ÄÔì²Ù×÷. Èç¹ûÊ¹ÓÃ
+´øÓÐÖÐ¼üµÄÊó±ê, ¿É½áºÏÄ¿±êÒÆ¶¯ÃüÁîÒ»²¢Ö´ÐÐ. ÔÚÒª
+¸ÄÔìµÄµØÐÎÉÏµ¥»÷Êó±êÖÐ¼ü, ÒÆÃñ²¿¶Ó»áÒÔ¸ÃµØÐÎÎª
 Ä¿±êÒÆ¶¯, µ½´ïºó×Ô¶¯Ö´ÐÐ¸ÄÔì¹¤×÷.\\
 !³ÇÊÐÀàÐÍ\
+Õë¶ÔËÄÖÖ²»Í¬ÀàÐÍµÄ³ÇÊÐ, Éè¶¨½¨ÉèÉèÊ©µÄ´ÎÐò. ÓÃÊó±ê
+½«ÁÐ±íÏÂ·½µÄ½¨ÖþÉèÊ©ÍÏÒ·µ½ÉÏ·½µÄÊý×Ö¿òÄÚ, ÒÔÉè¶¨
+ÏÈºó´ÎÐò, È»ºóÔÚ³ÇÊÐµÄ½¨Éè´°¿ÚÖÐÑ¡Ôñ¸Ã³ÇÊÐÀàÐÍ, ¼´
+¿É°´Éè¶¨Á÷³ÌÒÀ´Î½¨Éè. Èç¹ûµ±Ç°ÓÐÉèÊ©ÔÚ½¨, Éè¶¨µÄ´ÎÐò
+½«ÔÚÔÚ½¨µÄÉèÊ©½¨³ÉºóÔÙÐÐÆô¶¯.
+$快速宏操作\
+!快速宏操作\
+游戏是一种乐趣, 而不是工作. 借助快速宏操作, 从繁琐
+的重复命令中解脱, 腾出手来专注发展游戏策略吧.
+快速宏操作并非必不可少的工具, 但有助于简化游戏操作.
+建议在使用之前, 最好能先了解一下相关的知识要点.\\
+!地形改造\
+针对某一类地形, 定义操作的次序. 定义完成后, 可在
+移民部队的行动命令中选择"地形改造"(快捷键: E),
+移民部队就会依次进行已设定的改造操作. 如果使用
+带有中键的鼠标, 可结合目标移动命令一并执行. 在要
+改造的地形上单击鼠标中键, 移民部队会以该地形为
+目标移动, 到达后自动执行改造工作.\\
+!城市类型\
+针对四种不同类型的城市, 设定建设设施的次序. 用鼠标
+将列表下方的建筑设施拖曳到上方的数字框内, 以设定
+先后次序, 然后在城市的建设窗口中选择该城市类型, 即
+可按设定流程依次建设. 如果当前有设施在建, 设定的次序
+将在在建的设施建成后再行启动.
 #START
 $ÓÎÏ·¿ªÊ¼»Ãæ\
 !ÐÂ½¨ÓÎÏ·\
 ÓÎÏ·¿ªÊ¼»Ãæ°üº¬ÁËÈýÕÅÒ³Ãæ, ÒªÐÂ½¨ÓÎÏ·, ÇëÔÚ"ÐÂ½¨ÓÎÏ·"
+Ò³ÃæÉè¶¨¾ºÕùÖÖ×åµÄÊýÁ¿, ÓÎÏ·ÄÑ¶È, ÒÔ¼°ÓÎÏ·µÄ×îºóÄêÏÞ.
+Èç¹ûÄú°²×°ÁËÆäËûAIÄ£¿é, ¿Éµ¥»÷AI¿ò½øÐÐÉè¶¨. È«²¿ÉèÖÃ
 ½áÊøºó, °´"¿ªÊ¼"°´Å¥½øÈëÓÎÏ·.\\
 !×Ô¶¨ÒåÍæ¼Ò\
+¹´Ñ¡"×Ô¶¨ÒåÍæ¼Ò"¿ò, ´ò¿ª¸ü¶àÏêÏ¸ÉèÖÃ. ÔÚ×Ô¶¨Òå»ÃæÖÐ,
+²»½ö¿ÉÒÔ¶Ô¾ºÕùÖÖ×åAI, µçÄÔÓÎÏ·ÄÑ¶È, ÈËÀàÍæ¼ÒÊýÁ¿µÈµÈ
+½øÐÐÏêÏ¸ÉèÖÃ, Ò²¿ÉÕ¹¿ªµçÄÔAIÄ£¿éµÄ¿ìËÙ¶Ô¾ö, »òÑ¡Ôñ
 "³¬¼¶ÓÃ»§"Ä£Ê½, ÒÔÉÏµÛµÄ½Ç¶È¹Û¿´Õû¸öÊÀ½çµÄÐÝÆÝÐËË¥.
+µ¥»÷·½¿ò¿ÉÑ¡ÔñÈËÀàÍæ¼Ò»òµçÄÔAI,  ·½¿ò×ó²àµÄ"3"×ÖÈôÎª
+¹´Ñ¡×´Ì¬, ÔòÕâ·½¿ò´ú±íÁË3ÃûÍæ¼ÒµÄ¹²Í¬Éè¶¨. ÓÉ´Ë¿ÉÖª,
 ÓÎÏ·Íæ¼ÒµÄÉÏÏÞÊýÁ¿Îª15Ãû.\\
+·½¿ò×ó²àµÄÖ¸Ê¾Ìõ´ú±íÁËÍæ¼ÒµÄÓÎÏ·ÄÑ¶È, 1Îª¼òµ¥, 3ÎªÀ§ÄÑ.
+Èç¹ûÏë¾¡¿ÉÄÜµØÌá¸ßÓÎÏ·ÄÑ¶È, ¿É½«ÈËÀàÍæ¼ÒµÄÄÑ¶ÈÉèÎª×î¸ß,
 ²¢½«ËùÓÐAIÍæ¼ÒµÄÄÑ¶ÈÉèÖÃÎª×îµÍ.\\
+ÄÑ¶ÈÔ½¸ß, ÈË¿ÚÔö³¤, Éú²úËÙ¶ÈºÍÑÐ¾¿½ø¶È¶¼»á±äÂý, ÐÂÐÍ±øÖÖ
 µÄÔì¼ÛÒ²»á±äµÃ¸üÎª°º¹ó.\\
 !¶ÁÈ¡½ø¶È\
 ÔÚ¶ÁÈ¡½ø¶ÈÒ³ÃæÖÐ, ¿ÉÑ¡ÔñÔø¾µÄÓÎÏ·½ø¶È, ¼ÌÐøÏÈÇ°µÄÕ÷³Ì.
+Ñ¡ÔñÐèÒªµÄ½ø¶È, È»ºóµã»÷"¶ÁÈ¡"°´Å¥½øÈëÓÎÏ·. Ã¿¸öµ¥¶ÀµÄ
+½ø¶È´æµµÖÐ¶¼°üº¬ÁËËùÓÐµÄÓÎÏ·»ØºÏ, Òò´ËÄú¾¡¿ÉÏÈÑ¡ÔñÄ³¸ö
 ¸üÔçµÄÓÎÏ·Äê´ú, ³¢ÊÔÁíÒ»ÖÖ²ßÂÔ, Ò²Ðí»áÓÐ²»Ò»ÑùµÄ½á¹û.\\
 !µØÍ¼±à¼\
+Ä¬ÈÏÉèÖÃÏÂ, ÓÎÏ·½«ÒÔËæ»úµØÍ¼¿ªÊ¼; Ò²¿ÉÓÃÓÎÏ·ÄÚÖÃµÄ±à¼Æ÷
+×ÔÐÐ´´½¨µØÍ¼.  ÔÚ"µØÍ¼±à¼"Ò³ÃæÑ¡Ôñ"Ëæ»úµØÍ¼", È»ºóÉè¶¨
 ÊÀ½ç³ß´çºÍÂ½µØ±ÈÀý, ÔÙµãÑ¡"±à¼"ÔËÐÐ±à¼Æ÷.\\
+ºº»¯°æ±¾ÖÐ°üº¬ÁËÒ»¿îºº»¯Õß×ÔÐÐÓÅ»¯µÄµØÍ¼(ÊÀ½ç³ß´ç50%,
+Â½µØ±ÈÀý30%), ÄãÒ²¿É´Ó¹Ù·½Ö÷Ò³ÏÂÔØÆäËû¸ßÊÖÉè¼ÆµÄµØÍ¼,
+ÏÂÔØµØÍ¼½âÑ¹ºó·ÅÖÃÔÚÓÎÏ·Ä¿Â¼µÄMaps×ÓÄ¿Â¼ÏÂ¼´¿ÉÊ¹ÓÃ.
+$游戏开始画面\
+!新建游戏\
+游戏开始画面包含了三张页面, 要新建游戏, 请在"新建游戏"
+页面设定竞争种族的数量, 游戏难度, 以及游戏的最后年限.
+如果您安装了其他AI模块, 可单击AI框进行设定. 全部设置
+结束后, 按"开始"按钮进入游戏.\\
+!自定义玩家\
+勾选"自定义玩家"框, 打开更多详细设置. 在自定义画面中,
+不仅可以对竞争种族AI, 电脑游戏难度, 人类玩家数量等等
+进行详细设置, 也可展开电脑AI模块的快速对决, 或选择
+"超级用户"模式, 以上帝的角度观看整个世界的休戚兴衰.
+单击方框可选择人类玩家或电脑AI,  方框左侧的"3"字若为
+勾选状态, 则这方框代表了3名玩家的共同设定. 由此可知,
+游戏玩家的上限数量为15名.\\
+方框左侧的指示条代表了玩家的游戏难度, 1为简单, 3为困难.
+如果想尽可能地提高游戏难度, 可将人类玩家的难度设为最高,
+并将所有AI玩家的难度设置为最低.\\
+难度越高, 人口增长, 生产速度和研究进度都会变慢, 新型兵种
+的造价也会变得更为昂贵.\\
+!读取进度\
+在读取进度页面中, 可选择曾经的游戏进度, 继续先前的征程.
+选择需要的进度, 然后点击"读取"按钮进入游戏. 每个单独的
+进度存档中都包含了所有的游戏回合, 因此您尽可先选择某个
+更早的游戏年代, 尝试另一种策略, 也许会有不一样的结果.\\
+!地图编辑\
+默认设置下, 游戏将以随机地图开始; 也可用游戏内置的编辑器
+自行创建地图.  在"地图编辑"页面选择"随机地图", 然后设定
+世界尺寸和陆地比例, 再点选"编辑"运行编辑器.\\
+汉化版本中包含了一款汉化者自行优化的地图(世界尺寸50%,
+陆地比例30%), 你也可从官方主页下载其他高手设计的地图,
+下载地图解压后放置在游戏目录的Maps子目录下即可使用.
 #MAPEDIT
 $µØÍ¼±à¼Æ÷\
 !µØÍ¼±à¼Æ÷\
+ÓÎÏ·ÖÐ°üº¬ÁËÒ»¿î¼òµ¥µÄµØÍ¼±à¼Æ÷. ÒªÔËÐÐµØÍ¼±à¼Æ÷,
+ÔÚÓÎÏ·¿ªÊ¼»ÃæÖÐµã»÷"µØÍ¼±à¼"Ò³Ãæ, È»ºóÑ¡ÔñÒª±à¼
+µÄµØÍ¼, µãÑ¡"±à¼"°´Å¥. Èç¹ûÒª´´½¨ÐÂµÄµØÍ¼, ÇëÑ¡Ôñ
 "Ëæ»úµØÍ¼", ÔÙÉè¶¨ÊÀ½ç³ß´çºÍÂ½µØ±ÈÀý, ÔÙÑ¡"±à¼"°´Å¥.\\
+±à¼Æ÷µÄÊ¹ÓÃ·½·¨·Ç³£¼òµ¥. ÏÈ´ÓÆÁÄ»µ×²¿Ñ¡ÔñËùÐèµØÐÎ
+»òÏîÄ¿, È»ºóÓÃÊó±ê×ó¼üµ¥»÷µØÍ¼, ¼´¿ÉÌí¼ÓËùÑ¡ÏîÄ¿.
+±ðÍüÁË½«ÈýÖÖÏÖ´ú×ÊÔ´(ÓË/îÜ/Ë®Òø)Ìí¼ÓÔÚµØÍ¼ÉÏ, Ã¿ÖÖ
 ×ÊÔ´ÖÁÉÙÒ»´¦, ·ñÔò×îÖÕµÄÖ³Ãñ·É´¬½¨ÉèÎÞ·¨Íê³É.\\
+ÓÐÒ»µãÐë¼Ó×¢Òâ: ±ØÐëÉèÖÃÖÖ×å³õÊ¼Î»ÖÃ(¼´ÏîÄ¿ÁÐ±íÖÐµÄ
 ÆðÊ×¶þÏî), ÈôÎÞ³õÊ¼Î»ÖÃ, ÕâÕÅµØÍ¼ÊÇ²»ÄÜ½øÐÐÓÎÏ·µÄ. \\
+ÎªÁËÊ¹ÄúÖÆ×÷µÄµØÍ¼¸ü¼ÓÈÝÒ×±æÊ¶, Äú¿ÉÎªµØÍ¼ÎÄ¼þÌí¼ÓÏàÓ¦
+µÄËõÂÔÍ¼Æ¬.  ËõÂÔÍ¼ÐëÎªBMP¸ñÊ½, ÎÄ¼þÃûÓëµØÍ¼Ãû³ÆÏàÍ¬,
 ½«Æä·ÅÖÃÔÚÓÎÏ·µÄmaps×ÓÄ¿Â¼, Í¼Æ¬³ß´çÉÏÏÞÎª192x96ÏñËØ.
+$地图编辑器\
+!地图编辑器\
+游戏中包含了一款简单的地图编辑器. 要运行地图编辑器,
+在游戏开始画面中点击"地图编辑"页面, 然后选择要编辑
+的地图, 点选"编辑"按钮. 如果要创建新的地图, 请选择
+"随机地图", 再设定世界尺寸和陆地比例, 再选"编辑"按钮.\\
+编辑器的使用方法非常简单. 先从屏幕底部选择所需地形
+或项目, 然后用鼠标左键单击地图, 即可添加所选项目.
+别忘了将三种现代资源(铀/钴/水银)添加在地图上, 每种
+资源至少一处, 否则最终的殖民飞船建设无法完成.\\
+有一点须加注意: 必须设置种族初始位置(即项目列表中的
+起首二项), 若无初始位置, 这张地图是不能进行游戏的. \\
+为了使您制作的地图更加容易辨识, 您可为地图文件添加相应
+的缩略图片.  缩略图须为BMP格式, 文件名与地图名称相同,
+将其放置在游戏的maps子目录, 图片尺寸上限为192x96像素.
 #AIT
 $µçÄÔ¶Ô¾ö\
 !µçÄÔ¶Ô¾ö\
+Èç¹û°²×°ÁË¶à¸öAIÄ£¿é, Äã¿ÉÒÔÈÃÕâÐ©Ä£¿éÔÚÍ¬Ò»Æ¬µØÍ¼ÖÐ
+Ïà»¥ØËÉ±. ÔÚÐÂ½¨ÓÎÏ·½çÃæ, Ñ¡Ôñ"×Ô¶¨ÒåÓÎÏ·", È»ºóµ¥»÷
+ÖÐ¼äµÄ·½¿é, Ñ¡Ôñ"µçÄÔ¶Ô¾ö"ºó, ¿ªÊ¼ÓÎÏ·. ÕâÊ±Õû¸öÓÎÏ·
+»Ãæ½«ËõÐ¡ÎªÒ»¸ö¶Ô»°´°¿Ú, °´¿ªÊ¼ÓÎÏ·, ÏµÍ³½«×Ô¶¯ÑÝËã
+»ØºÏ½á¹û, Ö±ÖÁÄ³¸öAIÊ¤³ö. ÑÝËã½á¹û½«ÏÔÊ¾³É¼òµ¥µÄÍ³¼Æ
 Êý×Ö, ¸ù¾Ý»ØºÏÍÆ½ø¶øÍ¬²½¸üÐÂ, ÈçÏÂÍ¼ËùÊ¾:\\
+$电脑对决\
+!电脑对决\
+如果安装了多个AI模块, 你可以让这些模块在同一片地图中
+相互厮杀. 在新建游戏界面, 选择"自定义游戏", 然后单击
+中间的方块, 选择"电脑对决"后, 开始游戏. 这时整个游戏
+画面将缩小为一个对话窗口, 按开始游戏, 系统将自动演算
+回合结果, 直至某个AI胜出. 演算结果将显示成简单的统计
+数字, 根据回合推进而同步更新, 如下图所示:\\
 @AITShot\
 -1: ¸ÃÑÕÉ«AIÊÆÁ¦Ó®µÃÓÎÏ·µÄ´ÎÊý, »ñÊ¤ÔÒò¿ÉÄÜÊÇÖ³Ãñ
 ·É´¬·¢Éä, Ò²¿ÉÄÜÊÇÏûÃðËùÓÐÆäËûÊÆÁ¦.\
 -2: ¸ÃÑÕÉ«AIÊÆÁ¦ÓÎÏ·Ê§°ÜµÄ´ÎÊý.
+-1: 该颜色AI势力赢得游戏的次数, 获胜原因可能是殖民
+飞船发射, 也可能是消灭所有其他势力.\
+-2: 该颜色AI势力游戏失败的次数.
 #HOTKEYS
 $¿ì½Ý²Ù×÷\
 Ö÷»ÃæÖÐµÄÊó±ê²Ù×÷:\
 -×ó¼üµ¥»÷±¾·½²¿¶Ó - Ñ¡ÖÐ²¿¶Ó\
 -×ó¼üµ¥»÷±¾·½³ÇÊÐ - ´ò¿ª³ÇÊÐ´°¿Ú\
 -×ó¼üµ¥»÷Ëû¹ú²¿¶Ó - ²é¿´ÐÅÏ¢\
 -×ó¼üµ¥»÷Ëû¹ú³ÇÊÐ - ²é¿´³ÇÊÐ·ÀÓù\
 -×ó¼üµ¥»÷ÆäËûµØ¿é - ´°¿Ú¾ÓÖÐ\
 -ÓÒ¼üµ¥»÷ - ½«¸Ã´¦Ö¸¶¨ÎªÑ¡¶¨²¿¶ÓµÄÒÆ¶¯Ä¿±ê\
 -ÓÒ¼üµ¥»÷(³¬¼¶ÓÃ»§Ä£Ê½ÏÂ) - ´´½¨²¿¶Ó\\
 Ö÷»ÃæÖÐµÄ¼üÅÌ²Ù×÷:\
 -·½Ïò¼ü - ÒÆ¶¯Ñ¡¶¨²¿¶Ó\
 -Êý×Ö¼üÅÌ"+"¼ü - ½áÊø»ØºÏ\
 -Êý×Ö¼ü1 ~ 7 - Ð¡µØÍ¼ÅÔÒ»ÅÅ°´Å¥µÄ¶ÔÓ¦¿ì½Ý¼ü\
 -ÆäËû²Ëµ¥¿ì½Ý¼ü, Çë²Î¼ûÓÎÏ·ÖÐ¸÷²Ëµ¥
+$快捷操作\
+主画面中的鼠标操作:\
+-左键单击本方部队 - 选中部队\
+-左键单击本方城市 - 打开城市窗口\
+-左键单击他国部队 - 查看信息\
+-左键单击他国城市 - 查看城市防御\
+-左键单击其他地块 - 窗口居中\
+-右键单击 - 将该处指定为选定部队的移动目标\
+-右键单击(超级用户模式下) - 创建部队\\
+主画面中的键盘操作:\
+-方向键 - 移动选定部队\
+-数字键盘"+"键 - 结束回合\
+-数字键1 ~ 7 - 小地图旁一排按钮的对应快捷键\
+-其他菜单快捷键, 请参见游戏中各菜单
 #TRADINGGOODS
 $ÉÌÆ·Ã³Ò×\
 !ÉÌÆ·Ã³Ò×\
 Ñ¡ÔñÉÌÆ·Ã³Ò×, ËùÓÐÉú²úÔÁÏ½«±»Ö±½Ó×ª»»ÎªÏÖ½ðÀûÈó.
+$商品贸易\
+!商品贸易\
+选择商品贸易, 所有生产原料将被直接转换为现金利润.
 #MILRES
 $²¿¶ÓÑÐ·¢\
 !²¿¶ÓÑÐ·¢\
 ÒªÉú²úÐÂÐÍµÄÇ¿Á¦²¿¶Ó, ±ØÐëÏÈ½øÐÐ²¿¶ÓÑÐ·¢.\
 :CLASSES ²é¿´²¿¶ÓÑÐ·¢µÄÓÐ¹ØÐÅÏ¢
+$部队研发\
+!部队研发\
+要生产新型的强力部队, 必须先进行部队研发.\
+:CLASSES 查看部队研发的有关信息
 #ADVHELP
 ¿ÕÖÐ²¿¶ÓµÄ×î´ó±àÖÆÉÏÉýÖÁ 7%w.
+*
+*
+*
 µØÃæ²¿¶ÓµÄ×î´ó±àÖÆÉÏÉýÖÁ 10%w.
+*
+*
 ¿ÉÔÚºÓÁ÷ÉÏ¼ÜÇÅÐÞÂ·.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 Éú²úµØÃæ²¿¶ÓÊ±, ¿ÉÖ´ÐÐÕ÷Ä¼¹¦ÄÜ.
 ¿É¿ªÊ¼½¨ÔìÒªÈû.\::J ²Î¼û"µØÐÎ½¨Éè".
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ËùÓÐ½¨ÓÐµÀÂ·µÄÆ½Ì¹µØÐÎÇøÓò, %t +1.
 ¿É¸ü»»µØÐÎ, ¿ª±ÙÔËºÓ.\::J ²Î¼û"µØÐÎ½¨Éè".
 ¿É¿ªÊ¼Éú²ú¿ÕÖÐ²¿¶Ó.
+*
+*
 µØÃæ²¿¶ÓµÄ×î´ó±àÖÆÉÏÉýÖÁ 7%w.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ËùÓÐºÓÁ÷Í¾¾µÄµØ¿é, %t +1.\¿É¿ªÊ¼Éú²úº£ÉÏ²¿¶Ó.
+*
 ¿É¿ª²ÉÏÖ´ú×ÊÔ´.\»®Ê±´ú¿Æ¼¼: µ±Ä³¹úÊµÏÖÁË¹æÄ£Á¿²ú, È«ÊÀ½ç¶¼»á»ñÏ¤ÕâÒ»ÏûÏ¢.
+*
 ¿É¿ªÊ¼½¨Ôì¾üÊÂ»ùµØ.\::J ²Î¼û"µØÐÎ½¨Éè".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ¿É¿ª±ÙÅ©³¡.\::J ²Î¼û"µØÐÎ½¨Éè".
+*
+*
+*
+*
 ¿É¿ªÊ¼ÆÌÉèÌúÂ·.\::J ²Î¼û"µØÐÎ½¨Éè".
+*
 ¿É¿ª²É¹¤Òµ»¯×ÊÔ´.\»®Ê±´ú¿Æ¼¼: µ±Ä³¹úÊµÏÖÁË¿ÆÑ§, È«ÊÀ½ç¶¼»á»ñÏ¤ÕâÒ»ÏûÏ¢.
+*
 º£ÉÏ²¿¶ÓµÄ×î´ó±àÖÆÉÏÉýÖÁ 7%w.
+*
+*
+*
 º£ÉÏ²¿¶ÓµÄ×î´ó±àÖÆÉÏÉýÖÁ 9%w.\×°±¸×°¼×µÄÉÏÏÞÌáÉý1.
+*
+*
+*
+*
+*
 »®Ê±´ú¿Æ¼¼: µ±Ä³¹úÊµÏÖÁËÐÇ¼ÊÖ³Ãñ, È«ÊÀ½ç¶¼»á»ñÏ¤ÕâÒ»ÏûÏ¢.
+*
+*
 ¿É¿ªÊ¼Éú²úÐÂÐÍµØÃæ²¿¶Ó.
+*
+*
+*
 ½¨ÓÐ´óÑ§µÄ³ÇÊÐ, ¿Æ¼¼+5%\½¨ÓÐÊµÑéÊÒµÄ³ÇÊÐ, ¿Æ¼¼+10%
 ½¨ÓÐ¹¤³§µÄ³ÇÊÐ, Éú²ú+5%\½¨ÓÐÌØÇøµÄ³ÇÊÐ, Éú²ú+10%\(²»»áÔö¼Ó¶îÍâÎÛÈ¾)
+空中部队的最大编制上升至 7%w.
+*
+*
+*
+地面部队的最大编制上升至 10%w.
+*
+*
+可在河流上架桥修路.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+生产地面部队时, 可执行征募功能.
+可开始建造要塞.\::J 参见"地形建设".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+所有建有道路的平坦地形区域, %t +1.
+可更换地形, 开辟运河.\::J 参见"地形建设".
+可开始生产空中部队.
+*
+*
+地面部队的最大编制上升至 7%w.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+所有河流途经的地块, %t +1.\可开始生产海上部队.
+*
+可开采现代资源.\划时代科技: 当某国实现了规模量产, 全世界都会获悉这一消息.
+*
+可开始建造军事基地.\::J 参见"地形建设".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+可开辟农场.\::J 参见"地形建设".
+*
+*
+*
+*
+可开始铺设铁路.\::J 参见"地形建设".
+*
+可开采工业化资源.\划时代科技: 当某国实现了科学, 全世界都会获悉这一消息.
+*
+海上部队的最大编制上升至 7%w.
+*
+*
+*
+海上部队的最大编制上升至 9%w.\装备装甲的上限提升1.
+*
+*
+*
+*
+*
+划时代科技: 当某国实现了星际殖民, 全世界都会获悉这一消息.
+*
+*
+可开始生产新型地面部队.
+*
+*
+*
+建有大学的城市, 科技+5%\建有实验室的城市, 科技+10%
+建有工厂的城市, 生产+5%\建有特区的城市, 生产+10%\(不会增加额外污染)
+*
+*
 #IMPHELP
+¿ÉÉú²úÌØÊâ²¿¶Ó:\\::S7 Å«Á¥ÀÍ¹¤
 Ã¿¹¥Õ¼Ò»´¦³ÇÊÐ, ¾Í¿É»ñµÃÔÊÆÁ¦µÄ¹ú¼ÒÇé±¨, »¹¿É´Ó¸ÃÊÆÁ¦µÄ¿Æ¼¼³É¹ûÖÐÑ¡Ò»ÏîÇÔÎª¼ºÓÐ. ÇÔµÃµÄ¿Æ¼¼³É¹ûºÍÍ¨¹ý½»Éæ¶øµÃµÄÒ»Ñù, ÔÚÕÆÎÕÇ°±ØÐë½øÐÐÆÊÎöÐÔÑÐ¾¿, ÑÐ¾¿ËÙ¶È½«ÊÇ¶À×ÔÑÐ¾¿µÄÁ½±¶, ÇÒ²»±ØÑÐ¾¿ÏÈÆÚËùÐè¿Æ¼¼.
 É³Ä®µØÐÎ¿É¸ü»»ÎªÆ½Ô»ò²ÝµØ.\ËùÓÐ²¿¶Ó¶Ô¶ñÍÁµÄ¸ºÃæÐ§¹ûÃâÒß.
 Ææ¼£µÄ½¨Ôì³É±¾¼õÉÙËÄ·ÖÖ®Ò».
 ËùÓÐ½üº£µØ¿éÔö¼Ó 1%p. \\Ö»ÓÐÑØº£³ÇÊÐ²ÅÄÜ½¨Ôì´ËÆæ¼£.
 ÓµÓÐ´óÍ¼Êé¹ÝµÄ¹ú¼Ò, ¿É»ñµÃÆäËûÊÆÁ¦ÒÑÑÐµÃµÄ¿Æ¼¼³É¹û, Ìõ¼þÊÇÆäËûÊÆÁ¦ÖÐÒ»°ëÒÔÉÏÒÑÓµÓÐ¸Ã³É¹û. »ñµÃµÄ¿Æ¼¼³É¹ûºÍÍ¨¹ý½»Éæ¶øµÃµÄÒ»Ñù, ÔÚÕÆÎÕÇ°±ØÐë½øÐÐÆÊÎöÐÔÑÐ¾¿, ÑÐ¾¿ËÙ¶È½«ÊÇ¶À×ÔÑÐ¾¿µÄÁ½±¶, ÇÒ²»±ØÑÐ¾¿ÏÈÆÚËùÐè¿Æ¼¼.
 ½¨³Éºó, ¶ÔÓÚ±¾¹ú¼°ÒÑ½¨Á¢½»ÍùµÄ¹ú¼Ò, Ã¿»ØºÏ¹ú¿â½«»ñµÃ¶îÍâÊÕÈë, ÊÕÈëÊýÁ¿µÈÍ¬ÓÚ¸Ã¹úËÂÃíµÄ×ÜÊý.
 ÒÔÏÂ3Ïî¿Æ¼¼ÊôÐÔÉúÐ§:
+ÎÞÊÓ¿ÆÑÐÍ¶Èë±ÈÀý, ÔÚ½ÓÏÂÀ´µÄÁ½»ØºÏÖÐÁ¬ÐøÍê³ÉÁ½ÏîÐÂµÄ¿Æ¼¼³É¹û. Áí¿ÉÉú²úÌØÊâ²¿¶Ó:\\::S8 »¬Ïè»ú
 ±¾¹úËùÓÐº£ÉÏ²¿¶ÓµÄ»ú¶¯Á¦ +200.\\Ö»ÓÐÑØº£³ÇÊÐ²ÅÄÜ½¨Ôì´ËÆæ¼£.
 ÔÚ¹ºÂòÎ´Íê³ÉµÄÉèÊ©»òÆæ¼£Ê±, ¹ºÂòÒ»µ¥Î»ÔÁÏµÄ¼Û¸ñ½µÖÁ2%c.
+*
 Èç¹ûÕþÌåÊÇ¾ýÖ÷ÖÆ, ¿ÆÑÐ½ø¶È¼Ó¿ìÒ»±¶.
 ³ÇÊÐÖÐµÄ½ÌÌÃ¿ÉÊ¹¶îÍâµÄ2Ãû²»°²ÊÐÃñ±ä³É°²¶¨.
+*
 Ã¿¸ö³ÇÊÐ¶¼ÓÐ¸÷×ÔµÄÉÝ³ÞÂÊ, ÆäË®Æ½×ãÒÔ×èÖ¹³ÇÊÐÉ§ÂÒµÄ·¢Éú.\\Èç¹ûÒ»¸ö³ÇÊÐµÄÃ³Ò×ËùµÃÌ«ÉÙ, È«²¿Ã³Ò×¶î¶¼»»³ÉÉÝ³ÞÆ·, Ò²²»×ãÒÔ×èÖ¹É§ÂÒµÄ»°, ¸ÃÆæ¼£¶Ô´ËÇé¿öÎÞÄÜÎªÁ¦.
 ËùÓÐÆæ¼£µÄÐ§¹ûÓÀÔ¶²»»á¹ýÆÚ. ÒÑ¹ýÆÚµÄÆæ¼£ÖØÐÂÉúÐ§.
 Ïàµ±ÓÚÔÚÃ¿¸ö³ÇÊÐÖÐÔìÒ»×ùË®µçÕ¾.\\Ö»ÓÐÑØºÓ»ò¿¿½ü¸ßÉ½µÄ³ÇÊÐ²ÅÄÜ½¨Ôì´ËÆæ¼£.
 ÑØ×ÅÌúÂ·ÒÆ¶¯Ê±, ÎÞÐèºÄ·ÑÈÎºÎÐÐ¶¯µã.
 Æô¶¯ÀäÕ½Ê±´ú. ÀäÕ½Ê±ËùÓÐ¹ú¼ÒÎÞ·¨¿ªÕ¹¶ÔÍâ½»Éæ. ÀäÕ½¹²³ÖÐø40»ØºÏ.
+Õû¸öÊÀ½çµØÍ¼½«È«²¿´ò¿ª, ²¢»ñÖªËùÓÐ²¿¶ÓµÄÐÐ¶¯, Ð§¹û³ÖÐøÒ»»ØºÏ. »ñµÃËùÓÐÊÆÁ¦µÄ¹ú¼ÒÇé±¨ºÍ¾üÊÂÇé±¨.\\Òª½¨Éè´ËÆæ¼£, ±ØÐëÏÈ½¨\::B66 Ì«¿Õ¸Û
+*
+*
+*
+*
+*
+*
+*
+*
+³ÇÊÐÉú²úµÄµØÃæ²¿¶ÓÖ±½ÓÉýÎªÀúÁ·²¿¶Ó.  ÊÜÉËµÄµØÃæ²¿¶ÓÔÚ´Ë³ÇÖÐÁôÊØ, Ã¿»ØºÏ×´Ì¬»Ö¸´ËÙ¶È¼Ó±¶.
 ³ÇÊÐ¹æÄ£Ôö³¤ºó, Á¸Ê³´¢Á¿²»ÊÇÈ«¿Õ, ¶øÊÇ°ëÂú.
+可生产特殊部队:\\::S7 奴隶劳工
+每攻占一处城市, 就可获得原势力的国家情报, 还可从该势力的科技成果中选一项窃为己有. 窃得的科技成果和通过交涉而得的一样, 在掌握前必须进行剖析性研究, 研究速度将是独自研究的两倍, 且不必研究先期所需科技.
+沙漠地形可更换为平原或草地.\所有部队对恶土的负面效果免疫.
+奇迹的建造成本减少四分之一.
+所有近海地块增加 1%p. \\只有沿海城市才能建造此奇迹.
+拥有大图书馆的国家, 可获得其他势力已研得的科技成果, 条件是其他势力中一半以上已拥有该成果. 获得的科技成果和通过交涉而得的一样, 在掌握前必须进行剖析性研究, 研究速度将是独自研究的两倍, 且不必研究先期所需科技.
+建成后, 对于本国及已建立交往的国家, 每回合国库将获得额外收入, 收入数量等同于该国寺庙的总数.
+以下3项科技属性生效:
+无视科研投入比例, 在接下来的两回合中连续完成两项新的科技成果. 另可生产特殊部队:\\::S8 滑翔机
+本国所有海上部队的机动力 +200.\\只有沿海城市才能建造此奇迹.
+在购买未完成的设施或奇迹时, 购买一单位原料的价格降至2%c.
+*
+如果政体是君主制, 科研进度加快一倍.
+城市中的教堂可使额外的2名不安市民变成安定.
+*
+每个城市都有各自的奢侈率, 其水平足以阻止城市骚乱的发生.\\如果一个城市的贸易所得太少, 全部贸易额都换成奢侈品, 也不足以阻止骚乱的话, 该奇迹对此情况无能为力.
+所有奇迹的效果永远不会过期. 已过期的奇迹重新生效.
+相当于在每个城市中造一座水电站.\\只有沿河或靠近高山的城市才能建造此奇迹.
+沿着铁路移动时, 无需耗费任何行动点.
+启动冷战时代. 冷战时所有国家无法开展对外交涉. 冷战共持续40回合.
+整个世界地图将全部打开, 并获知所有部队的行动, 效果持续一回合. 获得所有势力的国家情报和军事情报.\\要建设此奇迹, 必须先建\::B66 太空港
+*
+*
+*
+*
+*
+*
+*
+*
+城市生产的地面部队直接升为历练部队.  受伤的地面部队在此城中留守, 每回合状态恢复速度加倍.
+城市规模增长后, 粮食储量不是全空, 而是半满.
 +2%m.
 Ë°ÊÕºÍÉÝ³ÞÉú²ú +50%.
 ¿ÆÑ§Éú²ú +50%.
 ÊÕ¼¯Ã³Ò×ÀûÈó, Ã¿¸öµØ¿éµÄÃ³Ò×Á¿Ã»ÓÐÉÏÏÞ, ²¢¼õÉÙ50%µÄ¸¯°Ü.
 ÊØÎÀ²¿¶ÓÔÚÔâÓöµØÃæ²¿¶ÓÏ®»÷Ê±, ·ÀÓùÁ¦ +200%. µ±ÊØÎÀ²¿¶Ó±»µÐ·½µØÃæ²¿¶Ó´Ý»ÙÊ±, ³ÇÊÐÈË¿Ú²»»á¼õÉÙ.
 ³ÇÊÐ¹æÄ£ÉÏÏÞ´Ó8±ä³É12.
 Ë°ÊÕºÍÉÝ³ÞÉú²ú +75%.
+税收和奢侈生产 +50%.
+科学生产 +50%.
+收集贸易利润, 每个地块的贸易量没有上限, 并减少50%的腐败.
+守卫部队在遭遇地面部队袭击时, 防御力 +200%. 当守卫部队被敌方地面部队摧毁时, 城市人口不会减少.
+城市规模上限从8变成12.
+税收和奢侈生产 +75%.
 +4%m.
 ¿ÆÑ§Éú²ú +75%.
 Ã¿¸ö½üº£µØ¿é +1%f.\\´ËÉèÊ©Ö»ÄÜ½¨ÔÚÑØº£³ÇÊÐ.
+科学生产 +75%.
+每个近海地块 +1%f.\\此设施只能建在沿海城市.
 +4%m.
 ÔÁÏÉú²ú +50%, ÎÛÈ¾ +50%.
 ÔÁÏÉú²ú +50%, ÎÛÈ¾ +50%.
 ÍêÈ«Ïû³ýÎÛÈ¾ÏÖÏó.
 ·¢µçÉèÊ©, Ê¹¹¤³§ºÍÌØÇøµÄÔÁÏÉú²úÐ§¹û¼Ó±¶.\(ÖØ¸´½¨Ôì·¢µçÉèÊ©, Ð§¹û²»»áµþ¼Ó.)\ÎÛÈ¾ +50%.
 ·¢µçÉèÊ©, Ê¹¹¤³§ºÍÌØÇøµÄÔÁÏÉú²úÐ§¹û¼Ó±¶.\(ÖØ¸´½¨Ôì·¢µçÉèÊ©, Ð§¹û²»»áµþ¼Ó.)\ÎÛÈ¾ -50%.\\´ËÉèÊ©Ö»ÄÜ½¨ÔÚÑØºÓ»òÁÙ½ü¸ßÉ½µÄ³ÇÊÐ.
 ·¢µçÉèÊ©, Ê¹¹¤³§ºÍÌØÇøµÄÔÁÏÉú²úÐ§¹û¼Ó±¶.\(ÖØ¸´½¨Ôì·¢µçÉèÊ©, Ð§¹û²»»áµþ¼Ó.)\²»»á²úÉúÈÎºÎÎÛÈ¾.
 Ã¿¸ö½üº£µØ¿é +1%p.\\´ËÉèÊ©Ö»ÄÜ½¨ÔÚÑØº£³ÇÊÐ.
 ÊÕ¼¯³ÇÊÐÃ³Ò×ÀûÈóµÄ»ù´¡ÉèÊ©. Ã¿¸öµØ¿é×î¶à³ö²ú 3%t.
 ³ÇÊÐ¹æÄ£ÉÏÏÞ´Ó12±ä³É30.
 Å©³¡Éú²úµÄÁ¸Ê³²úÁ¿ +50%.
 Ê¹³µÂÖµÄÃ³Ò×¼Ó³ÉÐ§¹ûÔÙ¼Ó±¶.
 ¿ÆÑ§Éú²ú +75%.
 ÊØÎÀ²¿¶ÓÔÚÔâÓö¿ÕÖÐ²¿¶Ó»òºäÕ¨Ï®»÷Ê±, ·ÀÓùÁ¦ +100%.
 ÊØÎÀ²¿¶ÓÔÚÔâÓöº£ÉÏ²¿¶Ó»òºäÕ¨Ï®»÷Ê±, ·ÀÓùÁ¦ +100%.\\´ËÉèÊ©Ö»ÄÜ½¨ÔÚÑØº£³ÇÊÐ.
 ³ÇÊÐÉú²úµÄ¿ÕÖÐ²¿¶ÓÖ±½ÓÉýÎªÀúÁ·²¿¶Ó. ÊÜÉËµÄ¿ÕÖÐ²¿¶ÓÔÚ´Ë³ÇÖÐÁôÊØ, Ã¿»ØºÏ×´Ì¬»Ö¸´ËÙ¶È¼Ó±¶.
 ³ÇÊÐÉú²úµÄº£ÉÏ²¿¶ÓÖ±½ÓÉýÎªÀúÁ·²¿¶Ó. ÊÜÉËµÄº£ÉÏ²¿¶ÓÔÚ´Ë³ÇÖÐÁôÊØ, Ã¿»ØºÏ×´Ì¬»Ö¸´ËÙ¶È¼Ó±¶.
+Ê¹ËùÔÚ³ÇÊÐµÄÃ³Ò××ÊÔ´²úÁ¿Ã»ÓÐÉÏÏÞ, ¶øÇÒ²»»á²úÉúÈÎºÎ¸¯°ÜÏÖÏó. ËùÔÚ³ÇÊÐ×Ô¶¯³ÉÎª¹ú¼ÒÊ×¶¼. ÓûÁË½âÊ×¶¼ÓëÆäËû³ÇÊÐ¸¯°ÜµÄ¹ØÏµ, Çë²Î¼û:\:RESOURCES "×ÊÔ´ÖÖÀà"Ä©½Ú
 Ïàµ±ÓÚÔÚÍ¬Ò»¿é´óÂ½ÉÏµÄÃ¿×ù³ÇÊÐÖÐÔìÒ»µÀ³ÇÇ½.
 Ê¹°²¶¨ÊÐÃñµÄÊýÁ¿Ôö¼Ó, ÔöÖµµÈÍ¬ÓÚ³ÇÊÐµÄ¹æÄ£Öµ.
 ËùÔÚ³ÇÊÐµÄ¿ÆÑ§×ÊÔ´²úÁ¿¼Ó±¶.
 ËùÔÚ³ÇÊÐÉú²úµÄËùÓÐµØÃæ²¿¶ÓÖ±½ÓÉýÎª¾«Ó¢²¿¶Ó. ÊÜÉËµÄµØÃæ²¿¶ÓÔÚ´Ë³ÇÖÐÁôÊØ, Ã¿»ØºÏ×´Ì¬»Ö¸´ËÙ¶È¼Ó±¶.
 ËùÔÚ³ÇÊÐÖÐ, ×¤ÊØ²¿¶Ó·ÀÓùÁ¦ +100%.
 ËùÔÚ³ÇÊÐ +12%f
 ËùÓÐÒøÐÐµÄÐ§¹û¼Ó±¶.
 ÌØÊâ×ÊÔ´ +100%.\\¿ÉÒÔ¿ªÊ¼½¨ÔìÖ³Ãñ·É´¬²¿¼þ. Èç¹ûÃ»ÓÐÌ«¿Õ¸Û, Ö³Ãñ·É´¬¹¤³Ì½«»¯ÎªÎÚÓÐ. Èç¹ûÌ«¿Õ¸Û±»ÆäËûÓµÓÐÌ«¿Õ¸ÛµÄÊÆÁ¦Õ¼Áì, ÔòÖ³Ãñ·É´¬Ò²½«ÂäÈëÕ¼ÁìÕßµÄÊÖÖÐ.
+原料生产 +50%, 污染 +50%.
+原料生产 +50%, 污染 +50%.
+完全消除污染现象.
+发电设施, 使工厂和特区的原料生产效果加倍.\(重复建造发电设施, 效果不会叠加.)\污染 +50%.
+发电设施, 使工厂和特区的原料生产效果加倍.\(重复建造发电设施, 效果不会叠加.)\污染 -50%.\\此设施只能建在沿河或临近高山的城市.
+发电设施, 使工厂和特区的原料生产效果加倍.\(重复建造发电设施, 效果不会叠加.)\不会产生任何污染.
+每个近海地块 +1%p.\\此设施只能建在沿海城市.
+收集城市贸易利润的基础设施. 每个地块最多出产 3%t.
+城市规模上限从12变成30.
+农场生产的粮食产量 +50%.
+使车轮的贸易加成效果再加倍.
+科学生产 +75%.
+守卫部队在遭遇空中部队或轰炸袭击时, 防御力 +100%.
+守卫部队在遭遇海上部队或轰炸袭击时, 防御力 +100%.\\此设施只能建在沿海城市.
+城市生产的空中部队直接升为历练部队. 受伤的空中部队在此城中留守, 每回合状态恢复速度加倍.
+城市生产的海上部队直接升为历练部队. 受伤的海上部队在此城中留守, 每回合状态恢复速度加倍.
+使所在城市的贸易资源产量没有上限, 而且不会产生任何腐败现象. 所在城市自动成为国家首都. 欲了解首都与其他城市腐败的关系, 请参见:\:RESOURCES "资源种类"末节
+相当于在同一块大陆上的每座城市中造一道城墙.
+使安定市民的数量增加, 增值等同于城市的规模值.
+所在城市的科学资源产量加倍.
+所在城市生产的所有地面部队直接升为精英部队. 受伤的地面部队在此城中留守, 每回合状态恢复速度加倍.
+所在城市中, 驻守部队防御力 +100%.
+所在城市 +12%f
+所有银行的效果加倍.
+特殊资源 +100%.\\可以开始建造殖民飞船部件. 如果没有太空港, 殖民飞船工程将化为乌有. 如果太空港被其他拥有太空港的势力占领, 则殖民飞船也将落入占领者的手中.
+*
 …
 #FEATUREHELP
 ¹¥»÷Á¦»ùÖµ +1.
 ·ÀÓùÁ¦»ùÖµ +1.\×¢Òâ: µØÃæ²¿¶Ó×°¼×ÉÏÏÞÎª2µ¥Î», ¿ÕÖÐºÍº£ÉÏ²¿¶ÓµÄ×°¼×ÉÏÏÞÎª3µ¥Î».
 »ú¶¯Á¦+50.
 µØÃæ²¿¶ÓÔËÔØ»ùÖµ +1.
 ¿ÕÖÐ²¿¶ÓÔËÔØ»ùÖµ +1.\Ä¸½¢²»ÄÜ´îÔØÔËÊä»ú.\°üº¬ÁËÀ×´ïÉùÄÉÊôÐÔ.
 »ú¶¯Á¦+200.
 ·É»úÆðº½ºó, ¶ÔµØÃæ»òº£ÉÏ²¿¶ÓÊµÐÐÊ×´Î´ò»÷Ê±, ¹¥»÷Á¦»ùÖµ +2.
 Ã¿Ôö¼ÓÒ»µãÈ¼ÓÍ, ·É»ú¿ÉÔÚÍâ¶àÍ£ÁôÒ»»ØºÏ, ÎÞÐè·µ»Ø³ÇÊÐ/Ä¸½¢/¾üÊÂ»ùµØ.
 µØÃæ²¿¶ÓÔËÔØ»ùÖµ +1.\Ä¸½¢²»ÄÜ´îÔØÔËÊä»ú.
 º£ÉÏ²¿¶Ó¿ÉÔÚÔ¶Ñóº½ÐÐ.
 ÊÓÒ°·¶Î§À©¿íÎª2¸ñ, ¿É·¢ÏÖÁÙ½üµÄµÐ·½Ç±Í§.
 ¾ß±¸Ç±º½ÄÜÁ¦, µÐ·½ÊÆÁ¦²»¿É¼û.
 ¹¥»÷³ÇÊÐÊ±, µÐ·½³ÇÇ½µÄ·ÀÓù¼Ó³ÉÎÞÐ§. µØÃæ²¿¶Ó¿É¹¥»÷ÁÚ½ÓµÄº£ÉÏ²¿¶Ó.\º£ÉÏ²¿¶Ó¿É¹¥»÷ÁÚ½ÓµÄ³ÇÊÐ»òµØÃæ²¿¶Ó.
 ÔÚ¸÷ÖÖµØÐÎÉÏÒÆ¶¯Ê±, ÏûºÄÐÐ¶¯µãÊýµÈÍ¬ÓÚµÀÂ·ÒÆ¶¯.
 ÔËÔØµÄ²¿¶ÓÃ¿»ØºÏ×´Ì¬Öð½¥»Ö¸´.
 ¹¥»÷Á¦¼°·ÀÓùÁ¦»ùÖµ·Ö±ð +1. ÐèÒª³ÇÊÐ2±¶µÄ¹©¸ø. ×°±¸¶îÍâ¸ºÖØµÄ²¿¶Ó, Ö»ÄÜÑØ×ÅµÀÂ·/ºÓÁ÷/ÔËºÓÒÆ¶¯, ÒÆ¶¯ÏûºÄÐÐ¶¯µãÊýÊÇÆÕÍ¨²¿¶ÓµÄ2±¶. Ò²¿ÉÑØ×ÅÌúÂ·ÒÆ¶¯, ÏûºÄÐÐ¶¯µãÊýµÈÍ¬ÓÚÆÕÍ¨²¿¶Ó. ÎÞ·¨´î³ËÔËÊä¹¤¾ß.
 ¶Ô¿ÕÖÐ²¿¶ÓµÄ·ÀÓùÁ¦ +100%.
 ¿ÉÕì²ìÁÚ½ü³ÇÊÐ, ÒÔ¼°Í¬Ò»µØ¿éµÄ¶à¸ö²¿¶Ó (°üÀ¨ÒþÐÎ·É»ú).
 »ú¶¯Á¦+100.
 »ú¶¯Á¦+100.
 »ú¶¯Á¦+400.
 ¾ß±¸ÒþÐÎÄÜÁ¦, µÐ·½ÊÆÁ¦²»¿É¼û.
 µ±´øÓÐ´ËÊôÐÔµÄ²¿¶ÓÕóÍöÊ±, »á¸øµÐÈËÔì³ÉÁ½±¶µÄÉËº¦.\\ÔÚÍ¬Ò»µØ¿é´æÔÚ¶àÖ§²¿¶ÓÊ±, ¿ñÈÈµÄµØÃæ²¿¶Ó½«ÊÇ·ÀÓùµÄÏÈÍ·Á¦Á¿.\\µ±¹ú¼ÒÕþÌåÊÇ¹²ºÍÖÆ, ÃñÖ÷ÖÆ»òÎ´À´ÖÆÊ±, ´ËÊôÐÔÊ§Ð§.
 µ±²¿¶Ó½«µÐ¾üÒ»¾Ù¼ßÃðÊ±, ²¿¶ÓÊÜµ½µÄÉËº¦ÊÇÍ¨³£µÄ¶þ·ÖÖ®Ò».
 ¼´Ê¹¹¥»÷Ê±Ê£ÓàÐÐ¶¯µã²»×ã1µã, ²¿¶ÓÒ²ÄÜÊ¹³öÈ«²¿µÄ¹¥»÷Á¦.
 ÊÓÒ°·¶Î§À©¿íÎª2¸ñ, Èç¹û´ýÃüÊ±ÉÐÓàÒ»°ëÐÐ¶¯µã, ²¿¶Ó×Ô¶¯×ªÈë×¤ÊØ×´Ì¬.
 Á¬ÐøÉú²úÍ¬ÖÖ²¿¶ÓµÄÉú²ú·ÑÓÃ¼õ°ë, µ«Èô¸ÄÎªÉú²úÆäËû²¿¶Ó, Éú²ú·ÑÓÃ¼Ó±¶.
+攻击力基值 +1.
+防御力基值 +1.\注意: 地面部队装甲上限为2单位, 空中和海上部队的装甲上限为3单位.
+机动力+50.
+地面部队运载基值 +1.
+空中部队运载基值 +1.\母舰不能搭载运输机.\包含了雷达声纳属性.
+机动力+200.
+飞机起航后, 对地面或海上部队实行首次打击时, 攻击力基值 +2.
+每增加一点燃油, 飞机可在外多停留一回合, 无需返回城市/母舰/军事基地.
+地面部队运载基值 +1.\母舰不能搭载运输机.
+海上部队可在远洋航行.
+视野范围扩宽为2格, 可发现临近的敌方潜艇.
+具备潜航能力, 敌方势力不可见.
+攻击城市时, 敌方城墙的防御加成无效. 地面部队可攻击邻接的海上部队.\海上部队可攻击邻接的城市或地面部队.
+在各种地形上移动时, 消耗行动点数等同于道路移动.
+运载的部队每回合状态逐渐恢复.
+攻击力及防御力基值分别 +1. 需要城市2倍的供给. 装备额外负重的部队, 只能沿着道路/河流/运河移动, 移动消耗行动点数是普通部队的2倍. 也可沿着铁路移动, 消耗行动点数等同于普通部队. 无法搭乘运输工具.
+对空中部队的防御力 +100%.
+可侦察邻近城市, 以及同一地块的多个部队 (包括隐形飞机).
+机动力+100.
+机动力+100.
+机动力+400.
+具备隐形能力, 敌方势力不可见.
+当带有此属性的部队阵亡时, 会给敌人造成两倍的伤害.\\在同一地块存在多支部队时, 狂热的地面部队将是防御的先头力量.\\当国家政体是共和制, 民主制或未来制时, 此属性失效.
+当部队将敌军一举歼灭时, 部队受到的伤害是通常的二分之一.
+即使攻击时剩余行动点不足1点, 部队也能使出全部的攻击力.
+视野范围扩宽为2格, 如果待命时尚余一半行动点, 部队自动转入驻守状态.
+连续生产同种部队的生产费用减半, 但若改为生产其他部队, 生产费用加倍.
 #GOVHELP
 -ËùÓÐ³ÇÊÐÏÝÈëÉ§ÂÒ.\-³ÇÊÐÉèÊ©ÎÞÐè×Ê½ðÎ¬³Ö.\-Á¥Êô²¿¶ÓÎÞÐè³ÇÊÐ¹©¸ø.\-³ÖÐø3¸ö»ØºÏ.
 -Ã¿¸öµØ¿é×ÊÔ´ÉÏÏÞÎª:  3%f, 2%p, 2%t.\-ÑÏÖØ¸¯°Ü. (¸¯°ÜÒò×Ó=3)\-Ã¿¸öÊÐÃñ¿ÉÖ§³Ö1Ö§ÎÞÐè¹©¸øµÄ²¿¶Ó.\-Ã»ÓÐÎÛÈ¾.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 1%f.
 -ÇáÎ¢¸¯°Ü. (¸¯°ÜÒò×Ó=1)\-Ã¿2¸öÊÐÃñ¿ÉÖ§³Ö1Ö§ÎÞÐè¹©¸øµÄ²¿¶Ó.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 1%f.
 -ËùÓÐ>0µÄÃ³Ò××ÊÔ´Ôö¼Ó1µãÃ³Ò×.\-ÖÐµÈ³Ì¶ÈµÄ¸¯°Ü. (¸¯°ÜÒò×Ó=2)\-ÔÚ±¾·½»òÃË¾üÊÆÁ¦ÁìÍÁÖ®ÍâµÄ¹¥»÷²¿¶Ó(¹¥»÷Á¦>0), »áÊ¹Á¥Êô³ÇÊÐµÄ°²¶¨ÊÐÃñ×ªÎª²»°², 1Ö§²¿¶ÓÓ°Ïì2Î»ÊÐÃñ.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 2%f.
 -ÇáÎ¢¸¯°Ü. (¸¯°ÜÒò×Ó=1)\-ËùÓÐ²¿¶ÓÎÞÐè³ÇÊÐ¹©¸ø.\-È«ÃñÐÅÑö, È«ÌåÊÐÃñ´¦ÓÚ°²¶¨×´Ì¬.\-¿ÆÑÐ½ø¶È¼õÂýÎªÔÏÈµÄÒ»°ë.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 1%f.
 -ËùÓÐ>1%pµÄ×ÊÔ´¶îÍâÔö¼Ó1µã.\-Ã»ÓÐ¸¯°ÜÏÖÏó.\-Ã¿2¸öÊÐÃñ¿ÉÖ§³Ö1Ö§ÎÞÐè¹©¸øµÄ²¿¶Ó.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 2%f.
 -ËùÓÐ>0µÄÃ³Ò××ÊÔ´Ôö¼Ó1µãÃ³Ò×.\-Ã»ÓÐ¸¯°ÜÏÖÏó.\-ÔÚ±¾·½»òÃË¾üÊÆÁ¦ÁìÍÁÖ®ÍâµÄ¹¥»÷²¿¶Ó(¹¥»÷Á¦>0), »áÊ¹Á¥Êô³ÇÊÐµÄ°²¶¨ÊÐÃñ×ªÎª²»°², 1Ö§²¿¶ÓÓ°Ïì2Î»ÊÐÃñ.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 2%f.
 -ËùÓÐ>0µÄÃ³Ò××ÊÔ´Ôö¼Ó1µãÃ³Ò×.\-ÑÐ·¢Î´À´¿Æ¼¼Ê±, ½öÐèÆÕÍ¨¿Æ¼¼µÄ2±¶ÑÐ·¢Ê±¼ä, ¶ø²»ÊÇ4±¶.\-Ã»ÓÐ¸¯°ÜÏÖÏó.\-ÔÚ±¾·½»òÃË¾üÊÆÁ¦ÁìÍÁÖ®ÍâµÄ¹¥»÷²¿¶Ó(¹¥»÷Á¦>0), »áÊ¹Á¥Êô³ÇÊÐµÄ°²¶¨ÊÐÃñ×ªÎª²»°², 1Ö§²¿¶ÓÓ°Ïì2Î»ÊÐÃñ.\-¶àÓàµÄÁ¸Ê³½«Ö±½Ó×ª»»³É½ðÇ®.\-³ÇÊÐÈË¿Ú²»ÔÙÔö³¤.\-Ã¿Ö§ÒÆÃñ²¿¶ÓÃ¿»ØºÏÏûºÄ 2%f.
+-所有城市陷入骚乱.\-城市设施无需资金维持.\-隶属部队无需城市供给.\-持续3个回合.
+-每个地块资源上限为:  3%f, 2%p, 2%t.\-严重腐败. (腐败因子=3)\-每个市民可支持1支无需供给的部队.\-没有污染.\-每支移民部队每回合消耗 1%f.
+-轻微腐败. (腐败因子=1)\-每2个市民可支持1支无需供给的部队.\-每支移民部队每回合消耗 1%f.
+-所有>0的贸易资源增加1点贸易.\-中等程度的腐败. (腐败因子=2)\-在本方或盟军势力领土之外的攻击部队(攻击力>0), 会使隶属城市的安定市民转为不安, 1支部队影响2位市民.\-每支移民部队每回合消耗 2%f.
+-轻微腐败. (腐败因子=1)\-所有部队无需城市供给.\-全民信仰, 全体市民处于安定状态.\-科研进度减慢为原先的一半.\-每支移民部队每回合消耗 1%f.
+-所有>1%p的资源额外增加1点.\-没有腐败现象.\-每2个市民可支持1支无需供给的部队.\-每支移民部队每回合消耗 2%f.
+-所有>0的贸易资源增加1点贸易.\-没有腐败现象.\-在本方或盟军势力领土之外的攻击部队(攻击力>0), 会使隶属城市的安定市民转为不安, 1支部队影响2位市民.\-每支移民部队每回合消耗 2%f.
+-所有>0的贸易资源增加1点贸易.\-研发未来科技时, 仅需普通科技的2倍研发时间, 而不是4倍.\-没有腐败现象.\-在本方或盟军势力领土之外的攻击部队(攻击力>0), 会使隶属城市的安定市民转为不安, 1支部队影响2位市民.\-多余的粮食将直接转换成金钱.\-城市人口不再增长.\-每支移民部队每回合消耗 2%f.
 #TECHAGE
+ÔçÆÚ¿Æ¼¼
+¹¤Òµ»¯¿Æ¼¼
+ÏÖ´ú¿Æ¼¼
+Î´À´¿Æ¼¼
+早期科技
+工业化科技
+现代科技
+未来科技
 #SPECIALMODEL
 -¿ÉÒÔ¸ÄÔìµØÐÎ, ½¨Á¢³ÇÊÐ.\-ÐèÒª³ÇÊÐ¹©¸øÁ¸Ê³.
 -¿ÉÒÔ¸ÄÔìµØÐÎ, ½¨Á¢³ÇÊÐ.\-ÐèÒª³ÇÊÐ¹©¸øÁ¸Ê³.\-¶Ô¶ñÍÁµÄ¸ºÃæÐ§¹ûÓÐÃâÒß.
+*
 -ÊØ³ÇÊ±·ÀÓùÁ¦ +100%.\-Ê¼ÖÕÐèÒª³ÇÊÐ¹©¸øÁ¸Ê³.\-ÔÚÅ«Á¥×¨ÖÆÉç»áÖÐ, Ã¿¸öÊØ³ÇµÄÎÀ±ø¿ÉµÖÏû2Ãû³ÇÄÚÊÐÃñµÄ²»°².
 :SPYMISSIONS ¿ÉÖ´ÐÐÃØÃÜÐÐ¶¯.\-¿ÉÕì²ìÁÚ½ü³ÇÊÐ, ÒÔ¼°Í¬Ò»µØ¿éµÄ¶à¸ö²¿¶Ó (°üÀ¨ÒþÐÎ·É»ú).\-ÊÓÒ°·¶Î§Îª2¸ñ.\-²»¾ß±¸µØÓò¿ØÖÆµÄÄÜÁ¦.\-²»»áÔÚÁ¥Êô³ÇÊÐÒýÆðÊÐÃñµÄ²»°².
 -½¨Éè¶Ó¿ÉÓÃ"¼ÓÈë³ÇÊÐ"µÄ·½·¨, ½«×ÔÉíÈý·ÖÖ®¶þµÄÉú²úÔÁÏ ¼ÓÈëµ±Ç°³ÇÊÐµÄ½¨ÉèÏîÄ¿Ö®ÖÐ (Ö³Ãñ·É´¬²¿¼þµÄ½¨Éè³ýÍâ).
 -¿É´îÔØÔËÊäÁ½Ö§²¿¶Ó.
 -¿ÉÒÔ¸ÄÔìµØÐÎ.\-ÎÞÐè³ÇÊÐ¹©¸øÁ¸Ê³.
 -ÔÚ±¾·½»ØºÏÖÐ, ¿ÉÔÚ¿ÕÖÐ·ÉÐÐ; ÔÚÆäËûÊÆÁ¦µÄ»ØºÏÖÐ, ½«±»µ±×÷µØÃæ²¿¶Ó.\-¿ÉÕì²ìÁÚ½ü³ÇÊÐ, ÒÔ¼°Í¬Ò»µØ¿éµÄ¶à¸ö²¿¶Ó.\-Èç¹ûÔÚ±¾·½»ØºÏ½áÊøÊ±, »¬Ïè»úÈÔÔÚº£Ãæ, ¾Í»á×¹»Ù.\-²»¿É´îÔØ½¢´¬.
+-可以改造地形, 建立城市.\-需要城市供给粮食.
+-可以改造地形, 建立城市.\-需要城市供给粮食.\-对恶土的负面效果有免疫.
+*
+-守城时防御力 +100%.\-始终需要城市供给粮食.\-在奴隶专制社会中, 每个守城的卫兵可抵消2名城内市民的不安.
+:SPYMISSIONS 可执行秘密行动.\-可侦察邻近城市, 以及同一地块的多个部队 (包括隐形飞机).\-视野范围为2格.\-不具备地域控制的能力.\-不会在隶属城市引起市民的不安.
+-建设队可用"加入城市"的方法, 将自身三分之二的生产原料 加入当前城市的建设项目之中 (殖民飞船部件的建设除外).
+-可搭载运输两支部队.
+-可以改造地形.\-无需城市供给粮食.
+-在本方回合中, 可在空中飞行; 在其他势力的回合中, 将被当作地面部队.\-可侦察邻近城市, 以及同一地块的多个部队.\-如果在本方回合结束时, 滑翔机仍在海面, 就会坠毁.\-不可搭载舰船.
 #JOBHELP
 :MOVEMENT ²¿¶ÓÒÆ¶¯Ê±ºÄ·Ñ¸üÉÙÐÐ¶¯µã, ²¿¶ÓÒÆ¶¯·¶Î§Ôö´ó.\::A29 ÅäºÏ³µÂÖ¿Æ¼¼, Ìá¸ßÃ³Ò×ÀûÈó.
 :MOVEMENT ²¿¶ÓÒÆ¶¯Ê±ºÄ·Ñ¸üÉÙÐÐ¶¯µã, ²¿¶ÓÒÆ¶¯·¶Î§Ôö´ó.\-ËùÔÚµØ¿éµÄÔÁÏ×ÊÔ´Éú²ú +50%.\-Ö»ÄÜÔÚÒÑÓÐµÀÂ·µÄµØ¿éÉÏÆÌÉèÌúÂ·. µÀÂ·µÄÔÓÐÐ§¹ûÒÀÈ»±£Áô.
 -Ê¹´¬Ö»¿ÉÍ¨ÐÐÈëÄÚÂ½.\-¿ÉµÖÏû¶ñÍÁµÄ¸ºÃæÐ§Ó¦.\-²»¿ÉÔÚ¸ßÉ½»ò±ùÔÉÏ¿ª±ÙÔËºÓ.
 -Ôö¼ÓÁ¸Ê³²úÁ¿, Ôö¼Ó·ù¶ÈÒòµØÐÎ¶øÒì.
 ::B51 ÓÐ³¬ÊÐµÄ³ÇÊÐÖÐ, Á¸Ê³²úÁ¿ +50%\-Ö»ÄÜÔÚÒÑ¹à¸ÈµÄµØ¿éÉÏ¿ª¿ÑÅ©³¡. ¹à¸ÈµÄÔÓÐÐ§¹ûÒÀÈ»±£Áô.
 -Ôö¼Ó¿ó²Ø²úÁ¿, Ôö¼Ó·ù¶ÈÒòµØÐÎ¶øÒì.
 -ÔÚÄÚ×¤ÊØµÄµØÃæ²¿¶Ó·ÀÓùÁ¦ +100%.\-ÊÓÒ°·¶Î§ÍØÎª2¸ñ.\:COMBAT ÆäËûÐ§¹û,Ïê¼û"Õ½¶·´óÈ«".
 -¿ÉµÖÏû¶ñÍÁµÄ¸ºÃæÐ§Ó¦.\-ÊÓÒ°·¶Î§ÍØÎª2¸ñ.\:COMBAT Õ½¶·¼°»Ö¸´Ð§¹û, Ïê¼û"Õ½¶·´óÈ«".\::F6 ·É»ú¿ÉÔÚ´Ë¼Ó×°Õ¨µ¯.\-ÈôÁÚ½ÓÔËºÓ, ´¬Ö»¿ÉÔÚ¾üÊÂ»ùµØÄÚÍ£²´.
+:MOVEMENT 部队移动时耗费更少行动点, 部队移动范围增大.\::A29 配合车轮科技, 提高贸易利润.
+:MOVEMENT 部队移动时耗费更少行动点, 部队移动范围增大.\-所在地块的原料资源生产 +50%.\-只能在已有道路的地块上铺设铁路. 道路的原有效果依然保留.
+-使船只可通行入内陆.\-可抵消恶土的负面效应.\-不可在高山或冰原上开辟运河.
+-增加粮食产量, 增加幅度因地形而异.
+::B51 有超市的城市中, 粮食产量 +50%\-只能在已灌溉的地块上开垦农场. 灌溉的原有效果依然保留.
+-增加矿藏产量, 增加幅度因地形而异.
+-在内驻守的地面部队防御力 +100%.\-视野范围拓为2格.\:COMBAT 其他效果,详见"战斗大全".
+-可抵消恶土的负面效应.\-视野范围拓为2格.\:COMBAT 战斗及恢复效果, 详见"战斗大全".\::F6 飞机可在此加装炸弹.\-若邻接运河, 船只可在军事基地内停泊.

branches/highdpi/Localization/zh-Hans/Language.txt

-              r464
+              r465
 #GAME ½ø¶È %d
 #MAP µØÍ¼ %d
 #BC ¹«ÔªÇ° %d Äê
 #AD ¹«Ôª %d Äê
+#GAME 进度 %d
+#MAP 地图 %d
+#BC 公元前 %d 年
+#AD 公元 %d 年
 #SHARE %d/%d
 #SHORTNAME #S
 #OWNED #A %s
 #GENCITY #S %d
 #GENMODEL #A Ä£¿é %d
+#GENMODEL #A 模块 %d
 #TILESIZE %dx%d
 'City Screen Text
 #HAPPINESS °²¶¨
 #CONTROL ½äÑÏ
 #FAITH ÐÅÑö
 #UNREST ²»°²
 #HAPPINESSDEMAND ÈË¿Ú
 #HAPPINESSPLUS Ê£Óà
 #STORAGE ´æÁ¸
 #FOOD Á¸Ê³
 #DEMAND ÐèÇó
 #SURPLUS ¶àÓà
 #LACK È±·¦
 #MATERIAL ÔÁÏ
 #PROD Éú²ú
 #POLL ÎÛÈ¾
 #SUPPORT Î¬³Ö
 #PROFIT ÀûÈó
 #TRADE Ã³Ò×
 #CORR ¸¯°Ü
 #SCIENCE ¿ÆÑÐ
 #TAX Ë°ÊÕ
 #LUX ÉÝ³Þ
 #DUMP ·ÏÁÏ
 #SUPUNITS Á¥Êô²¿¶Ó
+#HAPPINESS 安定
+#CONTROL 戒严
+#FAITH 信仰
+#UNREST 不安
+#HAPPINESSDEMAND 人口
+#HAPPINESSPLUS 剩余
+#STORAGE 存粮
+#FOOD 粮食
+#DEMAND 需求
+#SURPLUS 多余
+#LACK 缺乏
+#MATERIAL 原料
+#PROD 生产
+#POLL 污染
+#SUPPORT 维持
+#PROFIT 利润
+#TRADE 贸易
+#CORR 腐败
+#SCIENCE 科研
+#TAX 税收
+#LUX 奢侈
+#DUMP 废料
+#SUPUNITS 隶属部队
 'Class Screen Text
 #UNITOWNER (#A)
 #UNITSPEED »ú¶¯
 #UNITSTRENGTH Õ½¶·
 #UNITTRANSPORT ÔËÊä
 #UNITCOST Ôì¼Û
 #UNITBUILT ±àÖÆ
 #UNITINTRO Ê¼´´ÓÚ
 #UNITADOPT Òý½øÓÚ
 #UNITLOST ÎþÉü
 #UNITDESTROYED ÕóÍö
 #UNITAVAILABLE ÏÖÒÛ
 #UNITINPROD ÔÚ½¨
 #UNITKNOWN ÔÚÒÛ×Ü¼Æ
 #UNITSPECIAL ÌØÊâ²¿¶Ó
+#UNITSPEED 机动
+#UNITSTRENGTH 战斗
+#UNITTRANSPORT 运输
+#UNITCOST 造价
+#UNITBUILT 编制
+#UNITINTRO 始创于
+#UNITADOPT 引进于
+#UNITLOST 牺牲
+#UNITDESTROYED 阵亡
+#UNITAVAILABLE 现役
+#UNITINPROD 在建
+#UNITKNOWN 在役总计
+#UNITSPECIAL 特殊部队
 'Diplomacy Screen Text
 #FRSTATGOV ÕþÌå: %s
 #FRSTATPOP ÈË¿Ú: %d°ÙÍò
 #FRSTATTER ÁìÍÁ: %d°ÙÍòÆ½·½¹«Àï
 #FRSTATTECH ¿Æ¼¼: %d%%
 #FRSTATEXP Ì½Ë÷: %d%%
 #FRLASTCONTACT ÉÏ´Î½Ó´¥:
 #FRNOCONTACT Î´Ôø½Ó´¥£¬½öÆ¾´«ÎÅ
 #FRNOVISIT ÉÐÎ´°Ý·Ã
 #FROLDCIVILREP (´Ó%s´¦»ñµÃ)
 #FRNOCIVILREP (ÉÐÎÞ¹ú¼Ò±¨¸æ)
 #FROURATT ÎÒ·½Ì¬¶È: %s
 #FREXTINCT Ãð¾øÓÚ
 #FRTREATY ¹ØÏµ:
+#FRSTATGOV 政体: %s
+#FRSTATPOP 人口: %d百万
+#FRSTATTER 领土: %d百万平方公里
+#FRSTATTECH 科技: %d%%
+#FRSTATEXP 探索: %d%%
+#FRLASTCONTACT 上次接触:
+#FRNOCONTACT 未曾接触，仅凭传闻
+#FRNOVISIT 尚未拜访
+#FROLDCIVILREP (从%s处获得)
+#FRNOCIVILREP (尚无国家报告)
+#FROURATT 我方态度: %s
+#FREXTINCT 灭绝于
+#FRTREATY 关系:
 #FRAND ,
 #FRCREDIBILITY (%d%% ÐÅÓÃ¶È)
 #FRTREASURY ¹ú¿â: %d%%c
 #FRRELATIONS Ëû¹ú¹ØÏµ:
+#FRCREDIBILITY (%d%% 信用度)
+#FRTREASURY 国库: %d%%c
+#FRRELATIONS 他国关系:
 'Other Dialog Text
 #PRESENT µ±Ç°²¿¶Ó
 #SHOWSTRENGTH Õ½¶·Á¦: %d/%d
 #RIVER ºÓÁ÷
 #INITUNIT ²¿¶ÓÑÐ·¢
 #TECHFOCUS Ä¿±ê£º%s
 #NEXUS Á¬½Ó
 #SCIENCEREPORT_EXTINCT %s (Ãð¾ø)
 #MODELDRAFT ÐÂ²¿¶ÓÑÐ·¢ (%s)
 #TAXRATE Ë°ÊÕ
+#PRESENT 当前部队
+#SHOWSTRENGTH 战斗力: %d/%d
+#RIVER 河流
+#INITUNIT 部队研发
+#TECHFOCUS 目标：%s
+#NEXUS 连接
+#SCIENCEREPORT_EXTINCT %s (灭绝)
+#MODELDRAFT 新部队研发 (%s)
+#TAXRATE 税收
 #MONEYGAINPOS +%d%%c
 #MONEYGAINNEG %d%%c
 #TECHGAIN +%d%%r
 #TECHWAIT %s (%d »ØºÏ)
 #COSTDIFF1 ÈëÃÅÄÑ¶È: -25%
 #COSTDIFF2 ÖÐ¼äÄÑ¶È: ?
 #COSTDIFF3 ±äÌ¬ÄÑ¶È: +25%
+#TECHWAIT %s (%d 回合)
+#COSTDIFF1 入门难度: -25%
+#COSTDIFF2 中间难度: ?
+#COSTDIFF3 变态难度: +25%
 #NATEXISTS (%s)
 #CONSCRIPTS Õ÷Ä¼ %s
+#CONSCRIPTS 征募 %s
 #WONDEROF %s (%s)
 #WONDEROWNER (#A)
 #EXPIRED (ÒÑ¹ýÆÚ)
 #DESTROYED (ÒÑ±»»Ù)
 #NOWONDER ÉÐÎÞÆæ¼£½¨³É
 #BUILDORDER ÏÈÑ¡¶¨³ÇÊÐÀàÐÍ£¬ÔÙÉè¶¨½¨Éè´ÎÐò£º
 #BUILDREST ÉÐÎ´Éè¶¨´ÎÐòµÄÉèÊ©:
 #ENHANCE %s: %s ÐÐ¶¯µã
 #SHIPCOMP ·É´¬×é¼þ
 #SHIPPOW ¶¯Á¦²Õ
 #SHIPHAB ¾Ó×¡²Õ
 #SEARCH ËÑË÷
 #RANMAP Ëæ»úµØÍ¼
+#EXPIRED (已过期)
+#DESTROYED (已被毁)
+#NOWONDER 尚无奇迹建成
+#BUILDORDER 先选定城市类型，再设定建设次序：
+#BUILDREST 尚未设定次序的设施:
+#ENHANCE %s: %s 行动点
+#SHIPCOMP 飞船组件
+#SHIPPOW 动力舱
+#SHIPHAB 居住舱
+#SEARCH 搜索
+#RANMAP 随机地图
 #TWOTERRAINS %s / %s
 #MPMAP ¶àÈËÄ£Ê½
 #NOGAMES ÉÐÎÞ½ø¶È
 #AIT_ROUND µÚ%d»ØºÏ,
+#MPMAP 多人模式
+#NOGAMES 尚无进度
+#AIT_ROUND 第%d回合,
 'Dialog Titles
 #TITLE_TRIBE Ñ¡ÔñÖÖ×å
 #TITLE_GOV Ñ¡ÔñÕþ¸®
 #TITLE_TECHSELECT ÇëÖ¸¶¨¿ÆÑÐÏîÄ¿(°´×¡Shiftµ¥»÷¿´°ïÖú)
 #TITLE_FARTECH ÇëÉè¶¨¿ÆÑÐÄ¿±ê
 #TITLE_CITIES #A³ÇÊÐ
 #TITLE_EVENTS ÔÚ%s·¢ÉúÊÂ¼þ
 #TITLE_MODELS #A²¿¶Ó
 #TITLE_DIAGRAMS ÀúÊ·Í¼±í
 #TITLE_SHIPS Ö³Ãñ·É´¬
 #TITLE_SHIP #A Ö³Ãñ·É´¬
 #TITLE_EMODELS ÆäËûÊÆÁ¦ÑÐ·¢²¿¶Ó
 #TITLE_EDEFENSE ³ÇÊÐ·ÀÓù
 #TITLE_RATES ¾¼Ã
 #TITLE_DRAFT ²¿¶ÓÑÐ·¢
 #TITLE_WONDERS ÊÀ½çÆæ¼£
 #TITLE_ENHANCE µØÐÎ¸ÄÔì
 #TITLE_CITYTYPES ³ÇÊÐÀàÐÍ
 #TITLE_PROJECT ÇëÖ¸¶¨Òª½¨ÉèµÄµ¥Î»
 #TITLE_CITYNAME ³ÇÊÐÃû³Æ
 #TITLE_MODELNAME ÐÂÐÍ²¿¶ÓÃû³Æ
 #TITLE_ERROR ´íÎó
 #TITLE_SCIENCE ¿Æ¼¼±¨¸æ
 #TITLE_OFFERDELIVER Ìí¼ÓÌáÒé
 #TITLE_OFFERCOST Ìí¼ÓÐèÇó
 #TITLE_NUMBER Êý×Ö
 #TITLE_AMOUNT ÊýÁ¿
 #TITLE_CHOOSETECH Ñ¡Ôñ¿Æ¼¼
 #TITLE_CHOOSEMODEL Ñ¡ÔñÉè¼Æµ¥Î»
 #TITLE_CHOOSESHIPPART Ñ¡ÔñÀà±ð
 #TITLE_CHOOSECITY Ñ¡Ôñ³ÇÊÐ
 #TITLE_BOOKNAME ÓÎÏ·Ãû³Æ
 #TITLE_MAPNAME µØÍ¼Ãû³Æ
+#TITLE_TRIBE 选择种族
+#TITLE_GOV 选择政府
+#TITLE_TECHSELECT 请指定科研项目(按住Shift单击看帮助)
+#TITLE_FARTECH 请设定科研目标
+#TITLE_CITIES #A城市
+#TITLE_EVENTS 在%s发生事件
+#TITLE_MODELS #A部队
+#TITLE_DIAGRAMS 历史图表
+#TITLE_SHIPS 殖民飞船
+#TITLE_SHIP #A 殖民飞船
+#TITLE_EMODELS 其他势力研发部队
+#TITLE_EDEFENSE 城市防御
+#TITLE_RATES 经济
+#TITLE_DRAFT 部队研发
+#TITLE_WONDERS 世界奇迹
+#TITLE_ENHANCE 地形改造
+#TITLE_CITYTYPES 城市类型
+#TITLE_PROJECT 请指定要建设的单位
+#TITLE_CITYNAME 城市名称
+#TITLE_MODELNAME 新型部队名称
+#TITLE_ERROR 错误
+#TITLE_SCIENCE 科技报告
+#TITLE_OFFERDELIVER 添加提议
+#TITLE_OFFERCOST 添加需求
+#TITLE_NUMBER 数字
+#TITLE_AMOUNT 数量
+#TITLE_CHOOSETECH 选择科技
+#TITLE_CHOOSEMODEL 选择设计单位
+#TITLE_CHOOSESHIPPART 选择类别
+#TITLE_CHOOSECITY 选择城市
+#TITLE_BOOKNAME 游戏名称
+#TITLE_MAPNAME 地图名称
 #TITLE_NATION #N
+#TITLE_SPYMISSION ÃØÃÜÐÐ¶¯
+#TITLE_SUICIDE ×ÔÉ±ÐÐ¶¯
+#FRMILREP ¾üÊÂ±¨¸æ
+#TITLE_SPYMISSION 秘密行动
+#TITLE_SUICIDE 自杀行动
+#TITLE_MESSAGE Message
+#FRMILREP 军事报告
 'Message Text
 #NOALTAI Î´°²×°ÈÎºÎAIÄ£¿é.\Çëµ½ÓÎÏ·¹Ù·½ÍøÕ¾ÏÂÔØÏà¹ØAIÄ£¿é, »ò×ÔÐÐ´´½¨AIÄ£¿é
 #REVOLUTION ÔÚ½¨Á¢ÐÂÕþÌåÖ®Ç°, #aµÛ¹ú½«´¦ÓÚÎÞÕþ¸®×´Ì¬, ÕâÊÇ¸ïÃüÇ°±Ø¾µÄÕóÍ´, ÊÇ·ñÈ·¶¨¸ïÃü?
 #AUTOREVOLUTION ÐÂÕþÌåÒÑ¾Íê³É: \%s\\ÎªÁË×ª»»ÖÁ¸ÃÕþÌå,±ØÐë·ÏÆúµ±Ç°µÄÕþÌåÐÎÊ½, ¾ÀúÒ»¶ÎÎÞÕþ¸®Ê±ÆÚ. ÊÇ·ñ¿ªÊ¼¸ïÃü?
 #NOALTGOVS ·¢¶¯Ò»³¡¸ïÃü, ¿ÉÒÔ½«µ±Ç°µÄÕþÌå ¸ü»»ÎªÆäËûÕþÌå. µ«Ä¿Ç°ÎÒÃÇÖ»ÓµÓÐ Å«Á¥×¨ÖÆÒ»ÖÖÕþÌåÐÎÊ½, ÎÞ·¨¸ü»»ÐÂµÄÕþÌå.
 #AGE0 = %s =\Ê¯Æ÷Ê±´úÒÑ½üÎ²Éù, ÎªÁË¿Ë·þÓÎÄÁÉú»îµÄ²»±ã, ÎÒÃÇ¾ö¶¨ÔÚÕâÆ¬ÎÖÍÁ ÉÏ½¨Á¢×Ô¼ºµÄ¼ÒÔ°, ÓÀ¾Ã¶¨¾ÓÓÚ´Ë, ²¢¶¨ÃûÎª%s.
 #AGE1 = %s =\Ç§°ÙÄêÀ´, Í³ÖÎ½×²ãÎªÁË½ôÎÕÌØÈ¨, ¹ØÓÚÕâ¸öÊÀ½çµÄÖªÊ¶ Ò»Ö±ÓÉ×Ú×å³¤ÀÏ´«ÊÚÖ§Åä. ÏÖÔÚÒ»ÇÐ¶¼ÒÑ¸Ä±ä. ÓÉ×Ú½ÌÐÅÑöÃè»æµÄ¾ÉÊÀ½ç¹Û, ÒÑ±»¾ÑéºÍÀíÐÔÖªÊ¶È¡´ú, Õâ¾ÍÊÇ×î³õµÄ"¿ÆÑ§"
 #AGE2 = %s =\´ó¹æÄ£Éú²úµÄ³öÏÖ, Ê¹µÃ×Ô¹ÅÒÔÀ´È¨¹óÖ÷Ô×²Æ¸»µÄ¹æÂÉ\±»³¹µ×´òÆÆ.  Éú²úµÄÃÈÑ¿ËÄ´¦¿ª»¨, ¼±ËÙÀ©ÕÅµÄÊÐ³¡½«\´óÁ¿Ãñ¼ä×Ê½ð¾¡ÊýÄÉÈëÍøÖÐ.  Ò»¸öÈ«ÐÂÊ±´ú¾Í´Ëµ®Éú.
 #AGE3 = %s =\ÈËÀà¹ÅÀÏµÄÃÎÏëÖÕÓÚ³ÉÎªÏÖÊµ. \ÎÒÃÇÏÖÔÚµÄ¼¼ÊõÒÑ¾¿ÉÒÔ\½«ÒÆÃñËÍÍùÒ£Ô¶µÄÌìÍâÐÇÇò. \ÑÐ¾¿±íÃ÷, ´ËÏîºêÎ°ÏîÄ¿Íê³ÉµÄ¹Ø¼ü\ÊÇÌØÖÖ½ðÊô×ÊÔ´µÄ¿ª·ÅÀûÓÃ.
 #ENDTURN ±¾»ØºÏËùÓÐ²¿¶Ó¶¼ÒÑ½áÊøÐÐ¶¯.\ÇëÑ¡Ôñ½áÊø»ØºÏ, ½øÈëÏÂÒ»»ØºÏ.
 #CREDUP ÎÒ¹úµÄÐÅÓÃÒÑÉý¼¶Îª "%s".
 #CREDDOWN ÎÒ¹úµÄÐÅÓÃÒÑ½µ¼¶Îª "%s".
 #FOREIGNCITY ×î½üËùÖªÁ¥Êô¹ú:\#N\(×î½üÇé±¨»ñÈ¡ÓÚ%s)
 #EXTINCTCITY ×î½üËùÖªÁ¥Êô¹ú:\Ãð¾ø\(×î½üÇé±¨»ñÈ¡ÓÚ%s)
 #CAPTURE #NÕ¼ÁìÁË%s!
 #BOMBARD #NÕýÔÚºäÕ¨²»Éè·ÀµÄ%s!
 #EXPEL #aÁìÍÁÉÏµÄÆäËûÊÆÁ¦²¿¶ÓÒÑ±»ÇýÖð.
 #DISPOSE %s\\½«´Ë½¨ÖþÍÆµ¹ÖØ½¨£¿
 #SPDESTRUCTQUERY \(×¢Òâ: Èç¹û²ð³ýÌ«¿Õ¸Û, ´ËµØµÄÖ³Ãñ·É´¬ÏîÄ¿½«±»·Ï³ý!)
 #SELL %s\\½«´Ë½¨Öþ±äÂôÌ×ÏÖ£¿
 #LOSEMAT ÈôÍêÈ«¸ü¸Ä½¨ÉèÀàÐÍ, µ±Ç°½¨ÉèÖÐµÄÏîÄ¿½«±»±äÂô. %d%%p µÄ±äÂô¼Û¸ñÎª %d%%c.
 #LOSEMAT3 ÈôÒª¸ü¸ÄÎªÍ¬ÀàÐÍµÄÆäËû½¨ÉèÏîÄ¿, ½«ËðÊ§1/3µÄ½¨Éè½ø¶È. ÊÇ·ñ¼ÌÐø?
 #DOUBLESTATEIMP %s\\%sÒÑ½¨ÓÐ´ËÏî³ÇÊÐÉèÊ©. ÊÇ·ñ½«ÔÚµ±Ç°µÄ³ÇÊÐÖØ½¨¸ÃÉèÊ©, ½¨³Éºó±äÂôÔÓÐµÄÍ¬ÃûÉèÊ©?
 #READY ¸Ã½¨Éè½«ÔÚÏÂ»ØºÏ¿ªÊ¼Ê±Íê³É
 #NOMONEY ÏÖÓÐ½ðÇ®²»×ã,\ÎÞ·¨ÌáÇ°Íê¹¤.\(ÐèÒª%d%%c, ÏÖÓÐ%d%%c)
 #BUY Ö§¸¶%d%%c, ÈÃ´ËÏîÄ¿ÔÚÏÂ»ØºÏÍê¹¤?
 #EMIGRATE ¼ÌÐøÕ÷Ä¼ÒÆÃñ²¿¶Ó, ÓÐ¿ÉÄÜµ¼ÖÂ±¾³ÇÊÐ»Ä·Ï. ÊÇ·ñÔÝ»ºÕ÷Ä¼¼Æ»®, µÈµ½³ÇÊÐÈË¿ÚÔö³¤µ½ Ò»¶¨¹æÄ£ºóÔÙÐÐÕ÷Ä¼?
 #ADDTOMAXSIZE ´Ë³ÇÊÐµÄ¹æÄ£ÒÑ´ïÉÏÏÞ.
 #CITYMANAGEOFF È¡Ïû³ÇÊÐ×ÊÔ´µÄ×Ô¶¯·ÖÅä?
 #GLIDERLOST ÎÒ·½»¬Ïè»úÔÚº£Ãæ×¹»Ù
 #PLANELOST ÎÒ·½·É»úÈ¼ÓÍºÄ¾¡
 #DAMAGED_UTILIZE Õû±àÊÜËðµÄ²¿¶Ó,Ëù»ñÐ§¹û½«ÏàÓ¦½µµÍ. ÊÇ·ñ¼ÌÐø?
 #NOBB ÎÒÃÇÉÐÎ´ÕÆÎÕÔÚºÓÁ÷ÉÏ´î½¨ÇÅÁºµÄ¿Æ¼¼
 #NOCITY ´ËµØÐÎ²»ÊÊºÏ¶¨¾Ó½¨³Ç. ÁíÃÙÒ»¿é¿É¹à¸ÈµÄÍÁµØ¶¨¾Ó°É.
 #NOCAPTURER Æ½Ãñµ¥Î»ÎÞ·¨Õ¼ÁìÆäËûÊÆÁ¦µÄ³ÇÊÐ.
 #NOBOMBARDER Ã»ÓÐÐ¯´øÎäÆ÷, ²»ÄÜºäÕ¨³ÇÊÐ.
 #ZOC ¸Ã²¿¶Ó²»ÄÜÔÚµÐ·½¿ØÖÆµÄµØÇøËæÒâÒÆ¶¯.
 #FASTATTACK ÒÔ%d%%µÄÁ¦Á¿¹¥»÷Ä¿±êÃ´£¿
 #NOTIMELOADGROUND ¸Ã²¿¶ÓËùÊ£ÐÐ¶¯µã²»×ã%s, ÎÞ·¨Íê³É×°ÔË/Ð¶ÔË.
 #NOTIMELOADAIR ¸Ã·É»úËùÊ£ÐÐ¶¯µã²»×ã100, ÎÞ·¨ÔÚÄ¸½¢ÉÏÆð½µ.
 #NOTIMEBOMBARD ºäÕ¨³ÇÊÐÐèÒª100ÐÐ¶¯µã.
 #NOTIMEEXPEL ¸Ã²¿¶ÓËùÊ£ÐÐ¶¯µã²»×ã100, ÎÞ·¨ÇýÖð.
 #NOROAD ¸Ã²¿¶ÓÖ»ÄÜÑØ×ÅµÀÂ·»òÌúÂ·ÒÆ¶¯.
 #NONAV ¸Ã´¬Ö»Ã»ÓÐÔ¶Ñóº½ÐÐÄÜÁ¦.
 #NOTRANSPORT ¸Ã´¬Ö»Ã»ÓÐÔËÊäÄÜÁ¦.
 #FULLTRANSPORT ¸Ã´¬Ö»µÄÔËÔØ¿Õ¼äÒÑÂú.
 #LOWFUEL Õâ¼Ü·É»úÈ¼ÓÍ¼´½«ºÄ¾¡. Èç¹û¼ÌÐøÇ°ÐÐ, ½«ÎÞ·¨·µº½. ÊÇ·ñ¼ÌÐøÇ°ÐÐ?
 #LOWFUEL_GLIDER Õâ¼Ü»¬Ïè»ú±ØÐëÔÚ»ØºÏ½áÊøÊ±»Øµ½Â½µØ, Èç¹û¼ÌÐøÏòÇ°, ÓÐ×¹»ÙµÄÎ£ÏÕ. ÊÇ·ñ¼ÌÐø?
 #UNREST_FOREIGN %s\\ÕâÀïÒÑÊÇ#aµÄµØ½ç. Èç¹û¼ÌÐøÏòÇ°, ½«µ¼ÖÂ¸Ã²¿¶ÓÁ¥Êô³ÇÊÐµÄ¾ÓÃñ²»°². ÊÇ·ñ¼ÌÐø?
 #UNREST_NOTOWN %s\\Èç¹ûÀë¿ª#sµÄÁìÍÁ, ½«µ¼ÖÂ¸Ã²¿¶ÓÁ¥Êô³ÇÊÐµÄ¾ÓÃñ²»°². ÊÇ·ñ¼ÌÐø?
 #NOATTACKER ´Ë²¿¶Ó²»ÊÇ¾üÊÂµ¥Î», ÎÞ·¨Õ¹¿ª¹¥»÷.
 #ATTACKSUB ÎÞ·¨È·¶¨µÐ·½Ç±Í§µÄÎ»ÖÃ.
 #ATTACKSTEALTH ÎÞ·¨È·¶¨µÐ·½ÒþÐÎ·É»úµÄÎ»ÖÃ.
 #PEACE_NOATTACK ÎÒÃÇÓë#nÇ©¶©ÁËºÍÔ¼.
 #PEACE_NOMOVE ÎÒÃÇÓë#nÇ©¶©ÁËºÍÔ¼, ²»ÄÜ½øÈë¶Ô·½ÁìÍÁ.
 #PEACE_NOWORK ÕâÀïÊÇ#aµÄÁìÍÁ!\ÎÒÃÇºÍ¸Ã¹úÇ©ÓÐºÍÔ¼, ²»µÃÇÖ·¸.
 #NOFOREIGNINFO Î´·¢ÏÖÐÂµÄÇé±¨.
 #FOREIGNINFO »ñµÃÐÂµÄÇé±¨, ÄÚÈÝÈçÏÂ:
 #DOSSIER_PREPARED ÎÒÃÇ»ñµÃÁË#aµÄ¹ú¼ÒÇé±¨,°üÀ¨#aµÄÍ³¼ÆÍ¼±íÒÔ¼°¸Ã¹úµ±Ç°µÄ¿ÆÑÐ±¨¸æ.
 #VIOLATION ÎÒ·½²¿¶ÓÇÖ·¸ÁË#aµÄÁìÍÁ!\#NÒªÇóÎÒÃÇÔÚ%sÖ®Ç°½«²¿¶Ó³·Àë.
 #EVIOLATION #NÒòÎ¥·´ºÍÔ¼Ìõ¿îÒ»ÊÂ ÌØÏòÎÒ·½µÀÇ¸. ËûÃÇ´ðÓ¦ÔÚ%sÖ®Ç°³·×ß²¿¶Ó.
 #WITHDRAW ÎÒ·½²¿¶Ó±»ÀÕÁî´Ó#aÁìÍÁÉÏ³·Àë.
 #WONDERBUILT #N½¨³ÉÁËÐÂµÄÊÀ½çÆæ¼£:\%s
 #WONDERBUILTEXP Ä³¹ú½¨³ÉÁËÐÂµÄÊÀ½çÆæ¼£:\%s\\µ«ÕâÏîÆæ¼£ÒÑ¾¹ýÊ±, Ã»ÓÐÈÎºÎÏÖÊµÒâÒå.
 #WONDERBUILTOWN ÎÒ¹ú½¨³ÉÁËÐÂµÄÊÀ½çÆæ¼£:\%s
 #WONDERCAPT #NÕ¼ÁìÁËÒ»ÏîÊÀ½çÆæ¼£:\%s
 #WONDERCAPTOWN ÎÒ¹úÕ¼ÁìÁËÒ»ÏîÊÀ½çÆæ¼£:\%s
 #WONDEREXP ÊÀ½çÆæ¼£: %s µÄÐ§¹ûÒÑ²»¸´´æÔÚ.
 #WONDERDEST Ò»ÏîÊÀ½çÆæ¼£±»´Ý»ÙÁË:\%s
 #COLDWAR ÓÉÓÚºËÕ½µÄÊÀ½çÐÔÍþÐ², ËùÓÐÊÆÁ¦µÄÍâ½»Á¢³¡±äµÃÄÑÒÔ¶¯Ò¡, ½»ÉæÒÑ²»ÔÙÓÐÐ§. È«ÇòÀäÕ½¿ªÊ¼ÁË.
 #COLDWAREND ÀäÕ½½áÊøÁË.
 #SHIPBUILT #N¸ÕÍê³ÉÁËÖ³Ãñ·É´¬µÄÄ³²¿¼þÉú²ú.
 #SHIPBITRADE1 #S ºÍ
 #SHIPBITRADE2 #s ½»»»ÁË¸÷×ÔµÄÖ³Ãñ·É´¬²¿¼þ.
 #SHIPUNITRADE1 #N ´Ó #s ´¦»ñµÃÁË
 #SHIPUNITRADE2 ¼þÖ³Ãñ·É´¬²¿¼þ¡£
 #SHIPCAPTURE1 #N¶áÈ¡ÁË
 #SHIPCAPTURE2 #aµÄÖ³Ãñ·É´¬²¿¼þ!
 #SHIPDESTROYED #NµÄÖ³Ãñ·É´¬ÏîÄ¿±»·Ï³ýÁË
 #LOWFUNDS ¹ú¿âÒÑ½ü¿Ý½ß, Èç¹û²»¾¡¿ì²ÉÈ¡´ëÊ©, ÎÒÃÇÖ»ÄÜ¿¿±äÂô³ÇÊÐÉèÊ©¶ÈÈÕ.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #DISORDER %s½«ÏÝÈëÉ§ÂÒ.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #DISORDER_UNREST ÓÉÓÚ³ÇÊÐ²»°²ÈË¿Ú±äÎª¶àÊý, %s½«ÏÝÈëÎÞÕþ¸®×´Ì¬.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #FAMINE %sÓÐ±¬·¢¼¢»ÄµÄÎ£ÏÕ.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #FAMINE_TILES %sÓÐ±¬·¢¼¢»ÄµÄÎ£ÏÕ. ±¾³ÇËùÊôµØ¿é³ö²úµÄÁ¸Ê³²»×ã.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #FAMINE_UNREST %sÓÐ±¬·¢¼¢»ÄµÄÎ£ÏÕ. ÎªÁË¿ØÖÆÃñÖÚ²»°²ÇéÐ÷, ²¿·ÖÈË¿Ú´Ó×ÊÔ´Éú²ú×ªÎª³ÇÊÐ½äÑÏ²¿¶Ó, ´Ë¾Ù´ë½«Ê¹±¾³ÇËùÊôµØ¿é³ö²úµÄÁ¸Ê³²»×ã.\\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #LOWSUPPORT ÒÔ%sµÄÉú²úË®Æ½, ÎÞ·¨±£Ö¤Á¥Êô²¿¶ÓµÄ×îµÍ¹©¸ø.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #LOWSUPPORT_TILES ÒÔ%sµÄÉú²úË®Æ½, ÎÞ·¨±£Ö¤Á¥Êô²¿¶ÓµÄ×îµÍ¹©¸ø. ±¾³ÇËùÊôµØ¿é³ö²úµÄÔÁÏ²»×ã.\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #LOWSUPPORT_UNREST ÒÔ%sµÄÉú²úË®Æ½, ÎÞ·¨±£Ö¤Á¥Êô²¿¶ÓµÄ×îµÍ¹©¸ø. ÎªÁË¿ØÖÆÃñÖÚ²»°²ÇéÐ÷, ²¿·ÖÈË¿Ú´Ó×ÊÔ´Éú²ú×ªÎª³ÇÊÐ½äÑÏ²¿¶Ó, ´Ë¾Ù´ë½«Ê¹±¾³ÇËùÊôµØ¿é³ö²úµÄÔÁÏ²»×ã.\\ÊÇ·ñ¼ÌÐøÐÐ¶¯?
 #RESIGN ¼´½«¹Ø±Õ´ËÓÎÏ·.\ÊÇ·ñ±£´æµ±Ç°µÄ½ø¶È?
 #ENDTOUR ÊÇ·ñ±£´æ½ø¶È, ÒÔ±ã½ñºóÔÚ³¬¼¶ÓÃ»§Ä£Ê½ÖÐÖØÐÂ´ò¿ª?
 #MODELAVAILABLE ÐÂ²¿¶ÓÑÐ·¢³É¹¦, ¿ÉËæÊ±Í¶ÈëÉú²ú.
 #RESEARCH_GENERAL ÎÒ·½×îÐÂ¿ÆÑÐ³É¹û£º%s£¡
 #GRLIB_GENERAL ´Ó´óÍ¼Êé¹ÝÖÐ£¬ÎÒÃÇ»ñµÃÁË %s µÄÖªÊ¶£¡
 #ORACLEINCOME ÊÕÈë: %d%%c
 #NOSELLAGAIN %s\\Ò»»ØºÏÄÚ£¬Ã¿×ù³ÇÊÐÖ»ÄÜ±äÂô »òÖØ½¨Ò»ÖÖ½¨Öþ
 #OUTOFCONTROL %s\\Õâ×ù³ÇÊÐÉÐÎ´»Ö¸´Õý³£ÖÈÐò
 #NOCHANGEINANARCHY ÎÒ¹úÕý´¦ÓÚÎÞÕþ¸®×´Ì¬£¬ËùÓÐ³ÇÊÐ½¨ÖþÔÝÊ±Ê§Ð§.
 #EXTINCT = %s =\#nµÛ¹ú»ÙÃðÁË, ËûÃÇµÄ¹â»ÔÎÄÃ÷ ´Ó´Ë±»·â´æÔÚ´«ËµÖÐ.
 #EXTINCTALL \\ÎÒÃÇ³ÉÎªµØÇòÉÏÎ¨Ò»Áô´æµÄÎÄÃ÷
 #GAMEOVER #N ËùÓÐ³ÇÊÐ¶¼ÒÑÊ§ÊØ\\ÓÎÏ·½áÊø
 #TIMEUP ÓÎÏ·Ê±¼äµ½.\¾¡¹Ü#n¾¼Ã·±ÈÙ, ¿Æ¼¼ÁìÏÈ, ÔÚÊÀ½ç¸÷¹úÖÐÈ¡µÃÁËÒ»¶¨µÄÓ°Ïì, µ«ÖÕ¾¿Ã»ÄÜÕÆÎÕÖÕ¼«ÎÄÃ÷.\\ÓÎÏ·½áÊø
 #TIMEUPSUPER ÓÎÏ·Ê±¼äµ½.\Ã»ÓÐÒ»¸ö¹ú¼ÒÍê³ÉÖ³Ãñ·É´¬µÄ½¨Éè.
 #SPACESHIP1 #NµÄÖ³Ãñ·É´¬ÒÑ·¢ÉäÉý¿Õ.\
 #SPACESHIP2 ÐÇ¼ÊÖ³Ãñ¼Æ»®µÄ³É¹¦, Ó¡Ö¤ÁË¸Ã¹úÎÄÃ÷µÄÈ«ÃæÁìÏÈÓÅÊÆ.\\ÓÎÏ·½áÊø
 #MYSPACESHIP Àú¾ÎÞÊýµÄÆ¶ÇîÔÖÄÑ, ÎÞÊýµÄÁ÷ÑªÎþÉü, ÎÞÊýµÄÊ±´ú¸üµü, ÈËÀà¹ÅÀÏµÄÃÎÏëÖÕÓÚÔÚÎÒÃÇÊÖÖÐ±äÎªÏÖÊµ. ÎÒÃÇµÄ·É´¬Ïò×ÅÌ«¿ÕÖÐÎ´ÖªµÄÊÀ½ç·ÉÈ¥, Îªºó´úµÄÉú»îÑ°ÕÒÈ«ÐÂµÄ¼ÒÔ°.\\¹§Ï²Ó®µÃÓÎÏ·Ê¤Àû
 #SHAREDWIN (Óë %s ¹²ÏíÊ¤Àû)
+#NOALTAI 未安装任何AI模块.\请到游戏官方网站下载相关AI模块, 或自行创建AI模块
+#REVOLUTION 在建立新政体之前, #a帝国将处于无政府状态, 这是革命前必经的阵痛, 是否确定革命?
+#AUTOREVOLUTION 新政体已经完成: \%s\\为了转换至该政体,必须废弃当前的政体形式, 经历一段无政府时期. 是否开始革命?
+#NOALTGOVS 发动一场革命, 可以将当前的政体 更换为其他政体. 但目前我们只拥有 奴隶专制一种政体形式, 无法更换新的政体.
+#AGE0 = %s =\石器时代已近尾声, 为了克服游牧生活的不便, 我们决定在这片沃土 上建立自己的家园, 永久定居于此, 并定名为%s.
+#AGE1 = %s =\千百年来, 统治阶层为了紧握特权, 关于这个世界的知识 一直由宗族长老传授支配. 现在一切都已改变. 由宗教信仰描绘的旧世界观, 已被经验和理性知识取代, 这就是最初的"科学"
+#AGE2 = %s =\大规模生产的出现, 使得自古以来权贵主宰财富的规律\被彻底打破.  生产的萌芽四处开花, 急速扩张的市场将\大量民间资金尽数纳入网中.  一个全新时代就此诞生.
+#AGE3 = %s =\人类古老的梦想终于成为现实. \我们现在的技术已经可以\将移民送往遥远的天外星球. \研究表明, 此项宏伟项目完成的关键\是特种金属资源的开放利用.
+#ENDTURN 本回合所有部队都已结束行动.\请选择结束回合, 进入下一回合.
+#CREDUP 我国的信用已升级为 "%s".
+#CREDDOWN 我国的信用已降级为 "%s".
+#FOREIGNCITY 最近所知隶属国:\#N\(最近情报获取于%s)
+#EXTINCTCITY 最近所知隶属国:\灭绝\(最近情报获取于%s)
+#CAPTURE #N占领了%s!
+#BOMBARD #N正在轰炸不设防的%s!
+#EXPEL #a领土上的其他势力部队已被驱逐.
+#DISPOSE %s\\将此建筑推倒重建？
+#SPDESTRUCTQUERY \(注意: 如果拆除太空港, 此地的殖民飞船项目将被废除!)
+#SELL %s\\将此建筑变卖套现？
+#LOSEMAT 若完全更改建设类型, 当前建设中的项目将被变卖. %d%%p 的变卖价格为 %d%%c.
+#LOSEMAT3 若要更改为同类型的其他建设项目, 将损失1/3的建设进度. 是否继续?
+#DOUBLESTATEIMP %s\\%s已建有此项城市设施. 是否将在当前的城市重建该设施, 建成后变卖原有的同名设施?
+#READY 该建设将在下回合开始时完成
+#NOMONEY 现有金钱不足,\无法提前完工.\(需要%d%%c, 现有%d%%c)
+#BUY 支付%d%%c, 让此项目在下回合完工?
+#EMIGRATE 继续征募移民部队, 有可能导致本城市荒废. 是否暂缓征募计划, 等到城市人口增长到 一定规模后再行征募?
+#ADDTOMAXSIZE 此城市的规模已达上限.
+#CITYMANAGEOFF 取消城市资源的自动分配?
+#GLIDERLOST 我方滑翔机在海面坠毁
+#PLANELOST 我方飞机燃油耗尽
+#DAMAGED_UTILIZE 整编受损的部队,所获效果将相应降低. 是否继续?
+#NOBB 我们尚未掌握在河流上搭建桥梁的科技
+#NOCITY 此地形不适合定居建城. 另觅一块可灌溉的土地定居吧.
+#NOCAPTURER 平民单位无法占领其他势力的城市.
+#NOBOMBARDER 没有携带武器, 不能轰炸城市.
+#ZOC 该部队不能在敌方控制的地区随意移动.
+#FASTATTACK 以%d%%的力量攻击目标么？
+#NOTIMELOADGROUND 该部队所剩行动点不足%s, 无法完成装运/卸运.
+#NOTIMELOADAIR 该飞机所剩行动点不足100, 无法在母舰上起降.
+#NOTIMEBOMBARD 轰炸城市需要100行动点.
+#NOTIMEEXPEL 该部队所剩行动点不足100, 无法驱逐.
+#NOROAD 该部队只能沿着道路或铁路移动.
+#NONAV 该船只没有远洋航行能力.
+#NOTRANSPORT 该船只没有运输能力.
+#FULLTRANSPORT 该船只的运载空间已满.
+#LOWFUEL 这架飞机燃油即将耗尽. 如果继续前行, 将无法返航. 是否继续前行?
+#LOWFUEL_GLIDER 这架滑翔机必须在回合结束时回到陆地, 如果继续向前, 有坠毁的危险. 是否继续?
+#UNREST_FOREIGN %s\\这里已是#a的地界. 如果继续向前, 将导致该部队隶属城市的居民不安. 是否继续?
+#UNREST_NOTOWN %s\\如果离开#s的领土, 将导致该部队隶属城市的居民不安. 是否继续?
+#NOATTACKER 此部队不是军事单位, 无法展开攻击.
+#ATTACKSUB 无法确定敌方潜艇的位置.
+#ATTACKSTEALTH 无法确定敌方隐形飞机的位置.
+#PEACE_NOATTACK 我们与#n签订了和约.
+#PEACE_NOMOVE 我们与#n签订了和约, 不能进入对方领土.
+#PEACE_NOWORK 这里是#a的领土!\我们和该国签有和约, 不得侵犯.
+#NOFOREIGNINFO 未发现新的情报.
+#FOREIGNINFO 获得新的情报, 内容如下:
+#DOSSIER_PREPARED 我们获得了#a的国家情报,包括#a的统计图表以及该国当前的科研报告.
+#VIOLATION 我方部队侵犯了#a的领土!\#N要求我们在%s之前将部队撤离.
+#EVIOLATION #N因违反和约条款一事 特向我方道歉. 他们答应在%s之前撤走部队.
+#WITHDRAW 我方部队被勒令从#a领土上撤离.
+#WONDERBUILT #N建成了新的世界奇迹:\%s
+#WONDERBUILTEXP 某国建成了新的世界奇迹:\%s\\但这项奇迹已经过时, 没有任何现实意义.
+#WONDERBUILTOWN 我国建成了新的世界奇迹:\%s
+#WONDERCAPT #N占领了一项世界奇迹:\%s
+#WONDERCAPTOWN 我国占领了一项世界奇迹:\%s
+#WONDEREXP 世界奇迹: %s 的效果已不复存在.
+#WONDERDEST 一项世界奇迹被摧毁了:\%s
+#COLDWAR 由于核战的世界性威胁, 所有势力的外交立场变得难以动摇, 交涉已不再有效. 全球冷战开始了.
+#COLDWAREND 冷战结束了.
+#SHIPBUILT #N刚完成了殖民飞船的某部件生产.
+#SHIPBITRADE1 #S 和
+#SHIPBITRADE2 #s 交换了各自的殖民飞船部件.
+#SHIPUNITRADE1 #N 从 #s 处获得了
+#SHIPUNITRADE2 件殖民飞船部件。
+#SHIPCAPTURE1 #N夺取了
+#SHIPCAPTURE2 #a的殖民飞船部件!
+#SHIPDESTROYED #N的殖民飞船项目被废除了
+#LOWFUNDS 国库已近枯竭, 如果不尽快采取措施, 我们只能靠变卖城市设施度日.\是否继续行动?
+#DISORDER %s将陷入骚乱.\是否继续行动?
+#DISORDER_UNREST 由于城市不安人口变为多数, %s将陷入无政府状态.\是否继续行动?
+#FAMINE %s有爆发饥荒的危险.\是否继续行动?
+#FAMINE_TILES %s有爆发饥荒的危险. 本城所属地块出产的粮食不足.\是否继续行动?
+#FAMINE_UNREST %s有爆发饥荒的危险. 为了控制民众不安情绪, 部分人口从资源生产转为城市戒严部队, 此举措将使本城所属地块出产的粮食不足.\\是否继续行动?
+#LOWSUPPORT 以%s的生产水平, 无法保证隶属部队的最低供给.\是否继续行动?
+#LOWSUPPORT_TILES 以%s的生产水平, 无法保证隶属部队的最低供给. 本城所属地块出产的原料不足.\是否继续行动?
+#LOWSUPPORT_UNREST 以%s的生产水平, 无法保证隶属部队的最低供给. 为了控制民众不安情绪, 部分人口从资源生产转为城市戒严部队, 此举措将使本城所属地块出产的原料不足.\\是否继续行动?
+#RESIGN 即将关闭此游戏.\是否保存当前的进度?
+#ENDTOUR 是否保存进度, 以便今后在超级用户模式中重新打开?
+#MODELAVAILABLE 新部队研发成功, 可随时投入生产.
+#RESEARCH_GENERAL 我方最新科研成果：%s！
+#GRLIB_GENERAL 从大图书馆中，我们获得了 %s 的知识！
+#ORACLEINCOME 收入: %d%%c
+#NOSELLAGAIN %s\\一回合内，每座城市只能变卖 或重建一种建筑
+#OUTOFCONTROL %s\\这座城市尚未恢复正常秩序
+#NOCHANGEINANARCHY 我国正处于无政府状态，所有城市建筑暂时失效.
+#EXTINCT = %s =\#n帝国毁灭了, 他们的光辉文明 从此被封存在传说中.
+#EXTINCTALL \\我们成为地球上唯一留存的文明
+#GAMEOVER #N 所有城市都已失守\\游戏结束
+#TIMEUP 游戏时间到.\尽管#n经济繁荣, 科技领先, 在世界各国中取得了一定的影响, 但终究没能掌握终极文明.\\游戏结束
+#TIMEUPSUPER 游戏时间到.\没有一个国家完成殖民飞船的建设.
+#SPACESHIP1 #N的殖民飞船已发射升空.\
+#SPACESHIP2 星际殖民计划的成功, 印证了该国文明的全面领先优势.\\游戏结束
+#MYSPACESHIP 历经无数的贫穷灾难, 无数的流血牺牲, 无数的时代更迭, 人类古老的梦想终于在我们手中变为现实. 我们的飞船向着太空中未知的世界飞去, 为后代的生活寻找全新的家园.\\恭喜赢得游戏胜利
+#SHAREDWIN (与 %s 共享胜利)
 #SHAREDWIN_CONCAT %s, %s
 #NOAI Î´·¢ÏÖ°²×°µÄAI²å¼þ£¡
 #FILENOTFOUND Î´·¢ÏÖÃûÎª "%s" µÄÎÄ¼þ.
 #AIEXCEPTION AI²å¼þ%sÖÐ³öÏÖÑÏÖØ´íÎó£¡
 #LOADERR ´ËÓÎÏ·½ø¶ÈÓëµ±Ç°µÄÓÎÏ·°æ±¾²»ÄÜ¼æÈÝ
 #NOFILENAME ÎÞÐ§µÄÓÎÏ·½ø¶ÈÃû; ²»ÔÊÐí³öÏÖ×Ö·û'%s'
 #DLLERROR  %s ÎÞ·¨¶ÁÈ¡
 #AIERROR Î´·¢ÏÖÒÔ %s ÎªÃûµÄAI²å¼þ
 #MISSDEACT Íæ¼Ò%dÒì³£ÍË³ö, ÖÐÖ¹ÁËÓÎÏ·
 #CLIENTERROR ÎÞ·¨ÕÒµ½ÓÃ»§%s
 #LOADERROR ¸ÃÓÎÏ·½ø¶È´æÔÚÄÚ²¿´íÎó, ¿ÉÄÜÎÞ·¨Õý³£½øÐÐÓÎÏ·.\\¿É½«´Ë½ø¶È·¢ËÍ¸øÉè¼ÆÕß, ÉÏ±¨´íÎó.\ÊÇ·ñµÇÂ½ÍøÕ¾, ·¢ËÍ´íÎó·´À¡ÐÅÏ¢?
 #NOSTARTPOS ¸ÃµØÍ¼Î´¶¨ÒåÍæ¼ÒÆðÊ¼Î»ÖÃ, ÎÞ·¨ÓÃÆä½øÐÐÓÎÏ·.
 #TOOFEWTRIBES ¾ºÕù¶ÔÊÖµÄÊýÄ¿²»µÃ³¬¹ýÓÎÏ·ÖÐ¶¨ÒåµÄ¹ú¼ÒÊýÁ¿.
 #DELETEQUERY ÓÎÏ·½ø¶ÈÒÑÉ¾³ý
 #MAPDELETEQUERY µØÍ¼ÒÑÉ¾³ý
+#NOAI 未发现安装的AI插件！
+#FILENOTFOUND 未发现名为 "%s" 的文件.
+#AIEXCEPTION AI插件%s中出现严重错误！
+#LOADERR 此游戏进度与当前的游戏版本不能兼容
+#NOFILENAME 无效的游戏进度名; 不允许出现字符'%s'
+#DLLERROR  %s 无法读取
+#AIERROR 未发现以 %s 为名的AI插件
+#MISSDEACT 玩家%d异常退出, 中止了游戏
+#CLIENTERROR 无法找到用户%s
+#LOADERROR 该游戏进度存在内部错误, 可能无法正常进行游戏.\\可将此进度发送给设计者, 上报错误.\是否登陆网站, 发送错误反馈信息?
+#NOSTARTPOS 该地图未定义玩家起始位置, 无法用其进行游戏.
+#TOOFEWTRIBES 竞争对手的数目不得超过游戏中定义的国家数量.
+#DELETEQUERY 游戏进度已删除
+#MAPDELETEQUERY 地图已删除
 #TURN #N\%s
 #SUPERTURN ³¬¼¶ÓÃ»§\%s
 #FRNEWNATION ÎÒÃÇÒÑÍ¬#n½¨Á¢ÁËÍâ½»ÁªÏµ.
 #FRCONTACT #nµÄÊ¹½ÚÏëêî¼û´óÈË.\ÊÇ·ñ½Ó¼û?
 #FRREJECTED #N²»Ô¸½Ó¼ûÎÒ·½Ê¹½Ú.
 #FRCANCELQUERY_CEASEFIRE Ëº»ÙÍ£»ðÌõÔ¼?
 #FRCANCELQUERY_PEACE Ïò¶Ô·½ÐûÕ½Ã´£¿
 #FRCANCELQUERY_FRIENDLY ÖÕÖ¹Óë¶Ô·½µÄºÍÆ½ÌõÔ¼?
 #FRCANCELQUERY_ALLIANCE ÖÕÖ¹Óë¶Ô·½µÄÃËÔ¼?
 #FRCANCELBYREJECT_PEACE #Ê¹½Ú:\ÎÒÃÇµÄÄÍÐÄÒÑ¾ºÄ¾¡.\×¼±¸ÓÕ½°É!
 #FRCANCELBYREJECT_FRIENDLY #Ê¹½Ú:\´Ó½ñÈÕÆð, ºÍÆ½ÌõÔ¼ÒÑ±ä³ÉÒ»Ö½¿ÕÎÄ!
 #FRCANCELBYREJECT_ALLIANCE #Ê¹½Ú:\¼ÈÈ»Äã·½²»¿ÏºÏ×÷, ÄÇÎÒÃÇµÄÃËÔ¼Ò²ÎÞ·¨¼ÌÐøÁË. ÊÇÄãÈÃÎÒÃÇÃ»ÁËÑ¡ÔñµÄ.
 #FRMYALLIANCE1 #NÒÑÏòÎÒ·½ÃËÓÑ¿ªÕ½, ÐûÕ½¶ÔÏóÎª
 #FRMYALLIANCE2 #n. ÎÒÃÇ¿ÉÒÔÑ¡ÔñÖ§³Ö#a, ·´¶ÔÒ°ÂùµÄÕ½ÕùÐÐÎª.
 #FRENEMYALLIANCE #N¾ö¶¨Ö§³ÖÆäÃËÓÑ, ¼ÓÈëÓëÎÒ·½µÄÕ½Õù. ÎÒ·½ÏÈÇ°Óë#NµÄÌõÔ¼×Ô¶¯Ê§Ð§.
 #FRANARCHY #a´¦ÓÚÎÞÕþ¸®×´Ì¬, ÎÒ·½Ê¹½ÚÕÒ²»µ½Í¾¾¶Óë¶Ô·½µ±¾Ö½Ó´¥.
 #FRMYANARCHY ÎÒÃÇÕý´¦ÓÚÎÞÕþ¸®×´Ì¬, ±ØÐëµÈµ½¾ÖÊÆÎÈ¶¨ºó, ²ÅÄÜ¿ªÕ¹Íâ½»»î¶¯.
 #FRCOLDWAR Ä¿Ç°´¦ÓÚÀäÕ½ÆÚ, ÎÞ·¨ÓëÆäËûÊÆÁ¦½»Éæ.
 #MAX2WANTS Ò»»ØºÏ½»ÉæÖÐ×î¶àÌá³öÁ½ÏîÒªÇó.
 #MAX2OFFERS Ò»»ØºÏ½»ÉæÖÐ×î¶à¸ø³öÁ½ÏîÌáÒé.
 #NOOFFER ¸ÃÌáÒéÎÞÐ§£¡
 #CANCELTREATYRUSH ÔÚ3¸ö»ØºÏÄÚ£¬ÓëÍ¬Ò»¹ú¼Ò×î¶àÖÕÖ¹Ò»ÏîÍâ½»ÐÒé.
 #NOSPACEPORT ÎÒ·½Ã»ÓÐÌ«¿Õ¸Û, ÎÞ·¨Õý³£½ÓÊÕ¶Ô·½µÄ·É´¬²¿¼þ, ÊÇ·ñÖ´Òâ½ÓÊÕ?
 #SUICIDE ÈÃÕâÐ©¿ÉÁ¯µÄ¼Ò»ï\Ì¤ÉÏ»ÆÈª²»¹éÂ·?
 #RATES ÇëÖÆ¶¨¹úÃñ¾¼ÃµÄ·ÖÅä±ÈÀý
 #NORATES ×ÔÓÉÅ®ÉñÏñ\ÒÑ¾ÉúÐ§.
+#SUPERTURN 超级用户\%s
+#FRNEWNATION 我们已同#n建立了外交联系.
+#FRCONTACT #n的使节想觐见大人.\是否接见?
+#FRREJECTED #N不愿接见我方使节.
+#FRCANCELQUERY_CEASEFIRE 撕毁停火条约?
+#FRCANCELQUERY_PEACE 向对方宣战么？
+#FRCANCELQUERY_FRIENDLY 终止与对方的和平条约?
+#FRCANCELQUERY_ALLIANCE 终止与对方的盟约?
+#FRCANCELBYREJECT_PEACE #使节:\我们的耐心已经耗尽.\准备迎战吧!
+#FRCANCELBYREJECT_FRIENDLY #使节:\从今日起, 和平条约已变成一纸空文!
+#FRCANCELBYREJECT_ALLIANCE #使节:\既然你方不肯合作, 那我们的盟约也无法继续了. 是你让我们没了选择的.
+#FRMYALLIANCE1 #N已向我方盟友开战, 宣战对象为
+#FRMYALLIANCE2 #n. 我们可以选择支持#a, 反对野蛮的战争行为.
+#FRENEMYALLIANCE #N决定支持其盟友, 加入与我方的战争. 我方先前与#N的条约自动失效.
+#FRANARCHY #a处于无政府状态, 我方使节找不到途径与对方当局接触.
+#FRMYANARCHY 我们正处于无政府状态, 必须等到局势稳定后, 才能开展外交活动.
+#FRCOLDWAR 目前处于冷战期, 无法与其他势力交涉.
+#MAX2WANTS 一回合交涉中最多提出两项要求.
+#MAX2OFFERS 一回合交涉中最多给出两项提议.
+#NOOFFER 该提议无效！
+#CANCELTREATYRUSH 在3个回合内，与同一国家最多终止一项外交协议.
+#NOSPACEPORT 我方没有太空港, 无法正常接收对方的飞船部件, 是否执意接收?
+#SUICIDE 让这些可怜的家伙\踏上黄泉不归路?
+#RATES 请制定国民经济的分配比例
+#NORATES 自由女神像\已经生效.
 'Diplomatic Statements, do not use '\'!
 #FRSTART_NOTREATY ½÷´ú±í#nÃñÀ´´ËÓë¹ó¹ú½»Éæ.
 #FRSTART_PEACE ½÷´ú±í#nÏò¸óÏÂÖÂ¾´, ÓÐÐ©ÊÂÇéÏëÇë¸óÏÂÕå×Ã.
 #FRCANCELTREATY_PEACE ÎÒÃÇÕýÊ½Ïò¹ó¹úÐûÕ½.
 #FRCANCELTREATY_FRIENDLY ÎÒÃÇÒªÓë¹ó¹úÖÕÖ¹ÓÑºÃ¹ØÏµ.
 #FRCANCELTREATY_ALLIANCE Á½¹ú¼ÌÐø½áÃËÒÑºÁÎÞÒâÒå, ´Ó½ñÆðÕýÊ½½â³ýÃËÔ¼.
 #FRNOTICE ÎÒÃÇÔÙÒ²²»Ô¸ÈÌÊÜ ¶ûµÈ·´¸´Ð¡ÈËµÄ±°ÁÓÐÐ¾¶.
 #FRBREAK Ã»±ØÒª¼ÌÐøÌ¸ÅÐÁË. ÏÂ´ÎÔÙÔ¼Ê±¼ä°É.
 #FROFFER ÎÒÃÇÔ¸ÒâÓÃ\-%s\À´½»»»¹ó¹úµÄ\-%s
 #FRPRESENT ÎÒÃÇÔ¸½«:\-%s ·îËÍ¸ø¹ó¹ú×÷ÎªÀñÎï.
 #FRDEMAND_STRONG °Ñ\-%s ½»³öÀ´£¬\·ñÔòÓÐÄãÃÇÊÜµÄ!
 #FRDONE »¹ÓÐ±ðµÄÒªËµÃ´?
 #FRCEASEFIRE ÎÒÃÇÏëÇ©ÊðÍ£Õ½ÐÒé.
 #FRPEACE Îª½â¾öÁ½¹ú¼äÎÞÐÝÖ¹µÄ·×Õù, »¥Ïà³ÐÈÏ¶Ô·½µÄ¹ú½ç, ÎÒ·½½¨ÒéÇ©ÊðÒ»·ÝÓÀ¾ÃÐÔºÍÆ½ÌõÔ¼. ÊÇ·ñÔ¸ÒâÇ©×Ö?
 #FRFRIENDLY ÎÒÃÇ¶Ô#a ÏÈ½øµÄÎÄ»¯¼¼ÊõÑöÄ½ÒÑ¾Ã. ÈÃÎÒÃÇ¹²ÊðÓÑºÃÌõÔ¼, ÔÚÓÑÉÆµÄ»ù´¡ÉÏ½»Á÷·¢Õ¹°É.
 #FRALLIANCE ÎªÁË¼ÓÇ¿Á½¹úÈËÃñµÄ½ôÃÜºÏ×÷, ÊÇ·ñÔ¸ÒâÓëÎÒ·½Ç©ÊðÍ¬ÃËÐ¶¨, ½ñºóÁªÊÖ¶Ô¿¹À´·¸µÄµÐÈË?
 #FRACCEPTCEASEFIRE ÎÒÃÇ½ÓÊÜÄãµÄÌõ¼þ, ÔÝ»ºÐÐ¶¯.
 #FRACCEPTTREATY ÎÒÃÇ´ðÓ¦Äã, Ï£ÍûÕâ·ÝÌõÔ¼ÄÜÔÚÁ½¹ú ½»Á÷Ê·ÉÏÐ´ÏÂÕ¸ÐÂµÄÆªÕÂ.
 #FRNOTACCEPTTREATY ÈôÓë¹ó¹úÇ©ÊðÌõÔ¼, ¶Ô#n¶øÑÔ²¢ÎÞºÃ´¦.
 #FRENDTREATY_PEACE ÖÕÖ¹ºÍÆ½ÌõÔ¼
 #FRENDTREATY_FRIENDLY ÖÕÖ¹ÓÑºÃÌõÔ¼
 #FRENDTREATY_ALLIANCE ÖÕÖ¹ÃËÔ¼
 #FRACCEPTOFFER ÕâÌõ¼þºÜ¹«Æ½, ÎÒÃÇÍ¬ÒâÁË.
 #FRACCEPTPRESENT #NºÜ¸ßÐËÊÕÏÂÕâ·ÝÀñÎï.
 #FRACCEPTDEMAND_STRONG ÎªÁËÎ¬³Ö±Ë´ËµÄÓÑºÃ¹ØÏµ, ÎÒÃÇ¾ö¶¨Í¬ÒâÄãµÄÌõ¼þ.
 #FRNOTACCEPTOFFER ÕâÏîÌáÒé¶ÔÎÒ·½²¢ÎÞÖúÒæ.
 #FRNOTACCEPTPRESENT #N²»ÐèÒªÕâÑùÒ»·ÝÀñÎï.
 #FRNOTACCEPTDEMAND_STRONG ÄãÌ«Ì°À·, ±ð°×ÈÕ×öÃÎÁË.
 #FRDELCHOICE ÎÒÃÇ¶Ô¹ó¹úµÄ\-%s ·Ç³£¸ÐÐËÈ¤.\ÇëÎÊ¹ó¹úµÄ½»»»Ìõ¼þÊÇÊ²Ã´?
 #FRCOSTCHOICE Èç¹û³ÏÐÄÒªÎÒÃÇµÄ\-%s,\ÇëÎÊ¹ó¹úÏëÄÃÊ²Ã´À´½»»»ÄØ?
 #FRBYE ÏÖÔÚ²»ÐÐ, ±¾´ÎÌ¸ÅÐ¾Í´ËÎªÖ¹. ÔÙ¼û.
 #PRICE_CHOOSE Ñ¡ÔñµÄ¼Û¸ñ
 #PRICE_CIVIL #nµÄ¹ú¼ÒÇé±¨
 #PRICE_MIL #nµÄ¾üÊÂÇé±¨
 #PRICE_MAP #aµÄÊÀ½çµØÍ¼
 #PRICE_SHIPCOMP %d Ö³Ãñ·É´¬×é¼þ
 #PRICE_SHIPPOW %d ¶¯Á¦²Õ
 #PRICE_SHIPHAB %d ¾Ó×¡²Õ
 #PRICE_TRIBUTE Ã¿»ØºÏ%d%%c
 #PRICE_ALLTECH #aËùÓÐµÄ¿Æ¼¼³É¹û
 #PRICE_ALLMODEL #aËùÓÐµÄÑÐ·¢²¿¶Ó
+#FRSTART_NOTREATY 谨代表#n民来此与贵国交涉.
+#FRSTART_PEACE 谨代表#n向阁下致敬, 有些事情想请阁下斟酌.
+#FRCANCELTREATY_PEACE 我们正式向贵国宣战.
+#FRCANCELTREATY_FRIENDLY 我们要与贵国终止友好关系.
+#FRCANCELTREATY_ALLIANCE 两国继续结盟已毫无意义, 从今起正式解除盟约.
+#FRNOTICE 我们再也不愿忍受 尔等反复小人的卑劣行径.
+#FRBREAK 没必要继续谈判了. 下次再约时间吧.
+#FROFFER 我们愿意用\-%s\来交换贵国的\-%s
+#FRPRESENT 我们愿将:\-%s 奉送给贵国作为礼物.
+#FRDEMAND_STRONG 把\-%s 交出来，\否则有你们受的!
+#FRDONE 还有别的要说么?
+#FRCEASEFIRE 我们想签署停战协议.
+#FRPEACE 为解决两国间无休止的纷争, 互相承认对方的国界, 我方建议签署一份永久性和平条约. 是否愿意签字?
+#FRFRIENDLY 我们对#a 先进的文化技术仰慕已久. 让我们共署友好条约, 在友善的基础上交流发展吧.
+#FRALLIANCE 为了加强两国人民的紧密合作, 是否愿意与我方签署同盟协定, 今后联手对抗来犯的敌人?
+#FRACCEPTCEASEFIRE 我们接受你的条件, 暂缓行动.
+#FRACCEPTTREATY 我们答应你, 希望这份条约能在两国 交流史上写下崭新的篇章.
+#FRNOTACCEPTTREATY 若与贵国签署条约, 对#n而言并无好处.
+#FRENDTREATY_PEACE 终止和平条约
+#FRENDTREATY_FRIENDLY 终止友好条约
+#FRENDTREATY_ALLIANCE 终止盟约
+#FRACCEPTOFFER 这条件很公平, 我们同意了.
+#FRACCEPTPRESENT #N很高兴收下这份礼物.
+#FRACCEPTDEMAND_STRONG 为了维持彼此的友好关系, 我们决定同意你的条件.
+#FRNOTACCEPTOFFER 这项提议对我方并无助益.
+#FRNOTACCEPTPRESENT #N不需要这样一份礼物.
+#FRNOTACCEPTDEMAND_STRONG 你太贪婪, 别白日做梦了.
+#FRDELCHOICE 我们对贵国的\-%s 非常感兴趣.\请问贵国的交换条件是什么?
+#FRCOSTCHOICE 如果诚心要我们的\-%s,\请问贵国想拿什么来交换呢?
+#FRBYE 现在不行, 本次谈判就此为止. 再见.
+#PRICE_CHOOSE 选择的价格
+#PRICE_CIVIL #n的国家情报
+#PRICE_MIL #n的军事情报
+#PRICE_MAP #a的世界地图
+#PRICE_SHIPCOMP %d 殖民飞船组件
+#PRICE_SHIPPOW %d 动力舱
+#PRICE_SHIPHAB %d 居住舱
+#PRICE_TRIBUTE 每回合%d%%c
+#PRICE_ALLTECH #a所有的科技成果
+#PRICE_ALLMODEL #a所有的研发部队
 #PRICE_CONCAT %s\-%s
 #PRICECAT_ALLTECH ËùÓÐ¿Æ¼¼³É¹û
 #PRICECAT_ALLMODEL ËùÓÐ²¿¶ÓÑÐ·¢
+#PRICECAT_ALLTECH 所有科技成果
+#PRICECAT_ALLMODEL 所有部队研发
 'Button Captions
 #BTN_OK È·¶¨
 #BTN_CANCEL È¡Ïû
 #BTN_YES ÊÇ
 #BTN_NO ·ñ
 #BTN_INFO °ïÖú
+#BTN_OK 确定
+#BTN_CANCEL 取消
+#BTN_YES 是
+#BTN_NO 否
+#BTN_INFO 帮助
 #BTN_RESET Reset
 'Button Tooltips
 #BTN_SELECT Ñ¡Ôñ
 #BTN_PAGE ÏÂÒ³
 #BTN_SUPPORT Á¥Êô²¿¶Ó
 #BTN_IMPRS ³ÇÊÐÉèÊ©
 #BTN_CLASSES ²¿¶Ó
 #BTN_WONDERS Ææ¼£
 #BTN_BUY ¹ºÂò
 #BTN_DELETE É¾³ý
 #BTN_RENAME ¸üÃû
 #BTN_OBSOLETE Í£Ö¹Éú²ú
 #BTN_NONOBSOLETE ÔÊÐíÉú²ú
 #BTN_ALLOWCONSCRIPTS ÔÊÐíÕ÷Ä¼
 #BTN_NOCONSCRIPTS Í£Ö¹Õ÷Ä¼
 #BTN_ENDTURN ½áÊø»ØºÏ£¡
 #BTN_SKIP ²»ÔÙÏÔÊ¾ÆäËûÊÆÁ¦ÒÆ¶¯
 #BTN_NOAUTOMOVE Í£Ö¹ÏòÄ¿±êÒÆ¶¯
 #BTN_STOP Í£Ö¹
 #BTN_NEGO ¼ÌÐøÌ¸ÅÐ
 #BTN_DIALOG ÁªÂç´Ë¹ú
 #BTN_BREAK ÖÕÖ¹±¾´ÎÌ¸ÅÐ
 #BTN_PASS ½áÊø±¾·½ÌáÒé
 #BTN_CNTREATY Ëº»ÙÐÒé
 #BTN_ACCEPT ½ÓÊÜÌáÒé
 #BTN_NOTICE ÒÑ»ñÏ¤¾ö¶¨
 #BTN_REPLAY ÀúÊ·ÖØ·Å
 #BTN_RENGAME ÓÎÏ·¸üÃû
 #BTN_DELGAME ÓÎÏ·É¾³ý
 #BTN_RENMAP µØÍ¼¸üÃû
 #BTN_DELMAP µØÍ¼É¾³ý
 #BTN_CONTENTS Ä¿Â¼
 #BTN_BACK ·µ»Ø
 #BTN_SEARCH ËÑË÷
 #BTN_WANTCEASEFIRE ÒªÇóÍ£»ð
 #BTN_OFFERCEASEFIRE ÌáÒéÍ£»ð
 #BTN_WANTPEACE ÒªÇóºÍÆ½
 #BTN_OFFERPEACE ÌáÒéºÍÆ½
 #BTN_WANTENDPEACE ÒªÇóÖÐÖ¹ºÍÆ½
 #BTN_OFFERENDPEACE ÌáÒéÖÐÖ¹ºÍÆ½
 #BTN_WANTFRIENDLY ÒªÇóÓÑºÃÏà´¦
 #BTN_OFFERFRIENDLY ÌáÒéÓÑºÃÏà´¦
 #BTN_WANTALLIANCE ÒªÇóÁªÃË
 #BTN_OFFERALLIANCE ÌáÒéÁªÃË
 #BTN_WANTENDALLIANCE ÒªÇó½â³ýÁªÃË
 #BTN_OFFERENDALLIANCE ÌáÒé½â³ýÁªÃË
 #BTN_NEGOEARLIER ÔçÏÈµÄ²¿·Ö
 #BTN_NEGOLATER ºóÀ´µÄ²¿·Ö
+#BTN_SELECT 选择
+#BTN_PAGE 下页
+#BTN_SUPPORT 隶属部队
+#BTN_IMPRS 城市设施
+#BTN_CLASSES 部队
+#BTN_WONDERS 奇迹
+#BTN_BUY 购买
+#BTN_DELETE 删除
+#BTN_RENAME 更名
+#BTN_OBSOLETE 停止生产
+#BTN_NONOBSOLETE 允许生产
+#BTN_ALLOWCONSCRIPTS 允许征募
+#BTN_NOCONSCRIPTS 停止征募
+#BTN_ENDTURN 结束回合！
+#BTN_SKIP 不再显示其他势力移动
+#BTN_NOAUTOMOVE 停止向目标移动
+#BTN_STOP 停止
+#BTN_NEGO 继续谈判
+#BTN_DIALOG 联络此国
+#BTN_BREAK 终止本次谈判
+#BTN_PASS 结束本方提议
+#BTN_CNTREATY 撕毁协议
+#BTN_ACCEPT 接受提议
+#BTN_NOTICE 已获悉决定
+#BTN_REPLAY 历史重放
+#BTN_RENGAME 游戏更名
+#BTN_DELGAME 游戏删除
+#BTN_RENMAP 地图更名
+#BTN_DELMAP 地图删除
+#BTN_CONTENTS 目录
+#BTN_BACK 返回
+#BTN_SEARCH 搜索
+#BTN_WANTCEASEFIRE 要求停火
+#BTN_OFFERCEASEFIRE 提议停火
+#BTN_WANTPEACE 要求和平
+#BTN_OFFERPEACE 提议和平
+#BTN_WANTENDPEACE 要求中止和平
+#BTN_OFFERENDPEACE 提议中止和平
+#BTN_WANTFRIENDLY 要求友好相处
+#BTN_OFFERFRIENDLY 提议友好相处
+#BTN_WANTALLIANCE 要求联盟
+#BTN_OFFERALLIANCE 提议联盟
+#BTN_WANTENDALLIANCE 要求解除联盟
+#BTN_OFFERENDALLIANCE 提议解除联盟
+#BTN_NEGOEARLIER 早先的部分
+#BTN_NEGOLATER 后来的部分
 'Morphing Menu Entries
 #SUPER ³¬¼¶ÓÃ»§
 #HUMAN ±¾µØÍæ¼Ò
 #AIT µçÄÔ¶Ô¾ö
 #RANDOMAI Ëæ»úÑ¡ÔñAIÄ£¿é
 #BTN_FOUND ¶¨¾Ó
 #BTN_ADD ¼ÓÈë³ÇÊÐ
 #BTN_SETHOME ¸ÄÎª±¾³Ç²¿¶Ó
 #BTN_MOVEHOME ·µ»Ø×î½ü³ÇÊÐ
 #BTN_BUILDROAD ÐÞ½¨µÀÂ·
 #BTN_BUILDBRIDGE ¼ÜÉèµÀÂ·ÇÅ
 #BTN_BUILDRR ÐÞ½¨ÌúÂ·
 #BTN_BUILDRRBRIDGE ¼ÜÉèÌúÂ·ÇÅ
 #BTN_CLEAR Çå³ýÉÁÖ
 #BTN_DRAIN ³é¸ÉÕÓÔó
 #BTN_UNDESERT ÕûÎªÆ½Ô
 #FARTECH Éè¶¨Ä¿±ê
 #NOFARTECH Ã»ÓÐÄ¿±ê
 #UTILIZE ²Î½¨
 #INTEGRATE Õû±à
+#SUPER 超级用户
+#HUMAN 本地玩家
+#AIT 电脑对决
+#RANDOMAI 随机选择AI模块
+#BTN_FOUND 定居
+#BTN_ADD 加入城市
+#BTN_SETHOME 改为本城部队
+#BTN_MOVEHOME 返回最近城市
+#BTN_BUILDROAD 修建道路
+#BTN_BUILDBRIDGE 架设道路桥
+#BTN_BUILDRR 修建铁路
+#BTN_BUILDRRBRIDGE 架设铁路桥
+#BTN_CLEAR 清除森林
+#BTN_DRAIN 抽干沼泽
+#BTN_UNDESERT 整为平原
+#FARTECH 设定目标
+#NOFARTECH 没有目标
+#UTILIZE 参建
+#INTEGRATE 整编
 #NETWORK_SERVER Network Server
 #NETWORK_CLIENT Network Client
 'Busy Messages
 #BUSY_START ´´½¨ÊÀ½ç¡
 #BUSY_MOD %sÔØÈëÖÐ¡
 #BUSY_MODLH Í¼ÐÎ³õÊ¼»¯¡
 #BUSY_INIT Íæ¼Ò³õÊ¼»¯¡
 #BUSY_LOAD ÔØÈëÓÎÏ·½ø¶È¡
+#BUSY_START 创建世界…
+#BUSY_MOD %s载入中…
+#BUSY_MODLH 图形初始化…
+#BUSY_INIT 玩家初始化…
+#BUSY_LOAD 载入游戏进度…
 'Map Editor
 #MAP_START µçÄÔÖÖ×å³õÊ¼Î»ÖÃ
 #MAP_PREFSTART Íæ¼ÒÖÖ×å³õÊ¼Î»ÖÃ
 #MAP_RANDOM ·ÅÆúµ±Ç°µÄµØÍ¼, ÖØÐÂËæ»úÉú³ÉÐÂµÄµØÍ¼£¿
 #MAP_CLOSE Ñ¡Ôñ¹Ø±Õµ±Ç°µÄµØÍ¼¡£\ÊÇ·ñ±£´æ£¿
+#MAP_START 电脑种族初始位置
+#MAP_PREFSTART 玩家种族初始位置
+#MAP_RANDOM 放弃当前的地图, 重新随机生成新的地图？
+#MAP_CLOSE 选择关闭当前的地图。\是否保存？
 #STARTCONTROLS
+ÍË³ö
+¿ªÊ¼
+¶ÁÈ¡
+ÐÂ½¨ÓÎÏ·
+¶ÁÈ¡½ø¶È
+ÊÀ½ç³ß´ç£º
+Â½µØ±ÈÀý£º
+×Ô¶¨ÒåÍæ¼Ò
+Äê´ú£º
 %sµÄÄÑ¶È
+ÄêÏÞ£º
+µØÍ¼±à¼
+±à¼
+°ïÖú
+ÄÑ¶È£º
+¾ºÕùÖÖ×å£º
 AIÄ£¿é£º
+退出
+开始
+读取
+新建游戏
+读取进度
+世界尺寸：
+陆地比例：
+自定义玩家
+年代：
+%s的难度
+年限：
+地图编辑
+编辑
+帮助
+难度：
+竞争种族：
+AI模块：
 #AUTODIFF
+ÈëÃÅ
+¼òµ¥
+Õý³£
+À§ÄÑ
+±äÌ¬
+入门
+简单
+正常
+困难
+变态
 #CONTROLS
+È¡ÏûÃüÁî
+¹Ø±Õ
+¾¼Ã¼°Ë°ÊÕ¡
+³¤³Ç±£»¤ÇøÓò
+²é¿´µØÐÎ
+ÊÀ½çÆæ¼£¡
+ÓÎÏ·Ö¸ÄÏ
+²âÊÔ
+¾üÊÂÇé±¨¡
 AI²âÊÔÐÅÏ¢¡
+³ÇÊÐÀàÐÍ¡
+½çÃæ¾ÓÖÐ
+Ä¿±êÒÆ¶¯
+²¿¶ÓÃüÁî
+²¿¶ÓÐÅÏ¢
+½¨Á¢¾üÊÂ»ùµØ
+¸ü»»µØÐÎ
+Çå³ýÎÛÈ¾
+ÂÓ¶á
+½¨ÔìÒªÈû
+ÀúÊ·Í¼±í¡
+×¤·À¾¯½ä
+¿ª±ÙÔËºÓ
+´î³ËÔËÊä¹¤¾ß
+ÉÔºóÐÐ¶¯
+ÔµØµÈ´ý
+ÏÔÊ¾·½Î»´úÂë
+µØÐÎ½¨Éè
+Ñ¡Ïî
+²¿¶ÓÒÆ¶¯
+´°¿ÚÄ£Ê½ÏÔÊ¾
+»ØºÏ½áÊøÌáÊ¾
+ÊÓÒ°ÍâµØÇø±ä°µ
+³ÇÊÐ±¨¸æÑ¡Ïî
+³ÇÊÐÃû³Æ
+¹ú¼Ò±ß½ç
+³ÇÊÐ±¨¸æ¡
+¿ÆÑÐ±¨¸æ¡
+µØÐÎ¸ÄÔì
+µØÐÎ¸ÄÔì¡
+Ö³Ãñ·É´¬¡
+¿ìËÙºê²Ù×÷
+ÒýË®¹à¸È
+¿ª±ÙÅ©³¡
+Ö²Ê÷ÔìÁÖ
+¿ª²É¿ó²Ø
+´´½¨²¿¶Ó
+Íø¸ñ
 AI²âÊÔµØÍ¼
+Íâ¹ú²¿¶Ó¡
+ÕþÖÎ°æÍ¼
+Ö»ÏÔÊ¾¹¥»÷¼°Õ¼ÁìÐÐ¶¯
+²»ÏÔÊ¾
+Ìø¹ý20»ØºÏ
+¹ú¼ÒÇé±¨¡
+×÷±×
+ËùÓÐ¿Æ¼¼ÑÐ·¢³É¹¦
+Ã¿»ØºÏÉú²ú¿ìËÙÍê¹¤
+Ã¿»ØºÏ¿Æ¼¼¿ìËÙÑÐµÃ
+Ã¿»ØºÏ³ÇÊÐ³ÖÐøÔö³¤
+´ò¿ªËùÓÐµØÍ¼
+ËùÓÐ¹ú¼ÒÏàÊ¶
+ÔËÐÐÖÁÓÎÏ·½áÊø
+Ëû¹ú³ÇÊÐ¡
+³ÇÊÐ±¨¸æÁÐ±í
+³ÇÊÐ±¨¸æÆÁÄ»
+Ãû³Æ
+ÎÞÐèÏÖ´ú×ÊÔ´
+»Ö¸´ÐÝÕû
+·Å³öÔËÊä²¿¶Ó
+Ëæ»úµØÍ¼
+½âÉ¢
+×°ÔØÔËÊä²¿¶Ó
+¶ÔÊÖÒÆ¶¯
+ÂýËÙ
+¿ìËÙ
+¼«¿ì
+ÂýËÙ
+¿ìËÙ
+ÒôÐ§
+¹Ø±Õ
 ¿ªÆô(Ä¬ÈÏÒôÐ§)
 ¿ªÆô(Ìæ´úÒôÐ§)
+¹öÆÁ
+ÂýËÙ
+¿ìËÙ
+¹Ø±Õ
+·ÃÎÊ¹Ù·½ÍøÕ¾
+·¢¶¯ÕþÌå¸ïÃü£¡
+ÃË¾üÐÐ¶¯
+ÂýËÙ
+¿ìËÙ
+²»ÏÔÊ¾
+Ö»ÏÔÊ¾Ñ²Âß¡¢¹¥»÷¼°Õ¼ÁìÐÐ¶¯
+Ö»ÏÔÊ¾Ñ²Âß¡¢¹¥»÷¼°Õ¼ÁìÐÐ¶¯
+µØ¿é³ß´ç
+取消命令
+关闭
+经济及税收…
+长城保护区域
+查看地形
+世界奇迹…
+游戏指南
+测试
+军事情报…
+AI测试信息…
+城市类型…
+界面居中
+目标移动
+部队命令
+部队信息
+建立军事基地
+更换地形
+清除污染
+掠夺
+建造要塞
+历史图表…
+驻防警戒
+开辟运河
+搭乘运输工具
+稍后行动
+原地等待
+显示方位代码
+地形建设
+选项
+部队移动
+窗口模式显示
+回合结束提示
+视野外地区变暗
+城市报告选项
+城市名称
+国家边界
+城市报告…
+科研报告…
+地形改造
+地形改造…
+殖民飞船…
+快速宏操作
+引水灌溉
+开辟农场
+植树造林
+开采矿藏
+创建部队
+网格
+AI测试地图
+外国部队…
+政治版图
+只显示攻击及占领行动
+不显示
+跳过20回合
+国家情报…
+作弊
+所有科技研发成功
+每回合生产快速完工
+每回合科技快速研得
+每回合城市持续增长
+打开所有地图
+所有国家相识
+运行至游戏结束
+他国城市…
+城市报告列表
+城市报告屏幕
+名称
+无需现代资源
+恢复休整
+放出运输部队
+随机地图
+解散
+装载运输部队
+对手移动
+慢速
+快速
+极快
+慢速
+快速
+音效
+关闭
+开启(默认音效)
+开启(替代音效)
+滚屏
+慢速
+快速
+关闭
+访问官方网站
+发动政体革命！
+盟军行动
+慢速
+快速
+不显示
+只显示巡逻、攻击及占领行动
+只显示巡逻、攻击及占领行动
+地块尺寸
 Small
 Medium
 …
 #ADVANCES
+ÖÇÄÜ·ÉÐÐ
+Á½ÆÜ×÷Õ½
+ÌìÎÄÑ§
+Ô×ÓÑ§Ëµ
+Æû³µ
+µ¯µÀÑ§
+ÒøÐÐÒµ
+ÇÅÁº½¨Éè
+ÇàÍÖýÔì
+ÔáÀñÒÇÊ½
+»¯Ñ§
+ÆïÊ¿ÖÆ¶È
+¸´ºÏ²ÄÁÏ
+·¨ÂÉÌõÎÄ
+×éºÏ±øÖÖ
+ÄÚÈ¼»ú
+¹²²úÖ÷Òå
+¼ÆËã»ú
+Õ÷±øÖÆ¶È
+½¨Öþ
+ÆóÒµ½á¹¹
+ÐÇ¼Ê·ÉÐÐ
+»õ±Ò
+ÃñÖ÷Ö÷Òå
+¾¼ÃÑ§
+·¢µç
+µç×ÓÑ§
+¹¤³ÌÑ§
+»·¾³±£»¤
+³µÂÖ
+Õ¨Ò©
+·ÉÐÐ
+Çé±¨¹¤×÷
+»ðÒ©
+ÆïÊõ
+Âö³åÇý¶¯
+²úÒµ»¯
+ÖÇÄÜÎäÆ÷
+·¢Ã÷
+ÖýÌúÒ±Á¶
+¼¤¹â
+ºËÄÜ
+ÎÄÑ§
+»¥ÁªÍø
+µç´ÅÑ§
+µØÍ¼»æÖÆ
+ÖÆ×©
+¹æÄ£Á¿²ú
+ÊýÑ§
+Ò½Ò©
+Ò±½ð
+Ð¡ÐÍ»¯
+»ú¶¯×÷Õ½
+¾ýÖ÷ÕþÖÎ
+ÉñÃØÖ÷Òå
+º£ÉÏµ¼º½
+ºËÁÑ±ä
+ÕÜÑ§
+ÎïÀí
+ËÜÁÏ
+Ê«¸è
+ÖÆÌÕ
+ÎÞÏßµç
+ÔÙÑ»·
+µÍÎÂÀäÈ´
+Ò»ÉñÂÛ
+¹²ºÍÖ÷Òå
+»úÆ÷ÈË
+ÅçÆøÇý¶¯
+ÌúÂ·
+ÎÀÉúÉèÊ©
+¿ÆÑ§
+ÊéÐ´
+º½º£
+Ä£ÄâÉúÌ¬
+ÒþÐÎ¼¼Êõ
+ÕôÆûÒýÇæ
+¸ÖÌú
+ÈËÔìÊ³Æ·
+Õ½Êõ
+ÉñÑ§
+ÖØÁ¦Ñ§Ëµ
+Ã³Ò×
+ÐÇ¼ÊÖ³Ãñ
+´óÑ§
+ÖÇÄÜ»ð¼ý
+ÉÐÎäÏ°Ë×
+×ÖÄ¸
+¶àÉñÂÛ
+Ìá´¿
+µçÄÔ¿Æ¼¼
+ÄÉÃ×¼¼Êõ
+²ÄÁÏ¿ÆÑ§
+ÈË¹¤ÖÇÄÜ
+智能飞行
+两栖作战
+天文学
+原子学说
+汽车
+弹道学
+银行业
+桥梁建设
+青铜铸造
+葬礼仪式
+化学
+骑士制度
+复合材料
+法律条文
+组合兵种
+内燃机
+共产主义
+计算机
+征兵制度
+建筑
+企业结构
+星际飞行
+货币
+民主主义
+经济学
+发电
+电子学
+工程学
+环境保护
+车轮
+炸药
+飞行
+情报工作
+火药
+骑术
+脉冲驱动
+产业化
+智能武器
+发明
+铸铁冶炼
+激光
+核能
+文学
+互联网
+电磁学
+地图绘制
+制砖
+规模量产
+数学
+医药
+冶金
+小型化
+机动作战
+君主政治
+神秘主义
+海上导航
+核裂变
+哲学
+物理
+塑料
+诗歌
+制陶
+无线电
+再循环
+低温冷却
+一神论
+共和主义
+机器人
+喷气驱动
+铁路
+卫生设施
+科学
+书写
+航海
+模拟生态
+隐形技术
+蒸汽引擎
+钢铁
+人造食品
+战术
+神学
+重力学说
+贸易
+星际殖民
+大学
+智能火箭
+尚武习俗
+字母
+多神论
+提纯
+电脑科技
+纳米技术
+材料科学
+人工智能
 #IMPROVEMENTS
+½ð×ÖËþ
+ÖæË¹ÉñÃí
+¿ÕÖÐ»¨Ô°
+Ì«ÑôÉñÏñ
+¾ÞÐÍµÆËþ
+´óÍ¼Êé¹Ý
+ÉñÚÍÆôÊ¾
+ËïÎäÑ§Ôº
+´ï·ÒÆæ¹¤·¿
+ÂóÕÜÂ×Ô¶Õ÷
+Ê¥Ä¸Àñ°ÝÌÃ
+*
+Å£¶Ù´óÑ§
+°ÍºÕ´ó½ÌÌÃ
+*
+×ÔÓÉÅ®ÉñÏñ
+°£·Æ¶ûÌúËþ
+ÈýÏ¿´ó°Ó
+ÐÂ¸ÉÏßÌØ¿ì
+Âü¹þ¶Ù¼Æ»®
+½üµØ¿Õ¼äÕ¾
+*
+*
+*
+*
+*
+*
+*
+ÉÌÆ·Ã³Ò×
+±øÓª
+¹È²Ö
+ËÂÃí
+ÊÐ³¡
+Í¼Êé¹Ý
+·¨Ôº
+³ÇÇ½
+Ë®Çþ
+ÒøÐÐ
+½ÌÌÃ
+´óÑ§
+¸Û¿Ú
+¾çÔº
+¹¤³§
+ÌØÇø
+»ØÊÕÕ¾
+»ðµçÕ¾
+Ë®µçÕ¾
+ºËµçÕ¾
+º£ÉÏÆ½Ì¨
+ÊÐÕþÌü
+ÅÅÎÛ¹Ü
+³¬ÊÐ
+Á¢½»
+ÊµÑéÊÒ
+·À¿ÕÅÚ
+µï±¤
+»ú³¡
+´¬Îë
+¹¬µî
+³¤³Ç
+´ó¾ç³¡
+ÌìÎÄÌ¨
+¾üÊÂÑ§Ð£
+×÷Õ½ÑÚÌå
+Ë®ÔåÅ©³¡
+¹ÉÆ±½»Ò×
+Ì«¿Õ¸Û
+Ö³Ãñ·É´¬×é¼þ
+·É´¬¶¯Á¦²Õ
+·É´¬¾Ó×¡²Õ
+金字塔
+宙斯神庙
+空中花园
+太阳神像
+巨型灯塔
+大图书馆
+神谕启示
+孙武学院
+达芬奇工房
+麦哲伦远征
+圣母礼拜堂
+*
+牛顿大学
+巴赫大教堂
+*
+自由女神像
+埃菲尔铁塔
+三峡大坝
+新干线特快
+曼哈顿计划
+近地空间站
+*
+*
+*
+*
+*
+*
+*
+商品贸易
+兵营
+谷仓
+寺庙
+市场
+图书馆
+法院
+城墙
+水渠
+银行
+教堂
+大学
+港口
+剧院
+工厂
+特区
+回收站
+火电站
+水电站
+核电站
+海上平台
+市政厅
+排污管
+超市
+立交
+实验室
+防空炮
+碉堡
+机场
+船坞
+宫殿
+长城
+大剧场
+天文台
+军事学校
+作战掩体
+水藻农场
+股票交易
+太空港
+殖民飞船组件
+飞船动力舱
+飞船居住舱
 #FEATURES
 ÎäÆ÷(¹¥)
 ×°¼×(·À)
 »ú¶¯(ÒÆ)
+º£ÔË
+Ä¸½¢
+ÎÐÂÖ
+¿ÕÏ®
+È¼ÓÍ
+¿ÕÔË
+º£ÉÏµ¼º½
+À×´ïÉùÄÉ
+Ë®ÏÂÇ±º½
+Ô¶³ÌÅÚ»÷
+¿ìËÙÐÐ¾ü
+´¬ÉÏ¾ÈÉú
+¶îÍâ¸ºÖØ
+·À¿ÕÎäÆ÷
+¼äµý·É»ú
+ÕôÆû¶¯Á¦
+ºË×Ó¶¯Á¦
+ÅçÆøÒýÇæ
+ÒþÐÎ¼¼Êõ
+¿ñÈÈ·Ö×Ó
+Ò»»÷ÖÆµÐ
+ÆøÍÌ¶·Å£
+¾Ã¾É³³¡
+Á÷Ë®×÷Òµ
+武器(攻)
+装甲(防)
+机动(移)
+海运
+母舰
+涡轮
+空袭
+燃油
+空运
+海上导航
+雷达声纳
+水下潜航
+远程炮击
+快速行军
+船上救生
+额外负重
+防空武器
+间谍飞机
+蒸汽动力
+核子动力
+喷气引擎
+隐形技术
+狂热分子
+一击制敌
+气吞斗牛
+久经沙场
+流水作业
 #TERRAIN
+Ô¶Ñó
+½üº£
+²Ý³¡
+É³Ä®
+»ÄµØ
+Ì¦Ô
+±ùÔ
+ÕÓÔó
+´ÔÁÖ
+ÉÁÖ
+ÇðÁê
+¸ßÉ½
+*
+Óæ³¡
+Æ½Ô
+ÂÌÖÞ
+Ð¡Âó
+»Æ½ð
+ÊÞÆ¤
+ÄàÌ¿
+Ë®¹û
+ÁÔÎï
+ÃÀ¾Æ
+Ìú¿ó
+*
+ÃÌ¿ó
+*
+Ê¯ÓÍ
+ÂÁÍÁ
+È¼Æø
+*
+*
+ÎÚÄ¾
+¿óÈª
+ÃºÌ¿
+×êÊ¯
+¶ñÍÁ
+îÜ¿ó
+ÓË¿ó
+Ë®Òø
+远洋
+近海
+草场
+沙漠
+荒地
+苔原
+冰原
+沼泽
+丛林
+森林
+丘陵
+高山
+*
+渔场
+平原
+绿洲
+小麦
+黄金
+兽皮
+泥炭
+水果
+猎物
+美酒
+铁矿
+*
+锰矿
+*
+石油
+铝土
+燃气
+*
+*
+乌木
+矿泉
+煤炭
+钻石
+恶土
+钴矿
+铀矿
+水银
 #DOMAIN
+Â½¾ü
+º£¾ü
+¿Õ¾ü
+陆军
+海军
+空军
 #EXPERIENCE
+ÐÂ±ø
+ÊÜÑµ
+ÀúÁ·
+ÀÏ±ø
+¾«Èñ
+新兵
+受训
+历练
+老兵
+精锐
 #UNITSTATUS
+×¤·À×´Ì¬
+ºäÕ¨×°±¸
+É½ÇøÒÆ¶¯
+Õ÷Ä¼²¿¶Ó
+³·Àë²¿¶Ó
+*
+*
+*
+ÔËÔØ²¿¶Ó
+µ¼ÖÂ²»°²
+ÔµØÍ£Áô
+*
+ÏòÖ¸¶¨Ä¿±êÒÆ¶¯
+µØÐÎ¸ÄÔì
+ÊÜËð»Ö¸´
+驻防状态
+轰炸装备
+山区移动
+征募部队
+撤离部队
+*
+*
+*
+运载部队
+导致不安
+原地停留
+*
+向指定目标移动
+地形改造
+受损恢复
 #GOVERNMENT
+ÎÞÕþ¸®
+Å«Á¥ÖÆ
+¾ýÖ÷ÖÆ
+¹²ºÍÖÆ
+×Ú½ÌÖÆ
+¹²²úÖÆ
+ÃñÖ÷ÖÆ
+Î´À´ÖÆ
+无政府
+奴隶制
+君主制
+共和制
+宗教制
+共产制
+民主制
+未来制
 #TREATY
+½»Õ½
+Í£Õ½
+ºÍÆ½
+ÓÑºÃ
+ÁªÃË
+交战
+停战
+和平
+友好
+联盟
 #HAVETREATY
+Óë#n½¨½»
+Óë#nÍ£Õ½
+Óë#nºÍÆ½
+Óë#nÓÑºÃ
 #Óë#nÁªÃË
+与#n建交
+与#n停战
+与#n和平
+与#n友好
+#与#n联盟
 #ATTITUDE
+µÐ¶Ô
+Àäµ
+²»ºÏ
+ÖÐÁ¢
+½ÓÊÜ
+ÓÑÉÆ
+ÈÈÇé
+敌对
+冷淡
+不合
+中立
+接受
+友善
+热情
 #CREDIBILITY
+ÑÔ¶øÎÞÐÅ
+×½Ãþ²»¶¨
+ÖØÅµÊØÐÅ
+ÑÔ³ö±ØÐÐ
+言而无信
+捉摸不定
+重诺守信
+言出必行
 #CITYEVENTS
+ÊÐÃñÉ§ÂÒ
+Éú²úÍê¹¤
+ÈË¿ÚÔö³¤
+ÈË¿Ú¼õÉÙ
+²¿¶Ó½âÉ¢
+ÉèÊ©±äÂô
+Éú²úÔâ»Ù
+´ïµ½ÉÏÏÞ
+³öÏÖÎÛÈ¾
+³ÇÊÐ±»Î§
+Ææ¼£ÖØ¸´
+ÒÆÃñÑÓÆÚ
+³ÇÊÐ½¨Á¢
+³ÇÊÐ°²¸´
+³ÇÊÐ±»Õ¼
+ÎÞÐ§³ÇÊÐÀàÐÍ
+市民骚乱
+生产完工
+人口增长
+人口减少
+部队解散
+设施变卖
+生产遭毁
+达到上限
+出现污染
+城市被围
+奇迹重复
+移民延期
+城市建立
+城市安复
+城市被占
+无效城市类型
 #CITYTYPE
+ÆÕÍ¨ÐÍ³ÇÊÐ
+¿Æ¼¼ÐÍ³ÇÊÐ
+¹¤ÒµÐÍ³ÇÊÐ
+³¬¼¶´ó¶¼ÊÐ
+普通型城市
+科技型城市
+工业型城市
+超级大都市
 #DIAGRAM
+ÈË¿Ú
+ÁìÍÁ
+¾üÊÂ
+¿Æ¼¼
+Ì½Ë÷
+¸û×÷
+人口
+领土
+军事
+科技
+探索
+耕作
 #JOBRESULT
+*
+µÀÂ·
+ÌúÂ·
+Çå³ýÉÁÖ
+¹à¸È
+Å©³¡
+Ö²Ê÷ÔìÁÖ
+²É¿ó
+ÔËºÓ
+µØÐÎ¸ü¸Ä
+ÒªÈû
+Çå³ýÎÛÈ¾
+¾üÊÂ»ùµØ
+ÂÓ¶á
+¶¨¾Ó
+µÀÂ·ÇÅ
+ÌúÂ·ÇÅ
+ÒÆ³ýÉèÊ©
+±äÎªÆ½Ô
+³é¸ÉÕÓÔó
+道路
+铁路
+清除森林
+灌溉
+农场
+植树造林
+采矿
+运河
+地形更改
+要塞
+清除污染
+军事基地
+掠夺
+定居
+道路桥
+铁路桥
+移除设施
+变为平原
+抽干沼泽
 #ARMYLOST
 #A²¿¶Ó±»¼ßÃð
 #A½¢¶Ó±»¼ßÃð
 #A²¿¶Ó¼¯Èº±»¼ßÃð
+#A部队被歼灭
+#A舰队被歼灭
+#A部队集群被歼灭
 #SPYMISSION
+ÆÆ»µÉú²ú
+ÇÔÈ¡µØÍ¼
+»ñµÃµÚÈý¹úÇé±¨
+´òÌý¹ú¼ÒÇé±¨
+´òÌý¾üÊÂÇé±¨
+破坏生产
+窃取地图
+获得第三国情报
+打听国家情报
+打听军事情报
 #WANT
+Ë÷Òª¹ú¼ÒÇé±¨
+Ë÷Òª¾üÊÂÇé±¨
+Ë÷ÒªÊÀ½çµØÍ¼
+*
+Ë÷Òª¿Æ¼¼³É¹û
+Ë÷Òª²¿¶ÓÑÐ·¢
+Ë÷ÒªÀñ½ð
+*
+*
+*
+Ë÷Òª·É´¬²¿¼þ
+ÈÃ¶Ô·½×ÔÐÐ³ö¼Û
+索要国家情报
+索要军事情报
+索要世界地图
+*
+索要科技成果
+索要部队研发
+索要礼金
+*
+*
+*
+索要飞船部件
+让对方自行出价
 #OFFER
+·îËÍ¹ú¼ÒÇé±¨
+·îËÍ¾üÊÂÇé±¨
+·îËÍÊÀ½çµØÍ¼
+*
+·îËÍ¿Æ¼¼³É¹û
+·îËÍ²¿¶ÓÑÐ·¢
+·îËÍÀñ½ð
+*
+*
+*
+·îËÍ·É´¬²¿¼þ
+ÈÃ¶Ô·½×ÔÐÐÒª¼Û
+奉送国家情报
+奉送军事情报
+奉送世界地图
+*
+奉送科技成果
+奉送部队研发
+奉送礼金
+*
+*
+*
+奉送飞船部件
+让对方自行要价
 #CITYMANAGETYPE
+ÊÖ¶¯·ÖÅä
+¿ÆÑÐ×î´ó»¯
+¿ÆÑÐÓÅÏÈ
+Ôö³¤×î´ó»¯
+Éú²úÓÅÏÈ
+Éú²ú×î´ó»¯
+手动分配
+科研最大化
+科研优先
+增长最大化
+生产优先
+生产最大化
 #SETTINGS

branches/highdpi/Localization/zh-Hans/ReadMe.txt

-              r124
+              r465
 C-EVO(ÎÄÃ÷½ø»¯Ê·)ºº»¯ËµÃ÷
+C-EVO(文明进化史)汉化说明
+ÓÎÏ·½éÉÜ£º
 C-EVOÊÇÒ»¿î´ÓÎÄÃ÷(Civilization)ÏµÁÐÑÜÉú¶ø³öµÄWindowsÆ½Ì¨¿ªÔ´×ÔÓÉÓÎÏ·£¬ÔÚ×ñÑÎÄÃ÷ÏµÁÐ
+»ù±¾ÔÔòµÄ»ù´¡ÉÏ£¬×öÁËÐí¶àÓÐ´´ÒâºÍÈËÐÔ»¯µÄ¸ïÐÂ£¬ÊÇÒ»¿î¾«ÃÀÓÐÈ¤µÄÎÄÃ÷ÀàÓÎÏ·£¬ÎÄÃ÷ÃÔ²»¿É²»Íæ¡£
 ¹Ù·½Ö÷Ò³£ºhttp://www.c-evo.org
 Ô°æÓÎÏ·(V1.10£¬¶ÔÓ¦ºº»¯°ü)ÏÂÔØÒ³Ãæ£ºhttp://www.c-evo.org/files/download.php
+游戏介绍：
+C-EVO是一款从文明(Civilization)系列衍生而出的Windows平台开源自由游戏，在遵循文明系列
+基本原则的基础上，做了许多有创意和人性化的革新，是一款精美有趣的文明类游戏，文明迷不可不玩。
+官方主页：http://www.c-evo.org
+原版游戏(V1.10，对应汉化包)下载页面：http://www.c-evo.org/files/download.php
+ºº»¯°üÊ¹ÓÃ·½·¨£º
+°²×°Ô°æÓÎÏ·ºó£¬½«ºº»¯°üÄÚµÄÎÄ¼þ½âÑ¹µ½ÓÎÏ·°²×°Ä¿Â¼£¬Îñ±Ø¸²¸ÇÔÎÄ¼þ£¨Language.txt, Help\Help.txt£©£¬
+È»ºóÖ´ÐÐÓÎÏ·³ÌÐò¡£
+汉化包使用方法：
+安装原版游戏后，将汉化包内的文件解压到游戏安装目录，务必覆盖原文件（Language.txt, Help\Help.txt），
+然后执行游戏程序。
+ºº»¯ËµÃ÷£º
 . »ù±¾ÍêÈ«ºº»¯°æ£¬³ýÁËÓÎÏ·¹ØÓÚ²¿·ÖÍâÆäËûÄÚÈÝÎÄ×ÖÈ«²¿ºº»¯£¬°üÀ¨°ïÖúÖ¸ÄÏ£¬ÎÄ×ÖÁ¿Ô¼70KB¡£
 . ºº»¯°üÖÐ¸½´øÁËºº»¯Õß×ÔÐÐÉè¼ÆµÄÒ»¿îÓÎÏ·µØÍ¼£¬Ö÷Òª¶ÔÍæ¼ÒµÄÆðÊ¼Î»ÖÃ×öÁËÓÅ»¯¡£
 . ºº»¯°üÖÐÌí¼ÓÁËÓÎÏ·Ö¸ÄÏµÄ¿ì½ÝÔËÐÐ·½Ê½£¬·½±ãÍæ¼Ò²éÔÄ¡£
 . ÓÎÏ·Ö¸ÄÏÖÐµÄÄ³Ð©²¿·Ö£¬Èç¿Æ¼¼¡¢ÉèÊ©¡¢Ææ¼£µÈ°ïÖú´°¿Ú£¬´°¿Ú±êÌâÏÂ·½µÄÊ×ÐÐ£¨ÎÄ×ÖÄÚÈÝÓë´°¿Ú±êÌâÏàÍ¬£©
+ÎªÂÒÂë£¬Îª³ÌÐò¼æÈÝÎÊÌâ£¨Ê××ÖÄ¸´óÐ´³ö´í£©£¬ÎÞ·ÁÓÎÏ·£¬ÆäËû´¦ÉÐÎ´·¢ÏÖÏÔÊ¾´íÎó¡£
+汉化说明：
+. 基本完全汉化版，除了游戏关于部分外其他内容文字全部汉化，包括帮助指南，文字量约70KB。
+. 汉化包中附带了汉化者自行设计的一款游戏地图，主要对玩家的起始位置做了优化。
+. 汉化包中添加了游戏指南的快捷运行方式，方便玩家查阅。
+. 游戏指南中的某些部分，如科技、设施、奇迹等帮助窗口，窗口标题下方的首行（文字内容与窗口标题相同）
+为乱码，为程序兼容问题（首字母大写出错），无妨游戏，其他处尚未发现显示错误。
+ÍÆ¼öÓÎÏ·×ÖÌå£ºÎ¢ÈíÑÅºÚ£¬×ÖÌåÉèÖÃÎÄ¼þÒÑ¸½ÔÚºº»¯°üÖÐ
+推荐游戏字体：微软雅黑，字体设置文件已附在汉化包中
 V1.10°æ¸üÐÂ¸ÅÒª£º
 ¡¢ÓÎÏ·½çÃæ×÷ÁËµ÷Õû£¬ÐÂ½çÃæ¸üÖ±¹ÛÓÑºÃ
 ¡¢³ÇÊÐ´°¿ÚÖÐÔöÉèÁË×ÊÔ´×Ô¶¯·ÖÅäÄ£Ê½£¬·½±ãÍæ¼Ò¿ìËÙÉèÖÃ£¬¼õÉÙÁËÈß·±µÄÏ¸½Ú²Ù×÷
 ¡¢¸ù¾ÝÍæ¼Ò·´À¡£¬ÐÞ¸ÄÁËÈýÏîÆæ¼£µÄÐ§¹û
 ¡¢µ÷ÕûÁË³ÇÊÐ°²¶¨ÖµµÄÓ°Ïì²ÎÊýÒÔ¼°³õÊ¼Ë®Æ½
 ¡¢Ôö¼ÓÁË½»Õ½½á¹ûÔ¤²â
 ¡¢½»ÉæÖ¸ÁîµÄÉÙÁ¿µ÷Õû£¬È¥³ýÁËÄê¹±²¿·Ö£¬²¢µ÷ÕûÁËÖÕÖ¹ÌõÔ¼µÄ²¿·ÖÉè¶¨
 ¡¢ÆäËû·½ÃæµÄÎ¢µ÷
+V1.10版更新概要：
+、游戏界面作了调整，新界面更直观友好
+、城市窗口中增设了资源自动分配模式，方便玩家快速设置，减少了冗繁的细节操作
+、根据玩家反馈，修改了三项奇迹的效果
+、调整了城市安定值的影响参数以及初始水平
+、增加了交战结果预测
+、交涉指令的少量调整，去除了年贡部分，并调整了终止条约的部分设定
+、其他方面的微调
+ºº»¯¸üÐÂ£º
 .06.18  1.10°æºº»¯°üÖÆ×÷Íê³É£¬¶ÔÓ¦ÐÂÍÆ³öµÄ1.10Ó¢ÎÄ°æ£¨080526£©
 .04.18        1.04°æºº»¯°üÖÆ×÷Íê³É£¬¶ÔÓ¦ÔÏÈµÄ1.04Ó¢ÎÄ°æ
+汉化更新：
+.06.18  1.10版汉化包制作完成，对应新推出的1.10英文版（080526）
+.04.18    1.04版汉化包制作完成，对应原先的1.04英文版
+¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª¡ª
+ºº»¯£¨º¹»¯£©²»ÈÝÒ×£¬×ªÔØÊ±Çë±£Áôºº»¯Õß£¬Ð»Ð»¡£
+—————————————————————————————————————
+汉化（汗化）不容易，转载时请保留汉化者，谢谢。
 NapTID£¨ÎÞÃû£©2008.06.18
+NapTID（无名）2008.06.18

branches/highdpi/Localization/zh-Hans/Tribes/Americans.tribe.txt

-              r123
+              r465
 #CHOOSE ÃÀ¹ú
 #n ÃÀ¹úÈË
 #s ÃÀ¹ú
 #a ÃÀÀû¼á
+#CHOOSE 美国
+#n 美国人
+#s 美国
+#a 美利坚
 #COLOR FFAFAF
 #SYMBOLS Nation1, 48
 …
 #CITIES
+        »ªÊ¢¶Ù
+        Å¦Ô¼
+        ²¨Ê¿¶Ù
+        ·Ñ³Ç
+        ÑÇÌØÀ¼´ó
+        Ö¥¼Ó¸ç
+        ¾É½ðÉ½
+        ²¼·¨ÂÞ
+        ÂåÉ¼í¶
+        µ×ÌØÂÉ
+        ÐÂ°Â¶ûÁ¼
+        °Í¶ûµÄÄ¦
+        µ¤·ð
+        ÐÁÐÁÄÇÌá
+        ´ïÀË¹
+        Âõ°¢ÃÜ
+        ¿°ÈøË¹
+        Ê¥µü¸ê
+        ÀïÊ¿Âú
+        ÀË¹Î¬¼ÓË¹
         Phoenix
         Seattle
         Albuquerque
         Portland
         Minneapolis
         Houston
         Riverside
         Anaheim
         Nassau-Suffolk
         Tampa
         Oakland
         Pittsburgh
         St. Louis
         Cleveland
         Newark
         Fort Worth
         San Jose
         Orlando
         Sacramento
         Fort Lauderdale
         Indianapolis
         San Antonio
         Norfolk
         Columbus
         Milwaukee
         Charlotte
         Paterson
         Salt Lake City
         Greensboro
         Austin
         Nashville-Davidson
         Providence
         Raleigh
         Hartford
         New Brunswick
         Memphis
         West Palm Beach
         Long Branch
         Jacksonville
         Rochester
         Grand Rapids
         Oklahoma City
         Louisville
         Greenville
         Dayton
         Fresno
         Birmingham
         Honolulu
         Albany
         Tucson
         Tulsa
         Oxnard
         Syracuse
         Omaha
         Tacoma
         Akron
         Knoxville
         El Paso
         Bakersfield
         Allentown
         Gary
         Harrisburg
         Scranton
         Toledo
         Jersey City
         Baton Rouge
         Youngstown
         Springfield
         Sarasota
         Wilmington
         Little Rock
         Ann Arbor
         McAllen
         Stockton
         Charleston
         Wichita
         New Haven
         Mobile
         Columbia
         Colorado Springs
+    华盛顿
+    纽约
+    波士顿
+    费城
+    亚特兰大
+    芝加哥
+    旧金山
+    布法罗
+    洛杉矶
+    底特律
+    新奥尔良
+    巴尔的摩
+    丹佛
+    辛辛那提
+    达拉斯
+    迈阿密
+    堪萨斯
+    圣迭戈
+    里士满
+    拉斯维加斯
+    Phoenix
+    Seattle
+    Albuquerque
+    Portland
+    Minneapolis
+    Houston
+    Riverside
+    Anaheim
+    Nassau-Suffolk
+    Tampa
+    Oakland
+    Pittsburgh
+    St. Louis
+    Cleveland
+    Newark
+    Fort Worth
+    San Jose
+    Orlando
+    Sacramento
+    Fort Lauderdale
+    Indianapolis
+    San Antonio
+    Norfolk
+    Columbus
+    Milwaukee
+    Charlotte
+    Paterson
+    Salt Lake City
+    Greensboro
+    Austin
+    Nashville-Davidson
+    Providence
+    Raleigh
+    Hartford
+    New Brunswick
+    Memphis
+    West Palm Beach
+    Long Branch
+    Jacksonville
+    Rochester
+    Grand Rapids
+    Oklahoma City
+    Louisville
+    Greenville
+    Dayton
+    Fresno
+    Birmingham
+    Honolulu
+    Albany
+    Tucson
+    Tulsa
+    Oxnard
+    Syracuse
+    Omaha
+    Tacoma
+    Akron
+    Knoxville
+    El Paso
+    Bakersfield
+    Allentown
+    Gary
+    Harrisburg
+    Scranton
+    Toledo
+    Jersey City
+    Baton Rouge
+    Youngstown
+    Springfield
+    Sarasota
+    Wilmington
+    Little Rock
+    Ann Arbor
+    McAllen
+    Stockton
+    Charleston
+    Wichita
+    New Haven
+    Mobile
+    Columbia
+    Colorado Springs
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation1
+,      134,    ÇáÆï±ø
+,     136,    Ð»¶ûÂüÌ¹¿Ë
+,     202,    Ìú¼×½¢
+,  134,    轻骑兵
+, 136,    谢尔曼坦克
+, 202,    铁甲舰

branches/highdpi/Localization/zh-Hans/Tribes/Babyl.tribe.txt

-              r123
+              r465
 #CHOOSE °Í±ÈÂ×
 #n °Í±ÈÂ×ÈË
 #s °Í±ÈÂ×
 #a °Í±ÈÂ×
+#CHOOSE 巴比伦
+#n 巴比伦人
+#s 巴比伦
+#a 巴比伦
 #COLOR EFCB47
 #SYMBOLS Nation2, 92
 …
 #CITIES
+        °Í±ÈÂ×
+        ÎÚ¶û
+        ²¨Î÷ÅÁ
+        ÄáÄáÎ¢
+        ÑÇÊö
+        °¢¼ÓµÂ
+        ÎÚÂ³¿Ë
+        °¢¿ËÉ³
+        Â¬¼ÓÔú¸ñÎ÷
+        ÒÀÀû¶¼
+        ÈøÂíÀ
+        À¼ÓÊ©
+        »ùÊ©
+        ÄáÆÕ¶û
+        ÊæÂ¬°Í¿Ë
+        Ë¼ÅÁ¶û
+        À¶ûÈö
+        ÔúÄÂ°¢
+        µÏ¶ûÎ¬ÀÑÅ
+        ¶òÄ·Âí
         Adab
         Ebla
         Calah
         Dur Sharrukin
         Cunaxa
         Singara
         Nisibis
         Harran
         Opis
         Tarsus
         Gasur
         Aleppo
         Basra
         Charax
         Hassuna
         Larak
         Bad-tibira
         Cuthah
         Isin
         Arpad
         Guabba
         Jarmo
         Tell Halaf
         Shubat Enlil
         Mari
         Dur-Kurigalzu
+    巴比伦
+    乌尔
+    波西帕
+    尼尼微
+    亚述
+    阿加德
+    乌鲁克
+    阿克沙
+    卢加扎格西
+    依利都
+    萨马拉
+    拉加施
+    基施
+    尼普尔
+    舒卢巴克
+    思帕尔
+    拉尔撒
+    扎穆阿
+    迪尔维拉雅
+    厄姆马
+    Adab
+    Ebla
+    Calah
+    Dur Sharrukin
+    Cunaxa
+    Singara
+    Nisibis
+    Harran
+    Opis
+    Tarsus
+    Gasur
+    Aleppo
+    Basra
+    Charax
+    Hassuna
+    Larak
+    Bad-tibira
+    Cuthah
+    Isin
+    Arpad
+    Guabba
+    Jarmo
+    Tell Halaf
+    Shubat Enlil
+    Mari
+    Dur-Kurigalzu
 #UNITS Nation2
+,     010,    ÒÆÃñÕß
+,     040,    Ãñ±ø
+,     101,    ³¤Ã¬ÊÖ
+,     101,    ¼ýÊÖ
+,     102,    Ã¬µ¶ÊÖ
+,     103,    »ðÇ¹ÊÖ
+,     131,    Æï±ø
+,     132,    Õ½³µ
+, 010,    移民者
+, 040,    民兵
+, 101,    长矛手
+, 101,    箭手
+, 102,    矛刀手
+, 103,    火枪手
+, 131,    骑兵
+, 132,    战车

branches/highdpi/Localization/zh-Hans/Tribes/British.tribe.txt

-              r123
+              r465
 #CHOOSE ²»ÁÐµß
 #n ²»ÁÐµßÈË
 #s Ó¢¹ú
 #a ´ó²»ÁÐµß
+#CHOOSE 不列颠
+#n 不列颠人
+#s 英国
+#a 大不列颠
 #COLOR 978367
 #SYMBOLS Nation2, 95
 …
 #CITIES
+        Â×¶Ø
+        Ô¼¿Ë
+        Åµ¶¡ºº
+        ºÚË¹Í¢Ë¹
+        ¿²ÌØ²®À×
+        ¿¼ÎÄ´¹
+        ÎÖÀï¿Ë
+        Å¦¿¨Ë¹¶û
+        Å£½ò
+        ÀûÎïÆÖ
+        ¶à·ð
+        ²¼À³¶Ù
+        ÅµÎ¬Ææ
+        Àû×È
+        À×¶¡
+        ²®Ã÷º²
+        °£¿ËÈûÌØ
+        ½£ÇÅ
+        Ë¹¿¨²®ÀÕ
+        Âü³¹Ë¹ÌØ
         Bristol
         Leicester
         Carlisle
         Ipswich
         Portsmouth
         Berwick
         Sheffield
         Kingston upon Hull
         Bradford
         Stoke-on-Trent
         Wolverhampton
         Plymouth
         Derby
         Southampton
         Dudley
         Newcastle upon Tyne
         Sunderland
         Northampton
         Preston
         Walsall
         Luton
         Richmond
         Southend-on-Sea
         Bournemouth
         Middlesbrough
         West Bromwich
         Blackpool
         Oldbury
         Swindon
         Huddersfield
         Bolton
         Poole
         Peterborough
         Stockport
         Rotherham
         Watford
         Slough
         St Helens
         Sutton Coldfield
         Blackburn
         Oldham
         Basildon
         Woking
         Chelmsford
         Colchester
         Worthing
         Gillingham
         Eastbourne
         Solihull
         Rochdale
         Birkenhead
         Cheltenham
         Halifax
         Southport
         Maidstone
         Grimsby
         Crawley
         Hartlepool
         Darlington
         Wigan
         Bath
         South Shields
         Stockton-on-Tees
         Gateshead
         Warrington
         Worcester
         St Albans
         Lincoln
         Chester
         Salford
         Hemel Hempstead
         Basingstoke
         Stevenage
         Scunthorpe
         Barnsley
         Burnley
         Harlow
         Wakefield
         Bedford
         Newcastle-under-Lyme
         Redditch
         Chesterfield
         Mansfield
         High Wycombe
         Chatham
+    伦敦
+    约克
+    诺丁汉
+    黑斯廷斯
+    坎特伯雷
+    考文垂
+    沃里克
+    纽卡斯尔
+    牛津
+    利物浦
+    多佛
+    布莱顿
+    诺维奇
+    利兹
+    雷丁
+    伯明翰
+    埃克塞特
+    剑桥
+    斯卡伯勒
+    曼彻斯特
+    Bristol
+    Leicester
+    Carlisle
+    Ipswich
+    Portsmouth
+    Berwick
+    Sheffield
+    Kingston upon Hull
+    Bradford
+    Stoke-on-Trent
+    Wolverhampton
+    Plymouth
+    Derby
+    Southampton
+    Dudley
+    Newcastle upon Tyne
+    Sunderland
+    Northampton
+    Preston
+    Walsall
+    Luton
+    Richmond
+    Southend-on-Sea
+    Bournemouth
+    Middlesbrough
+    West Bromwich
+    Blackpool
+    Oldbury
+    Swindon
+    Huddersfield
+    Bolton
+    Poole
+    Peterborough
+    Stockport
+    Rotherham
+    Watford
+    Slough
+    St Helens
+    Sutton Coldfield
+    Blackburn
+    Oldham
+    Basildon
+    Woking
+    Chelmsford
+    Colchester
+    Worthing
+    Gillingham
+    Eastbourne
+    Solihull
+    Rochdale
+    Birkenhead
+    Cheltenham
+    Halifax
+    Southport
+    Maidstone
+    Grimsby
+    Crawley
+    Hartlepool
+    Darlington
+    Wigan
+    Bath
+    South Shields
+    Stockton-on-Tees
+    Gateshead
+    Warrington
+    Worcester
+    St Albans
+    Lincoln
+    Chester
+    Salford
+    Hemel Hempstead
+    Basingstoke
+    Stevenage
+    Scunthorpe
+    Barnsley
+    Burnley
+    Harlow
+    Wakefield
+    Bedford
+    Newcastle-under-Lyme
+    Redditch
+    Chesterfield
+    Mansfield
+    High Wycombe
+    Chatham
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation2
+,     21,     ÌØ¹¤
+,     201,    ÈýÎ¦·«´¬
+,     132,    ÆïÊ¿
+, 21, 特工
+, 201,    三桅帆船
+, 132,    骑士

branches/highdpi/Localization/zh-Hans/Tribes/Chinese.tribe.txt

-              r123
+              r465
 #CHOOSE ÖÐ¹ú
 #n ÖÐ¹úÈË
 #s ÖÐ¹ú
 #a ÖÐ»ª
+#CHOOSE 中国
+#n 中国人
+#s 中国
+#a 中华
 #COLOR 00FFFF
 #SYMBOLS Nation1, 41
 …
 #CITIES
+        ±±¾©
+        ÉÏº£
+        ¹ãÖÝ
+        ÄÏ¾©
+        Çàµº
+        º¼ÖÝ
+        ³É¶¼
+        Ïã¸Û
+        Ìì½ò
+        Îäºº
+        °ÄÃÅ
+        À¥Ã÷
+        Î÷°²
+        ¼ÃÄÏ
+        ¸£ÖÝ
+        Äþ²¨
+        ³¤É³
+        º£¿Ú
+        ÉòÑô
+        ´óÁ¬
+        ¹þ¶û±õ
+        ÖØÇì
+        ÀÈø
+        À¼ÖÝ
+        Ö£ÖÝ
+        ÄÏ²ý
+        ºÏ·Ê
+        ÄÏÄþ
+        ÎÚÂ³Ä¾Æë
+        ³¤´º
+        Ì¨±±
+        Ì«Ô
+        ºôºÍºÆÌØ
+        ¸ßÐÛ
+        ¸§Ë³
+        °°É½
+        ´óÍ¬
+        ÌÆÉ½
+        »ùÂ¡
+        ÆëÆë¹þ¶û
+        ¹óÑô
+        Ê¯¼Ò×¯
+        °üÍ·
+        ÎÞÎý
+        ÍÂÂ³·¬
+        ¿ª·â
+        Òø´¨
+        ºªµ¦
+        ÐìÖÝ
+        ±¾Ïª
+        ÈýÑÇ
+        ÏÃÃÅ
+        ÈªÖÝ
+        ÂåÑô
+        ·ðÉ½
+        ¾Å½
+        ËÕÖÝ
+        ÑïÖÝ
+        ¹ðÁÖ
+        ´óÇì
+        ÎÂÖÝ
+        »´ÄÏ
+        ÑÓ°²
+        ººÖÐ
+        ¸·ÐÂ
+        ÁøÖÝ
+        ºâÑô
+        ÁÉÑô
+        Äµµ¤½
+        Î÷Äþ
+        Óª¿Ú
+        °²Çì
+        ÕÅ¼Ò¿Ú
+        µ¤¶«
+        ³£ÖÝ
+        ¿¦Ê²
+        º×¸Ú
+        ÏæÌ¶
+        Ïå·®
+        ¿µ¶¨
+        ÃàÑô
+        ¼ÑÄ¾Ë¹
+        ¾ÆÈª
+        ÄÏÍ¨
+        ÎäÍþ
+        ÉîÛÚ
+        Îßºþ
+        Æ½¶¥É½
+        °ö²º
+        ÖêÖÞ
+        »ÆÊ¯
+        ÅÊÖ¦»¨
+        ÑÌÌ¨
+        ±¦¼¦
+        ÉÇÍ·
+        ´óÀí
+        ×ñÒå
+        ×Ô¹±
+        Õ¿½
+    北京
+    上海
+    广州
+    南京
+    青岛
+    杭州
+    成都
+    香港
+    天津
+    武汉
+    澳门
+    昆明
+    西安
+    济南
+    福州
+    宁波
+    长沙
+    海口
+    沈阳
+    大连
+    哈尔滨
+    重庆
+    拉萨
+    兰州
+    郑州
+    南昌
+    合肥
+    南宁
+    乌鲁木齐
+    长春
+    台北
+    太原
+    呼和浩特
+    高雄
+    抚顺
+    鞍山
+    大同
+    唐山
+    基隆
+    齐齐哈尔
+    贵阳
+    石家庄
+    包头
+    无锡
+    吐鲁番
+    开封
+    银川
+    邯郸
+    徐州
+    本溪
+    三亚
+    厦门
+    泉州
+    洛阳
+    佛山
+    九江
+    苏州
+    扬州
+    桂林
+    大庆
+    温州
+    淮南
+    延安
+    汉中
+    阜新
+    柳州
+    衡阳
+    辽阳
+    牡丹江
+    西宁
+    营口
+    安庆
+    张家口
+    丹东
+    常州
+    喀什
+    鹤岗
+    湘潭
+    襄樊
+    康定
+    绵阳
+    佳木斯
+    酒泉
+    南通
+    武威
+    深圳
+    芜湖
+    平顶山
+    蚌埠
+    株洲
+    黄石
+    攀枝花
+    烟台
+    宝鸡
+    汕头
+    大理
+    遵义
+    自贡
+    湛江
 #UNITS Nation1
+,      040,    Ãñ±ø
+,     104,    ÓÎ»÷¶Ó
+,     072,    Ð¡ô®°å
+,  040,    民兵
+, 104,    游击队
+, 072,    小舢板

branches/highdpi/Localization/zh-Hans/Tribes/Egyptians.tribe.txt

-              r123
+              r465
 #CHOOSE °£¼°
 #n °£¼°ÈË
 #s °£¼°
 #a °£¼°
+#CHOOSE 埃及
+#n 埃及人
+#s 埃及
+#a 埃及
 #COLOR 37CFAF
 #SYMBOLS Nation1, 42
 …
 #CITIES
+        µ×±ÈË¹
+        ÃÏ·ÆË¹
+        º£ÁÒ²¨ÀûË¹
+        °£ÀÕ·ÒµÙÄá
+        ÑÇÀúÉ½´ó
+        ÅÉÀÃ·Î÷Ë¹
+        ¼ªÈø
+        °Ý±ÈÂåË¹
+        °¬¶û°¢ÂêÄÇ
+        Ð»À¿×²¨Àû
+        °¢±È¶àË¹
+        °¬¶û¿À
+        ÑÇÐÞÌØ
+        °¢·¥ÀïË¹
+        ÀûÊ©ÌØ
+        ²¼ÍÐ
+        °£µÏ¸¥
+        ±ÓËÉ
+        ²¼Î÷ÀïË¹
+        ¿¨»ë
         Athribis
         Mendes
         El-Ashmunein
         Tenis
         Naukratis
         Syene
         Medinet Habu
         Buhen
         Hatnub
         El-Kharga
         Qift
         Quessir
         Fawakhir
         Deir El-Medina
         Fayyum
         Sais
         Maidum
         Abusir
         Zawyet al-Aryan
         Saqqara
         Mazghuma
         Hawara
         Saylah
         Dara
         Tukh
         El-Kula
         Karnak
         Kom Ombo
         Phile
         Rosetta
         Tjel
         Edwa
         Gebel el-Tarif
         Hipponius
         Dishasha
         Kafr Hammar
         Tarkhan
         Esna
         Armant
         Naga ed-Dair
         Deir el-Bahari
         Naqada
         El-Ballas
         Tentyra
         Qaw el-Kebir
+        Ikkur
         Quban
         Kumma
         Semma
         Uronarti
         Shalfak
         Mirgissa
         Faras
         Abu Simbel
         Bir Nakhlai
         Aniba
+    底比斯
+    孟菲斯
+    海烈波利斯
+    埃勒芬蒂尼
+    亚历山大
+    派拉梅西斯
+    吉萨
+    拜比洛斯
+    艾尔阿玛那
+    谢拉孔波利
+    阿比多斯
+    艾尔凯拉
+    亚修特
+    阿伐里斯
+    利施特
+    布托
+    埃迪弗
+    庇松
+    布西里斯
+    卡浑
+    Athribis
+    Mendes
+    El-Ashmunein
+    Tenis
+    Naukratis
+    Syene
+    Medinet Habu
+    Buhen
+    Hatnub
+    El-Kharga
+    Qift
+    Quessir
+    Fawakhir
+    Deir El-Medina
+    Fayyum
+    Sais
+    Maidum
+    Abusir
+    Zawyet al-Aryan
+    Saqqara
+    Mazghuma
+    Hawara
+    Saylah
+    Dara
+    Tukh
+    El-Kula
+    Karnak
+    Kom Ombo
+    Phile
+    Rosetta
+    Tjel
+    Edwa
+    Gebel el-Tarif
+    Hipponius
+    Dishasha
+    Kafr Hammar
+    Tarkhan
+    Esna
+    Armant
+    Naga ed-Dair
+    Deir el-Bahari
+    Naqada
+    El-Ballas
+    Tentyra
+    Qaw el-Kebir
+    Ikkur
+    Quban
+    Kumma
+    Semma
+    Uronarti
+    Shalfak
+    Mirgissa
+    Faras
+    Abu Simbel
+    Bir Nakhlai
+    Aniba
 #UNITS Nation1
+,      040,    Ãñ±ø
+,     101,    ¼ýÊÖ
+,     102,    ³¤Ã¬ÊÖ
+,  040,    民兵
+, 101,    箭手
+, 102,    长矛手

branches/highdpi/Localization/zh-Hans/Tribes/French.tribe.txt

-              r123
+              r465
 #CHOOSE ·¨À¼Î÷
 #n ·¨À¼Î÷ÈË
 #s ·¨¹ú
 #a ·¨À¼Î÷
+#CHOOSE 法兰西
+#n 法兰西人
+#s 法国
+#a 法兰西
 #COLOR 576FC7
 #SYMBOLS Nation1, 43
 …
 #CITIES
+        °ÍÀè
+        °Â¶ûÁ¼
+        Àï°º
+        À¼Ë¹
+        Í¼¶û
+        ÂíÈü
+        É³ÌØ¶û
+        °¢Î¬ÄáÎÌ
+        Ä¦ÄÉ¸ç
+        Â³°º
+        ¸ñÀÕÅµ²¼¶û
+        µÚÈÖ
+        ÑÇÃß
+        Éª±¤
+        ²¨ÍßµÚ¶û
+        Í¼Â¬×È
+        °ÍÔ¼Ú«
+        Ë¹ÌØÀË¹±¤
+        ²¼À×Ë¹ÌØ
+        ²¨¶û¶à
+        Àï¶û
+        ÄáË¹
+        ÄÏÌØ
+        Ê¥°£µÙ°²
+        ÃÉ±ËÀû°£
+        À×¶÷
+        ÀÕ°¢¸¥¶û
+        ÍÁÂ×
         Angers
         Le Mans
         Clermont-Ferrand
         Aix-en-Provence
         Limoges
         Nimes
         Villeurbanne
         Metz
         Caen
         Mulhouse
         Boulogne-Billancourt
         Perpignan
         Nancy
         Roubaix
         Argenteuil
         Tourcoing
         Montreuil
         Saint-Denis
         Versailles
         Nanterre
         Creteil
         Aulnay-sous-Bois
         Pau
         Vitry-sur-Seine
         Calais
         Colombes
         La Rochelle
         Asnieres
         Champigny-sur-Marne
         Rueil-Malmaison
         Saint-Maur-des-Fosses
         Bourges
         Antibes
         Dunkerque
         Courbevoie
         Beziers
         Cannes
         Saint-Nazaire
         Colmar
         Villeneuve-d'Ascq
         Valence
         Lorient
         Aubervilliers
         Drancy
         Merignac
         Troyes
         La Seyne-sur-Mer
         Quimper
         Antony
         Saint-Quentin
         Neuilly-sur-Seine
         Noisy-le-Grand
         Sarcelles
         Niort
         Pessac
         Venissieux
         Chambery
         Charleville-Mezieres
         Beauvais
         Cergy
         Levallois-Perret
         Cholet
         Issy-les-Moulineaux
         Montauban
         Vannes
         Hyeres
         Evreux
         Maisons-Alfort
         Laval
         Fontenay-sous-Bois
         Ivry-sur-Seine
         Saint-Malo
         Arles
         Belfort
         Annecy
         Sartrouville
         Clichy
         Chalon-sur-Saône
         Pantin
         Chateauroux
         Meaux
         La Roche-sur-Yon
         Blois
         Brive-la-Gaillarde
         Evry
         Clamart
         Villejuif
         Chalons-sur-Marne
         Sevran
         Le Blanc-Mesnil
         Bondy
         Frejus
         Narbonne
         Epinay-sur-Seine
         Tarbes
         Albi
         Saint-Brieuc
         Chelles
         Boulogne-sur-Mer
         Bobigny
         Carcassonne
+    巴黎
+    奥尔良
+    里昂
+    兰斯
+    图尔
+    马赛
+    沙特尔
+    阿维尼翁
+    摩纳哥
+    鲁昂
+    格勒诺布尔
+    第戎
+    亚眠
+    瑟堡
+    波瓦第尔
+    图卢兹
+    巴约讷
+    斯特拉斯堡
+    布雷斯特
+    波尔多
+    里尔
+    尼斯
+    南特
+    圣埃蒂安
+    蒙彼利埃
+    雷恩
+    勒阿弗尔
+    土伦
+    Angers
+    Le Mans
+    Clermont-Ferrand
+    Aix-en-Provence
+    Limoges
+    Nimes
+    Villeurbanne
+    Metz
+    Caen
+    Mulhouse
+    Boulogne-Billancourt
+    Perpignan
+    Nancy
+    Roubaix
+    Argenteuil
+    Tourcoing
+    Montreuil
+    Saint-Denis
+    Versailles
+    Nanterre
+    Creteil
+    Aulnay-sous-Bois
+    Pau
+    Vitry-sur-Seine
+    Calais
+    Colombes
+    La Rochelle
+    Asnieres
+    Champigny-sur-Marne
+    Rueil-Malmaison
+    Saint-Maur-des-Fosses
+    Bourges
+    Antibes
+    Dunkerque
+    Courbevoie
+    Beziers
+    Cannes
+    Saint-Nazaire
+    Colmar
+    Villeneuve-d'Ascq
+    Valence
+    Lorient
+    Aubervilliers
+    Drancy
+    Merignac
+    Troyes
+    La Seyne-sur-Mer
+    Quimper
+    Antony
+    Saint-Quentin
+    Neuilly-sur-Seine
+    Noisy-le-Grand
+    Sarcelles
+    Niort
+    Pessac
+    Venissieux
+    Chambery
+    Charleville-Mezieres
+    Beauvais
+    Cergy
+    Levallois-Perret
+    Cholet
+    Issy-les-Moulineaux
+    Montauban
+    Vannes
+    Hyeres
+    Evreux
+    Maisons-Alfort
+    Laval
+    Fontenay-sous-Bois
+    Ivry-sur-Seine
+    Saint-Malo
+    Arles
+    Belfort
+    Annecy
+    Sartrouville
+    Clichy
+    Chalon-sur-Sa鬾e
+    Pantin
+    Chateauroux
+    Meaux
+    La Roche-sur-Yon
+    Blois
+    Brive-la-Gaillarde
+    Evry
+    Clamart
+    Villejuif
+    Chalons-sur-Marne
+    Sevran
+    Le Blanc-Mesnil
+    Bondy
+    Frejus
+    Narbonne
+    Epinay-sur-Seine
+    Tarbes
+    Albi
+    Saint-Brieuc
+    Chelles
+    Boulogne-sur-Mer
+    Bobigny
+    Carcassonne
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation1
+,      103,    »ðÇ¹ÊÖ
+,     104,    ¹úÃñÎÀ¶Ó
+,     134,    ²½Æï±ø
+,  103,    火枪手
+, 104,    国民卫队
+, 134,    步骑兵

branches/highdpi/Localization/zh-Hans/Tribes/Germans.tribe.txt

-              r123
+              r465
 #CHOOSE ÈÕ¶úÂü
 #n ÈÕ¶úÂüÈË
 #s µÂ¹ú
 #a ÈÕ¶úÂü
+#CHOOSE 日耳曼
+#n 日耳曼人
+#s 德国
+#a 日耳曼
 #COLOR AFAFAF
 #SYMBOLS Nation1, 44
 …
 #CITIES
+        °ØÁÖ
+        ¿ÆÂ¡
+        ÑÇè¡
+        ·¨À¼¿Ë¸£
+        ÌØÀï¶û
+        À×¸ùË¹±¤
+        ºº±¤
+        ±ÈÀÕ·Æ¶ûµÂ
+        Âüº£Ä·
+        ²¨¶÷
+        ¶àÌØÃÉµÂ
+        Ä½ÄáºÚ
+        ²»À³Ã·
+        Å¦Â×±¤
+        Ë¹Í¼¼ÓÌØ
+        ¶ÅÈû¶û¶à·ò
+        µÂÀÛË¹¶Ù
+        ººÅµÍþ
+        ¶ÅÒÁË¹±¤
+        À³±ÈÎý
+        °£É
+        ¿ªÄ·ÄáË¹
+        ¿¨¶ûË¹Â³¶ò
+        ²¨ºè
         Augsburg
         Lubeck
         Munster
         Konigsberg
         Stettin
         Wuppertal
         Gelsenkirchen
         Halle
         Wiesbaden
         Monchengladbach
         Braunschweig
         Krefeld
         Magdeburg
         Kiel
         Oberhausen
         Rostock
         Hagen
         Erfurt
         Freiburg
         Kassel
         Saarbrucken
         Mainz
         Hamm
         Herne
         Mulheim
         Osnabruck
         Ludwigshafen
         Solingen
         Leverkusen
         Oldenburg
         Neuss
         Heidelberg
         Darmstadt
         Potsdam
         Paderborn
         Gottingen
         Bremerhaven
         Wurzburg
         Recklinghausen
         Wolfsburg
         Bottrop
         Heilbronn
         Remscheid
         Gera
         Cottbus
         Pforzheim
         Offenbach
         Ulm
         Salzgitter
         Ingolstadt
         Siegen
         Schwerin
         Reutlingen
         Furth
         Koblenz
         Moers
         Bergisch Gladbach
         Hildesheim
         Witten
         Kaiserslautern
         Zwickau
         Erlangen
         Iserlohn
         Jena
         Gutersloh
         Marl
         Lunen
         Velbert
         Duren
         Ratingen
         Esslingen
         Wilhelmshaven
         Dessau
         Hanau
         Ludwigsburg
         Flensburg
         Minden
         Brandenburg
         Ludenscheid
         Neumunster
         Tubingen
         Dorsten
         Villingen-Schwenningen
         Worms
         Castrop-Rauxel
         Gladbeck
         Arnsberg
         Delmenhorst
         Frankfurt/Oder
         Konstanz
         Neubrandenburg
         Viersen
         Marburg
         Rheine
         Detmold
         Bayreuth
         Celle
         Giessen
         Bocholt
         Troisdorf
         Norderstedt
         Dinslaken
         Bamberg
         Herten
         Neuwied
         Unna
         Aschaffenburg
         Lippstadt
         Plauen
         Aalen
         Luneburg
         Herford
         Kempten
         Grevenbroich
         Gorlitz
         Garbsen
         Stralsund
         Schwabisch Gmund
         Kerpen
         Dormagen
         Fulda
         Weimar
+    柏林
+    科隆
+    亚琛
+    法兰克福
+    特里尔
+    雷根斯堡
+    汉堡
+    比勒菲尔德
+    曼海姆
+    波恩
+    多特蒙德
+    慕尼黑
+    不莱梅
+    纽伦堡
+    斯图加特
+    杜塞尔多夫
+    德累斯顿
+    汉诺威
+    杜伊斯堡
+    莱比锡
+    埃森
+    开姆尼斯
+    卡尔斯鲁厄
+    波鸿
+    Augsburg
+    Lubeck
+    Munster
+    Konigsberg
+    Stettin
+    Wuppertal
+    Gelsenkirchen
+    Halle
+    Wiesbaden
+    Monchengladbach
+    Braunschweig
+    Krefeld
+    Magdeburg
+    Kiel
+    Oberhausen
+    Rostock
+    Hagen
+    Erfurt
+    Freiburg
+    Kassel
+    Saarbrucken
+    Mainz
+    Hamm
+    Herne
+    Mulheim
+    Osnabruck
+    Ludwigshafen
+    Solingen
+    Leverkusen
+    Oldenburg
+    Neuss
+    Heidelberg
+    Darmstadt
+    Potsdam
+    Paderborn
+    Gottingen
+    Bremerhaven
+    Wurzburg
+    Recklinghausen
+    Wolfsburg
+    Bottrop
+    Heilbronn
+    Remscheid
+    Gera
+    Cottbus
+    Pforzheim
+    Offenbach
+    Ulm
+    Salzgitter
+    Ingolstadt
+    Siegen
+    Schwerin
+    Reutlingen
+    Furth
+    Koblenz
+    Moers
+    Bergisch Gladbach
+    Hildesheim
+    Witten
+    Kaiserslautern
+    Zwickau
+    Erlangen
+    Iserlohn
+    Jena
+    Gutersloh
+    Marl
+    Lunen
+    Velbert
+    Duren
+    Ratingen
+    Esslingen
+    Wilhelmshaven
+    Dessau
+    Hanau
+    Ludwigsburg
+    Flensburg
+    Minden
+    Brandenburg
+    Ludenscheid
+    Neumunster
+    Tubingen
+    Dorsten
+    Villingen-Schwenningen
+    Worms
+    Castrop-Rauxel
+    Gladbeck
+    Arnsberg
+    Delmenhorst
+    Frankfurt/Oder
+    Konstanz
+    Neubrandenburg
+    Viersen
+    Marburg
+    Rheine
+    Detmold
+    Bayreuth
+    Celle
+    Giessen
+    Bocholt
+    Troisdorf
+    Norderstedt
+    Dinslaken
+    Bamberg
+    Herten
+    Neuwied
+    Unna
+    Aschaffenburg
+    Lippstadt
+    Plauen
+    Aalen
+    Luneburg
+    Herford
+    Kempten
+    Grevenbroich
+    Gorlitz
+    Garbsen
+    Stralsund
+    Schwabisch Gmund
+    Kerpen
+    Dormagen
+    Fulda
+    Weimar
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation1
+,      105,    ²½±ø
+,     106,    Í»»÷¶Ó
+,     300,    ¸£¿ËÕ½¶·»ú
+,  105,    步兵
+, 106,    突击队
+, 300,    福克战斗机

branches/highdpi/Localization/zh-Hans/Tribes/Greeks.tribe.txt

-              r123
+              r465
 #CHOOSE ¹ÅÏ£À°
 #n Ï£À°ÈË
 #s Ï£À°
 #a Ï£À°
+#CHOOSE 古希腊
+#n 希腊人
+#s 希腊
+#a 希腊
 #COLOR FF00BF
 #SYMBOLS Nation2, 90
 …
 #CITIES
+        ÑÅµä
+        Ë¹°Í´ï
+        ¿ÆÁÖË¹
+        ·¨ÈöÂåË¹
+        µÂ¶ûó
+        ÅµË÷Ë¹
+        ÌØÂåÒÁ
+        ÂõÎýÄá
+        °¢¸êË¹
+        ÈûÄªÆ¤À³
+        ÀÃ×ÑÇ
+        ÂÞµÂ
+        °ÂÁÖÆ¥ÑÇ
+        ÎýÀ¿âÔú
+        ÈøÂåÄá¿¨
+        ÂíÀËÉ
+        °¢²¨ÂÞÄáÑÅ
+        ÂüÌÝÄáÑÇ
+        ÑÇ¿ËÐË
+        ¿¨¶û»ùË¹
         Eretria
         Herakleia
         Ephesos
         Halicarnassos
         Pergamon
         Miletos
         Artemisium
         Megara
         Cithera
         Gythium
         Sellasia
         Messene
         Mothone
         Pherae
         Bassae
         Megalopolis
         Tegea
         Stymphalus
         Philus
         Tiryns
         Troezen
         Aegina
         Halieis
         Epidaurus
         Sicyon
         Cerynia
         Elis
         Brauron
         Colonus
         Oropus
         Decelea
         Tanagra
         Ascra
         Haliartus
         Thebai
         Orchomenus
         Naupactus
         Stratus
         Histiaea
         Carystus
         Ambracia
         Dodona
         Corcyra
         Buthrotum
         Iolcus
         Larissa
         Gonnus
         Pydna
         Aegae
         Beroea
         Mieza
         Pella
         Stobi
         Edessa
         Olynthus
         Potidaea
         Acanthus
         Uranopolis
         Stagirus
         Amphipolis
         Thasos
         Drerus
         Gortyna
         Hierapytna
         Miletus
         Ephesus
         Mytilene
         Atarneus
         Pergamum
         Sigeum
         Sestus
         Abdera
+    雅典
+    斯巴达
+    科林斯
+    法撒洛斯
+    德尔婓
+    诺索斯
+    特洛伊
+    迈锡尼
+    阿戈斯
+    塞莫皮莱
+    拉米亚
+    罗德
+    奥林匹亚
+    锡拉库扎
+    萨洛尼卡
+    马拉松
+    阿波罗尼雅
+    曼梯尼亚
+    亚克兴
+    卡尔基斯
+    Eretria
+    Herakleia
+    Ephesos
+    Halicarnassos
+    Pergamon
+    Miletos
+    Artemisium
+    Megara
+    Cithera
+    Gythium
+    Sellasia
+    Messene
+    Mothone
+    Pherae
+    Bassae
+    Megalopolis
+    Tegea
+    Stymphalus
+    Philus
+    Tiryns
+    Troezen
+    Aegina
+    Halieis
+    Epidaurus
+    Sicyon
+    Cerynia
+    Elis
+    Brauron
+    Colonus
+    Oropus
+    Decelea
+    Tanagra
+    Ascra
+    Haliartus
+    Thebai
+    Orchomenus
+    Naupactus
+    Stratus
+    Histiaea
+    Carystus
+    Ambracia
+    Dodona
+    Corcyra
+    Buthrotum
+    Iolcus
+    Larissa
+    Gonnus
+    Pydna
+    Aegae
+    Beroea
+    Mieza
+    Pella
+    Stobi
+    Edessa
+    Olynthus
+    Potidaea
+    Acanthus
+    Uranopolis
+    Stagirus
+    Amphipolis
+    Thasos
+    Drerus
+    Gortyna
+    Hierapytna
+    Miletus
+    Ephesus
+    Mytilene
+    Atarneus
+    Pergamum
+    Sigeum
+    Sestus
+    Abdera
 #UNITS Nation2
+,     010,    ÒÆÃñÕß
+,     040,    Ãñ±ø
+,     101,    ÖØ×°²½±ø
+,     102,    ·½Õó±ø
+,     131,    Æï±ø
+,     132,    Õ½³µ
+,     200,    Èý½°Õ½´¬
+, 010,    移民者
+, 040,    民兵
+, 101,    重装步兵
+, 102,    方阵兵
+, 131,    骑兵
+, 132,    战车
+, 200,    三桨战船

branches/highdpi/Localization/zh-Hans/Tribes/Japanese.tribe.txt

-              r123
+              r465
 #CHOOSE ÈÕ±¾
 #n ÈÕ±¾ÈË
 #s ÈÕ±¾
 #a ÈÕ±¾
+#CHOOSE 日本
+#n 日本人
+#s 日本
+#a 日本
 #COLOR 57AB27
 #SYMBOLS Nation1, 45
 …
 #CITIES
+        ¾©¶¼
+        ´óÚæ
+        ¶«¾©
+        ÈøÄ¦
+        Â¹¶ùµº
+        ÄÎÁ¼
+        Ãû¹ÅÎÝ
+        Éñ»§
+        ³¤Æé
+        ºá±õ
+        ÏÂ¹Ø
+        ËÉÉ½
+        Ôý»Ï
+        º¯¹Ý
+        ÒÁÊÆ
+        ¸»É½
+        ¸£µº
+        ¸£¸Ô
+        ÏÉÌ¨
+        ¹ãµº
         Suo
         Bizen
         Echizen
         Izumi
         Omi
         Echigo
         Kozuke
         Sado
         Izumo
         Kawasaki
         Kitakyushu
         Chiba
         Sakai
         Kumamoto
         Okayama
         Sagamihara
         Hamamatsu
         Funabashi
         Higashiosaka
         Hachioji
         Niigata
         Amagasaki
         Shizuoka
         Himeji
         Matsudo
         Kanazawa
         Urawa
         Kawaguchi
         Ichikawa
         Utsunomiya
         Omiya
         Yokosuka
         Oita
         Kurashiki
         Gifu
         Hirakata
         Toyonaka
         Wakayama
         Nishinomiya
         Fukuyama
         Fujisawa
         Takatsuki
         Asahikawa
         Machida
         Iwaki
         Nagano
         Toyohashi
         Suita
         Toyota
         Takamatsu
         Koriyama
         Kawagoe
         Okazaki
         Kochi
         Tokorozawa
         Kashiwa
         Akita
         Naha
         Miyazaki
         Koshigaya
         Aomori
         Akashi
         Morioka
         Yokkaichi
         Maebashi
         Kasugai
         Ichihara
         Yao
         Otsu
         Tokushima
         Ichinomiya
         Kakogawa
         Neyagawa
         Ibaraki
         Fukui
         Yamagata
         Hiratsuka
         Mito
         Sasebo
+    京都
+    大阪
+    东京
+    萨摩
+    鹿儿岛
+    奈良
+    名古屋
+    神户
+    长崎
+    横滨
+    下关
+    松山
+    札幌
+    函馆
+    伊势
+    富山
+    福岛
+    福冈
+    仙台
+    广岛
+    Suo
+    Bizen
+    Echizen
+    Izumi
+    Omi
+    Echigo
+    Kozuke
+    Sado
+    Izumo
+    Kawasaki
+    Kitakyushu
+    Chiba
+    Sakai
+    Kumamoto
+    Okayama
+    Sagamihara
+    Hamamatsu
+    Funabashi
+    Higashiosaka
+    Hachioji
+    Niigata
+    Amagasaki
+    Shizuoka
+    Himeji
+    Matsudo
+    Kanazawa
+    Urawa
+    Kawaguchi
+    Ichikawa
+    Utsunomiya
+    Omiya
+    Yokosuka
+    Oita
+    Kurashiki
+    Gifu
+    Hirakata
+    Toyonaka
+    Wakayama
+    Nishinomiya
+    Fukuyama
+    Fujisawa
+    Takatsuki
+    Asahikawa
+    Machida
+    Iwaki
+    Nagano
+    Toyohashi
+    Suita
+    Toyota
+    Takamatsu
+    Koriyama
+    Kawagoe
+    Okazaki
+    Kochi
+    Tokorozawa
+    Kashiwa
+    Akita
+    Naha
+    Miyazaki
+    Koshigaya
+    Aomori
+    Akashi
+    Morioka
+    Yokkaichi
+    Maebashi
+    Kasugai
+    Ichihara
+    Yao
+    Otsu
+    Tokushima
+    Ichinomiya
+    Kakogawa
+    Neyagawa
+    Ibaraki
+    Fukui
+    Yamagata
+    Hiratsuka
+    Mito
+    Sasebo
 #UNITS Nation1
+,      040,    Ãñ±ø
+,      101,    ÎäÊ¿
+,     102,    ÈÌÕß
+,     300,    ÁãÊ½»ú
+,  040,    民兵
+,  101,    武士
+, 102,    忍者
+, 300,    零式机

branches/highdpi/Localization/zh-Hans/Tribes/Mongols.tribe.txt

-              r123
+              r465
 #CHOOSE ÃÉ¹Å
 #n ÃÉ¹ÅÈË
 #s ÃÉ¹Å
 #a ÃÉ¹Å
+#CHOOSE 蒙古
+#n 蒙古人
+#s 蒙古
+#a 蒙古
 #COLOR 8367B3
 #SYMBOLS Nation2, 91
 …
 #CITIES
+        ¹þÀºÍÁÖ
+        ÉÐÍ¼
+        ÒÁ¿Æ¿¨ÔÞ
+        ÎÚÀ¼°ÍÍÐ
+        ÎÚÀ¼ÎÚµÂ
+        ¶òµÂÄÚÌØ
+        ´ï¶ûº¹
+        ¿ÆÒÁ°ÍÉÆ
+        ÄªÂ¡
+        ÎÚÀ¼¸ñÄ·
+        »ô·üµÂ
+        ÎÚÁÐËþÒÁ
+        °ÍÑïºé¸ñ
+        °Â¶û»ùÒÁ
+        ËÕºÏ°ÍËþ
+        °¢ÍßÒÁÐ»
+        Èû²ßÀ×¼ª
+        É£¶÷É¢µÂ
+        °¢¶ûËþÒÁ
+        °º¶àºº
         Bulgan
         Zuunmod
         Baruun-Urt
         Dalanzadgad
         Mandalgovi
         Zuunharaa
         Cojr
         Batshireet
         Batsumber
         Berh
         Dariganga
         Dasincilen
         Hanh
         Har-Ajrag
         Hagtal
         Hutag
         Nalajh
         Tes
         Tosontsengel
         Tsetserleg
         Tumentsogt
+    哈拉和林
+    尚图
+    伊科卡赞
+    乌兰巴托
+    乌兰乌德
+    厄德内特
+    达尔汗
+    科伊巴善
+    莫隆
+    乌兰格姆
+    霍伏德
+    乌列塔伊
+    巴扬洪格
+    奥尔基伊
+    苏合巴塔
+    阿瓦伊谢
+    塞策雷吉
+    桑恩散德
+    阿尔塔伊
+    昂多汉
+    Bulgan
+    Zuunmod
+    Baruun-Urt
+    Dalanzadgad
+    Mandalgovi
+    Zuunharaa
+    Cojr
+    Batshireet
+    Batsumber
+    Berh
+    Dariganga
+    Dasincilen
+    Hanh
+    Har-Ajrag
+    Hagtal
+    Hutag
+    Nalajh
+    Tes
+    Tosontsengel
+    Tsetserleg
+    Tumentsogt
 #UNITS Nation2
+,     010,    ÒÆÃñÕß
+,     040,    Ãñ±ø
+,     102,    ¼ýÊÖ
+,     102,    µ¶ÊÖ
+,     103,    »ðÇ¹ÊÖ
+,     131,    Âí¹ÊÖ
+,     132,    ÃÉ¹ÅÆï±ø
+,     200,    ·«´¬
+, 010,    移民者
+, 040,    民兵
+, 102,    箭手
+, 102,    刀手
+, 103,    火枪手
+, 131,    马弓手
+, 132,    蒙古骑兵
+, 200,    帆船

branches/highdpi/Localization/zh-Hans/Tribes/Persians.tribe.txt

-              r123
+              r465
 #CHOOSE ²¨Ë¹
 #n ²¨Ë¹ÈË
 #s ²¨Ë¹
 #a ²¨Ë¹
+#CHOOSE 波斯
+#n 波斯人
+#s 波斯
+#a 波斯
 #COLOR EB830B
 #SYMBOLS Nation1, 46
 …
 #CITIES
+        ²¨Ë¹²¨ÀûË¹
+        ÒÁË¹·¨º±
+        ËÕÈø
+        ²¼¹þÀ
+        ´ó²»ÀïÊ¿
+        ¿¦²¼¶û
+        »ô¶ûÄ¾×È
+        ¿Ë¶ûÂü
+        ËþÊ²¸É
+        ÉèÀ×Ó
+        ¿²´ó¹þ
+        °¢ÍßÊ¿
+        °¢±´À
+        °ÍÊ¿À
+        ÔúºÚµ¤
+        °¢Ê²¹þ°ÍµÂ
+        °¢°ÍË¹
+        ¹þÂíµ¤
+        ÀÊ²ÌØ
+        ÎÚ¶ûÃ×Ò®
         Zanjan
         Borazjan
         Artacoana
         Phrada
         Dakyanus
         Bampur
         Tureng Tepe
         Nishapur
         Ctesiphon
         Hatra
         Rhagae
         Hecatompylos
         Maracanda
         Khorasan
         Kyreshata
         Bisitun
         Jiruft
         Darabgird
         Siraf
         Gur
         Shushtar
         Tepe Hissar
         Kashan
         Anshan
         Dezful
         Mohammerah
         Awan
         Simash
         Tepe Sialk
+    波斯波利斯
+    伊斯法罕
+    苏萨
+    布哈拉
+    大不里士
+    喀布尔
+    霍尔木兹
+    克尔曼
+    塔什干
+    设拉子
+    坎大哈
+    阿瓦士
+    阿贝拉
+    巴士拉
+    扎黑丹
+    阿什哈巴德
+    阿巴斯
+    哈马丹
+    拉什特
+    乌尔米耶
+    Zanjan
+    Borazjan
+    Artacoana
+    Phrada
+    Dakyanus
+    Bampur
+    Tureng Tepe
+    Nishapur
+    Ctesiphon
+    Hatra
+    Rhagae
+    Hecatompylos
+    Maracanda
+    Khorasan
+    Kyreshata
+    Bisitun
+    Jiruft
+    Darabgird
+    Siraf
+    Gur
+    Shushtar
+    Tepe Hissar
+    Kashan
+    Anshan
+    Dezful
+    Mohammerah
+    Awan
+    Simash
+    Tepe Sialk
 #UNITS Nation1
+,      040,    Ãñ±ø
+,     101,    ³¤Ã¬ÊÖ
+,     102,    Íäµ¶ÊÖ
+,  040,    民兵
+, 101,    长矛手
+, 102,    弯刀手

branches/highdpi/Localization/zh-Hans/Tribes/Phoenicians.tribe.txt

-              r123
+              r465
 #CHOOSE óÄá»ù
 #n óÄá»ùÈË
 #s óÄá»ù
 #a óÄá»ù
+#CHOOSE 婓尼基
+#n 婓尼基人
+#s 婓尼基
+#a 婓尼基
 #COLOR B3FF00
 #SYMBOLS Nation1, 40
 …
 #CITIES
+        åÈÌ«»ù
+        ±È²¼Á÷Ë¹
+        Î÷¶Ù
+        Ìá¶û
+        ±´ÂÞß¯
+        µÄÀè²¨Àï
+        °Í¶û±´¿Ë
+        °¢À¶ÈË¹
+        Ô¼ÅÁ
+        °¢Ê©¿¦Â×
+        °¢¿ËÀï
+        ÎÚ¼ÓÀûÌØ
+        Î÷Ã×À
+        Èø·¨À¼µÂ
+        ¼ÓµØÑÇ
+        ÎÚÌá¿¨
+        ÂíÀ¿¦
+        °ÍÀûÑÇ
+        ¿¨ÄªÄÉ
+        Èü¿ËÎ÷
         Abdera
         Caralis
         Panormus
         Leptis Parva
         Cartenna
         Rusicade
         Rusucurru
         Girba
         Leptis Magna
         Oea
         Sabratha
         Carthago Nova
         Wy't
         Tinx
         Rusaddit
         Theveste
         Bulla Regia
         Thugga
         Hadrumetum
         Zama Regia
         Thysdris
         Madauros
         Hippou Akra
         Cirta
         Cuicul
         Tipasa
         Lix
         Volubilis
         Ilici
         Hispalis
         Eryx
         Motya
         Drepanon
         Lilybaion
         Icosium
         Iol
         Eivissa
+    迦太基
+    比布流斯
+    西顿
+    提尔
+    贝罗忒
+    的黎波里
+    巴尔贝克
+    阿拉度斯
+    约帕
+    阿施喀伦
+    阿克里
+    乌加利特
+    西米拉
+    萨法兰德
+    加地亚
+    乌提卡
+    马拉喀
+    巴利亚
+    卡莫纳
+    赛克西
+    Abdera
+    Caralis
+    Panormus
+    Leptis Parva
+    Cartenna
+    Rusicade
+    Rusucurru
+    Girba
+    Leptis Magna
+    Oea
+    Sabratha
+    Carthago Nova
+    Wy't
+    Tinx
+    Rusaddit
+    Theveste
+    Bulla Regia
+    Thugga
+    Hadrumetum
+    Zama Regia
+    Thysdris
+    Madauros
+    Hippou Akra
+    Cirta
+    Cuicul
+    Tipasa
+    Lix
+    Volubilis
+    Ilici
+    Hispalis
+    Eryx
+    Motya
+    Drepanon
+    Lilybaion
+    Icosium
+    Iol
+    Eivissa
 #UNITS Nation1
+,      040,    Ãñ±ø
+,     131,    Ïó±ø
+,     201,    Ð¡·«´¬
+,  040,    民兵
+, 131,    象兵
+, 201,    小帆船

branches/highdpi/Localization/zh-Hans/Tribes/Romans.tribe.txt

-              r123
+              r465
 #CHOOSE ¹ÅÂÞÂí
 #n ÂÞÂíÈË
 #s ÂÞÂí
 #a ÂÞÂí
+#CHOOSE 古罗马
+#n 罗马人
+#s 罗马
+#a 罗马
 #COLOR FFFFFF
 #SYMBOLS Nation1, 49
 …
 #CITIES
+        ÂÞÂí
+        °ÂË¹µÙÑÇ
+        ÅÁÒÁË¹ëø
+        ¿¨ÆÕ°¢
+        Ëþ¿üÄáÑÇ
+        Äá°¢²¨ÀûË¹
+        ÅÓÅà
+        ¶ò¿¼ÀÅ©
+        °¢°ÍÂ¡¼Ó
+        °¢¿üÀ×ÑÇ
+        ËþÀÎ÷ÄÉ
+        ¿¨Î÷ÄÛ
+        ±´ÄÚÎÄÍÍ
+        ÈøÍ¼ÄáÑÇ
+        ¿ËÂ¬ÐÞ
+        °¢À×Ìï
+        ¿¨Î÷ÀïÄÛ
+        ÈÈÅ¬ÑÇ
+        Ã·µÏ°ÂÀÅ©
+        Èø°ÍµÙÑÇ
         Asculum
         Populonia
         Castrum Novum
         Fanum Fortunae
         Venusia
         Brundisium
         Canusium
         Panormus
         Opitergium
         Altinum
         Patavium
         Regium Lepicum
         Augusta Taurinorum
         Cremona
         Mutina
         Forum Livi
         Forum Sempronii
         Florentia
         Pisae
         Reate
         Amiternum
         Tarentum
         Pometia
         Tusculum
         Nomentum
         Lavinium
         Signia
         Antium
         Velitrae
         Praeneste
         Aquilonia
         Bonomia
         Patavium
         Volaterrae
         Vetulonia
         Potentia
         Pisaurum
         Aeclanum
         Grumentum
         Liternum
         Puteoli
         Fabrateria Nova
         Sipontum
         Buxentum
         Castrum Hannibalis
         Minervium
         Augusta Praetoria
         Brixia
         Sena Iulia
         Hispellum
+    罗马
+    奥斯蒂亚
+    帕伊斯滕
+    卡普阿
+    塔奎尼亚
+    尼阿波利斯
+    庞培
+    厄考拉农
+    阿巴隆加
+    阿奎雷亚
+    塔拉西纳
+    卡西嫩
+    贝内文屯
+    萨图尼亚
+    克卢修
+    阿雷田
+    卡西里嫩
+    热努亚
+    梅迪奥拉农
+    萨巴蒂亚
+    Asculum
+    Populonia
+    Castrum Novum
+    Fanum Fortunae
+    Venusia
+    Brundisium
+    Canusium
+    Panormus
+    Opitergium
+    Altinum
+    Patavium
+    Regium Lepicum
+    Augusta Taurinorum
+    Cremona
+    Mutina
+    Forum Livi
+    Forum Sempronii
+    Florentia
+    Pisae
+    Reate
+    Amiternum
+    Tarentum
+    Pometia
+    Tusculum
+    Nomentum
+    Lavinium
+    Signia
+    Antium
+    Velitrae
+    Praeneste
+    Aquilonia
+    Bonomia
+    Patavium
+    Volaterrae
+    Vetulonia
+    Potentia
+    Pisaurum
+    Aeclanum
+    Grumentum
+    Liternum
+    Puteoli
+    Fabrateria Nova
+    Sipontum
+    Buxentum
+    Castrum Hannibalis
+    Minervium
+    Augusta Praetoria
+    Brixia
+    Sena Iulia
+    Hispellum
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation1
+,      101,    ÂÞÂí²½±ø
+,     131,    ÂÞÂíÆï±ø
+,     200,    ¶à½°´¬
+,  101,    罗马步兵
+, 131,    罗马骑兵
+, 200,    多桨船

branches/highdpi/Localization/zh-Hans/Tribes/Russians.tribe.txt

-              r123
+              r465
 #CHOOSE ¶í¹ú
 #n ¶í¹úÈË
 #s ¶í¹ú
 #a ¶íÂÞË¹
+#CHOOSE 俄国
+#n 俄国人
+#s 俄国
+#a 俄罗斯
 #COLOR E70000
 #SYMBOLS Nation2, 94
 …
 #CITIES
+        ÄªË¹¿Æ
+        Ê¥±ËµÃ±¤
+        »ù¸¨
+        Ã÷Ë¹¿Ë
+        °½µÂÈø
+        Ë¹Î¬¶ûµÂÂå·òË¹¿Ë
+        º£²ÎáË
+        Åµ·ò¸çÂÞµÂ
+        ¹þ¶û¿Æ·ò
+        ¿ËÀË¹ÅµÑÇË¹¿Ë
+        ÂÞË¹ÍÐ·ò
+        ¿â¶ûË¹¿Ë
+        ÈøÂíÀ
+        Âí¸ñÄáÍÐ¸ç¶ûË¹¿Ë
+        ÑÅÂÞË¹ÀÎÖ
+        ÐÂÎ÷²®ÀûÑÇ
+        ¶õÄ¾Ë¹¿Ë
+        Ë¹Ä¦ÀâË¹¿Ë
+        ±Ë¶ûÄ·
+        ÎÖÂÞÄùÊ²
         Sevastopol
         Ufa
         Krivoy Rog
         Niznij Novgorod
         Chelabinsk
         Dnipropetrovsk
         Donetsk
         Volgograd
         Voronezh
         Saratov
         Zaporizhzhya
         Lviv
         Toljatti
         Simbirsk
         Izhevsk
         Krasnodar
         Chabarovsk
         Irkutsk
         Barnaul
         Novokuzneck
         Penza
         Razan
         Orenburg
         Lipeck
         Naberezhnyje Chelny
         Mykolayiv
         Tula
         Gomel
         Tumen
         Kemerovo
         Mariupol
         Astrachan
         Tomsk
         Kirov
         Ivanovo
         Luhansk
         Bransk
         Cheboksary
         Tver
         Nizhnij Tagil
         Makiyivka
         Murmansk
         Mogilev
         Kurgan
         Archangelsk
         Sochi
         Vitebsk
         Vinnytsya
         Orel
         Stavropol
         Simferopol
         Kaluga
         Vladimir
         Belgorod
         Machachkala
         Kherson
         Cherepovec
         Poltava
         Saransk
         Tambov
         Chita
         Vladikavkaz
         Grodno
         Vologda
         Chernihiv
         Komsomolsk-na-Amure
         Cherkasy
         Sumy
         Horlivka
         Volzhskij
         Kostroma
         Taganrog
         Zhytomyr
         Petrozavodsk
         Dzerzhinsk
         Surgut
         Orsk
         Angarsk
         Sterlitamak
+    莫斯科
+    圣彼得堡
+    基辅
+    明斯克
+    敖德萨
+    斯维尔德洛夫斯克
+    海参崴
+    诺夫哥罗德
+    哈尔科夫
+    克拉斯诺亚斯克
+    罗斯托夫
+    库尔斯克
+    萨马拉
+    马格尼托哥尔斯克
+    雅罗斯拉沃
+    新西伯利亚
+    鄂木斯克
+    斯摩棱斯克
+    彼尔姆
+    沃罗涅什
+    Sevastopol
+    Ufa
+    Krivoy Rog
+    Niznij Novgorod
+    Chelabinsk
+    Dnipropetrovsk
+    Donetsk
+    Volgograd
+    Voronezh
+    Saratov
+    Zaporizhzhya
+    Lviv
+    Toljatti
+    Simbirsk
+    Izhevsk
+    Krasnodar
+    Chabarovsk
+    Irkutsk
+    Barnaul
+    Novokuzneck
+    Penza
+    Razan
+    Orenburg
+    Lipeck
+    Naberezhnyje Chelny
+    Mykolayiv
+    Tula
+    Gomel
+    Tumen
+    Kemerovo
+    Mariupol
+    Astrachan
+    Tomsk
+    Kirov
+    Ivanovo
+    Luhansk
+    Bransk
+    Cheboksary
+    Tver
+    Nizhnij Tagil
+    Makiyivka
+    Murmansk
+    Mogilev
+    Kurgan
+    Archangelsk
+    Sochi
+    Vitebsk
+    Vinnytsya
+    Orel
+    Stavropol
+    Simferopol
+    Kaluga
+    Vladimir
+    Belgorod
+    Machachkala
+    Kherson
+    Cherepovec
+    Poltava
+    Saransk
+    Tambov
+    Chita
+    Vladikavkaz
+    Grodno
+    Vologda
+    Chernihiv
+    Komsomolsk-na-Amure
+    Cherkasy
+    Sumy
+    Horlivka
+    Volzhskij
+    Kostroma
+    Taganrog
+    Zhytomyr
+    Petrozavodsk
+    Dzerzhinsk
+    Surgut
+    Orsk
+    Angarsk
+    Sterlitamak
 #UNITS Nation2
+,     010,    ÒÆÃñÕß
+,     040,    Ãñ±ø
+,     102,    ³¤Ã¬ÊÖ
+,     104,    ²½Ç¹ÊÖ
+,     133,    ¸çÈø¿ËÆï±ø
+,     134,    ÇáÆï±ø
+,     135,    T-34Ì¹¿Ë
 ,     301,    Ã×¸ñ-29
+, 010,    移民者
+, 040,    民兵
+, 102,    长矛手
+, 104,    步枪手
+, 133,    哥萨克骑兵
+, 134,    轻骑兵
+, 135,    T-34坦克
+, 301,    米格-29

branches/highdpi/Localization/zh-Hans/Tribes/Spanish.tribe.txt

-              r123
+              r465
 #CHOOSE Î÷°àÑÀ
 #n Î÷°àÑÀÈË
 #s Î÷°àÑÀ
 #a Î÷°àÑÀ
+#CHOOSE 西班牙
+#n 西班牙人
+#s 西班牙
+#a 西班牙
 #COLOR FFFF00
 #SYMBOLS Nation1, 47
 …
 #CITIES
+        ÂíµÂÀï
+        ÈûÎ¬ÀûÑÇ
+        ÍÐÀ³¶à
+        ¿Æ¶à°Í
+        ÍßÂ×Î÷ÑÇ
+        ÈøÀÂü¿¨
+        °ÍÈûÂÞÄÇ
+        ÍßÀ¶àÀûµÂ
+        ÈøÀ¸êÈø
+        ¿¨µÏ×È
+        ±Ï¶û°Í¶õ
+        ¸ñÁÖÄÉ´ï
+        ÂíÀ¼Ó
+        ÅËÆÕÂÞÄÇ
+        Î¬¸ê
+        °¢Î¬À
+        ÁÐ°º
+        ÄÂ¶ûÎ÷ÑÇ
+        °ÂÎ¬Ò®¶à
+        É£Ì¹µÂ
         Burgos
         Ciudad Rodrigo
         Calatrava
         Cartagena
         Las Palmas
         Palma de Mallorca
         Alicante
         Gijon
         L'Hospitalet
         A Coruna
         Vitoria-Gasteiz
         Santa Cruz de Tenerife
         Badalona
         Elche
         Mostoles
         Sabadell
         Jerez de la Frontera
         Donostia-San Sebastian
         Fuenlabrada
         Terrassa
         Leganes
         Alcala de Henares
         Almeria
         Getafe
         Albacete
         Alcorcon
         Castellon de la Plana
         Huelva
         Badajoz
         La Laguna
         Logrono
         Santa Coloma de Gramanet
         Tarragona
         Lleida
         Jaen
         Marbella
         Ourense
         Mataro
         Algeciras
         Dos Hermanas
         Torrejon de Ardoz
         Barakaldo
         Santiago de Compostela
         Alcobendas
         Reus
         Telde
         Lugo
         San Fernando
         Getxo
         Aviles
         Caceres
         Cornella
         Palencia
         Ferrol
         Sant Boi
         Coslada
         Parla
         Lorca
         El Puerto de Santa Maria
         Talavera de la Reina
         Pontevedra
         Ceuta
         Girona
         Melilla
         Pozuelo de Alarcon
         Guadalajara
         Zamora
         Torrent
         Manresa
         Ponferrada
         El Prat
         Chiclana de la Frontera
         Sanlucar de Barrameda
         Ciudad Real
         La Linea de la Concepcion
         Rubi
         Alcoy
         Gandia
         San Sebastian de los Reyes
         Las Rozas de Madrid
         Torrevieja
         Alcala de Guadaira
+    马德里
+    塞维利亚
+    托莱多
+    科多巴
+    瓦伦西亚
+    萨拉曼卡
+    巴塞罗那
+    瓦拉多利德
+    萨拉戈萨
+    卡迪兹
+    毕尔巴鄂
+    格林纳达
+    马拉加
+    潘普罗那
+    维戈
+    阿维拉
+    列昂
+    穆尔西亚
+    奥维耶多
+    桑坦德
+    Burgos
+    Ciudad Rodrigo
+    Calatrava
+    Cartagena
+    Las Palmas
+    Palma de Mallorca
+    Alicante
+    Gijon
+    L'Hospitalet
+    A Coruna
+    Vitoria-Gasteiz
+    Santa Cruz de Tenerife
+    Badalona
+    Elche
+    Mostoles
+    Sabadell
+    Jerez de la Frontera
+    Donostia-San Sebastian
+    Fuenlabrada
+    Terrassa
+    Leganes
+    Alcala de Henares
+    Almeria
+    Getafe
+    Albacete
+    Alcorcon
+    Castellon de la Plana
+    Huelva
+    Badajoz
+    La Laguna
+    Logrono
+    Santa Coloma de Gramanet
+    Tarragona
+    Lleida
+    Jaen
+    Marbella
+    Ourense
+    Mataro
+    Algeciras
+    Dos Hermanas
+    Torrejon de Ardoz
+    Barakaldo
+    Santiago de Compostela
+    Alcobendas
+    Reus
+    Telde
+    Lugo
+    San Fernando
+    Getxo
+    Aviles
+    Caceres
+    Cornella
+    Palencia
+    Ferrol
+    Sant Boi
+    Coslada
+    Parla
+    Lorca
+    El Puerto de Santa Maria
+    Talavera de la Reina
+    Pontevedra
+    Ceuta
+    Girona
+    Melilla
+    Pozuelo de Alarcon
+    Guadalajara
+    Zamora
+    Torrent
+    Manresa
+    Ponferrada
+    El Prat
+    Chiclana de la Frontera
+    Sanlucar de Barrameda
+    Ciudad Real
+    La Linea de la Concepcion
+    Rubi
+    Alcoy
+    Gandia
+    San Sebastian de los Reyes
+    Las Rozas de Madrid
+    Torrevieja
+    Alcala de Guadaira
 #UNITS StdUnits
+,     040,    Ãñ±ø
+, 040,    民兵
 #UNITS Nation1
+,      103,    »ðÇ¹ÊÖ
+,     133,    ÇáÆï±ø
+,     201,    ¾ü½¢
+,  103,    火枪手
+, 133,    轻骑兵
+, 201,    军舰

branches/highdpi/Localization/zh-Hans/Tribes/StdUnits.txt

-              r123
+              r465
 ,      074,    Å«Á¥ÀÍ¹¤
 ,      075,    ×ÔÓÉÃñÖÚ
 ,      071,    Ð¡Ç±Í§
 ,      073,    »¬Ïè»ú
 ,      064,    µ¥Î¦·«´¬
 ,     010,    ÍØ»ÄÕß
 ,     011,    ¹¤³ÌÊ¦
 ,     021,    ÌØÖÖ±ø
 ,     030,    ½¨Éè¶Ó
 ,     017,    ½¨³ÇµØ
 ,     041,    ÊØ³ÇÎÀ±ø
 ,     100,    ÂùÕ½Ê¿
 ,     100,    ¹±ø
 ,     100,    ÂùÕ½Ê¿
 ,     100,    ÂùÕ½Ê¿
 ,     101,    ÂÞÂí¾üÍÅ
 ,     101,    ³¤Ã¬ÊÖ
 ,     101,    ·½Õó±ø
 ,     101,    ¼ýÊÖ
 ,     102,    ÊØÎÀ
 ,     102,    ÊØÎÀ
 ,     102,    ÊØÎÀ
 ,     102,    ÊØÎÀ
 ,     103,    »ðÇ¹ÊÖ
 ,     103,    »ðÇ¹ÊÖ
 ,     103,    »ðÇ¹ÊÖ
 ,     103,    »ðÇ¹ÊÖ
 ,     104,    ²½Ç¹ÊÖ
 ,     104,    ²½Ç¹ÊÖ
 ,     104,    ²½Ç¹ÊÖ
 ,     104,    ²½Ç¹ÊÖ
 ,     105,    ²½±ø
 ,     105,    ²½±ø
 ,     105,    ²½±ø
 ,     105,    ²½±ø
 ,     106,    Â½Õ½¶Ó
 ,     106,    Â½Õ½¶Ó
 ,     106,    Â½Õ½¶Ó
 ,     106,    Â½Õ½¶Ó
 ,     110,    ×°¼×²½±ø
 ,     110,    ×°¼×²½±ø
 ,     110,    ×°¼×²½±ø
 ,     110,    ×°¼×²½±ø
 ,     130,    Æï±ø
 ,     130,    Æï±ø
 ,     130,    Æï±ø
 ,     130,    Æï±ø
 ,     131,    Æï±ø
 ,     131,    Æï±ø
 ,     131,    Æï±ø
 ,     131,    Æï±ø
 ,     132,    ÆïÊ¿
 ,     132,    ÆïÊ¿
 ,     132,    ÆïÊ¿
 ,     132,    ÆïÊ¿
 ,     133,    ÁúÆï±ø
 ,     133,    ÁúÆï±ø
 ,     133,    ÁúÆï±ø
 ,     133,    ÁúÆï±ø
 ,     134,    ÇáÆï±ø
 ,     134,    ÇáÆï±ø
 ,     134,    ÇáÆï±ø
 ,     134,    ÇáÆï±ø
 ,     135,    Ì¹¿Ë
 ,     135,    Ì¹¿Ë
 ,     135,    Ì¹¿Ë
 ,     135,    Ì¹¿Ë
 ,     136,    ×°¼×³µ
 ,     136,    ×°¼×³µ
 ,     136,    ×°¼×³µ
 ,     136,    ×°¼×³µ
 ,    170,    Í¶Ê¯³µ
 ,    170,    ¹¥³ÇËþ
 ,    170,    åóÅÚ
 ,    170,    åóÅÚ
 ,    171,    ¼ÓÅ©ÅÚ
 ,    171,    ¼ÓÅ©ÅÚ
 ,    171,    ¼ÓÅ©ÅÚ
 ,    171,    ¼ÓÅ©ÅÚ
 ,    172,    Áñµ¯ÅÚ
 ,    172,    Áñµ¯ÅÚ
 ,    172,    Áñµ¯ÅÚ
 ,    172,    Áñµ¯ÅÚ
 ,    173,    »ð¼ýÅÚ
 ,    173,    »ð¼ýÅÚ
 ,    173,    »ð¼ýÅÚ
 ,    173,    »ð¼ýÅÚ
 ,    200,    ·«´¬
 ,    200,    ·«´¬
 ,    200,    ·«´¬
 ,    200,    ·«´¬
 ,    201,    ´ó·«´¬
 ,    201,    ¿ìËÙ·«´¬
 ,    201,    »¤ÎÀ½¢
 ,    201,    »¤ÎÀ½¢
 ,    202     Ìú¼×½¢
 ,    202,    ÇýÖð½¢
 ,    202,    Ñ²Ñó½¢
 ,    202,    Ñ²Ñó½¢
 ,    203,    µ¼µ¯Ñ²Ñó½¢
 ,    203,    Õ½ÁÐ½¢
 ,    203,    Õ½ÁÐÑ²Ñó½¢
 ,    203,    Õ½ÁÐ½¢
 ,    210,    ÔËÊä½¢
 ,    210,    ÔËÊä½¢
 ,    210,    ÔËÊä½¢
 ,    210,    ÔËÊä½¢
 ,    220,    º½Ä¸
 ,    220,    º½Ä¸
 ,    220,    º½Ä¸
 ,    220,    º½Ä¸
 ,    240,    Ç±Í§
 ,    240,    Ç±Í§
 ,    240,    Ç±Í§
 ,    240,    Ç±Í§
 ,    300,    Õ½¶·»ú
 ,    300,    Õ½¶·»ú
 ,    300,    Õ½¶·»ú
 ,    300,    Õ½¶·»ú
 ,    301,    ÅçÆøÕ½¶·»ú
 ,    301,    ÅçÆøÕ½¶·»ú
 ,    301,    Ö±Éý»ú
 ,    301,    ÅçÆøÕ½¶·»ú
 ,    310,    ºäÕ¨»ú
 ,    310,    ºäÕ¨»ú
 ,    310,    ·ÉÍ§
 ,    310,    ºäÕ¨»ú
 ,    311,    ÏÖ´úºäÕ¨»ú
 ,    311,    ÏÖ´úºäÕ¨»ú
 ,    311,    ÏÖ´úºäÕ¨»ú
 ,    311,    ÏÖ´úºäÕ¨»ú
+,  074,    奴隶劳工
+,  075,    自由民众
+,  071,    小潜艇
+,  073,    滑翔机
+,  064,    单桅帆船
+, 010,    拓荒者
+, 011,    工程师
+, 021,    特种兵
+, 030,    建设队
+, 017,    建城地
+, 041,    守城卫兵
+, 100,    蛮战士
+, 100,    弓兵
+, 100,    蛮战士
+, 100,    蛮战士
+, 101,    罗马军团
+, 101,    长矛手
+, 101,    方阵兵
+, 101,    箭手
+, 102,    守卫
+, 102,    守卫
+, 102,    守卫
+, 102,    守卫
+, 103,    火枪手
+, 103,    火枪手
+, 103,    火枪手
+, 103,    火枪手
+, 104,    步枪手
+, 104,    步枪手
+, 104,    步枪手
+, 104,    步枪手
+, 105,    步兵
+, 105,    步兵
+, 105,    步兵
+, 105,    步兵
+, 106,    陆战队
+, 106,    陆战队
+, 106,    陆战队
+, 106,    陆战队
+, 110,    装甲步兵
+, 110,    装甲步兵
+, 110,    装甲步兵
+, 110,    装甲步兵
+, 130,    骑兵
+, 130,    骑兵
+, 130,    骑兵
+, 130,    骑兵
+, 131,    骑兵
+, 131,    骑兵
+, 131,    骑兵
+, 131,    骑兵
+, 132,    骑士
+, 132,    骑士
+, 132,    骑士
+, 132,    骑士
+, 133,    龙骑兵
+, 133,    龙骑兵
+, 133,    龙骑兵
+, 133,    龙骑兵
+, 134,    轻骑兵
+, 134,    轻骑兵
+, 134,    轻骑兵
+, 134,    轻骑兵
+, 135,    坦克
+, 135,    坦克
+, 135,    坦克
+, 135,    坦克
+, 136,    装甲车
+, 136,    装甲车
+, 136,    装甲车
+, 136,    装甲车
+,    170,    投石车
+,    170,    攻城塔
+,    170,    弩炮
+,    170,    弩炮
+,    171,    加农炮
+,    171,    加农炮
+,    171,    加农炮
+,    171,    加农炮
+,    172,    榴弹炮
+,    172,    榴弹炮
+,    172,    榴弹炮
+,    172,    榴弹炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    200,    帆船
+,    200,    帆船
+,    200,    帆船
+,    200,    帆船
+,    201,    大帆船
+,    201,    快速帆船
+,    201,    护卫舰
+,    201,    护卫舰
+,    202 铁甲舰
+,    202,    驱逐舰
+,    202,    巡洋舰
+,    202,    巡洋舰
+,    203,    导弹巡洋舰
+,    203,    战列舰
+,    203,    战列巡洋舰
+,    203,    战列舰
+,    210,    运输舰
+,    210,    运输舰
+,    210,    运输舰
+,    210,    运输舰
+,    220,    航母
+,    220,    航母
+,    220,    航母
+,    220,    航母
+,    240,    潜艇
+,    240,    潜艇
+,    240,    潜艇
+,    240,    潜艇
+,    300,    战斗机
+,    300,    战斗机
+,    300,    战斗机
+,    300,    战斗机
+,    301,    喷气战斗机
+,    301,    喷气战斗机
+,    301,    直升机
+,    301,    喷气战斗机
+,    310,    轰炸机
+,    310,    轰炸机
+,    310,    飞艇
+,    310,    轰炸机
+,    311,    现代轰炸机
+,    311,    现代轰炸机
+,    311,    现代轰炸机
+,    311,    现代轰炸机

branches/highdpi/Localization/zh-Hans/Tribes/Vikings.tribe.txt

-              r123
+              r465
 #CHOOSE Î¬¾©
 #n Î¬¾©ÈË
 #s Î¬¾©
 #a Î¬¾©
+#CHOOSE 维京
+#n 维京人
+#s 维京
+#a 维京
 #COLOR 9FBB8B
 #SYMBOLS Nation2, 93
 …
 #CITIES
+        ÌØÂ¡ºÕÄ·
+        ÎÚÆÕÈøÀ
+        °Â¶ûºúË¹
+        Î¬±¤
+        ÂÞË¹»ùÀÕ
+        ÁÖµÂ»ôÄ·
+        Ë¹¿¨À
+        Å·µÇÈû
+        À¼µÂ
+        Ë¹µÂ¸ç¶ûÄ¦
+        °ÂË¹Â½
+        ¸ç±¾¹þ¸ù
+        ¸çµÂ±¤
+        Âí¶ûÄ¬
+        ±°¶û¸ù
+        °Â¶û±¤
+        ºÕ¶ûÐÁ±¤
+        À×¿ËÑÅÎ´¿Ë
+        °ÂÀ×²¼Âå
+        Åµ¶û¿ÆÆ½
         Linkoping
         Vasteras
         Jonkoping
         Kaupang
         Hladir
         The Udal
         Jorvik
         Westness
         Ravning Enge
         Birka
         Jarlshof
         Sigtuna
         Larne
         Hedeby
         Aldeigjuborg
         Nonnebakken
         Stavanger
         Umea
         Baerum
         Boras
         Sundsvall
         Gavle
         Frederiksberg
         Eskilstuna
         Halmstad
         Huddinge
         Esbjerg
         Karlstad
         Sodertalje
         Nacka
         Kristianstad
         Vaxjo
         Botkyrka
         Skelleftea
         Lulea
         Kristiansand
         Haninge
         Gentofte
         Fredrikstad
         Kungsbacka
         Randers
         Gladsakse
         Kolding
         Karlskrona
         Jarfalla
         Taby
         Kalmar
         Helsingor
         Ostersund
         Tromso
         Sollentuna
         Herning
         Gotland
         Solna
         Horsens
         Molndal
         Ornskoldsvik
         Falun
         Drammen
         Vejle
         Trollhattan
         Varberg
         Norrtalje
         Silkeborg
         Sandnes
         Lyngby-Tarbaek
         Skien
         Skovde
         Hvidovre
         Nykoping
         Uddevalla
         Hassleholm
         Asker
         Fredericia
         Greve
         Borlange
         Sarpsborg
         Naestved
         Hoje Tastrup
         Ballerup
         Svendborg
         Lillehammer
         Kopavogur
         Hafnarfjordur
         Akureyri
         Godthab
         Holsteinsborg
+    特隆赫姆
+    乌普萨拉
+    奥尔胡斯
+    维堡
+    罗斯基勒
+    林德霍姆
+    斯卡拉
+    欧登塞
+    兰德
+    斯德哥尔摩
+    奥斯陆
+    哥本哈根
+    哥德堡
+    马尔默
+    卑尔根
+    奥尔堡
+    赫尔辛堡
+    雷克雅未克
+    奥雷布洛
+    诺尔科平
+    Linkoping
+    Vasteras
+    Jonkoping
+    Kaupang
+    Hladir
+    The Udal
+    Jorvik
+    Westness
+    Ravning Enge
+    Birka
+    Jarlshof
+    Sigtuna
+    Larne
+    Hedeby
+    Aldeigjuborg
+    Nonnebakken
+    Stavanger
+    Umea
+    Baerum
+    Boras
+    Sundsvall
+    Gavle
+    Frederiksberg
+    Eskilstuna
+    Halmstad
+    Huddinge
+    Esbjerg
+    Karlstad
+    Sodertalje
+    Nacka
+    Kristianstad
+    Vaxjo
+    Botkyrka
+    Skelleftea
+    Lulea
+    Kristiansand
+    Haninge
+    Gentofte
+    Fredrikstad
+    Kungsbacka
+    Randers
+    Gladsakse
+    Kolding
+    Karlskrona
+    Jarfalla
+    Taby
+    Kalmar
+    Helsingor
+    Ostersund
+    Tromso
+    Sollentuna
+    Herning
+    Gotland
+    Solna
+    Horsens
+    Molndal
+    Ornskoldsvik
+    Falun
+    Drammen
+    Vejle
+    Trollhattan
+    Varberg
+    Norrtalje
+    Silkeborg
+    Sandnes
+    Lyngby-Tarbaek
+    Skien
+    Skovde
+    Hvidovre
+    Nykoping
+    Uddevalla
+    Hassleholm
+    Asker
+    Fredericia
+    Greve
+    Borlange
+    Sarpsborg
+    Naestved
+    Hoje Tastrup
+    Ballerup
+    Svendborg
+    Lillehammer
+    Kopavogur
+    Hafnarfjordur
+    Akureyri
+    Godthab
+    Holsteinsborg
 #UNITS Nation2
+,     010,    ÒÆÃñÕß
+,     040,    Ãñ±ø
+,     101,    ³¤Ã¬ÊÖ
+,     101,    ÂùÕ½Ê¿
+,     102,    ¼ýÊÖ
+,     102,    ½£Ê¿
+,     102,    ½£Ê¿
+,     133,    ·çÆï±ø
+, 010,    移民者
+, 040,    民兵
+, 101,    长矛手
+, 101,    蛮战士
+, 102,    箭手
+, 102,    剑士
+, 102,    剑士
+, 133,    风骑兵

branches/highdpi/Localization/zh-Hant/Help/Help.txt

-              r464
+              r465
 #HELPTITLE_MAIN ´åÀ¸«ü«n
 #HELPTITLE_QUICKSTART §Ö³t¤W¤â
 #HELPTITLE_CONCEPTS ·§©À¸Ñ»¡
 #HELPTITLE_TECHLIST ¬ì§Þ¤@Äý
 #HELPTITLE_IMPLIST «°¥«³]¬I
 #HELPTITLE_UNIQUELIST °ê®a¤uµ{
 #HELPTITLE_WONDERLIST ¥@¬É©_¸ñ
 #HELPTITLE_TERLIST ¦a§ÎÏúÃþ
 #HELPTITLE_JOBLIST ¦a§Î«Ø³]
 #HELPTITLE_MODELLIST ¯S®í³¡¶¤
 #HELPTITLE_FEATURELIST ³¡¶¤ÄÝ©Ê
 #HELPTITLE_FEATURE1LIST °ò¥»ÄÝ©Ê
 #HELPTITLE_FEATURE2LIST ¯S®íÄÝ©Ê
 #HELPTITLE_FEATURE3LIST ¬ì§ÞÄÝ©Ê
 #HELPTITLE_GOVLIST ¬FÊ^¤@Äý
 #HELPTITLE_KEYS §Ö±¶¾Þ§@
 #HELPTITLE_ABOUT Ãö¤_´åÀ¸
 #HELPTITLE_CREDITS ¨î§@¦W³æ
 #HELPTITLE_SEARCHRESULTS ·j¯Áµ²ªG
 #HELPSPEC_TER (¦a§ÎÏúÃþ)
 #HELPSPEC_ADV (¬ì§Þ¦¨ªG)
 #HELPSPEC_FUTURE (¥¼¨Ó¬ì§Þ)
 #HELPSPEC_IMP («°¥«³]¬I)
 #HELPSPEC_NAT (°ê®a¤uµ{)
 #HELPSPEC_WONDER (¥@¬É©_¸ñ)
 #HELPSPEC_SHIPPART (¸²î³¡¥ó)
 #HELPSPEC_CAP (³¡¶¤°ò¥»ÄÝ©Ê)
 #HELPSPEC_FEATURE (³¡¶¤¯S®íÄÝ©Ê)
 #HELPSPEC_STANDARD (³¡¶¤¬ì§ÞÄÝ©Ê)
+#HELPTITLE_MAIN 游戲指南
+#HELPTITLE_QUICKSTART 快速上手
+#HELPTITLE_CONCEPTS 概念解說
+#HELPTITLE_TECHLIST 科技一覽
+#HELPTITLE_IMPLIST 城市設施
+#HELPTITLE_UNIQUELIST 國家工程
+#HELPTITLE_WONDERLIST 世界奇跡
+#HELPTITLE_TERLIST 地形种類
+#HELPTITLE_JOBLIST 地形建設
+#HELPTITLE_MODELLIST 特殊部隊
+#HELPTITLE_FEATURELIST 部隊屬性
+#HELPTITLE_FEATURE1LIST 基本屬性
+#HELPTITLE_FEATURE2LIST 特殊屬性
+#HELPTITLE_FEATURE3LIST 科技屬性
+#HELPTITLE_GOVLIST 政体一覽
+#HELPTITLE_KEYS 快捷操作
+#HELPTITLE_ABOUT 關于游戲
+#HELPTITLE_CREDITS 制作名單
+#HELPTITLE_SEARCHRESULTS 搜索結果
+#HELPSPEC_TER (地形种類)
+#HELPSPEC_ADV (科技成果)
+#HELPSPEC_FUTURE (未來科技)
+#HELPSPEC_IMP (城市設施)
+#HELPSPEC_NAT (國家工程)
+#HELPSPEC_WONDER (世界奇跡)
+#HELPSPEC_SHIPPART (飛船部件)
+#HELPSPEC_CAP (部隊基本屬性)
+#HELPSPEC_FEATURE (部隊特殊屬性)
+#HELPSPEC_STANDARD (部隊科技屬性)
 #TECHFORMULA %.6g*n*EXP(n/%.6g)
 #PREREQ ¥ý´Á©Ò»Ý¬ì§Þ
 #PREREQALT ¥ý´Á©Ò»Ý¬ì§Þ (¤T¶µ¤¤»Ý¨ã³Æ¨â¶µ)
 #BASETECH (¦E®É¥N¬ì§Þ)
 #STRENGTHUP %s: ¾Ô¤æ¤O¿¼W¦]¤l +%d
 #COSTUP (³yÉ²¿¼W¦]¤l +%d)
 #COSTMIN (³yÉ²¿¼W¦]¤l ¤W¤É¦Ü %d)
 #TRANSUP %s: ¹B¿é¤O¿¼W¦]¤l +%d
 #ADVEFFECT ¥\®Ä
 #EFFECT ®ÄªG
 #COSTS ³yÉ²
 #BUILDCOST ¥Í²£³yÉ²: %d%%p
 #MAINTCOST ºûÅ@¶O¥Î: ¨C¦^¦X %d%%c
 #REPLACE §ó´À
 #REPLACETEXT ¦¹³]¬I«Ø¦¨¦Z, ¤U¦C³]¬I±N¦Û°Ê§@¼o, ÅÜ½æ§é²{:
 #EXPIRATION ¹L´Á
 #EXPWITH %sµo²{¤§¦Z, ¸Ó®ÄªG±N¹L´Á.
 #EXPSLAVE ©Ò¦³¥£Æ×¦¨¬°¦Û¥Ñ¤H, ¦}°±¤î¤u§@.
 #REQUIRED ©Ò»Ý¬ì§Þ: %s
 #RAREREQUIRED ¥Í²£»Ýn %s
 #RESFOOD Â³¹: %d%%f
 #RESPROD ¥Í²£: %d%%p
 #RESTRADE ¶T©ö: %d%%t
 #MOREIRR (Äéµ@¦Z +%d%%f)
 #MOREMINE (ªöÄq¦Z +%d%%p)
 #MOREROAD (×¸ô¦Z +%d%%t)
 #SPECIAL ¯S®í¸ê·½
+#PREREQ 先期所需科技
+#PREREQALT 先期所需科技 (三項中需具備兩項)
+#BASETECH (划時代科技)
+#STRENGTHUP %s: 戰斗力倍增因子 +%d
+#COSTUP (造价倍增因子 +%d)
+#COSTMIN (造价倍增因子 上升至 %d)
+#TRANSUP %s: 運輸力倍增因子 +%d
+#ADVEFFECT 功效
+#EFFECT 效果
+#COSTS 造价
+#BUILDCOST 生產造价: %d%%p
+#MAINTCOST 維護費用: 每回合 %d%%c
+#REPLACE 更替
+#REPLACETEXT 此設施建成后, 下列設施將自動作廢, 變賣折現:
+#EXPIRATION 過期
+#EXPWITH %s發現之后, 該效果將過期.
+#EXPSLAVE 所有奴成為自由人, 并停止工作.
+#REQUIRED 所需科技: %s
+#RAREREQUIRED 生產需要 %s
+#RESFOOD 糧食: %d%%f
+#RESPROD 生產: %d%%p
+#RESTRADE 貿易: %d%%t
+#MOREIRR (灌溉后 +%d%%f)
+#MOREMINE (采礦后 +%d%%p)
+#MOREROAD (修路后 +%d%%t)
+#SPECIAL 特殊資源
 #SPECIALFOOD , +%d%%f
 #SPECIALPROD , +%d%%p
 #SPECIALTRADE , +%d%%t
 #TRAFO ¦a§Î¥iÅÜ§ó¬° %s
 #MOVEPLAIN ³¡¶¤²¾°ÊÃþ«¬: ¥©Z¦a§Î
 #MOVEHEAVY ³¡¶¤²¾°ÊÃþ«¬: ±T¹ò¦a§Î
 #DEFBONUS ¨¾±s¥[¦¨: %d%%
 #JOBCOST -«Ø³]³yÉ²: %s ¦æ°ÊÂI
 #JOBCOSTVAR -«Ø³]³yÉ²: ½Ð¦b´åÀ¸¤¤¿ï¾Ü"¨t²Îµæ³æ" - "§Ö³t§»¾Þ§@" -  "¦a§Î§ï³y"
 #TERIMPEXCLUDE Äéµ@¡BªöÄq¡Bn¶ë©Mx¨Æ°ò¦a¤£¥i¦@¦s¤_¦P¤@¦a¶ô. ¨Ò¦p, Y¦b¤w«Ø¦³n¶ëªº¦a¶ô«Ø³]x¨Æ°ò¦a, «hn¶ë±N®ø¥¢, x¨Æ°ò¦a¨ú¦Ó¥N¤§.
 #TERIMPCITY «°¥«©Ò¦bªº¦a¶ô, ¦P®É¥]§t¥H¤U®ÄªG:\-¹D¸ô\-ÅK¸ô (ÅK¸ô¬ì§Þµo²{¦Z)\-¹Bªe\-Äéµ@\-¹A³õ.
 #HOSTILE ¦b´c¤g¤W³q¦æ©Î¾n¤ãªº³¡¶¤, ¨äª¬ºA·|¨ü¨ì·l¶Ë, ¨ü·l¤ñ¨ÒÉO®ø¯Óªº¦æ°ÊÂI¦¨¥¿¤ñ, ¾n¤ã¤@¦^¦X, ±N·l¥¢%d%%ªºª¬ºA. ªe¬y¡Bºñ¬w¡B¹Bªe©Îx¨Æ°ò¦a¥i©è®ø´c¤gªºt±¼vÅT.
 #DEADLANDS ´c¤gµLªk¶i¦æ¥ô¦ó§ï³y.
 #RARE ¨C¤@±iÀHÉó¦a¹Ï¤W, ³£¦³12¶ô´c¤g, ¨ä¤¤¤@¥bÄÂÃµÛ¯S®í¸ê·½, ¨CÏú¯S®í¸ê·½¦U¦³¨â³B.
 #STRENGTH ¾Ô¤æ: %d/%d
 #SPEED Éó°Ê: %s
 #MODELNOTE (¦b¤£¦P°ê®a¤¤, ¦PÏú³¡¶¤ªº¥~Æ[©M¦WºÙ¥i¯à¦³©Ò®tÉÝ.)
 #COSTBASE ¥Í²£³yÉ²°òÈ %s%%p
 #WEIGHT ½s¨î %s%%w
 #BUILDALLOW ·s¼W³]¬I
 #MODELALLOW ¥i©º¯S®í³¡¶¤
 #FEATALLOW ·s¼W¯S®íÄÝ©Ê
 #FOLLOWADV ¦ZÄò¬ì§Þ
 #GOVALLOW ¥X²{·s¥Í¬FÊ^
 #UPGRADEALLOW x¨Æ¼vÅT
 #SEEALSO ¥t½Ð°Ñ¾\:
 #FUTURETECHHELP25¥Nªí¤F¥¼¨Óªº¬ì§Þ»â°ì. ¦b¦¹»â°ì¤U, ¨CÓ°ê®a³Ì¦h¥i¬ãµo25¶µ¬ì¬ã¦¨ªG.\\
 ¨C¶µ¥¼¨Ó¬ì§Þ»Ýnì¥ý4¿ªº¬ãµo¸êª÷. ÉO¨ä¥L¬ì§Þ¦¨ªG¤£¦P, ¥¼¨Ó¬ì§Þ¤£¥i¥Î§@¥~¥æ¥æ¯Aªº¯|½X, ¤]µLªk±q¤j¹Ï®ÑÀ]¤¤ª½±µÀò¨ú.
 #FUTURETECHHELP100 ¥Nªí¤F¥¼¨Óªº¬ì§Þ»â°ì. ¦b¦¹»â°ì¤U, ¨CÓ°ê®a³Ì¦h¥i¬ãµo100¶µ¬ì¬ã¦¨ªG.\\
 ¨C¶µ¥¼¨Ó¬ì§Þ»Ýnì¥ý4¿ªº¬ãµo¸êª÷. ÉO¨ä¥L¬ì§Þ¦¨ªG¤£¦P, ¥¼¨Ó¬ì§Þ¤£¥i¥Î§@¥~¥æ¥æ¯Aªº¯|½X, ¤]µLªk±q¤j¹Ï®ÑÀ]¤¤ª½±µÀò¨ú.
 #CRED_CAPSOUND Ánµ
 #CRED_CAPAI ¤H¤u´¼¯à¼Ò¶ô
 #CRED_CAPLANG ¤¤¤å¤Æª©¥»
 #AUTHOR @NAPTID\Â²Ê^¤¤¤åª©¥Ñ NapTID(µL¦W) Â½Ä¶¨î§@.
 #MATCHES ²Å¦X "%s"ªº·j¯Áµ²ªG:
 #NOMATCHES ¥¼µo²{¥]§t "%s" ªº¥ô¦ó·j¯Áµ²ªG.
+#TRAFO 地形可變更為 %s
+#MOVEPLAIN 部隊移動類型: 平坦地形
+#MOVEHEAVY 部隊移動類型: 崎嶇地形
+#DEFBONUS 防御加成: %d%%
+#JOBCOST -建設造价: %s 行動點
+#JOBCOSTVAR -建設造价: 請在游戲中選擇"系統菜單" - "快速宏操作" -  "地形改造"
+#TERIMPEXCLUDE 灌溉、采礦、要塞和軍事基地不可共存于同一地塊. 例如, 若在已建有要塞的地塊建設軍事基地, 則要塞將消失, 軍事基地取而代之.
+#TERIMPCITY 城市所在的地塊, 同時包含以下效果:\-道路\-鐵路 (鐵路科技發現后)\-運河\-灌溉\-農場.
+#HOSTILE 在惡土上通行或駐扎的部隊, 其狀態會受到損傷, 受損比例与消耗的行動點成正比, 駐扎一回合, 將損失%d%%的狀態. 河流、綠洲、運河或軍事基地可抵消惡土的負面影響.
+#DEADLANDS 惡土無法進行任何改造.
+#RARE 每一張隨机地圖上, 都有12塊惡土, 其中一半蘊藏著特殊資源, 每种特殊資源各有兩處.
+#STRENGTH 戰斗: %d/%d
+#SPEED 机動: %s
+#MODELNOTE (在不同國家中, 同种部隊的外觀和名稱可能有所差异.)
+#COSTBASE 生產造价基值 %s%%p
+#WEIGHT 編制 %s%%w
+#BUILDALLOW 新增設施
+#MODELALLOW 可征特殊部隊
+#FEATALLOW 新增特殊屬性
+#FOLLOWADV 后續科技
+#GOVALLOW 出現新生政体
+#UPGRADEALLOW 軍事影響
+#SEEALSO 另請參閱:
+#FUTURETECHHELP25代表了未來的科技領域. 在此領域下, 每個國家最多可研發25項科研成果.\\
+每項未來科技需要原先4倍的研發資金. 与其他科技成果不同, 未來科技不可用作外交交涉的砝碼, 也無法從大圖書館中直接獲取.
+#FUTURETECHHELP100 代表了未來的科技領域. 在此領域下, 每個國家最多可研發100項科研成果.\\
+每項未來科技需要原先4倍的研發資金. 与其他科技成果不同, 未來科技不可用作外交交涉的砝碼, 也無法從大圖書館中直接獲取.
+#CRED_CAPSOUND 聲音
+#CRED_CAPAI 人工智能模塊
+#CRED_CAPLANG 中文化版本
+#AUTHOR @NAPTID\簡体中文版由 NapTID(無名) 翻譯制作.
+#MATCHES 符合 "%s"的搜索結果:
+#NOMATCHES 未發現包含 "%s" 的任何搜索結果.
 #CONCEPTS
 $·§©À¸Ñ»¡\
 ;INTRO ´åÀ¸¤¶²Ð\\
 !´åÀ¸¸Ñ»¡\
 ;BASICS ·§½×\
 ;SCIENCE ¬ì§Þ\
 ;DIPLOMACY ¥~¥æ\
 ;SHIP ÀòÐ`\\
 !³¡¶¤¸Ñ»¡\
 ;MOVEMENT ³¡¶¤²¾°Ê\
 ;COMMANDS ³¡¶¤«ü¥O\
 ;SETTLE ²¾¥Á¤u§@\
 ;COMBAT ¾Ô¤æ¤j¥þ\
 ;SPYMISSIONS ¯µ±K¦æ°Ê\
 ;CLASSES ³¡¶¤¬ãµo\\
 !«°¥«¸Ñ»¡\
 ;CITIES «°¥«ºÞ²z\
 ;PRODUCTION ¥Í²£¸Ô¸Ñ\
 ;BUILDINGS «Øµ®¤¶²Ð\
 ;SUPPORT ³¡¶¤Æ×ÄÝ\\
 !¨ä¥L·§©À\
 ;MACRO §Ö³t§»¾Þ§@\
 ;MAPEDIT ¦a¹Ï½s¿è¾¹\
 ;AIT ¹q¸£¹ï¨M
+$概念解說\
+;INTRO 游戲介紹\\
+!游戲解說\
+;BASICS 概論\
+;SCIENCE 科技\
+;DIPLOMACY 外交\
+;SHIP 獲胜\\
+!部隊解說\
+;MOVEMENT 部隊移動\
+;COMMANDS 部隊指令\
+;SETTLE 移民工作\
+;COMBAT 戰斗大全\
+;SPYMISSIONS 秘密行動\
+;CLASSES 部隊研發\\
+!城市解說\
+;CITIES 城市管理\
+;PRODUCTION 生產詳解\
+;BUILDINGS 建筑介紹\
+;SUPPORT 部隊屬\\
+!其他概念\
+;MACRO 快速宏操作\
+;MAPEDIT 地圖編輯器\
+;AIT 電腦對決
 #ABOUT
 $Ãö¤_´åÀ¸\
+$關于游戲\
 &LOGO\\
 !°_·½¤Î¥Ø¼Ð\
+!起源及目標\
 C-evo is a non-commerical game project based on the famous "Sid Meier's
 Civilization" by Microprose. The ambition of C-evo is not, to compete with
 …
 ::E2 c-evo.org\\
 !©Ò¦³Åv³\¥i\
+!所有權許可\
 C-evo is a compilation of work by a number of authors. You are allowed
 to play the game and to distribute it without explicit permission. The compilation
 …
 the graphics, you should ask the author of an item before using it for another
 purpose than to play.\
 ::C ¬d¬Ý¨î§@¤Hû¦W³æ\\
 !AI¼Ò¶ô\
+::C 查看制作人員名單\\
+!AI模塊\
 The game has an open AI interface, which means the player can replace the standard AI
 contained in the package by other AI algorithms, either for all or for single
 …
 you installed the game. Maybe competition will lead us to the first real good AI
 in modern strategy gaming.\
 ::E1 AI¼Ò¶ô¶}µo«ü«n\\
 !¨t²Î¹B¦æ»Ý¨D\
 -¤@¶ô¥iÅã¥Ü16¦ì¦â©Î¥H¤WªºÅã¥d\
 -±À¯ò¶}±Ò¦rÊ^¥·Æ¥\¯à\\
 !©R¥O¦æ¹B¦æ°Ñ¼Æ\
 -cevo.exe -man ... ¤£¹B¦æ´åÀ¸, ¶ÈÅã¥Ü«ü«n\\
 !§R°£´åÀ¸\
 ½Ð¹B¦æ±±¨î±ªO¤¤ªº§R°£µ{§Ç¦V¾É.\\
 !¿ù»~³ø§i\
+::E1 AI模塊開發指南\\
+!系統運行需求\
+-一塊可顯示16位色或以上的顯卡\
+-推荐開啟字体平滑功能\\
+!命令行運行參數\
+-cevo.exe -man ... 不運行游戲, 僅顯示指南\\
+!刪除游戲\
+請運行控制面板中的刪除程序向導.\\
+!錯誤報告\
 To support the progress of this project, please tell me about problems you have
 …
 #CREDITS
 $¨î§@¤Hû\
+$制作人員\
 @@18\\
 !³]p\
+ì³Ð·N¨Ó¦ÛSid Meier & Brian Reynolds¨î§@ªº
  "Sid Meier's Civilization" ¤Î "Civilization II".\
 ®ÚÕuª±®a¦P¦nªº·N¨£«ØÄ³×§ï¦Ó¦¨.\\
 !µ{§Ç\
 ¥Dµ{§Ç: Steffen Gerlach.\
 PNG¹Ï¤ù¤ä«ù: Edmund H. Hand\\
 !´ú¸Õ\
 µL¼Æ¤£ª¾¦Wªº´ú¸ÕªÌ, ·PÁÂ§AÌ¨C¤@Ó¤H!\\
 !¨ä¥L\
 ¬Y¨Ç¯¾²z¹Ï¤ù¨Ó¦Û "Mayang's Free Textures".\
 «°¥«¦W³æ´£¨Ñ: Charles Nadolski..\\
 !¬ü¤u\
+µ´¤j³¡¤À¹Ï¤ù¬O±qÊI¤W¬y¶Çªº¦UÏú¤å©úII¸ê·½¥]¤º´£¨úªº,
+¨ä¤¤¤@¨Ç§@ªÌ¤w¤£¥i¦Ò, ÁÙ¦³¤@¨ÇµLªkÁpµ¸. Yµo²{°Ó·~
+ª©Åv¹Ï¤ù, ©Î¬O¤£º@±zªº³Ò°Ê¦¨ªG³Q§K¶OÂà¥Î, ©Î¬O§@¬°
 ¹Ï¤ù§@ªÌªº±z·Q¦b¨î§@¤Hû¦W³æ¤¤¯d¤U©m¦W, ½ÐÁp¨t§ÚÌ.
+!設計\
+原創意來自Sid Meier & Brian Reynolds制作的
+ "Sid Meier's Civilization" 及 "Civilization II".\
+根据玩家同好的意見建議修改而成.\\
+!程序\
+主程序: Steffen Gerlach.\
+PNG圖片支持: Edmund H. Hand\\
+!測試\
+無數不知名的測試者, 感謝你們每一個人!\\
+!其他\
+某些紋理圖片來自 "Mayang's Free Textures".\
+城市名單提供: Charles Nadolski..\\
+!美工\
+絕大部分圖片是從网上流傳的各种文明II資源包內提取的,
+其中一些作者已不可考, 還有一些無法聯絡. 若發現商業
+版權圖片, 或是不愿您的勞動成果被免費轉用, 或是作為
+圖片作者的您想在制作人員名單中留下姓名, 請聯系我們.
 #QUICK
 $§Ö³t¤W¤â\
 !§Ö³t¤W¤â\
 ¥H¤U¬O´åÀ¸°ò¥»ªºnÂI, ¨Ñ·s¤â§Ö³t¤Jªù:\
 -³o¬O¤@´Ú¦^¦X¨î´åÀ¸, ´åÀ¸®Ö¤ß·½¦Û¤å©ú¨t¦C.\
 -·í©Ò¦³³¡¶¤¦æ°Êµ²§ô¦Z, ±zªº¦^¦X¦Û°Êµ²§ô. ¦pªG´åÀ¸
 °±¤î¹B¦æ, ¤]³\¬O¨t²Î¦bµ¥±z¤â°Êµ²§ô¦^¦X.\
 -¤j¦h¼Æ¥iÂIÀ»ªº¶µ¥Ø³£¥H¥Õ¦â¥~®Øªí¥Ü.\
 -¦b¦P¤@¦a¶ô¤W, ¤]³\¾n¦³¦h¤ä³¡¶¤, ¦ý¥u¦³³Ì±j¤jªº³¡¶¤
 ¤~·|Åã¥Ü¦b¦a¹Ï¤W.\
 -¥Î¹«¼Ð¥ªÁä³æÀ»¿ï¾Ü³¡¶¤, . ¿ï¤¤ªº³¡¶¤¹Ï¼Ð±N·|°{Ã{,
 «Ì¹õ¤U¤è±a·P¼Û¸¹ªº«ö¶s, ¬O¸Ó³¡¶¤¬ÛÃöªº¾Þ§@µæ³æ.\
 -n²¾°Ê³¡¶¤, ½Ð¨Ï¥ÎÁä½L¤è¦VÁä¡B¼Æ¦rÁä©Î¹«¼Ð¥kÁä.\
 -¹«¼Ð³æÀ»«°¥«¹Ï¼Ð, ¥iÅã¥Ü¸Ó«°¥«ªº¾Þ§@µ¡¤f, ¨ä¤¤³Ì
+«nªº¬O¥Í²£«ö¶s, ³æÀ»µ¡¤f¤¤³¡ªº¥Í²£«ö¶s, ¥i¿ï¾Ü
 ·sªº«Ø³]¥Ø¼Ð, ¨Ò¦p¿ï¾Ü©Ý¯îªÌ, ¥h§O³B«Ø¥ß·sªº«°¥«.\
 -«°¥««Ø³]¡B¼Wªøªº³t«×, ¥H¤Î¬ì¬ãµ|¦¬ªº¦h¤Ö,
 ¥þ³£¨ú¨M¤_§Aªº¿ï¾Ü.\
 -¦b¦h¼Æ±¡ªp¤U, ¦b¹«¼ÐÂIÀ»¬Y¶µ¥Øªº¦P®É«ö¦íShiftÁä,
 ¥iÅã¥Ü¬ÛÃöªºÀ°§U«H®§.\\\
+$快速上手\
+!快速上手\
+以下是游戲基本的要點, 供新手快速入門:\
+-這是一款回合制游戲, 游戲核心源自文明系列.\
+-當所有部隊行動結束后, 您的回合自動結束. 如果游戲
+停止運行, 也許是系統在等您手動結束回合.\
+-大多數可點擊的項目都以白色外框表示.\
+-在同一地塊上, 也許駐有多支部隊, 但只有最強大的部隊
+才會顯示在地圖上.\
+-用鼠標左鍵單擊選擇部隊, . 選中的部隊圖標將會閃爍,
+屏幕下方帶感歎號的按鈕, 是該部隊相關的操作菜單.\
+-要移動部隊, 請使用鍵盤方向鍵、數字鍵或鼠標右鍵.\
+-鼠標單擊城市圖標, 可顯示該城市的操作窗口, 其中最
+重要的是生產按鈕, 單擊窗口中部的生產按鈕, 可選擇
+新的建設目標, 例如選擇拓荒者, 去別處建立新的城市.\
+-城市建設、增長的速度, 以及科研稅收的多少,
+全都取決于你的選擇.\
+-在多數情況下, 在鼠標點擊某項目的同時按住Shift鍵,
+可顯示相關的幫助信息.\\\
 @@22\\
 !P¤å©ú¨t¦Cªº¦Ñª±®a\
 ´N¦a§Î©M³¡¶¤¹Ï¤ùªº¬Û¦üµ{«×¦Ó¨¥, C-evo(¤å©ú¶i¤Æ¥v)
+«Ü®e©ö³Q¬Ý§@¬O¤å©úII¥N¸g¨åªºÎ`¨îª©. ¦ý²`¤J´åÀ¸¦Z,
+§A´N·|µo²{¨âªÌ¦³³\¦h¤£¦P. ¨ä®tÉÝµ{«×¬Æ¦Ü¥iÉO
+¤å©úI©MII¥N¤§¶¡ªº®tÉÝ¬Û´£¦}½×. ¬d¬Ý¨ãÊ^®tÉÝ,
 ½ÐÂIÀ»¤U¦C¼ÐÃD:\
 :MOVEMENT ³¡¶¤²¾°Ê\
 ::T ¦a§ÎÏúÃþ\
 ::B202 ©_¸ñ¼vÅT\
 ::G ¬FÊ^§Î¦¡\
 ::A ¬ì§Þºt¤Æ\
 :DIPLOMACY ¹ï¥~¥æ¯A\
 :SHIP ´Þ¥Á¸²î\\
 °£¤F¤Wz®tÉÝ¤§¥~, ÁÙ¦³¥H¤UnÂI´£½Ð¦U¦ìª±®a¯d·N:\
 -C-evo¤£¾aÀHÉó¹Bºâ§@¬°½æÂI. ¨C¤@¶µp¦Eªºµ²ªG³£¥i
 ¹w´Á, °£¤F¥@¬É¦a¹Ïªº¥Í¦¨©M¨ä¥L¶Õ¤OªºÁ|°Ê¤§¥~.\
 -¹q¸£pºâ©Ò¨ÌÕuªº³W«hÉO¯u¤Hª±®a§¹¥þ¬Û¦P. ¹q¸£ª±®a
 ¦}µLÃB¥~ªºÉ¬¶Õ, ¦bÀò±o±¡³ø¤è±¤]¤@¼Ë.\
 -«°¥«µ²ÌÛÉO¤å©ú¨t¦C²¤¦³¥X¤J. ¦b«°¥«©Ò¦bªº¦a¶ô, ¦³1Ó
+¥«¥Át³d³Ò°Ê¥Í²£, ¦ý¤£·|±q¨Æ°Ó·~¶T©ö; ¦¹¥~, ¥«¥Áµ²ÌÛ
 ¤]¦³©ÒÂ²¤Æ, ¦p¥h°£¤FÃÀ¤H©M¦¬µ|¤Hµ¥µ¥.\
 -«°¥«³Ì¤p³W¼Ò¬°2¯Å, ¥Í²£¤@¤ä©Ý¯îªÌ, ¶·¯Ó¶O2Ó¥«¥Á.\
 -«°¥«Â³¹Àx¶q¤W¦}«D¥Ñ«°¥«³W¼Ò¨M©w, ¦]¦¹¤j«°¥«ªº
 ¼Wªø³t«×, ©¹©¹»·°ª¤_¸û¤pªº«°¥«.\
 -µL»ÝÁ{ªñ®ü¬v©Îªe¬y, §Y¥i¶i¦æÄéµ@.\
 -±q¨ä¥L¶Õ¤OÀò±oªº¥ý¶i¬ì§Þ, µLªkª½±µ§Q¥Î, ¥²¶·¥ý°w¹ï
+¸Ó¬ì§Þ¶i¦æåªR©Ê¬ã¨s, ¬ã¨s³t«×±N¬O¿W¦Û¬ã¨sªº¨â¿,
 ¥B¤£¥²¬ã¨s¥ý´Á©Ò»Ý¬ì§Þ.\
 -¬Y¨Ç°ª¯Å§@¾Ô³¡¶¤µLªkª½±µ«Ø³], ¥²¶·¥ý¶i¦æ¬ãµo,
 ¬ãµo¦¨¥\¦Z¤~¯à«Ø³].\
 -¬Y¨Ç¦a§Î¹ï¦a±³¡¶¤·|³y¦¨¶Ë®`, ¸Ô¨£"¦a§ÎÏúÃþ"¤¤ªº"´c¤g".\
+!致文明系列的老玩家\
+就地形和部隊圖片的相似程度而言, C-evo(文明進化史)
+很容易被看作是文明II代經典的复制版. 但深入游戲后,
+你就會發現兩者有許多不同. 其差异程度甚至可与
+文明I和II代之間的差异相提并論. 查看具体差异,
+請點擊下列標題:\
+:MOVEMENT 部隊移動\
+::T 地形种類\
+::B202 奇跡影響\
+::G 政体形式\
+::A 科技演化\
+:DIPLOMACY 對外交涉\
+:SHIP 殖民飛船\\
+除了上述差异之外, 還有以下要點提請各位玩家留意:\
+-C-evo不靠隨机運算作為賣點. 每一項計划的結果都可
+預期, 除了世界地圖的生成和其他勢力的舉動之外.\
+-電腦計算所依据的規則与真人玩家完全相同. 電腦玩家
+并無額外的优勢, 在獲得情報方面也一樣.\
+-城市結构与文明系列略有出入. 在城市所在的地塊, 有1個
+市民負責勞動生產, 但不會從事商業貿易; 此外, 市民結构
+也有所簡化, 如去除了藝人和收稅人等等.\
+-城市最小規模為2級, 生產一支拓荒者, 須耗費2個市民.\
+-城市糧食儲量上限并非由城市規模決定, 因此大城市的
+增長速度, 往往遠高于較小的城市.\
+-無需臨近海洋或河流, 即可進行灌溉.\
+-從其他勢力獲得的先進科技, 無法直接利用, 必須先針對
+該科技進行剖析性研究, 研究速度將是獨自研究的兩倍,
+且不必研究先期所需科技.\
+-某些高級作戰部隊無法直接建設, 必須先進行研發,
+研發成功后才能建設.\
+-某些地形對地面部隊會造成傷害, 詳見"地形种類"中的"惡土".\
 #INTRO
 $´åÀ¸¤¶²Ð\
+$游戲介紹\
 @@56\
 !Åwªï¶i¤JC-evo(¤å©ú¶i¤Æ¥v)ªº¥@¬É\
+¥»´åÀ¸±a±z»â²¤¤HÃþ¤å©úªºµo®i¥v, ±z¥i±a»â¤@¤äÏú±Ú,
+¾ú¸g¤»¤d¦~·É®áÅÜ¾E, ±q¤HÃþ³Ìªìªº©w©~¶}©l¾Ä¤æ, ¨D¥Í,
+¶i¤Æ, ª½¦Ü¹ê²{¤HÃþªº²×Ìå¹Ú·Q--´Þ¥Á¥~¬P. «e¶iªº¹D¸ô
+¦}¤£Á`¬O¤@µf©Z³~: ¥i¥Îªº¸ê·½¦}¤£¥R¸Î, »Ýnºë¥´²Óºâ;
+©P³òªº³¥¦a¯í¯í, ¤Ö»¡¤]±oªá¤L¤d¦~¤~¯àÅÜ¦¨¤å©ú¼Ö¤g;
+§ó§O´£¤£´Á¦Ó¦ÜªºÄÈ¯î©MÅÜ¶Ã¤F, ¤Ñ¨a¤Hº×©l²×¬O«°¥«
 Ácºaµo®iªº³Ì¤j«Â¯Ù..\\
 ÏúÏú¤£§Q¦]¯À¤§¤U, °ß¦³¾a²`¿Ñ»·¼{¤~¯à±a»â¤H¥Á¨«¦V©¯ºÖ.
 ÂX±i«Ò°ê»â¤g, µo®i«°¥««Ø³], ×§LÀç, ¿ì¤j¾Ç, ³y¤uÉD......
+¦b«Ø³]ªº¦P®É, ¤]§O©¿µø¤F¬ì¾Ç¬ã¨s, ¬ãµo·s¦¡³¡¶¤©MªZ¾¹,
+¬£»º©Ý¯î³¡¶¤¶}¹@·sªº¨U¤g, ¤Þ»â²î¶¤´M§ä®ü¬v©¼©¤ªº¤j³°,
 ±N¾ãÓ¥@¬ÉºÉ¦¬²´©³.\\
+§O§Ñ¤F, §Aªº°ê®a¦}¤£¬O³o¥@¬É¤¤°ß¤@ªº¤å©ú. ¨C¶ô¤j³°¤W
+³£¦³¤£¦Pªº³¡¸¨, ¦s¦b¬Û·íªº¤å¤Æ®tÉÝ. n°O¦í, ¨S¦³þÓ
+Ïú±Ú¬O¤Ñ©R¥Ã¦sªº, ¥ô¦ó¤@Ó«Ò°ê³£¦³¥i¯à¦b¤@©]¶¡¶ÉÂÐ,
 §Aªº°ê®a¤]¤£¨Ò¥~.\\
+ÉO¥L°êªº²Ä¤@¦¸±µàD¤]³\¦}¤£·|¬O¤@¦¸´r§Öªº¸g¾ú, ¦ý³q¹L
+¤£¾Óªº¥~¥æ¥æ¯A, ³\¦hì¥ýªº¤£¥i¯à¤]·|ÅÜ¦¨¥i¯à. ÉO¨ä¥L
+¤å©ú¥æ´«¬ì§Þª¾ÃÑ, ¥Î±ø¬ù«OÅ@¦U¦Ûªº§Q¯q, ©Î¬O«Ø¥ß°í©T
+ªº·ù¬ù, ¦b³´¤J³Â·Ð®É¦³ÓÀ°¤âÀ³¸Ó¤£¬O§¥¨Æ.  ¦ý¤]§O¤Ó¹L
+¨Ì¿à±ø¬ù, ¦]¬°³oÓ¥@¬É¨S¦³¥Ã»·ªºªB¤Í, ¥u¦³¥Í¦sªº¹ï¤â,
 ¤£½×¬OþÓÏú±Ú, ³£¦b¬°¤F¦P¤@Ó¥Ø¼Ð¦ÓÄvª§: ³Ì²×ªºÐ`§Q.
+!歡迎進入C-evo(文明進化史)的世界\
+本游戲帶您領略人類文明的發展史, 您可帶領一支种族,
+歷經六千年滄桑變遷, 從人類最初的定居開始奮斗, 求生,
+進化, 直至實現人類的終极夢想--殖民外星. 前進的道路
+并不總是一番坦途: 可用的資源并不充裕, 需要精打細算;
+周圍的野地茫茫, 少說也得花几千年才能變成文明樂土;
+更別提不期而至的饑荒和變亂了, 天災人禍始終是城市
+繁榮發展的最大威脅..\\
+种种不利因素之下, 唯有靠深謀遠慮才能帶領人民走向幸福.
+擴張帝國領土, 發展城市建設, 修兵營, 辦大學, 造工厂......
+在建設的同時, 也別忽視了科學研究, 研發新式部隊和武器,
+派遣拓荒部隊開辟新的沃土, 引領船隊尋找海洋彼岸的大陸,
+將整個世界盡收眼底.\\
+別忘了, 你的國家并不是這世界中唯一的文明. 每塊大陸上
+都有不同的部落, 存在相當的文化差异. 要記住, 沒有哪個
+种族是天命永存的, 任何一個帝國都有可能在一夜間傾覆,
+你的國家也不例外.\\
+与他國的第一次接触也許并不會是一次愉快的經歷, 但通過
+不懈的外交交涉, 許多原先的不可能也會變成可能. 与其他
+文明交換科技知識, 用條約保護各自的利益, 或是建立堅固
+的盟約, 在陷入麻煩時有個幫手應該不是坏事.  但也別太過
+依賴條約, 因為這個世界沒有永遠的朋友, 只有生存的對手,
+不論是哪個种族, 都在為了同一個目標而競爭: 最終的胜利.
 #BASICS
 $·§½×\
 !·§½×\
+°ê®aªº²Õ¦¨³æ¦ì¬O³¡¶¤©M«°¥«. ³¡¶¤ªºÂ¾³d¬O±´ÀI©M§ð¦u,
 ¦Ó«°¥«ªºÂ¾¯à¬O¤H¤f¼Wªø, ¥Í²£«Ø³]©M¬ì¾Ç¬ã¨s.\\
+¥@¬É¦a¹Ï¥Ñ¥|Ãä§Î¦a¶ô²Õ¦¨. ¨CÓ¦a¶ô³£¦³¨ä¦a§ÎÄÝ©Ê,
+®ÚÕu¤£¦Pªº¦a§ÎÏúÃþ, ¦a¶ôªº¥H¤U¤TÏúÄÝ©Ê·|¦³©Ò¤£¦P:
+¸ê·½²£¶q, ¨¾±s¥[¦¨, ©M²¾°Ê®ø¯Ó. ¦P¤@¦a¶ô¤W³Ì¦h¯à«Ø
+¤@®y«°¥«, ¦ý¥i®e¯Çªº¦P°ê³¡¶¤¼Æ¶q¦}µL¨î. nÀò±o
 ¯S©w¦a¶ôªºÀ°§U«H®§, ½Ð¦bÂI¿ï¦a¶ô®É«ö¦íShiftÁä.\
 ::T ¦a§ÎÏúÃþ\\
+¥»´åÀ¸ªö¥Î¤F¦^¦X¨î¶i¦æ¤è¦¡¡A¨ä¥L¹ï¤â¥²¶·µ¥«Ý±z¥þ³¡
+¦æ°Ê§¹²¦¡Aµ²§ô¦^¦X¤§¦Z¤è¥i¨Ì¦¸¦æ°Ê. ¦bÀq»{°t¸m¤U,
+©Ò¦³³¡¶¤¦æ°Ê§¹¦¨¦Z,¦^¦X±N¦Û°Êµ²§ô, ¦pªG±z¬Ý¨ì"µ¥«Ý
 ¦^¦Xµ²§ô"ªº´£¥Ü,½ÐÂIÀ»«Ì¹õ¥k¤U¨¤ªºµ²§ô¦^¦X«ö¶s.\\
+$概論\
+!概論\
+國家的組成單位是部隊和城市. 部隊的職責是探險和攻守,
+而城市的職能是人口增長, 生產建設和科學研究.\\
+世界地圖由四邊形地塊組成. 每個地塊都有其地形屬性,
+根据不同的地形种類, 地塊的以下三种屬性會有所不同:
+資源產量, 防御加成, 和移動消耗. 同一地塊上最多能建
+一座城市, 但可容納的同國部隊數量并無限制. 要獲得
+特定地塊的幫助信息, 請在點選地塊時按住Shift鍵.\
+::T 地形种類\\
+本游戲采用了回合制進行方式，其他對手必須等待您全部
+行動完畢，結束回合之后方可依次行動. 在默認配置下,
+所有部隊行動完成后,回合將自動結束, 如果您看到"等待
+回合結束"的提示,請點擊屏幕右下角的結束回合按鈕.\\
 #SCIENCE
 $¬ì§Þ\
+$科技\
 @@46\
 !¬ì§Þ\
+´åÀ¸¤¤°ê®an·Q×«Ø·sªº³]¬I, ²Õ«Ø·sªº³¡¶¤,
+©Î¬O¦¨¥ß·sªº¬FÊ^, ¥²¶·¥ý¬ã¨s¬ÛÃöªº¬ì§Þ.
+°£¤Fªì©l®Éªº¤L¶µ¬ì§Þ¤§¥~, µ´¤j³¡¤À¬ì§Þ»Ý
 ¥ý¬ã¨s1¦Ü2¶µ«e¾É©Ê¬ì§Þ, ¸Ô±¡½Ð¬Ý:\
 ::A ¬ì§Þ¤@Äý\\
+´åÀ¸¶}©l¦Z¤@¦^¦X, ¨t²Î·|´£¥Üª±®a¿ï¾Ü·Qn
+¬ã¨sªº²Ä¤@¶µ·s¬ì§Þ. nÀòª¾¬ÛÃö¬ì§Þªº¸Ô²Ó
 «H®§, ½Ð¦bÂI¿ï¬ì§Þ¦WºÙªº¦P®É«ö¦íShiftÁä.
 ¬ì§Þ¬ã¨sªº¶i«×¨ú¨M¤_°ê®a²Ö¿nªº¬ì¾ÇÁ`¶q (%r)
+¦pªG²Ö¿nªº%r¹F¨ì³W©wªº¤ô¥, ´N¯àÀò±o·sªº
+¬ì¬ã¦¨ªG. ¨C¦¸¥u¯à¬ã¨s¤@¶µ¬ì§Þ, ¨M©w¤§¦Z,
+¬ã¨sp¦E´NµLªk§ó§ï¤F.
+ÀHµÛ¥»°ê¬ì§Þ¦¨ªGªº¤£Â_±À¥X, ·s¬ì§Þªº¬ã¨s
 ©Ò»Ýnªº¬ì¾ÇÁ`¶q·|³v¨B¼W¦h, ¸Ô±¡½Ð¬Ý:\\
 ;SCIENCECOST ¬ì¬ã¶O¥Î¸Ô¸Ñ
+!科技\
+游戲中國家要想修建新的設施, 組建新的部隊,
+或是成立新的政体, 必須先研究相關的科技.
+除了初始時的几項科技之外, 絕大部分科技需
+先研究1至2項前導性科技, 詳情請看:\
+::A 科技一覽\\
+游戲開始后一回合, 系統會提示玩家選擇想要
+研究的第一項新科技. 要獲知相關科技的詳細
+信息, 請在點選科技名稱的同時按住Shift鍵.
+科技研究的進度取決于國家累積的科學總量 (%r)
+如果累積的%r達到規定的水平, 就能獲得新的
+科研成果. 每次只能研究一項科技, 決定之后,
+研究計划就無法更改了.
+隨著本國科技成果的不斷推出, 新科技的研究
+所需要的科學總量會逐步增多, 詳情請看:\\
+;SCIENCECOST 科研費用詳解
 #SCIENCECOST
 $¬ì¬ã¶O¥Î¸Ô¸Ñ\
 !¬ì¬ã¶O¥Î¸Ô¸Ñ\
+ÀHµÛ¬ì§Þ¬ãµo¼Æ¶qªº¼W¦h, ¬ì¬ã¶O¥Î¤]·|ÀH¤§´£°ª.
 ·í«eÃø«×¤U, ¬ì¬ã¶O¥Îªºpºâ¤½¦¡¬°:\
+$科研費用詳解\
+!科研費用詳解\
+隨著科技研發數量的增多, 科研費用也會隨之提高.
+當前難度下, 科研費用的計算公式為:\
 &TECHFORMULA\\
 ÅÜ¶qnªºªì©lÈ¬°4, ¦}®ÚÕu¥H¤U±ø¥óµo¥Í¬ÛÀ³ÅÜ¤Æ:\
 -³¡¶¤¬ãµo¤£·|¼vÅTnÈªºÅÜ¤Æ\
 -¹q¸£¬ì§Þªº¬ã¨s¤£·|¼vÅTnÈªºÅÜ¤Æ\
 -¦¨¥\¬ã±o±q¨ä¥L¶Õ¤OÀò±oªº¬ì§Þ, nÈ+1\
 -¦Û¦æ¦¨¥\¬ã±o¥ô¦ó¨ä¥L¬ì§Þ, ¥]¬A¤TÏú¥¼¨Ó¬ì§Þ, nÈ+2\
 -±q¤j¹Ï®ÑÀ]¤¤ª½±µÀò±o¬ì§Þ, nÈ+1
+變量n的初始值為4, 并根据以下條件發生相應變化:\
+-部隊研發不會影響n值的變化\
+-電腦科技的研究不會影響n值的變化\
+-成功研得從其他勢力獲得的科技, n值+1\
+-自行成功研得任何其他科技, 包括三种未來科技, n值+2\
+-從大圖書館中直接獲得科技, n值+1
 #DIPLOMACY
 $¥~¥æ\
 !·§½×\
+¨âÓ¯À¥¼¿Ñ±ªº°ê®an«Ø¥ß¥~¥æÃö¨t, ¥²¶·µ¥¨ì¨ä¤¤¤@°ê
+ªº¦a±³¡¶¤µo²{¥t¤@°êªº¦a±³¡¶¤©Î«°¥«¤§¦Z¤è¥i¶i¦æ.
+¦b°ê®a±¡³øµe±, ¥i¬d¬Ý¤wª¾¨ä¥L¶Õ¤Oªº¬ÛÃö«H®§.
+¦b°ê®a±¡³øµe±¤¤, Åã¥Ü¤F¤@Ó°ê®aªº¬FÊ^§Î¦¡, ²{¦³¸êª÷,
 ¥~¥æ¥ß³õ, ¥H¤Î¤H¤f, »â¤g, ¬ì§Þ, ±´¯Áµ¥·§ªp. \\
 !¥æ¯A\
+·í¨â°êµo¥Í±µàD¤§¦Z, ¥i¶}®i¥~¥æ¥æ¯A, ¦b¥æ¯A¤¤¥i¶i¦æ
+¥æ´«¶T©ö©ÎÃ±¸p¨ó¬ù. ¾ãÓ¥æ¯A¹Lµ{¥Dn¥Ñ¨î©w´£Ä³,
 ±µ¨ü´£Ä³, ¥H¤Î¨ú®ø±ø¬ù¤T³¡¤À²Õ¦¨.\\
+·í¥æ¯AÂù¤è³£°±¤î´£Ä³ªº®ÉÔ, ¥æ¯A´N±Nµ²§ô. ¦pªG¤@¤è
 ¿ï¾Ü²×¤î½Í§P, ¥æ¯A¤]·|¥ß§Y²×¤î.\\
 !´£Ä³\
+¥~¥æ¥æ¯A¥Dnªº²Õ¦¨³¡¤À¬O¦UÏú´£Ä³. ´£Ä³ªº¤º®e¤¤¥]§t¤F
+¥æ¯A¤@¤è¦V¥t¤@¤è´£¥Xªºn¨D, ¥H¤Îº@·N¬°¤§¥I¥Xªº±ø¥ó.
 ¥i¯à¥]§tªº¤º®e¦³:\
 -¤@¶µ±ø¬ù\
 -°ê®a±¡³ø\
 -x¨Æ±¡³ø\
 -¤@µ§²{ª÷\
 -¬ì§Þ¦¨ªG\
 -³¡¶¤¬ãµo\
 -±´¯Á¦a¹Ï\
 -´Þ¥Á¸²î³¡¥ó(¤ÓªÅ´ä«Ø¦¨¦Z)\\
 ¦pªG´£Ä³¤¤¥¼¥]§t¦V¹ï¤èn¨Dªº¤º®e, ´N¬Û·í¤_¤@¥÷Â§ª«.
+¥u¦³¹ï¤è±µ¨ü, Â§ª«¤~¦³®ÄªG. ÉO¤§¬Û¤Ïªº±¡ªp¬O, ¦pªG
 ´£Ä³¤¤¥¼¥]§t¦V¹ï¤è¥I¥Xªº±ø¥ó, ´N¬O¨ª»r»rªº¯Á¨ú.\\
+±q¨ä¥L¶Õ¤OÀò±oªº¥ý¶i¬ì§Þ, µLªkª½±µ§Q¥Î, ¥²¶·¥ý°w¹ï
+¸Ó¬ì§Þ¶i¦æåªR©Ê¬ã¨s, ¬ã¨s³t«×±N¬O¿W¦Û¬ã¨sªº¨â¿,
 ¥B¤£¥²¬ã¨s¥ý´Á©Ò»Ý¬ì§Þ.\\
 !±ø¬ù\
 ±ø¬ù¤À¬°¥H¤U¤LÏú:\\
 -©M¥±ø¬ù:
+¨â°ê¤£±o¬Û¤¬§ðÀ», ¤]¤£±o¶i¤J¹ï¤èªº°ê¹Ò.
 ©M¥°ê®aªº³¡¶¤¹ï¥t¤@¤èªº«°¥«¨S¦³³ò§ð®ÄÀ³.\\
 -¤Í¦n±ø¬ù:
+°£¤F©M¥±ø¬ùªº¤Wz¬ù©w¤§¥~,
 ¨â°ê¨C¦^¦X¥æ´«¦U¦Ûªº°ê®a±¡³ø..\\
 -·ù¬ù:
+¦¨¬°·ù°ê¤§¦Z, ¤v¶Õ¤O³¡¶¤¥i¦b·ù°ê°ê¬É¤º¦Û¥Ñ²¾°Ê,
+¤Ï¤§¥çµM. ¥t¥~, ·ù°ê¶¡¦@¨É©Ò¦³±¡³ø (¥]¬A¦a°Ï/x¨Æ
 ¤Î¦a¹Ï±¡³ø), ¹ï¤è³¡¶¤ªº¤@Á|¤@°Ê¤]±N¥þ³¡ª¾±x.\\
+¥t¥~, ¨S¦³Ã±¸p¥ô¦ó±ø¬ùªº¨âÓ°ê®a, ¥i¥H¹F¦¨°±¾Ô¨óÄ³.
+°±¾Ô¨óÄ³¤£ÄÝ¤_±ø¬ù, ¶È¬O¤@Ïú¼È®É¤£§ðÀ»¹ï¤èªº¤¹¿Õ.
+·í¨ä¤¤¤@¤è¶}¾Ô¦Z, ¨óÄ³¦Û°Ê¥¢®Ä.
 ºî¤W©Òz, ¨â°ê¶¡¥i¯àªºÃö¨t¦Cªí¦p¤U:\
+$外交\
+!概論\
+兩個素未謀面的國家要建立外交關系, 必須等到其中一國
+的地面部隊發現另一國的地面部隊或城市之后方可進行.
+在國家情報畫面, 可查看已知其他勢力的相關信息.
+在國家情報畫面中, 顯示了一個國家的政体形式, 現有資金,
+外交立場, 以及人口, 領土, 科技, 探索等概況. \\
+!交涉\
+當兩國發生接触之后, 可開展外交交涉, 在交涉中可進行
+交換貿易或簽署協約. 整個交涉過程主要由制定提議,
+接受提議, 以及取消條約三部分組成.\\
+當交涉雙方都停止提議的時候, 交涉就將結束. 如果一方
+選擇終止談判, 交涉也會立即終止.\\
+!提議\
+外交交涉主要的組成部分是各种提議. 提議的內容中包含了
+交涉一方向另一方提出的要求, 以及愿意為之付出的條件.
+可能包含的內容有:\
+-一項條約\
+-國家情報\
+-軍事情報\
+-一筆現金\
+-科技成果\
+-部隊研發\
+-探索地圖\
+-殖民飛船部件(太空港建成后)\\
+如果提議中未包含向對方要求的內容, 就相當于一份禮物.
+只有對方接受, 禮物才有效果. 与之相反的情況是, 如果
+提議中未包含向對方付出的條件, 就是赤裸裸的索取.\\
+從其他勢力獲得的先進科技, 無法直接利用, 必須先針對
+該科技進行剖析性研究, 研究速度將是獨自研究的兩倍,
+且不必研究先期所需科技.\\
+!條約\
+條約分為以下几种:\\
+-和平條約:
+兩國不得相互攻擊, 也不得進入對方的國境.
+和平國家的部隊對另一方的城市沒有圍攻效應.\\
+-友好條約:
+除了和平條約的上述約定之外,
+兩國每回合交換各自的國家情報..\\
+-盟約:
+成為盟國之后, 己勢力部隊可在盟國國界內自由移動,
+反之亦然. 另外, 盟國間共享所有情報 (包括地區/軍事
+及地圖情報), 對方部隊的一舉一動也將全部知悉.\\
+另外, 沒有簽署任何條約的兩個國家, 可以達成停戰協議.
+停戰協議不屬于條約, 僅是一种暫時不攻擊對方的允諾.
+當其中一方開戰后, 協議自動失效.
+綜上所述, 兩國間可能的關系列表如下:\
 &TREATIES\\
+¥u¦³¦b¥~¥æ¥æ¯A¤¤, ©Î¬O¤@°ê©Úµ´±µ¨£
+§O°ê¨Ï¸`ªº®ÉÔ, ¤è¥i¨ú®øì¥ýÃ±qªº
+±ø¬ù. ¨ú®ø±ø¬ù¦Z, ¦b±µ¤U¨Óªº¤T¦^¦X¤º
 ¤£¥iÉO¦P¤@°ê®a¦A¦¸¨ú®ø¨ä¥L±ø¬ù.
+¦pªGA°ê¨ú®øÉOB°ê¶¡ªº©M¥±ø¬ù,
 «hB°êªº¦P·ù°ê¤]±N¹ïA°ê«Å¾Ô.\\
 !¥i«Hµ{«×\
+n§PÂ_¤@Ó°ê®a¬O§_¨¥¥X¥²¦æ, ¥i«H«×¬O
 «n°Ñ¦Ò¨ÌÕu. ¥i«H«×¤À¬°¥H¤U¥|Óµ¥¯Å:\
 -¨¥¥X¥²¦æ (100%¥i«H«×)\
 -«¿Õ¦u«H (90%~99%¥i«H«×)\
 -®»ºN¤£©w (70%~89%¥i«H«×)\
 -¨¥¦ÓµL«H (¥i«H«×§C¤_70%)\\
+¦b©M¥®É´Á, ¨C¦^¦X¨CÓ°ê®aªº¥i«H«×+1, ª½¦Ü³Ì¤jÈ.
+´åÀ¸¶}©l®É, ©Ò¦³°ê®aªº³Ì¤j¥i«H«×¬°100, ¼¹·´©M¥±ø¬ù
+±N¨Ï·í«e¥i«H«×´î¥b, ³Ì¤j¥i«H«×-10. ¼¹·´·ù¬ù±N¨Ï·í«e
+¥i«H«×´î¤Ö¥|¤À¤§¤T. µL½×¬O§_«Ø¥ß¹L¥~¥æÃö¨t, ¤@Ó°ê®a
 ªº¥i«H«×, ¹ï¨ä¥L°ê®a³£¬O¤½¶}³z©úªº.
+只有在外交交涉中, 或是一國拒絕接見
+別國使節的時候, 方可取消原先簽訂的
+條約. 取消條約后, 在接下來的三回合內
+不可与同一國家再次取消其他條約.
+如果A國取消与B國間的和平條約,
+則B國的同盟國也將對A國宣戰.\\
+!可信程度\
+要判斷一個國家是否言出必行, 可信度是
+重要參考依据. 可信度分為以下四個等級:\
+-言出必行 (100%可信度)\
+-重諾守信 (90%~99%可信度)\
+-捉摸不定 (70%~89%可信度)\
+-言而無信 (可信度低于70%)\\
+在和平時期, 每回合每個國家的可信度+1, 直至最大值.
+游戲開始時, 所有國家的最大可信度為100, 撕毀和平條約
+將使當前可信度減半, 最大可信度-10. 撕毀盟約將使當前
+可信度減少四分之三. 無論是否建立過外交關系, 一個國家
+的可信度, 對其他國家都是公開透明的.
 #SHIP
 $´åÀ¸ÀòÐ`\
 !ÀòÐ`¤è¦¡\
+n·Q¨ú±o³Ì²×Ð`§Q, ¥u¦³¤@±ø³~®|: ¦V¥~¤ÓªÅ´Þ¥Á! ¦pªG
+§Aªº¶Õ¤O¦¨¬°ºÓ¬£»º´Þ¥Á¸²îªº°ê®a, ¨º§A´N¬O³Ì¦Z
 ªºÄ¹®a. ¤@¿´´Þ¥Á¸²î»Ý12Ó³¡¥ó²Õ¦X¦Ó¦¨:\\
 ;:B67 6Ó´Þ¥Á¸²î²Õ¥ó\
 ;:B68 4Ó°Ê¤O¿µ\
 ;:B69 2Ó©~¦í¿µ\\
+n²Õ«Ø¥H¤W¤TÏú¸²î³¡¥ó, ¥²¶·¨Ì¾a¤TÏú¹ïÀ³ªº¯S®í¸ê·½.
+¥u¦³¥Í²£¸ÓÏú¯S®í¸ê·½ªº«°¥«, ¤~¯à²Õ«Ø¬ÛÀ³ªº¸²î³¡¥ó.
+¦b²Õ«Ø¸²î³¡¥ó®É, µLªkÉ§U³q±`ªº´£³t¤â¬q¥[§Ö«Ø³].
 ¯S®í¸ê·½¥]¬A:\
+$游戲獲胜\
+!獲胜方式\
+要想取得最終胜利, 只有一條途徑: 向外太空殖民! 如果
+你的勢力成為首個派遣殖民飛船的國家, 那你就是最后
+的贏家. 一艘殖民飛船需12個部件組合而成:\\
+;:B67 6個殖民飛船組件\
+;:B68 4個動力艙\
+;:B69 2個居住艙\\
+要組建以上三种飛船部件, 必須依靠三种對應的特殊資源.
+只有生產該种特殊資源的城市, 才能組建相應的飛船部件.
+在組建飛船部件時, 無法借助通常的提速手段加快建設.
+特殊資源包括:\
 &MODERN\\
 nµo²{³o¨Ç¯S®í¸ê·½, ¥²¶·¥ýÀò±o¥H¤U¬ì§Þ:\
 ::A47 ³W¼Ò¶q²£
+要發現這些特殊資源, 必須先獲得以下科技:\
+::A47 規模量產
 #MOVEMENT
 $³¡¶¤²¾°Ê\
 !³¡¶¤²¾°Ê\
+n¹ï³¡¶¤¤U¹F©R¥O, ½Ð¥ý¿ï¤¤°õ¦æ©R¥Oªº³¡¶¤. ³Q¿ïªº³¡¶¤
+·|¥H°{Ã{ªí¥Ü¿ï¤¤ª¬ºA, ¦P®É¸Ó³¡¶¤ªº¸Ô²Ó±¡ªp·|Åã¥Ü¦b
+«Ì¹õ¤U¤è. ¥Î¤è¦VÁä, ¤pÁä½L¼Æ¦rÁä©Î¹«¼Ð¥kÁä«ü´§³¡¶¤¦V
 ¥Ø¼Ð¦a¶ô²¾°Ê.\\
 !²¾°Ê¨î\
 ³q±`±¡ªp¤U, ³¡¶¤Á`¯à²¾°Ê¨ì¾F±µ¦a¶ô, ¦ý¥H¤U±¡ªp°£¥~:\
 -¥Ø¼Ð¦a¶ô¤W¦³¨ä¥L¶Õ¤Oªº³¡¶¤.\
 -²¾°Ê³¡¶¤ªºÉó°Ê¤O¤£¨¬, ¸Ô±¡¨£¤U¤å.\
 -¦a±³¡¶¤¤£¥i¦b®ü±²¾°Ê, ®ü¤W³¡¶¤¤£¥i¦b³°¦a²¾°Ê.\
 -¨S¦³®ü¤W¾É¯è¯à¤OªºÄ¥¥u¤£¥i¦b»·¬v²¾°Ê.\
 -¤£¥i¦V¨ä¥L¶Õ¤Oªº±±¨î¦a°ì²¾°Ê, ¸Ô±¡¨£¤U¤å.\\
 !ªÅ¤¤³¡¶¤\
+ªÅ¤¤³¡¶¤¦b¨C¦^¦Xµ²§ô®É¥²¶·¦^¨ì¥»¤è°ò¦a(¥]¬A¥»¤è«°¥«,
+x¨Æ°ò¦a, ¤Î¥ÀÄ¥), ¦pªG¥¼¯àªð¦^°ò¦a, ¸Ó³¡¶¤·|¼Y·´°}¤`.
 ¦³¤@Ïú¤èªk¥i¥HÁ×§K¤Wz±¡ªpªºµo¥Í:\
 ::F7 µ¹³¡¶¤¼W¥[¿Uªo\\
 !Éó°Ê®ø¯Ó\
+¨C¦¸²¾°Ê³£»Ý®ø¯Ó¤@©wªºÉó°Ê¤O(MP), ®ü¤W³¡¶¤, ªÅ¤¤³¡¶¤,
+¥H¤Î¦V¥©Z¦a§Î²¾°Êªº¦a±³¡¶¤§@±×¦V²¾°Ê®É(¦p¦è¥_¤è),
+»Ý®ø¯ÓªºÉó°Ê¤O¬°1ÂI; ««ª½©Î¤ô¥¤è¦V²¾°Ê®É(¦p¥¿¥_¤è),
+»Ý®ø¯ÓªºÉó°Ê¤O¬°1.5ÂI. ¦V±T¹ò¦a§Î²¾°Ê®É, Éó°Ê¤O¬°1.5ªº
+¦a±³¡¶¤, ©Ò¯ÓªºÉó°Ê¤O¬O¥©Z¦a§Îªº120%, Éó°Ê¤O¦b1.5ÂI
+¥H¤Wªº¦a±³¡¶¤, ©Ò¯ÓªºÉó°Ê¤O¬O¥©Z¦a§Îªº130%. ¦V°ª¤s
+¦a¶ô²¾°Ê®É, ¦a±³¡¶¤»Ý®ø¯Ó¨â¦^¦XÉó°Ê¤O, ²¾°Ê§¹¦¨¦Zªº
 ¤@Ó¦^¦X±NµLªk¦æ°Ê..\
 ::T ¬d¬Ý¦a§ÎÏúÃþ\\
 ²¾°Ê©Ò¯ÓÉó°Ê¤Oªº¥Ü·N¹Ï¦p¤U:\
+$部隊移動\
+!部隊移動\
+要對部隊下達命令, 請先選中執行命令的部隊. 被選的部隊
+會以閃爍表示選中狀態, 同時該部隊的詳細情況會顯示在
+屏幕下方. 用方向鍵, 小鍵盤數字鍵或鼠標右鍵指揮部隊向
+目標地塊移動.\\
+!移動限制\
+通常情況下, 部隊總能移動到鄰接地塊, 但以下情況除外:\
+-目標地塊上有其他勢力的部隊.\
+-移動部隊的机動力不足, 詳情見下文.\
+-地面部隊不可在海面移動, 海上部隊不可在陸地移動.\
+-沒有海上導航能力的艦只不可在遠洋移動.\
+-不可向其他勢力的控制地域移動, 詳情見下文.\\
+!空中部隊\
+空中部隊在每回合結束時必須回到本方基地(包括本方城市,
+軍事基地, 及母艦), 如果未能返回基地, 該部隊會墜毀陣亡.
+有一种方法可以避免上述情況的發生:\
+::F7 給部隊增加燃油\\
+!机動消耗\
+每次移動都需消耗一定的机動力(MP), 海上部隊, 空中部隊,
+以及向平坦地形移動的地面部隊作斜向移動時(如西北方),
+需消耗的机動力為1點; 垂直或水平方向移動時(如正北方),
+需消耗的机動力為1.5點. 向崎嶇地形移動時, 机動力為1.5的
+地面部隊, 所耗的机動力是平坦地形的120%, 机動力在1.5點
+以上的地面部隊, 所耗的机動力是平坦地形的130%. 向高山
+地塊移動時, 地面部隊需消耗兩回合机動力, 移動完成后的
+一個回合將無法行動..\
+::T 查看地形种類\\
+移動所耗机動力的示意圖如下:\
 @MoveShot\
 -¥ª¹Ï - ªì©lÉó°Ê¤O1.5ªº³¡¶¤\
 -¥k¹Ï - ªì©lÉó°Ê¤O3ªº³¡¶¤\\
+¦pªG³¡¶¤¶¶µÛ¹D¸ô, ªe¬y©Î¹Bªe²¾°Ê, µL½×ì©l¦a§Î¬°¦ó,
 Éó°Ê¤O®ø¯Ó³£±N°¬°0.4(±×¦V²¾°Ê)©M0.6(«D±×¦V²¾°Ê).
 ¦pªG¶¶µÛÅK¸ô²¾°Ê, Éó°Ê¤O®ø¯Ó±N°¬°ªì©lÉó°Ê¤Oªº8%
 (±×¦V²¾°Ê)©M12%(«D±×¦V²¾°Ê).\\
 ·s¦^¦X¶}©l®É, ³¡¶¤®ø¯ÓªºÉó°Ê¤O±N¦^Î`¨ìªì©l³Ì¤jÈ.
 ®ü¤W³¡¶¤¨ü·l¦Z, Éó°Ê¤OµLªk§¹¥þ¦^Î`, ¦ý¤£·|§C¤_2.5.\\
 n²¾°Ê¨ì§ó»·³B, ¥i¨Ï¥Î¥Ø¼Ð²¾°Ê¥\¯à, ¥kÁä³æÀ»¥Ø¼Ð¦a¶ô,
 ³¡¶¤´N·|¦V¸Ó¦a¶ô«ùÄò²¾°Ê.\\
 !±±¨î¦a°ì\
+³¡¶¤¤À¬°¨âÏú: ¤@Ïú¦³¦a°ì±±¨î¯à¤O, ¥t¤@Ïú«h¨S¦³. ¦³
 ¦a°ì±±¨î¯à¤Oªº³¡¶¤¦b±µªñ¨ä¥L¶Õ¤Oªº¦a°ì±±¨î³¡¶¤®É,
 µLªk¦V¹ï¤è±±¨îªº¦a°ì²¾°Ê, °£«D¥Ø¼Ð¦a¶ô¬O¥»¤è«°¥«,
 ©Î¸Ó¦a¶ô¦s¦b¥»¤èªº¦a°ì±±¨î³¡¶¤. ®ü¤W³¡¶¤, ªÅ¤¤³¡¶¤,
 ¯SÏú§L¥H¤Î³B¤_¹B¿éª¬ºAªº³¡¶¤¨S¦³¦a°ì±±¨î¯à¤O.\\
 !¥e»â«°¥«\
+§ðÀ»«¬¦a±³¡¶¤¥i¥e»â¤£³]¨¾ªº¼Ä¤è«°¥«. ¥e»â¼Ä«°¦Z,
+¸Ó«°Æ×ÄÝ¦}¦b¥~¾n¤ãªº¼Äx³¡¶¤±N¥þ¼Æ®ø¤`, ¾ãÓ«°¥«
 ¤]·|³´¤JÄÌ¶Ãª¬ºA, ¦}«ùÄò¤TÓ¦^¦X.
+-左圖 - 初始机動力1.5的部隊\
+-右圖 - 初始机動力3的部隊\\
+如果部隊順著道路, 河流或運河移動, 無論原始地形為何,
+机動力消耗都將降為0.4(斜向移動)和0.6(非斜向移動).
+如果順著鐵路移動, 机動力消耗將降為初始机動力的8%
+(斜向移動)和12%(非斜向移動).\\
+新回合開始時, 部隊消耗的机動力將回复到初始最大值.
+海上部隊受損后, 机動力無法完全回复, 但不會低于2.5.\\
+要移動到更遠處, 可使用目標移動功能, 右鍵單擊目標地塊,
+部隊就會向該地塊持續移動.\\
+!控制地域\
+部隊分為兩种: 一种有地域控制能力, 另一种則沒有. 有
+地域控制能力的部隊在接近其他勢力的地域控制部隊時,
+無法向對方控制的地域移動, 除非目標地塊是本方城市,
+或該地塊存在本方的地域控制部隊. 海上部隊, 空中部隊,
+特种兵以及處于運輸狀態的部隊沒有地域控制能力.\\
+!占領城市\
+攻擊型地面部隊可占領不設防的敵方城市. 占領敵城后,
+該城屬并在外駐扎的敵軍部隊將全數消亡, 整個城市
+也會陷入騷亂狀態, 并持續三個回合.
 #COMMANDS
 $³¡¶¤«ü¥O\
+$部隊指令\
 @@16\
 !³¡¶¤«ü¥O\
 ³¡¶¤ÏúÃþ¤£¦P, ¥H¤Î³¡¶¤©Ò³B¦a§Î¤£¦P, ³¡¶¤«ü¥O¤]¦³®tÉÝ:\
 -¸Ñ´²: ¸Ñ´²¸Ó³¡¶¤\
 -¾ã½s: ±N³¡¶¤½s¨î¥´´², ¥[¤J¨ì·í«e«°¥««Ø³]ªº·s³¡¶¤¤¤\
 -¥Ø¼Ð²¾°Ê: Ä~Äò¦V¥ý«e³]©wªº¥Ø¼Ð²¾°Ê\
 -µy¦Z¦æ°Ê: ¼È®É¸õ¹L, ¿ï¾Ü¤U¤@³¡¶¤\
 -ì¦aµ¥«Ý: ¥»¦^¦X¤£¦A¦æ°Ê\
 -¾n¦uÄµ§Ù: «ùÄò¤£¦æ°Ê, ª½¦Ü³Q¦A¦¸¤â°Ê¿ï¤¤\
 -«ìÎ`¥ð¾ã: ¨ü·l³¡¶¤¦bì¦a°±¯d«ìÎ`ª¬ºA, ª½¦Ü§¹¥þ±dÎ`\
 -§ï¬°¥»«°³¡¶¤: ±N©Ò¦b«°¥««ü©w¬°¸Ó³¡¶¤·sªºÆ×ÄÝ«°¥«\
 -ªð¦^³Ìªñ«°¥«: ºÉ§Öªð¦^¶ZÖÃ³Ìªñªº¥»¤è«°¥«\
 -¬É±©~¤¤: ¥H¸Ó³¡¶¤¬°µ¡¤f¤¤¤ß, ½Õ¾ã´åÀ¸µ¡¤f\
 -±°¹Ü: ºR·´·í«e¦a¶ôªº¦a§Î«Ø³](»Ý¯Ó¶O1ÂIÉó°Ê¤O)
+!部隊指令\
+部隊种類不同, 以及部隊所處地形不同, 部隊指令也有差异:\
+-解散: 解散該部隊\
+-整編: 將部隊編制打散, 加入到當前城市建設的新部隊中\
+-目標移動: 繼續向先前設定的目標移動\
+-稍后行動: 暫時跳過, 選擇下一部隊\
+-原地等待: 本回合不再行動\
+-駐守警戒: 持續不行動, 直至被再次手動選中\
+-恢复休整: 受損部隊在原地停留恢复狀態, 直至完全康复\
+-改為本城部隊: 將所在城市指定為該部隊新的屬城市\
+-返回最近城市: 盡快返回距离最近的本方城市\
+-界面居中: 以該部隊為窗口中心, 調整游戲窗口\
+-掠奪: 摧毀當前地塊的地形建設(需耗費1點机動力)
 #SETTLE
 $²¾¥Á¤u§@\
+$移民工作\
 @@29\
 !²¾¥Á¤u§@\
 ²¾¥Á³¡¶¤, ¦p©Ý¯îªÌ©M¤uµ{®v, ¥i¹ï¦a§Î¶i¦æ§ï³y:\
 -©w©~: ¦b©Ò¦b¦a¶ô«Ø¥ß·s«°¥«\
 -²M°£´ËªL: ¬å¥ï´ËªL, ¹@¬°¯î¦a\
 -©â¤zªh¿A: ±Nªh¿AÅÜ¬°¯ó³õ©Î¥ì\
 -´Ó¾ð³yªL: ±N©Ò¦b¦a§ÎÅÜ¬°´ËªL\
 -§ó´«¦a§Î: §ó´«¦a§ÎÏúÃþ, ¸Ô¨£¬ÛÃö¦a§ÎªºÅÜ§ó«H®§\
 -²M°£¦Ã¬V: ®ø°£¦]¹L«×¥Í²£³y¦¨ªº¦a¶ô¦Ã¬V\\
 -¦a§Î«Ø³]: ¤À¬°¦hÏúÃþ«¬, ¸Ô¨£:\
 ::J ¦a§Î«Ø³]¤@Äý\
+§ï³y¦a§Î»Ýªá¶O¤@©w¶qªºÉó°Ê¤O, ¥i¯à«ùÄò¼ÆÓ¬Æ¦Ü¼Æ¤QÓ
+¦^¦X¤è¯à§¹¦¨.   ¬°¥[§Ö§ï³y³t«×, ¥i¥H¬£»º¦h¤ä²¾¥Á³¡¶¤¦b
+¦P¤@¦a¶ô¤W°õ¦æ¬Û¦Pªº§ï³y¥ô°È.  ¦pªG³Ñ§EÉó°Ê¤O¤£¨¬1,
+§ï³y¥ô°È±N±À¿ð¨ì¤U¦^¦X¤~¶}©l.  ¤uµ{®v°õ¦æ¥ô°Èªº®Ä²vÉO
+©Ý¯îªÌ¬Û¦P, ¦ý¥Ñ¤_¤uµ{®v¾Ö¦³§ó°ªªºªì©lÉó°Ê¤O, ¦]¦¹¤u§@
 ³t«×¤ñ©Ý¯îªÌ§ó§Ö.\
 ::T ¥i°Ñ¦Ò: ¦a§ÎÏúÃþ¤@Äý
+!移民工作\
+移民部隊, 如拓荒者和工程師, 可對地形進行改造:\
+-定居: 在所在地塊建立新城市\
+-清除森林: 砍伐森林, 辟為荒地\
+-抽干沼澤: 將沼澤變為草場或平原\
+-植樹造林: 將所在地形變為森林\
+-更換地形: 更換地形种類, 詳見相關地形的變更信息\
+-清除污染: 消除因過度生產造成的地塊污染\\
+-地形建設: 分為多种類型, 詳見:\
+::J 地形建設一覽\
+改造地形需花費一定量的机動力, 可能持續數個甚至數十個
+回合方能完成.   為加快改造速度, 可以派遣多支移民部隊在
+同一地塊上執行相同的改造任務.  如果剩余机動力不足1,
+改造任務將推遲到下回合才開始.  工程師執行任務的效率与
+拓荒者相同, 但由于工程師擁有更高的初始机動力, 因此工作
+速度比拓荒者更快.\
+::T 可參考: 地形种類一覽
 #COMBAT
 $¾Ô¤æ¤j¥þ\
 !§ð¦u·§½×\
+¥Î¤è¦VÁä©Î¹«¼Ð¥i«ü´§¥»¤è³¡¶¤§ðÀ»¾F±µªº¼Ä¤è³¡¶¤, ¤èªk
+ÉO³¡¶¤²¾°Ê¬Û¦P. ¦ý§ðÀ»¤]¦³¤@©wªº³W«h, ³q±`±¡ªp¤U, ¦a±
+³¡¶¤µLªk§ðÀ»®ü¤W³¡¶¤, ¤Ï¤§¥çµM.  ®ü¤W³¡¶¤¤£¯à±q«°¥«¤º
+©Î¹Bªe¤¤µo°_§ðÀ»; ªÅ¤¤³¡¶¤¥un¤£¦b«°¥«¤º©Îx¨Æ°ò¦a¤¤,
+´N¥u¯à³Q¨ä¥LªÅ¤¤³¡¶¤§ðÀ». ¾Ô¤æ¤¤®z¶Õ¤@¤è·|³Q®ø·À, ±j¶Õ
+¤@¤è±N¨ü¨ì·l¶Ë, ±j®z®t¶Z¶V¤j,±j¶Õ³¡¶¤¨ü·l¶V¤p.
 n¹wª¾§ðÀ»ªº®ÄªG, ½Ð«ö¦íShiftÁä, ¥kÁäÂIÀ»n§ðÀ»ªº¥Ø¼Ð.\\
+¨C¤ä³¡¶¤ªº¾Ô¤æ¤O¤À¬°§ðÀ»©M¨¾±s¨âÏú. ³¡¶¤±¡³ø¤¤Åã¥Üªº
 /25, ·N«ä´N¬O§ðÀ»75, ¨¾±s25. ¦b¤@³õ¾Ôª§¤¤, ÁÙ¦³¤@¨Ç
 ¦]¯À·|¼vÅT¹ê»Úªº¾Ô¤æ¤O:\
 -³¡¶¤¸gÅç: ¸gÅç¤W¤É¤@¯Å, ¾Ô¤æ¤O´N´£¤É25%, ¸Ô¨£¤U¤å.\
 -¦a§Î¨¾±s¥[¦¨: ¶È¹ï³Q§ðÀ»¤@¤è¦³®Ä, ¸Ô¨£¦a§ÎÃþ«¬¤@Äý.\
 -¯S®í¨¾±s³]¬I: ¦p«°Àð, n¶ëµ¥µ¥; ¶È¹ï³Q§ðÀ»¤@¤è¦³®Ä.\
 -¾n¦uª¬ºA: ¶È¹ï³Q§ðÀ»¤@¤è¦³®Ä; ¤£³B¤_¹B¿éª¬ºAªº³¡¶¤,
 Y¤W¦^¦X¨S¦³¦æ°Ê, ¥»¦^¦X¦Û°Ê¶i¤J¾n¦uª¬ºA, ¨¾±s+50%.\
 -¦b«°¥«¨½©Îx¨Æ°ò¦a¤¤°±¯dªºªÅ¤¤³¡¶¤¨¾±s¤O¬°¹s, ¦b
 «°¥«¨½©Î¹Bªe¤¤ªº®ü¤W³¡¶¤¨¾±s¤O´î¥b.\
 ª`·N: ¦hÏú¨¾±s¤O¥[¦¨ªº®ÄªG¬O¿n²Ö¬Û¥[, ¦Ó¤£¬O¿¼Æ¬Û¼.\\
 Y§ðÀ»¤èÉó°Ê¤£¨¬1ÂI, «h®i¶}§ðÀ»®ÉµLªk¨Ï¥X¥þ³¡¾Ô¤æ¤O,
 ·|®ÚÕu³Ñ§EªºÉó°Ê¦Ó¬ÛÀ³«d®z.\\
 !§ðÀ»¦¨¸s³¡¶¤\
+¦pªG¨â¤ä©Î¨â¤ä¥H¤Wªº³¡¶¤°±¯d¦b¦P¤@¦a¶ô, ¦b¾D¨ü§ðÀ»®É,
+¥u¦³¤@¤ä³¡¶¤¥X°}¨¾¦u, ´N¬OÅã¥Ü¦b¦a¹Ï¤Wªº¨º¤ä³¡¶¤.
 ³q±`±¡ªp¤U, ¨t²Î·|¬D¿ï¨¾±s³Ì±jªº³¡¶¤, ¸Ô±¡½ÐÂIÀ»:\\
 ;TILEDEF ¦¨¸s³¡¶¤ªº¨¾¦u\\
+¦pªG¦b«°¥«, n¶ë©Îx¨Æ°ò¦a¤§¥~ªº¦¨¸s³¡¶¤¦b¾Ô¤æ¤¤¸¨±Ñ,
 ¸Ó¦a¶ô¤W©Ò¦³ªº³¡¶¤³£·|³Q®ø·À, ¼ç¸¥©MÁô§Î¸Éó¤]¤£¨Ò¥~.\\
 !¸gÅçµ¥¯Å\
 ÀHµÛ¦b¾Ô¤æ¤¤¨ü·lª¬ºAªº¿n²Ö, ³¡¶¤ªº¸gÅçµ¥¯Å·|³v¯Å´£¤É,
 ¨C·l¥¢100ÂIª¬ºA, ³¡¶¤¸gÅç´£¤É¤@¯Å. ¸gÅçµ¥¯Å¸Ô¦C¦p¤U:\
+$戰斗大全\
+!攻守概論\
+用方向鍵或鼠標可指揮本方部隊攻擊鄰接的敵方部隊, 方法
+与部隊移動相同. 但攻擊也有一定的規則, 通常情況下, 地面
+部隊無法攻擊海上部隊, 反之亦然.  海上部隊不能從城市內
+或運河中發起攻擊; 空中部隊只要不在城市內或軍事基地中,
+就只能被其他空中部隊攻擊. 戰斗中弱勢一方會被消滅, 強勢
+一方將受到損傷, 強弱差距越大,強勢部隊受損越小.
+要預知攻擊的效果, 請按住Shift鍵, 右鍵點擊要攻擊的目標.\\
+每支部隊的戰斗力分為攻擊和防御兩种. 部隊情報中顯示的
+/25, 意思就是攻擊75, 防御25. 在一場戰爭中, 還有一些
+因素會影響實際的戰斗力:\
+-部隊經驗: 經驗上升一級, 戰斗力就提升25%, 詳見下文.\
+-地形防御加成: 僅對被攻擊一方有效, 詳見地形類型一覽.\
+-特殊防御設施: 如城牆, 要塞等等; 僅對被攻擊一方有效.\
+-駐守狀態: 僅對被攻擊一方有效; 不處于運輸狀態的部隊,
+若上回合沒有行動, 本回合自動進入駐守狀態, 防御+50%.\
+-在城市里或軍事基地中停留的空中部隊防御力為零, 在
+城市里或運河中的海上部隊防御力減半.\
+注意: 多种防御力加成的效果是積累相加, 而不是倍數相乘.\\
+若攻擊方机動不足1點, 則展開攻擊時無法使出全部戰斗力,
+會根据剩余的机動而相應削弱.\\
+!攻擊成群部隊\
+如果兩支或兩支以上的部隊停留在同一地塊, 在遭受攻擊時,
+只有一支部隊出陣防守, 就是顯示在地圖上的那支部隊.
+通常情況下, 系統會挑選防御最強的部隊, 詳情請點擊:\\
+;TILEDEF 成群部隊的防守\\
+如果在城市, 要塞或軍事基地之外的成群部隊在戰斗中落敗,
+該地塊上所有的部隊都會被消滅, 潛艇和隱形飛机也不例外.\\
+!經驗等級\
+隨著在戰斗中受損狀態的積累, 部隊的經驗等級會逐級提升,
+每損失100點狀態, 部隊經驗提升一級. 經驗等級詳列如下:\
 &EXPERIENCE\\
 !ª¬ºA«ìÎ`\
+¦^¦Xµ²§ô®É, ¨ü·l³¡¶¤·|®ÚÕu³Ñ§EªºÉó°Ê¬ÛÀ³«ìÎ`³¡¤Àª¬ºA.
+¦pªG¥»¦^¦X¥¼´¿²¾°Ê, ³¡¶¤ªºª¬ºA³Ì¤j«ìÎ`8ÂI, Y¦b¥¼ÄÌ¶Ã
+«°¥«©Îx¨Æ°ò¦a¤¤, ª¬ºA³Ì¤j«ìÎ`20ÂI.  ®ü±¤Wªº¨ü·l³¡¶¤
 ª¬ºA¤£·|«ìÎ`. ªÅ¤¤³¡¶¤¥u¦³¦b«°¥«©Îx¨Æ°ò¦a¤¤¤~¯à«ìÎ`.\\
 !ÅF¬µ«°¥«\
+¨ã³ÆÅF¬µ¯à¤Oªº®ü¤W©MªÅ¤¤³¡¶¤¥i§ðÀ»¾F±µªº¼Ä¤è«°¥«,
+ÅF¬µ®ø¯Ó1ÂIÉó°Ê. ³QÅF¬µªº«°¥«³W¼Ò´î¤Ö1¯Å, ª½¦Ü³Q
 §¹¥þºR·´. °õ¦æÅF¬µªº³¡¶¤¤£·|¨ü·l, ¤]µLªkÀò±o¸gÅçÈ.
 ÅF¬µ¤èªkÉO§ðÀ»¤èªk¬Û¦P, ¥Î¹«¼Ð©ÎÁä½L«ü´§³¡¶¤§ðÀ».\\
 !ÅX³v³¡¶¤\
+§A¤]¥i¥H«ü´§¤@¤ä³¡¶¤±N¦b¤v¤è»â¤g¤W¾n¤ãªº©M¬ù°ê³¡¶¤
+ÅX³v¥X¹Ò.  °õ¦æÅX³v«ü¥Oªº³¡¶¤¥²¶·¬O¦a±©Î®ü¤Wªº§ðÀ»©Ê
 ³¡¶¤, ¥B³Ñ§EÉó°Ê¤j¤_1ÂI.  ÅX³vªº¤èªkÉO§ðÀ»¤èªk¬Û¦P.
+!狀態恢复\
+回合結束時, 受損部隊會根据剩余的机動相應恢复部分狀態.
+如果本回合未曾移動, 部隊的狀態最大恢复8點, 若在未騷亂
+城市或軍事基地中, 狀態最大恢复20點.  海面上的受損部隊
+狀態不會恢复. 空中部隊只有在城市或軍事基地中才能恢复.\\
+!轟炸城市\
+具備轟炸能力的海上和空中部隊可攻擊鄰接的敵方城市,
+轟炸消耗1點机動. 被轟炸的城市規模減少1級, 直至被
+完全摧毀. 執行轟炸的部隊不會受損, 也無法獲得經驗值.
+轟炸方法与攻擊方法相同, 用鼠標或鍵盤指揮部隊攻擊.\\
+!驅逐部隊\
+你也可以指揮一支部隊將在己方領土上駐扎的和約國部隊
+驅逐出境.  執行驅逐指令的部隊必須是地面或海上的攻擊性
+部隊, 且剩余机動大于1點.  驅逐的方法与攻擊方法相同.
 #TILEDEF
 $¦¨¸s³¡¶¤\
 !¦¨¸s³¡¶¤\
+¦pªG¨â¤ä©Î¨â¤ä¥H¤Wªº³¡¶¤°±¯d¦b¦P¤@¦a¶ô, ¦b¾D¨ü§ðÀ»®É,
 ¥u¦³¨¾±s³Ì±jªº¨º¤ä³¡¶¤·|¥X°}¨¾¦u, ¦ý¤]·|¥X²{¨Ò¥~±¡ªp.
 ¨t²Î¦bÚÌ©w¨¾±s³¡¶¤®É, ¨Ì¦¸¿í´`¦p¤U³W«h:\
 -³ÌÉ¬¥ýªº³W«h¬O®ÚÕu³¡¶¤ªºÃþ§O. º¥ý¬O¨ã³Æ¨g¼ö¤À¤lÄÝ©Ê
+ªº¦a±³¡¶¤, µM¦Z¬O¨ã¦³¦a°ì±±¨îÄÝ©Êªº±`³W¦a±³¡¶¤, ²Ä¤T
 ¿ï¾Ü¬O¨S¦³¦a°ì±±¨îÄÝ©Êªº¦a±³¡¶¤, ³Ì¦Z¬O¼ç¸¥©MÁô§Î¸Éó.
 ¦b¹B¿éÄ¥©M¹B¿éÉó¤Wªº¹B¿é³¡¶¤¥Ã»·¤£·|§@¬°¨¾¦u³¡¶¤¥X°}.\
 -¦pªG¦³¨â¤ä³¡¶¤Ãþ§O¬Û¦P, ¨¾±s¸û°ªªº³¡¶¤±N¾á¥ô¨¾¦u¥ô°È.
+³o¨½ªº¨¾±s¤O«üªº¬O±N¸gÅçµ¥¯Å, ·í«eª¬ºA©M¾n¦uª¬ºAµ¥¦]¯À
 ºî¦X¦Ò¼{ªºµ²ªG. ¹ï¯S©w³¡¶¤ªº¯S®í¨¾±s¥[¦¨±N¤£§@¦Ò¼{.\
 -¦pªG¨â¤ä©Î¨â¤ä¥H¤W¨ã³Æ¬Û¦Pªº¨¾±s¤O(³oÏú±¡ªpÌå¤Öµo¥Í)
 ³yÉ²¸û§Cªº¨º¤ä³¡¶¤±N¾á¥ô¨¾¦u¥ô°È.
+$成群部隊\
+!成群部隊\
+如果兩支或兩支以上的部隊停留在同一地塊, 在遭受攻擊時,
+只有防御最強的那支部隊會出陣防守, 但也會出現例外情況.
+系統在确定防御部隊時, 依次遵循如下規則:\
+-最优先的規則是根据部隊的類別. 首先是具備狂熱分子屬性
+的地面部隊, 然后是具有地域控制屬性的常規地面部隊, 第三
+選擇是沒有地域控制屬性的地面部隊, 最后是潛艇和隱形飛机.
+在運輸艦和運輸机上的運輸部隊永遠不會作為防守部隊出陣.\
+-如果有兩支部隊類別相同, 防御較高的部隊將擔任防守任務.
+這里的防御力指的是將經驗等級, 當前狀態和駐守狀態等因素
+綜合考慮的結果. 對特定部隊的特殊防御加成將不作考慮.\
+-如果兩支或兩支以上具備相同的防御力(這种情況极少發生)
+造价較低的那支部隊將擔任防守任務.
 #SPYMISSIONS
 $¯µ±K¦æ°Ê\
+$秘密行動\
 @@28\
 !¯µ±K¦æ°Ê\
+¥u¦³¯SÏú§L¤~¯à°õ¦æ¯µ±K¦æ°Ê. ±N¯SÏú§L¬£»º¨ì¼Ä¤è«°¥«
 ¤§¦Z, ·|¼u¥X¤@Ó¦æ°Êµæ³æ¨Ñª±®a¿ï¾Ü, ¿ï¶µ¦p¤U:\
 -¯}§¥¥Í²£: «°¥«ªº«Ø³]¥Í²£°±º¢¤@¦^¦X.\
 -ÅÑ¨ú¦a¹Ï: Àò±o¼Ä¤è³Ì·sªº¥@¬É¦a¹Ï.\
 -Àò±o²Ä¤T°ê±¡³ø: ±q¼Ä¤èÀòª¾²Ä¤T°êªº°ê®a±¡³ø.\
 -¥´§v°ê®a±¡³ø: Àòª¾¼Ä¤è³Ì·sªº°ê®a±¡³ø.\
 -¥´§vx¨Æ±¡³ø: Àòª¾¼Ä¤è³Ì·sªºx¨Æ±¡³ø.\\
 Ã±¸p©M¥±ø¬ùªº¨âÓ°ê®a, µLªk¦b¹ï¤è«°¥«¶}®i¯µ±K¦æ°Ê.
 ¦ý¯SÏú§L¨ÌµM¥i¼ç¤J¥ô¦ó¦a°Ï, µLµø±ø¬ùªº¬ù§ô.
+!秘密行動\
+只有特种兵才能執行秘密行動. 將特种兵派遣到敵方城市
+之后, 會彈出一個行動菜單供玩家選擇, 選項如下:\
+-破坏生產: 城市的建設生產停滯一回合.\
+-竊取地圖: 獲得敵方最新的世界地圖.\
+-獲得第三國情報: 從敵方獲知第三國的國家情報.\
+-打听國家情報: 獲知敵方最新的國家情報.\
+-打听軍事情報: 獲知敵方最新的軍事情報.\\
+簽署和平條約的兩個國家, 無法在對方城市開展秘密行動.
+但特种兵依然可潛入任何地區, 無視條約的約束.
 #CLASSES
 $³¡¶¤¬ãµo\
 !³¡¶¤¬ãµo\
+´åÀ¸ªì©l®É, ¥ô¦ó¶Õ¤O³£¥iª½±µ¥Í²£¥Á§L©M©Ý¯îªÌ,
 ¬Y¨Ç¯S®í³¡¶¤¶·´x´¤¯S©wªº¬ì§Þ©Î©_¸ñ, ¤è¥i¥Í²£.\
 ::S °Ñ¨£"¯S®í³¡¶¤"\\
+n¥Í²£¨ä¥Lªº·s«¬³¡¶¤, ¥²¶·É§U¬ì§Þ¬ãµo¤è¯à¹F¦¨.
+·íÀò±o¤F¬ÛÃöªº¬ì§Þª¾ÃÑ¤§¦Z, (¨Ò¦p´x´¤©|ªZ²ß«U¦Z,
+¥i¬ãµo·sªº¦a±³¡¶¤), ¥i¦b¬ãµoµ¡¤f¿ï¾Ü"³¡¶¤¬ãµo",
 ±q¦Ó¶}±Ò³¡¶¤¬ãµoµ¡¤f:\\
+$部隊研發\
+!部隊研發\
+游戲初始時, 任何勢力都可直接生產民兵和拓荒者,
+某些特殊部隊須掌握特定的科技或奇跡, 方可生產.\
+::S 參見"特殊部隊"\\
+要生產其他的新型部隊, 必須借助科技研發方能達成.
+當獲得了相關的科技知識之后, (例如掌握尚武習俗后,
+可研發新的地面部隊), 可在研發窗口選擇"部隊研發",
+從而開啟部隊研發窗口:\\
 @DraftShot\
 ¹Ï¨Ò:\
 -1: ·í«e½s¨î\
 -2: ¿¼W¦]¤l\
 -3: ¿ï¾Ü©Ò»ÝªºÄÝ©Ê\
 -4: ¿ï¾Ü§LÏú\
 -5: ¬ãµo§LÏúªº«ü¼Æ\\
+³¡¶¤¬ãµoªºµ²ªG¨ú¨M¤_¨âÓ¦]¯À: ¤@¬O·í«e¥»°êªº¬ì§Þµo®i
+¤ô¥.  ¬Y¨Ç¬ì§Þ¦¨ªG¥i±a¨Ó·sªº³¡¶¤ÄÝ©Ê, ©Î´£¤É°ò¥»ÄÝ©Ê
 ªº¿¼W¦]¤l, °ò¥»ÄÝ©Ê¥]¬A§ðÀ», ¨¾±s, ¹B¿é, ³yÉ²µ¥µ¥.\\
+¥t¤@Ó«h¬Oª±®a¦Û¦æ½Õ°tªº¦U¶µÄÝ©Ê¤ñ¨Ò¤Î¯S®í®ÄªG¥[¦¨.
+µ´¤j¦h¼ÆÄÝ©Ê´£¤É®É, ¥Í²£³yÉ²(%p)©M³¡¶¤½s¨î(%w)¤]·|
+¬ÛÀ³´£¤É. ³¡¶¤§LÏú©M¬ì§Þ¦¨ªG¨M©wµÛ³¡¶¤½s¨îªº¤W.  n
 Àòª¾¬YÄÝ©Êªº¸Ô²Ó«H®§, ½Ð«ö¦íShiftÁä¦Z³æÀ»ÄÝ©Ê¦WºÙ.\
 ::F ³¡¶¤ÄÝ©Ê\\
+®ÚÕu´åÀ¸Ãø«×ªº¤£¦P, §ðÀ», ¨¾±s©M¹B¿éÄÝ©Êªº´£¤É©Ò±a¨Ó
+ªº³yÉ²ÅÜ¤Æ¤]·|¦³®tÉÝ. ¦bÂ²³æÃø«×¤U, ³¡¶¤³yÉ²±N¤ñ¥¿±`
 Ãø«×§C25%, ¦Ó¦b§xÃøÃø«×¤U, ³yÉ²±N¤ñ¥¿±`Ãø«×°ª25%.
+圖例:\
+-1: 當前編制\
+-2: 倍增因子\
+-3: 選擇所需的屬性\
+-4: 選擇兵种\
+-5: 研發兵种的指數\\
+部隊研發的結果取決于兩個因素: 一是當前本國的科技發展
+水平.  某些科技成果可帶來新的部隊屬性, 或提升基本屬性
+的倍增因子, 基本屬性包括攻擊, 防御, 運輸, 造价等等.\\
+另一個則是玩家自行調配的各項屬性比例及特殊效果加成.
+絕大多數屬性提升時, 生產造价(%p)和部隊編制(%w)也會
+相應提升. 部隊兵种和科技成果決定著部隊編制的上限.  要
+獲知某屬性的詳細信息, 請按住Shift鍵后單擊屬性名稱.\
+::F 部隊屬性\\
+根据游戲難度的不同, 攻擊, 防御和運輸屬性的提升所帶來
+的造价變化也會有差异. 在簡單難度下, 部隊造价將比正常
+難度低25%, 而在困難難度下, 造价將比正常難度高25%.
 #CITIES
 $«°¥«·§½×\
+$城市概論\
 @@43\
 !«°¥«·§½×\
+«°¥«ªº°ò¥»¥\¯à¬O¦¬¶°¾Fªñ¦a¶ôªº¸ê·½, ¦}±N¦¬¶°ªº¸ê·½
+³B²z¦Z, Âà¬°¬ì§Þ, ¥Í²£, ©Î¤H¤f.
+´åÀ¸ªì©l®É, ¤@Ó°ê®a¥u¦³¤@Ó«°¥«, ¸Ó«°¤]¬O°ê®aªºº³£.
+¦³¨âÏú¤èªk¼W¥[«°¥«¼Æ¶q, ¤@¬O¬£»º²¾¥Á³¡¶¤«Ø¥ß·s«°¥«,
+¤G¬O¬£§L¥e»â§O°êªº«°¥«. «°¥«¥u¯à«Ø¥ß¦b¥iÄéµ@ªº¤g¦a¤W
 (¯ó³õ/¥ì/¯î¦a/¥C³®/aì).\\
+¨CÓ«°¥«¦³¦U¦Û±MÄÝªºµe±, ³æÀ»¦a¹Ï¤Wªº«°¥«¹Ï¼Ð,
 §Y¥i¥´¶}¸Ó«°¥«ªº±MÄÝµe±: \\
+!城市概論\
+城市的基本功能是收集鄰近地塊的資源, 并將收集的資源
+處理后, 轉為科技, 生產, 或人口.
+游戲初始時, 一個國家只有一個城市, 該城也是國家的首都.
+有兩种方法增加城市數量, 一是派遣移民部隊建立新城市,
+二是派兵占領別國的城市. 城市只能建立在可灌溉的土地上
+(草場/平原/荒地/丘陵/苔原).\\
+每個城市有各自專屬的畫面, 單擊地圖上的城市圖標,
+即可打開該城市的專屬畫面: \\
 @CityShot\
 ¤Wzµe±¤¤, ¥Dn¥]§t¤F¦p¤U¤LÓ¤j¶µ:\\
 !¥«¥Á\
+«°¥«µe±¥ª¤W¨¤ªº¤HÁy¥NªíµÛ¸Ó«°ªº¥«¥Á. «°¥«³W¼Òªº
+¤U¬°2¯Å, ¦pªG³W¼Ò°¦Ü2¯Å¥H¤U, «h¸Ó«°±N¤£Î`¦s¦b.
+Àq»{±ø¥ó¤U, «°¥«³W¼Ò¤W¬°8¯Å, ¦ý¤WÈ¥i³q¹L¯S®í
 ªº«°¥«³]¬I´£¤É.\\
+¨CÓ¥«¥Á¥i¦¬¶°¤@Ó¦a¶ô(¨£¤W¹Ï1)ªº¸ê·½. ¤@Ó¦a¶ô¤W
+³Ì¦h®e¯Ç¤@¦W¥«¥Á. ³Q¨ä¥L«°¥«¥e¥Îªº¦a¶ô±N³Q¼Ð¥Ü¬°
 ¤£¥i¥Î¦a¶ô.\\
 ¥¼³Q«ü©wªºªÅ¶¢¥«¥Á, ±N³Q¥Î§@¬°«°¥«§ÙÄY³¡¶¤(¨£¤W¹Ï2)
 ¥i¥Î¨ä¨Óºû«ù«°¥«¦w©wªº¤ñ¨Ò, ¨Ï«°¥«¤£¦Ü¤_³´¤JÄÌ¶Ã.
 ¸Ô²Ó«H®§½Ð°Ñ·Ó¤U¤åÀ°§U³¡¤À.\\
 !¦w©w\
+«°¥«µe±ªº¥k¤W¤èÅã¥Ü¤F·í«e¥«¥Áªº¦w©wª¬ºA.
 ¸Ó³¡¤À¤À¬°¤T¦æ:\
 -°ø¨× (¹Ï¼Ð: %l). ¦pªG¦b"¸gÀÙ¤Îµ|¦¬"µæ³æ¤¤
+³]©w¤F°ø¨×¤ñ¨Ò, «h¨CÓ«°¥«ªº¶T©ö¼Æ¤¤±N¦³
 ¤@³¡¤ÀÂà¤Æ¬°°ø¨×,¸Ô¨£¤U¤å¤¤ªº"¶T©ö"³¡¤À.\
 -¦w©w (%m). Àq»{±¡ªp¤U, «°¥«¤¤¦³¥|¦W¥«¥Á
+¬O¦w©wªº, ¨ä§E¥«¥Á³£¬O¤£¦wªº. «Ø³y¯S©wªº
+«°¥«³]¬I©Î©_¸ñ, ¥i´£¤É¦w©w¥«¥Áªº¼Æ¶q. ¨C®y
 ©_¸ñ¯à¨Ï©Ò¦b«°¥«¤¤ªº¨â¦W¤£¦w¥«¥ÁÅÜ¬°¦w©w.\
 -§ÙÄY (%o). ¨C¤ä«°¥«§ÙÄY³¡¶¤¥i¨Ï¨â¦W¤£¦w
+¥«¥ÁÅÜ¬°¦w©w. ¥t¥~, ¯S®í³¡¶¤¤¤ªº¦u«°½Ã§L
 ¤]¥i¨Ï±o¦w©w¥«¥Áªº¼Æ¶q¼W¥[.\\
+¦pªG¤£¦w¥«¥Á¼Æ¶W¶V¤F°ø¨×¼ÆÉO¦w©w¥«¥Á¼Æ
 ¤§©M, «h¾ãÓ«°¥«±N³´¤JÄÌ¶Ã.\\
+¬Y¨Ç¯S©wªº¬FÊ^§Î¦¡¤U, ¤£¦w¨Æ¥óªºµo¥Í·|°§C
 «°¥«ªº¦w©wÈ, ¸Ô²Ó«H®§½Ð°Ñ¦Ò\
 ::G ¬FÊ^§Î¦¡\\
 !«H¥õ\
+¦b©v±Ð¨î°ê®a,¦w©wÈªºpºâÉO¨ä¥L¬FÊ^§Î¦¡¤£¦P.
+¨CÓ¥«¥Á³£¦]«H¥õ¦ÓÅÜ±o¦w©w, ¦]¦¹©v±Ð¨î°ê®a
 µL»Ý¾á¤ß«°¥«ªº¦w©w°ÝÃD, §ó¤£·|¥X²{«°¥«ÄÌ¶Ã.\\
 !¸ê·½ÏúÃþ\
+«°¥«±q©P³ò¦a¶ô¤¤¦¬¶°ªº¸ê·½, ®ÚÕuÃþ«¬¤£¦P
 ¤À¬°¤TÏú: Â³¹(%f), ì®Æ(%p)©M¶T©ö(%t).
+上述畫面中, 主要包含了如下几個大項:\\
+!市民\
+城市畫面左上角的人臉代表著該城的市民. 城市規模的
+下限為2級, 如果規模降至2級以下, 則該城將不复存在.
+默認條件下, 城市規模上限為8級, 但上限值可通過特殊
+的城市設施提升.\\
+每個市民可收集一個地塊(見上圖1)的資源. 一個地塊上
+最多容納一名市民. 被其他城市占用的地塊將被標示為
+不可用地塊.\\
+未被指定的空閒市民, 將被用作為城市戒嚴部隊(見上圖2)
+可用其來維持城市安定的比例, 使城市不至于陷入騷亂.
+詳細信息請參照下文幫助部分.\\
+!安定\
+城市畫面的右上方顯示了當前市民的安定狀態.
+該部分分為三行:\
+-奢侈 (圖標: %l). 如果在"經濟及稅收"菜單中
+設定了奢侈比例, 則每個城市的貿易數中將有
+一部分轉化為奢侈,詳見下文中的"貿易"部分.\
+-安定 (%m). 默認情況下, 城市中有四名市民
+是安定的, 其余市民都是不安的. 建造特定的
+城市設施或奇跡, 可提升安定市民的數量. 每座
+奇跡能使所在城市中的兩名不安市民變為安定.\
+-戒嚴 (%o). 每支城市戒嚴部隊可使兩名不安
+市民變為安定. 另外, 特殊部隊中的守城衛兵
+也可使得安定市民的數量增加.\\
+如果不安市民數超越了奢侈數与安定市民數
+之和, 則整個城市將陷入騷亂.\\
+某些特定的政体形式下, 不安事件的發生會降低
+城市的安定值, 詳細信息請參考\
+::G 政体形式\\
+!信仰\
+在宗教制國家,安定值的計算与其他政体形式不同.
+每個市民都因信仰而變得安定, 因此宗教制國家
+無需擔心城市的安定問題, 更不會出現城市騷亂.\\
+!資源种類\
+城市從周圍地塊中收集的資源, 根据類型不同
+分為三种: 糧食(%f), 原料(%p)和貿易(%t).
 \\
 ¨CÓ¦a¶ô¥X²£¸ê·½ªº¦h¤Ö¨ú¨M¤_¥H¤U¤TÓ±ø¥ó:\
 ::T ¦a§ÎÏúÃþ\
 ::J ¦a§Î§ï³y\
 ::G ¬FÊ^§Î¦¡\\
 !Â³¹\
+Â³¹(²Å¸¹¬°%f)¥Nªí¤F¦UÏú¹ª«. «°¥«Â³¹ªº¥Í²£®ø¯Ó
 ±¡ªpÅã¥Ü¦bÂ³¹±ªO¤¤(¨£¤W¹Ï4).  Â³¹¬O¤HÃþ¨C¤éªº®Ú¥»,
+¨CÓ¥«¥Á¨C¦^¦X»Ý®ø¯Ó2%f. ÁÙ¦³¤@¨Ç³¡¶¤»Ýn©w¶qªºÂ³¹
+§@¬°¨Ñµ¹, ¦pÂ³¹¨ÑÀ³¤£¨¬, ±N±q«°¥«ªº¦sÂ³¤¤¦©°£. ¦pªG
+¦sÂ³¯ÓºÉ, «°¥«³´¤JÄÈ¯î, ·|¦³¤@¦W¥«¥Á©Î¤@¤ä³¡¶¤®ø¥¢.
+¦ý¦b³q±`±¡ªp¤U, «°¥«¥Í²£ªºÂ³¹¶q¤£·|§C¤_®ø¯Ó¶q. ¦pªG
+¥Í²£ªºÂ³¹¦³³Ñ§E, ¦h§EªºÂ³¹±Np¤J¦sÂ³, ¦ý¦³¤@Ïú±¡ªp
+ÄÝ¤_¨Ò¥~: ³W¼Ò¹F¨ì8ªº¤j«°¥«¨C¦^¦X¦pªG¦h§E1³æ¦ìªºÂ³¹,
+«h³o1³æ¦ìÂ³¹±Nª½±µÂà¬°¸êª÷, ¤£p¤J¦sÂ³. ¦pªG¦sÂ³¹F¨ì
+¤W, ¥B«°¥«³W¼Ò¥¼¹F¤W, ¨º¤\³oÓ«°¥«ªº³W¼Ò·|´£¤É1¯Å,
 ¥«¥Á¼Æ¶q¥[1.\\
 !ì®Æ\
+ì®Æ (²Å¸¹¬°%p)¬O¤@Ïú©â¶Hªº¸ê·½, ¬O¦UÏú³Ò°Ê¥Í²£¸ê·½
+¦p¤ìÀY, Äq¥Û, ¥Ûªoµ¥ªºÁ`ºÙ. «°¥«ì®Æªº¥Í²£®ø¯Ó±¡ªpÅã¥Ü
+¦bì®Æ±ªO¤¤(¨£¤W¹Ï5). «°¥«¤¤¬Y¨ÇÆ×ÄÝ³¡¶¤»Ý®ø¯Ó¤@©w¶q
+ªºì®Æ¥Hºû«ù¤é±`¨Ñµ¹, ³Ñ§Eì®Æ±N§ë¤J¨ì¥Í²£«Ø³]¤§¤¤.
 ±z¥i§ó§ï«°¥«·í«e«Ø³]ªº¶µ¥Ø(¨£¤W¹Ï6). «°¥«¦a¹Ï(¨£¤W¹Ï7)
+Åã¥Ü¤F«°¥«·í«e³]¬Iªº¦ì¸m.
 ¦³Ãö«Ø³]ªº¸Ô²Ó«H®§, ½Ð°Ñ¦Ò¤U¤@³¹¸`"¥Í²£¸Ô¸Ñ".\\
 !¶T©ö\
+¶T©ö(²Å¸¹¬°%t)¥Nªí«°¥«ªº¶T©ö©Ò±o. ¥u¦³«°¥«©P³òªº¦a¶ô
+¤~¯à¶i¦æ¶T©ö, «°¥«¥»¨©Ò¦bªº¦a¶ô¤£·|°^Äm¥ô¦ó¶T©öÈ,
+§Y«K«°¥««Ø¦bª÷Äq¤W¤]µLÀÙ¤_¨Æ.  «°¥«¶T©öªº¥Í²£®ø¯Ó±¡ªp
+Åã¥Ü¦b¶T©ö±ªO¤¤(¨£¤W¹Ï8). ®ÚÕu°ê®a·í«eªº¬FÊ^ÅÜ¤Æ,
+¥H¤ÎÉOº³£ªº¦a²z¶ZÖÃ, «°¥«¤¤¤@©w¤ñ¨Òªº¶T©ö©Ò±o·|¦]¬°
+»G±Ñ¦Ó¥Õ¥Õ¬y¥¢, ³Ñ§Eªº%t±N«öp¦E¤¤ªº¤ñ¨Ò¤À°t¦Z, ¤À§O
+¥Î¤_°ê®aµ|¦¬, °ø¨×®ø¶O©M¬ì¾Ç¬ã¨s. µ|¦¬³¡¤À(%c)©è®ø¤ä¥X
+¤§¦Zªº³Ñ§E©Ò±o±N¥R¤J°ê®w; ¬ì¬ã³¡¤À(%r)±N¥Î§@¬ì¬ã¸g¶O,
+¥[§Ö·í«e¬ì¬ãªº¶i«×; °ø¨×³¡¤À(%l)¥i½Õ¾ã¥«¥Áªº¦w©wµ{«×.
 ª`: nÀò±o¶T©ö§Q¼í, ¸Ó«°¦Ü¤Ö¶·¾Ö¦³¥H¤U«Øµ®:\
 ::B49 ¥«¬FÆU\\
 ;CORRUPTION ¬ÛÃö¸ê®Æ: pºâ»G±Ñ¤ñ¨Ò\\
 !¸ê·½¦Û°Ê¤À°t\
+«ü©w¨t²Î¹ïªö¶°¸ê·½¥H¤Î°õ¦æ§ÙÄYªº¥«¥Á¶i¦æ¦Û°ÊÉ¬¤Æ¤À°t.
 ª±®a¥u»Ý®ÚÕuÓ¤H¥Ø¼Ð, «ü©w³ÌÉ¬¦]¤l(¨£¤W¹Ï9).
 ¦Û°Ê¤À°t¦³¥H¤U¤Ïú¼Ò¦¡:
 -¼Wªø³Ì¤j¤Æ(Àq»{¼Ò¦¡). ¥þ¤O«OÃÒ«°¥«¤H¤f¼Wªø, ºÉ¤@¤Á¥i¯à
 ¦¬¶°¹ª«¸ê·½.\
 -¥Í²£³Ì¤j¤Æ. ¥þ¤O«OÃÒ«°¥«³]¬I«Ø³], ºÉ¥i¯à¦¬¶°ì®Æ¸ê·½.
+¦Ò¼{¨ìª±®a¦bÁÊ¶R³]¬I®É»Ýn¤@©w°]¤O¤ä«ù, ¦¹¼Ò¦¡¤]¤£·|
 ©¿²¤¤F¶T©ö¸ê·½ªº¦¬¶°, ¦ÓÂ³¹ÉO¬ì¬ã¸ê·½±N³Q°ò¥»©¿²¤.\
 -¬ì¬ã³Ì¤j¤Æ. µÛ«¦¬¶°¶T©ö¸ê·½(§Y¬ì¬ã¤Îµ|¦¬ªº¨Ó·½). Â³¹
 ¸ê·½±N³Q°ò¥»©¿²¤.\
 -¥Í²£É¬¥ý. ¼Wªø¤Î¨ä¥L¦]¯ÀÝÅUªº¼Ò¦¡, É¬¥ý¦Ò¼{ì®Æ¦¬¶°.\
 -¬ì¬ãÉ¬¥ý. ¼Wªø¤Î¨ä¥L¦]¯ÀÝÅUªº¼Ò¦¡, É¬¥ý¦Ò¼{¶T©ö¦¬¶°. \\
 ;OPTI ¬ÛÃö¸ê®Æ: ¸ê·½¦Û°Ê¤À°t¤½¦¡\\
 ª`·N, ¦b¬Y¨Ç±¡ªp¤U, ¦Û°Ê¤À°t¥i¯àµL®Ä, ¨Ò¦p:
 ¦b«°¥««Ø³]©w¬°°Ó«~¶T©ö®É¿ï¾Ü"¥Í²£³Ì¤j¤Æ";
 ¦b«°¥«³W¼Òµo®i¤w¹F¤W®É¿ï¾Ü"¼Wªø³Ì¤j¤Æ";
 ¦b«°¥«µL¥«¬FÆU¦¬¶°¶T©ö®É¿ï¾Ü"¬ì¬ã³Ì¤j¤Æ";
+¥H¤W±¡ªp¤U, ¦b¦Û°Ê¤À°t¼Ò¦¡¤Uªº¨t²Î¥u¯à°h¦Ó
 ¨D¨ä¦¸, ¥i¯à¾ÉPªº¦ZªGÃø¥H¹w®Æ.\\
+¦³¤T¶µ±j¨î±ø¥óªºÉ¬¥ý¯Å¬Æ¤_ª±®a«ü©wªº³ÌÉ¬¦]¤l,
 ª±®aµLªk§ïÅÜ³o¤T¶µ±ø¥ó:\
 -ºn±ø¥ó: «°¥«ºû«ù¦w©w, ¤£P³´¤JÄÌ¶Ã\
 -¦¸n±ø¥ó: «OÃÒÆ×ÄÝ³¡¶¤ªºì®Æ¨Ñµ¹\
 -²Ä¤T±ø¥ó: «OÃÒ«°¥«¤H¤f¥H¤ÎÆ×ÄÝ³¡¶¤ªºÂ³¹¨Ñµ¹\\
 !¤â°Ê¤À°t\
 ¦pªG¤£·Q¨Ï¥Î¸ê·½¦Û°Ê¤À°t, ¦³¨âÏú¤è¦¡¤Á´«¦Ü¤â°Ê¤À°t:
+¥iÂIÀ»¶ê§Î¤À°t«ö¶s©³³¡ªº¦Ç¦â¥bÀô; ©ÎªÌª½±µÂIÀ»¤W¤èªº
+«°¥«¦a¹Ï. ¦b¤â°Ê¼Ò¦¡¤U, ª±®a¥i¦Û¥Ñ¤À°t¥«¥Á¦b«ü©wªº¦a¶ô
 ¦¬¶°¸ê·½, ©Î¬O§ï¬°«°¥«§ÙÄY³¡¶¤. ÂIÀ»¦b¦a¶ô¤W¤u§@ªº¥«¥Á,
+¥i±N¨ä§ï¬°«°¥«§ÙÄY³¡¶¤; ÂIÀ»µL¤H¤u§@ªº¦a¶ô, ¥i±N°õ¦æ
+§ÙÄYªº¥«¥Á«ü¬£¨ì¸Ó¦a¶ô¤u§@. µ²¦X¥H¤W¨â¨B, §Y¥i±N¤@Ó¦a¶ô
 ¤W¤u§@ªº¥«¥ÁÂà²¾¦Ü¥t¤@¦a¶ô.\\
+·í¸ê·½¦Û°Ê¤À°t¼Ò¦¡³QÃö³¬¦Z, ½Ð¯d¤ß¥H¤U¨Ñ¨Dªº¥¿Å:
+Â³¹¨Ñµ¹, ³¡¶¤ì®Æ¨Ñµ¹, ¥H¤Î«°¥«¦w©w¤H¤fªº¤ñ¨Ò, §_«h
 ¥i¯à¥X²{·N®Æ¤£¨ìªº¦ZªG.\\
 !«°¥«ÄÌ¶Ã\
 ¦pªG«°¥«ªº¤£¦w¤H¤f¼Æ¶W¹L¤F¦w©w¤H¤f¼Æ, ¾ãÓ«°¥«±N³´¤JÄÌ¶Ã,
 ©Ò¦³¥Í²£, ¬ì¬ã¤Îµ|¦¬¬¡°Ê°±º¢. ±qÄÌ¶ÃÃzµo¦Zªº²Ä¤G¦^¦X¶}©l,
+«°¥«¤£¦Aµ¹Æ×ÄÝªº³¡¶¤¨Ñµ¹¸ê·½, »Ýn¸ê·½ºû«ùªº³¡¶¤±N³v¤ä
 ¸Ñ´², ¨C¦^¦X´î¤Ö¤@¤ä, ª½¦ÜÄÌ¶Ãµ²§ô.\\
+¦b³q±`±¡ªp¤U, ¦Û°Ê¤À°t¼Ò¦¡Á`¯àÁ×§K«°¥«ÄÌ¶Ãªºµo¥Í, °£«D
+µo¥Í¹L¦hªº¤£¦w¨Æ¥ó. ¦pªG¹J¨ì¤Wz±¡ªp, ½Ð±N¾ÉP¤£¦w¨Æ¥ó
 ªº³¡¶¤ºM¦^¨ì¥»¤g, ©Î¸Ñ´²³o¨Ç³¡¶¤, §Y¥i¨Ï«°¥««ìÎ`¯´§Ç.\\
 ¦pªGÃö³¬¤F¦Û°Ê¤À°t¼Ò¦¡, ½Ð§O§Ñ¤F±±¨î«°¥«¦w©w¤H¤fªº¤ñ¨Ò.
 ³Ì±`¥Îªº¤èªk¬O±N§ó¦h¥«¥Á§ï¬°«°¥«§ÙÄY³¡¶¤.
+每個地塊出產資源的多少取決于以下三個條件:\
+::T 地形种類\
+::J 地形改造\
+::G 政体形式\\
+!糧食\
+糧食(符號為%f)代表了各种食物. 城市糧食的生產消耗
+情況顯示在糧食面板中(見上圖4).  糧食是人類每日的根本,
+每個市民每回合需消耗2%f. 還有一些部隊需要定量的糧食
+作為供給, 如糧食供應不足, 將從城市的存糧中扣除. 如果
+存糧耗盡, 城市陷入饑荒, 會有一名市民或一支部隊消失.
+但在通常情況下, 城市生產的糧食量不會低于消耗量. 如果
+生產的糧食有剩余, 多余的糧食將計入存糧, 但有一种情況
+屬于例外: 規模達到8的大城市每回合如果多余1單位的糧食,
+則這1單位糧食將直接轉為資金, 不計入存糧. 如果存糧達到
+上限, 且城市規模未達上限, 那么這個城市的規模會提升1級,
+市民數量加1.\\
+!原料\
+原料 (符號為%p)是一种抽象的資源, 是各种勞動生產資源
+如木頭, 礦石, 石油等的總稱. 城市原料的生產消耗情況顯示
+在原料面板中(見上圖5). 城市中某些屬部隊需消耗一定量
+的原料以維持日常供給, 剩余原料將投入到生產建設之中.
+您可更改城市當前建設的項目(見上圖6). 城市地圖(見上圖7)
+顯示了城市當前設施的位置.
+有關建設的詳細信息, 請參考下一章節"生產詳解".\\
+!貿易\
+貿易(符號為%t)代表城市的貿易所得. 只有城市周圍的地塊
+才能進行貿易, 城市本身所在的地塊不會貢獻任何貿易值,
+即便城市建在金礦上也無濟于事.  城市貿易的生產消耗情況
+顯示在貿易面板中(見上圖8). 根据國家當前的政体變化,
+以及与首都的地理距离, 城市中一定比例的貿易所得會因為
+腐敗而白白流失, 剩余的%t將按計划中的比例分配后, 分別
+用于國家稅收, 奢侈消費和科學研究. 稅收部分(%c)抵消支出
+之后的剩余所得將充入國庫; 科研部分(%r)將用作科研經費,
+加快當前科研的進度; 奢侈部分(%l)可調整市民的安定程度.
+注: 要獲得貿易利潤, 該城至少須擁有以下建筑:\
+::B49 市政廳\\
+;CORRUPTION 相關資料: 計算腐敗比例\\
+!資源自動分配\
+指定系統對采集資源以及執行戒嚴的市民進行自動优化分配.
+玩家只需根据個人目標, 指定最优因子(見上圖9).
+自動分配有以下五种模式:
+-增長最大化(默認模式). 全力保證城市人口增長, 盡一切可能
+收集食物資源.\
+-生產最大化. 全力保證城市設施建設, 盡可能收集原料資源.
+考慮到玩家在購買設施時需要一定財力支持, 此模式也不會
+忽略了貿易資源的收集, 而糧食与科研資源將被基本忽略.\
+-科研最大化. 著重收集貿易資源(即科研及稅收的來源). 糧食
+資源將被基本忽略.\
+-生產优先. 增長及其他因素兼顧的模式, 优先考慮原料收集.\
+-科研优先. 增長及其他因素兼顧的模式, 优先考慮貿易收集. \\
+;OPTI 相關資料: 資源自動分配公式\\
+注意, 在某些情況下, 自動分配可能無效, 例如:
+在城市建設定為商品貿易時選擇"生產最大化";
+在城市規模發展已達上限時選擇"增長最大化";
+在城市無市政廳收集貿易時選擇"科研最大化";
+以上情況下, 在自動分配模式下的系統只能退而
+求其次, 可能導致的后果難以預料.\\
+有三項強制條件的优先級甚于玩家指定的最优因子,
+玩家無法改變這三項條件:\
+-首要條件: 城市維持安定, 不致陷入騷亂\
+-次要條件: 保證屬部隊的原料供給\
+-第三條件: 保證城市人口以及屬部隊的糧食供給\\
+!手動分配\
+如果不想使用資源自動分配, 有兩种方式切換至手動分配:
+可點擊圓形分配按鈕底部的灰色半環; 或者直接點擊上方的
+城市地圖. 在手動模式下, 玩家可自由分配市民在指定的地塊
+收集資源, 或是改為城市戒嚴部隊. 點擊在地塊上工作的市民,
+可將其改為城市戒嚴部隊; 點擊無人工作的地塊, 可將執行
+戒嚴的市民指派到該地塊工作. 結合以上兩步, 即可將一個地塊
+上工作的市民轉移至另一地塊.\\
+當資源自動分配模式被關閉后, 請留心以下供求的平衡:
+糧食供給, 部隊原料供給, 以及城市安定人口的比例, 否則
+可能出現意料不到的后果.\\
+!城市騷亂\
+如果城市的不安人口數超過了安定人口數, 整個城市將陷入騷亂,
+所有生產, 科研及稅收活動停滯. 從騷亂爆發后的第二回合開始,
+城市不再給屬的部隊供給資源, 需要資源維持的部隊將逐支
+解散, 每回合減少一支, 直至騷亂結束.\\
+在通常情況下, 自動分配模式總能避免城市騷亂的發生, 除非
+發生過多的不安事件. 如果遇到上述情況, 請將導致不安事件
+的部隊撤回到本土, 或解散這些部隊, 即可使城市恢复秩序.\\
+如果關閉了自動分配模式, 請別忘了控制城市安定人口的比例.
+最常用的方法是將更多市民改為城市戒嚴部隊.
 #CORRUPTION
 $pºâ»G±Ñ¤ñ¨Ò\
 !pºâ»G±Ñ¤ñ¨Ò\
 ¤@Ó«°¥«ªº»G±Ñ¤ñ¨Ò, ®ÚÕu¥H¤U¤½¦¡pºâ:\
 @CORRUPTION\
 -T - «°¥«¶T©öÁ`È\
 -C - ¬FÊ^»G±Ñ¦]¤l\
 -D - «°¥«ÉOº³£ªº¶ZÖÃ\
 -Dmax - ²z½×¤W¬Û¹j³Ì»·ªº¨â®y«°¥«¶¡ªº¶ZÖÃ (§Y¥H¦a¹Ï
 ¥þ°ªÉO¦a¹Ï¥b¼e¬°ª½¨¤Ãä, ©Ò±oªº¤T¨¤§Î±×Ãäªø«×)\\
+¦pªG¤@Ó°ê®a¨S¦³º³£, «hµL½×¬°¦óÏú¬FÊ^, ¸Ó°ê©Ò¦³«°¥«
 ¤¤ªº»G±Ñ¤ñ¨Ò¬°100%, ¦³ªk°|ªº«°¥«»G±Ñ¤ñ¨Ò¬°50%.
+$計算腐敗比例\
+!計算腐敗比例\
+一個城市的腐敗比例, 根据以下公式計算:\
+@Corruption\
+-T - 城市貿易總值\
+-C - 政体腐敗因子\
+-D - 城市与首都的距离\
+-Dmax - 理論上相隔最遠的兩座城市間的距离 (即以地圖
+全高与地圖半寬為直角邊, 所得的三角形斜邊長度)\\
+如果一個國家沒有首都, 則無論為何种政体, 該國所有城市
+中的腐敗比例為100%, 有法院的城市腐敗比例為50%.
 #OPTI
 $¸ê·½¦Û°Ê¤À°t±ø¥ó¤½¦¡\
 !¸ê·½¦Û°Ê¤À°t±ø¥ó¤½¦¡\
 ¦Û°Ê¤À°t¸ê·½¦@¥]¬A¤Ïú±¡ªp, ¨ä¤¤ªº®t§O¦b¤_É¬¥ý¦]¤lmªºÚÌ©w¤Îpºâ. É¬¥ý¦]¤lmªº¦Ò¶qS³ò¥]¬A¥H¤U¥|Ãþ: Â³¹(f), ì®Æ(p),
 µ|¦¬(t)©M¬ì¬ã(r), m2¬°¦¸É¬¦]¤l, ¥H¦¹Ãþ±À\
 -¼Wªø³Ì¤j¤Æ: m = f, m2 = 2p + t + r\
 -¥Í²£³Ì¤j¤Æ: m = 4p + t, m2 = r, m3 = f\
 -¬ì¬ã³Ì¤j¤Æ: m = 2r + t + p, m2 = f\
 -¥Í²£É¬¥ý: m = sqrt(f) * (8p + 2t + r)\
 -¬ì¬ãÉ¬¥ý: m = sqrt(f) * (r + t + p)
+$資源自動分配條件公式\
+!資源自動分配條件公式\
+自動分配資源共包括五种情況, 其中的差別在于优先因子m的确定及計算. 优先因子m的考量范圍包括以下四類: 糧食(f), 原料(p),
+稅收(t)和科研(r), m2為次优因子, 以此類推\
+-增長最大化: m = f, m2 = 2p + t + r\
+-生產最大化: m = 4p + t, m2 = r, m3 = f\
+-科研最大化: m = 2r + t + p, m2 = f\
+-生產优先: m = sqrt(f) * (8p + 2t + r)\
+-科研优先: m = sqrt(f) * (r + t + p)
 #PRODUCTION
 $¥Í²£¸Ô¸Ñ\
 !¥Í²£¥Ø¼Ð\
+«Ø¥ß·s«°©Î¥e»â¼Ä«°¦Z, ·í«eªº«Ø³]¥Ø¼Ð±N©w¬° "°Ó«~¶T©ö",
+·N§Y±N¥Í²£ì®Æª½±µÂà´«¬°ª÷¿ú§Q¼í. ÂIÀ»¥Ø¼Ð¹Ï¤ù, ¥i¿ï¾Ü
+¨ä¥L¥Ø¼Ð, ¿ï¾ÜS³ò¨ú¨M¤_¥»°êªº¬ì§Þµo®i¤ô¥. «ö¦íShiftÁä
 ¦ZÂIÀ»¶µ¥Ø, ¥iÅã¥Ü¬ÛÃöÀ°§U. ¦³3Ãþ«Ø³]¥Ø¼Ð¥i¨Ñ¿ï¾Ü:\
 -³¡¶¤\
 -«°¥«³]¬I\
 -©_¸ñ¤Î°ê®a¤uµ{\\
+¦pªG±N«°¥«·í«eªº«Ø³]¥Ø¼Ð §ó§ï¬°¦PÃþ¤¤ªº¨ä¥L³]¬I©Î³¡¶¤,
+²Ö¿nªº¥Í²£ì®Æ±N·l¥¢¤T¤À¤§¤@. ¦pªG§ó§ï¬°¨ä¥LÃþ§Oªº³]¬I
+©Î³¡¶¤, «h²Ö¿nªº¥Í²£ì®Æ±Nª½±µÅÜ½æ¬°ª÷¿ú.  n·Q¥[§Ö³]¬I
+«Ø³]ªº³t«×, ¥i¿ï¾Ü¤w¦³ªº³]¬I, ¦Ó¦Z¿ï¾Ü±ÀË««Ø, «hì³]¬I
+¤T¤À¤§¤Gªº¥Í²£ì®Æ±N³Q¦^¦¬, ª½±µ²K¥[¨ì·í«e«Ø³]³]¬Iªº
+¥Í²£ì®Æ¤¤; n·Q¥[§Ö³¡¶¤«Ø³]ªº³t«× («Ø³]¶¤°£¥~), ¥i¿ï¾Ü
+«°¤º¾n¦uªº³¡¶¤, ¦Ó¦Z¿ï¾Ü¾ã½s, «hì³¡¶¤¤T¤À¤§¤Gªº¤Hû±N
 ª½±µ¥[¤J·í«e«Ø³]³¡¶¤¤§¤¤.\\
 !²¾¥Á\
+©Ý¯îªÌ¡B¤uµ{®v¡B¥£Æ×¥H¤Î©º¶Ò³¡¶¤³£¨Ó¦Û¤_¥«¥Á, ¦]¦¹¦b
+¥Í²£³o¨Ç³¡¶¤¦Z, «°¥«³W¼Ò±N·|ÁY¤p. ¥Í²£©º¶Ò³¡¶¤©M¥£Æ×,
+³W¼Ò±NÁY¤p¤@¯Å; ¥Í²£©Ý¯îªÌ©M¤uµ{®v, «°¥«³W¼Ò±NÁY¤p¨â¯Å.
+²¾¥Á¹Lµ{¬O¥i°fªº: ±N¥H¤W³¡¶¤¥[¤J«°¥«, ¥i¨Ï«°¥«³W¼ÒÂX¤j,
 «e´£¬O«°¥«³W¼Ò¥¼¹F¨ì¤W.\\
 !©º¶Ò\
+¥i¥H¥Î©º¶Òªº¤è¦¡¥Í²£¥ô¦ó¤wª¾ªº¦a±³¡¶¤. ©º¶Òªº³¡¶¤
+±N¦h¯Ó¶O1%f¹ª«. ©º¶Òªº¦n³B¦b¤_, ¥i±N³¡¶¤ªº¥Í²£®É¶¡
 ÁY´î¨ìì¨Óªº¤T¤À¤§¤@. n©º¶Ò³¡¶¤, ¶·¥ýÀò±o¥H¤U¬ì§Þ:\
 ::A18 ©º§L¨î«×\\
 !¶R½æ¥Í²£ì®Æ\
+n¨³³t§¹¦¨¥Í²£, ¥iªá¿úÁÊ¶R, ÁÊ¶R¦Zªº¥Ø¼Ð±N¤_¤U¦^¦X
+¶}©l®É§¹¤u. n·Q§Ö,±oªá¤jÉ²¿ú: ¨CÓ¥¼§¹¦¨ªºì®Æ%p,
+»Ý¤ä¥I4¿ªºª÷¿ú. ¤Ï¨¥¤§, ¤]¥i¥HÅÜ½æ¥Í²£ì®Æ, ¥u»Ý±N
 ¥Ø¼Ð§ï¬°"°Ó«~¶T©ö"§Y¥i. ²Ö¿nªº¥Í²£ì®Æ±NÂà´«¬°ª÷¿ú.\\
 !¦Ã¬V\
+¨C1ÂIì®Æ¥Í²£³£±N³y¦¨1ÂI¦Ã¬V, ¦Ó¨CÓ¥«¥Á¥i©è®ø1ÂI¦Ã¬V,
+¦h§Eªº¦Ã¬V±NºCºC¿n²Ö¬°¼o®Æ, ¦pªG¿n²Öªº¼o®Æ¼Æ¶q¹F¨ì240,
+«°¥«S³ò¤º±N¥X²{¤@³B¦Ã¬V°Ï, ¸Ó¦a¶ôªº¸ê·½²£¶q±N°¬°ì¥ý
 ªº¤@¥b. ©Ý¯îªÌ©M¤uµ{®v¥i¥H²M²z¦Ã¬V.
+$生產詳解\
+!生產目標\
+建立新城或占領敵城后, 當前的建設目標將定為 "商品貿易",
+意即將生產原料直接轉換為金錢利潤. 點擊目標圖片, 可選擇
+其他目標, 選擇范圍取決于本國的科技發展水平. 按住Shift鍵
+后點擊項目, 可顯示相關幫助. 有3類建設目標可供選擇:\
+-部隊\
+-城市設施\
+-奇跡及國家工程\\
+如果將城市當前的建設目標 更改為同類中的其他設施或部隊,
+累積的生產原料將損失三分之一. 如果更改為其他類別的設施
+或部隊, 則累積的生產原料將直接變賣為金錢.  要想加快設施
+建設的速度, 可選擇已有的設施, 而后選擇推倒重建, 則原設施
+三分之二的生產原料將被回收, 直接添加到當前建設設施的
+生產原料中; 要想加快部隊建設的速度 (建設隊除外), 可選擇
+城內駐守的部隊, 而后選擇整編, 則原部隊三分之二的人員將
+直接加入當前建設部隊之中.\\
+!移民\
+拓荒者、工程師、奴以及征募部隊都來自于市民, 因此在
+生產這些部隊后, 城市規模將會縮小. 生產征募部隊和奴,
+規模將縮小一級; 生產拓荒者和工程師, 城市規模將縮小兩級.
+移民過程是可逆的: 將以上部隊加入城市, 可使城市規模擴大,
+前提是城市規模未達到上限.\\
+!征募\
+可以用征募的方式生產任何已知的地面部隊. 征募的部隊
+將多耗費1%f食物. 征募的好處在于, 可將部隊的生產時間
+縮減到原來的三分之一. 要征募部隊, 須先獲得以下科技:\
+::A18 征兵制度\\
+!買賣生產原料\
+要迅速完成生產, 可花錢購買, 購買后的目標將于下回合
+開始時完工. 要想快,得花大价錢: 每個未完成的原料%p,
+需支付4倍的金錢. 反言之, 也可以變賣生產原料, 只需將
+目標改為"商品貿易"即可. 累積的生產原料將轉換為金錢.\\
+!污染\
+每1點原料生產都將造成1點污染, 而每個市民可抵消1點污染,
+多余的污染將慢慢積累為廢料, 如果積累的廢料數量達到240,
+城市范圍內將出現一處污染區, 該地塊的資源產量將降為原先
+的一半. 拓荒者和工程師可以清理污染.
 #BUILDINGS
 $«Øµ®¤¶²Ð\
+$建筑介紹\
 @@67\
 !«Øµ®¤¶²Ð\
+«Øµ®·|¹ï©Ò¦bªº«°¥«, ¬Æ¦Ü¾ãÓ°ê®a²£¥Í¿nÌåªº§@¥Î.
 ¦@¦³3Ïú«Øµ®, ¥¦Ì¤§¶¡ªº°Ï§O¦b¤_¥i«Ø³yªº¼Æ¶q:\
 -«°¥«³]¬I: ¨CÓ«°¥«³£¥i«Ø³].\
 -°ê®a¤uµ{: ¨C¶µ°ê®a¤uµ{, ¦P¤@Ó°ê®a¥u¯à«Ø³]¤@¦¸.
+Y¦b·sªº«°¥««Ø³]¤w¦³ªº°ê®a¤uµ{, ¦b·s«Ø³]§¹¤u®É,
 ì¦³ªº°ê®a¤uµ{±N³QÅÜ½æ.\
 -¥@¬É©_¸ñ: ¥þ¥@¬É¥u¤¹³\¾Ö¦³¤@®y. ¦pªG¬Y°ê«Ø¦¨¤F
+©_¸ñ, «h¨ä¥L°ê®a¤£¯à¦A«Ø¬Û¦Pªº©_¸ñ. ¦pªG«Ø¦¨ªº
+©_¸ñÀHµÛ©Ò¦b«°¥«¤@°_³Q¼ÄxºR·´, ´N·|¥Ã»·®ø¥¢,
+µLªkÎ`«Ø. °£¤F¦U¦Ûªº¯S®í®ÄªG¤§¥~, ¨C®y©_¸ñÁÙ¯à
 ¨Ï©Ò¦b«°¥«¤¤ªº¤@¦W¤£¦w¥«¥ÁÅÜ¬°¦w©w.\\
 ::B «°¥«³]¬I\
 ::B201 °ê®a¤uµ{\
 ::B202 ¥@¬É©_¸ñ\\
+¤j³¡¤À«°¥«³]¬I©M°ê®a¤uµ{³£»Ýn²{ª÷ºû«ù, ¨C¦^¦X
+©Òªá¶Oªº²{ª÷±N¦Û°Ê±q°ê®w¤¤¦©°£. ¦pªG°ê®w¯ÓºÉ,
 ±NÀHÉóÅÜ½æ¤@¶µ³]¬I, ¥Î¥H©è¶Å.\\
+¦b«°¥«µe±¤¤, «ö"«°¥«³]¬I"«ö¶s, ¥i¬d¬Ý«°¥«¤¤²{¦³ªº
+³]¬I¦Cªí. ¦pªGn±N¬Y¶µ³]¬IÅÜ½æ, ©Î±ÀË««Ø¬Y³]¬I,
+¥H¥[§Ö·í«e³]¬Iªº«Ø³]¶i«×, ¥ªÁä³æÀ»¨ä¹Ï¼Ð§Y¥i.
 ³]¬IÅÜ½æªºÉ²®æµ¥¦P¤_¨ä¥Í²£ì®Æ´«ºâ¦¨²{ª÷ªºÉ²®æ.
+!建筑介紹\
+建筑會對所在的城市, 甚至整個國家產生積极的作用.
+共有3种建筑, 它們之間的區別在于可建造的數量:\
+-城市設施: 每個城市都可建設.\
+-國家工程: 每項國家工程, 同一個國家只能建設一次.
+若在新的城市建設已有的國家工程, 在新建設完工時,
+原有的國家工程將被變賣.\
+-世界奇跡: 全世界只允許擁有一座. 如果某國建成了
+奇跡, 則其他國家不能再建相同的奇跡. 如果建成的
+奇跡隨著所在城市一起被敵軍摧毀, 就會永遠消失,
+無法复建. 除了各自的特殊效果之外, 每座奇跡還能
+使所在城市中的一名不安市民變為安定.\\
+::B 城市設施\
+::B201 國家工程\
+::B202 世界奇跡\\
+大部分城市設施和國家工程都需要現金維持, 每回合
+所花費的現金將自動從國庫中扣除. 如果國庫耗盡,
+將隨机變賣一項設施, 用以抵債.\\
+在城市畫面中, 按"城市設施"按鈕, 可查看城市中現有的
+設施列表. 如果要將某項設施變賣, 或推倒重建某設施,
+以加快當前設施的建設進度, 左鍵單擊其圖標即可.
+設施變賣的价格等同于其生產原料換算成現金的价格.
 #SUPPORT
 $³¡¶¤Æ×ÄÝ\
 !³¡¶¤Æ×ÄÝ\
+¨C¤ä³¡¶¤¨C¦^¦X»Ý®ø¯Ó1%p¥Í²£ì®Æ, ®ø¯Óì®Æ±qÆ×ÄÝ«°¥«
+¤¤¦©°£. ½s¨î¦b6%w¥H¤Wªº²î¥u, »Ý®ø¯ÓÂù¿ªº¥Í²£ì®Æ.
+³¡¶¤³ÌªìÆ×ÄÝ¤_¥Í²£¸Ó³¡¶¤ªº«°¥«. ¦pªG·Q§ïÅÜÆ×ÄÝ«°¥«,
+±N³¡¶¤²¾¦ÜnÆ×ÄÝªº«°¥«¦Z, ¿ï¾Ü"§ï¬°¥»«°³¡¶¤"§Y¥i.
 «°¥«µe±¤¤¿ï¾Ü"Æ×ÄÝ³¡¶¤"«ö¶s, ¥i¬d¬Ý¸Ó«°ªºÆ×ÄÝ³¡¶¤.\\
+¤@¤p³¡¤À³¡¶¤¤£»Ýn¥Í²£ì®Æ¨Ñµ¹, µL»Ý¨Ñµ¹ªº³¡¤À¥H
+¦Ç¦â(%n)Åã¥Ü, »Ýn¨Ñµ¹ªº³¡¤À¥H«G¦â(%p)Åã¥Ü. ³o§å
+³¡¶¤ªº¼Æ¶q¨ú¨M¤_¬FÊ^§Î¦¡. ¦pªG«°¥«µLªk´£¨Ñ¨¬°÷ªº
 ¥Í²£ì®Æ¨Ñµ¹³¡¶¤, «h¨ä¤¤³Ì·GÉ²ªº³¡¶¤±N³Q±j¦æ¸Ñ´².\\
+¦pªG«°¥«ÄÌ¶Ã¶W¹L¤@Ó¦^¦X, ¨ä³¡¶¤¨Ñµ¹±N¥þ³¡°±º¢,
+¦pªG¸Ó«°¥«¦s¦bÆ×ÄÝ³¡¶¤, «h¨C¦^¦X±N¦³1¤ä³¡¶¤³Q¸Ñ´²,
 ª½¦ÜÄÌ¶Ãµ²§ô.
+$部隊屬\
+!部隊屬\
+每支部隊每回合需消耗1%p生產原料, 消耗原料從屬城市
+中扣除. 編制在6%w以上的船只, 需消耗雙倍的生產原料.
+部隊最初屬于生產該部隊的城市. 如果想改變屬城市,
+將部隊移至要屬的城市后, 選擇"改為本城部隊"即可.
+城市畫面中選擇"屬部隊"按鈕, 可查看該城的屬部隊.\\
+一小部分部隊不需要生產原料供給, 無需供給的部分以
+灰色(%n)顯示, 需要供給的部分以亮色(%p)顯示. 這批
+部隊的數量取決于政体形式. 如果城市無法提供足夠的
+生產原料供給部隊, 則其中最廉价的部隊將被強行解散.\\
+如果城市騷亂超過一個回合, 其部隊供給將全部停滯,
+如果該城市存在屬部隊, 則每回合將有1支部隊被解散,
+直至騷亂結束.
 #MACRO
 $§Ö³t§»¾Þ§@\
 !§Ö³t§»¾Þ§@\
+´åÀ¸¬O¤@Ïú¼Ö½ì, ¦Ó¤£¬O¤u§@. É§U§Ö³t§»¾Þ§@, ±qÁcº¾
+ªº«Î`©R¥O¤¤¸Ñ²æ, ÄË¥X¤â¨Ó±Mª`µo®i´åÀ¸µ¦²¤§a.
+§Ö³t§»¾Þ§@¦}«D¥²¤£¥i¤Öªº¤u¨ã, ¦ý¦³§U¤_Â²¤Æ´åÀ¸¾Þ§@.
 «ØÄ³¦b¨Ï¥Î¤§«e, ³Ì¦n¯à¥ý¤F¸Ñ¤@¤U¬ÛÃöªºª¾ÃÑnÂI.\\
 !¦a§Î§ï³y\
+°w¹ï¬Y¤@Ãþ¦a§Î, ©w¸q¾Þ§@ªº¦¸§Ç. ©w¸q§¹¦¨¦Z, ¥i¦b
+²¾¥Á³¡¶¤ªº¦æ°Ê©R¥O¤¤¿ï¾Ü"¦a§Î§ï³y"(§Ö±¶Áä: E),
+²¾¥Á³¡¶¤´N·|¨Ì¦¸¶i¦æ¤w³]©wªº§ï³y¾Þ§@. ¦pªG¨Ï¥Î
+±a¦³¤¤Áäªº¹«¼Ð, ¥iµ²¦X¥Ø¼Ð²¾°Ê©R¥O¤@¦}°õ¦æ. ¦bn
+§ï³yªº¦a§Î¤W³æÀ»¹«¼Ð¤¤Áä, ²¾¥Á³¡¶¤·|¥H¸Ó¦a§Î¬°
 ¥Ø¼Ð²¾°Ê, ¨ì¹F¦Z¦Û°Ê°õ¦æ§ï³y¤u§@.\\
 !«°¥«Ãþ«¬\
+°w¹ï¥|Ïú¤£¦PÃþ«¬ªº«°¥«, ³]©w«Ø³]³]¬Iªº¦¸§Ç. ¥Î¹«¼Ð
+±N¦Cªí¤U¤èªº«Øµ®³]¬I©ì¦²¨ì¤W¤èªº¼Æ¦r®Ø¤º, ¥H³]©w
+¥ý¦Z¦¸§Ç, µM¦Z¦b«°¥«ªº«Ø³]µ¡¤f¤¤¿ï¾Ü¸Ó«°¥«Ãþ«¬, §Y
+¥i«ö³]©w¬yµ{¨Ì¦¸«Ø³]. ¦pªG·í«e¦³³]¬I¦b«Ø, ³]©wªº¦¸§Ç
+±N¦b¦b«Øªº³]¬I«Ø¦¨¦Z¦A¦æ±Ò°Ê.
+$快速宏操作\
+!快速宏操作\
+游戲是一种樂趣, 而不是工作. 借助快速宏操作, 從繁瑣
+的重复命令中解脫, 騰出手來專注發展游戲策略吧.
+快速宏操作并非必不可少的工具, 但有助于簡化游戲操作.
+建議在使用之前, 最好能先了解一下相關的知識要點.\\
+!地形改造\
+針對某一類地形, 定義操作的次序. 定義完成后, 可在
+移民部隊的行動命令中選擇"地形改造"(快捷鍵: E),
+移民部隊就會依次進行已設定的改造操作. 如果使用
+帶有中鍵的鼠標, 可結合目標移動命令一并執行. 在要
+改造的地形上單擊鼠標中鍵, 移民部隊會以該地形為
+目標移動, 到達后自動執行改造工作.\\
+!城市類型\
+針對四种不同類型的城市, 設定建設設施的次序. 用鼠標
+將列表下方的建筑設施拖曳到上方的數字框內, 以設定
+先后次序, 然后在城市的建設窗口中選擇該城市類型, 即
+可按設定流程依次建設. 如果當前有設施在建, 設定的次序
+將在在建的設施建成后再行啟動.
 #START
 $´åÀ¸¶}©lµe±\
 !·s«Ø´åÀ¸\
 ´åÀ¸¶}©lµe±¥]§t¤F¤T±i¶±, n·s«Ø´åÀ¸, ½Ð¦b"·s«Ø´åÀ¸"
+¶±³]©wÄvª§Ïú±Úªº¼Æ¶q, ´åÀ¸Ãø«×, ¥H¤Î´åÀ¸ªº³Ì¦Z¦~.
+¦pªG±z¦w¸Ë¤F¨ä¥LAI¼Ò¶ô, ¥i³æÀ»AI®Ø¶i¦æ³]©w. ¥þ³¡³]¸m
 µ²§ô¦Z, «ö"¶}©l"«ö¶s¶i¤J´åÀ¸.\\
 !¦Û©w¸qª±®a\
+¤Ä¿ï"¦Û©w¸qª±®a"®Ø, ¥´¶}§ó¦h¸Ô²Ó³]¸m. ¦b¦Û©w¸qµe±¤¤,
+¤£¶È¥i¥H¹ïÄvª§Ïú±ÚAI, ¹q¸£´åÀ¸Ãø«×, ¤HÃþª±®a¼Æ¶qµ¥µ¥
+¶i¦æ¸Ô²Ó³]¸m, ¤]¥i®i¶}¹q¸£AI¼Ò¶ôªº§Ö³t¹ï¨M, ©Î¿ï¾Ü
 "¶W¯Å¥Î¤á"¼Ò¦¡, ¥H¤W«Òªº¨¤«×Æ[¬Ý¾ãÓ¥@¬Éªº¥ð±¿³°I.
+³æÀ»¤è®Ø¥i¿ï¾Ü¤HÃþª±®a©Î¹q¸£AI,  ¤è®Ø¥ª°¼ªº"3"¦rY¬°
+¤Ä¿ïª¬ºA, «h³o¤è®Ø¥Nªí¤F3¦Wª±®aªº¦@¦P³]©w. ¥Ñ¦¹¥iª¾,
 ´åÀ¸ª±®aªº¤W¼Æ¶q¬°15¦W.\\
+¤è®Ø¥ª°¼ªº«ü¥Ü±ø¥Nªí¤Fª±®aªº´åÀ¸Ãø«×, 1¬°Â²³æ, 3¬°§xÃø.
+¦pªG·QºÉ¥i¯à¦a´£°ª´åÀ¸Ãø«×, ¥i±N¤HÃþª±®aªºÃø«×³]¬°³Ì°ª,
 ¦}±N©Ò¦³AIª±®aªºÃø«×³]¸m¬°³Ì§C.\\
+Ãø«×¶V°ª, ¤H¤f¼Wªø, ¥Í²£³t«×©M¬ã¨s¶i«×³£·|ÅÜºC, ·s«¬§LÏú
 ªº³yÉ²¤]·|ÅÜ±o§ó¬°©ù¶Q.\\
 !Åª¨ú¶i«×\
 ¦bÅª¨ú¶i«×¶±¤¤, ¥i¿ï¾Ü´¿¸gªº´åÀ¸¶i«×, Ä~Äò¥ý«eªº©ºµ{.
+¿ï¾Ü»Ýnªº¶i«×, µM¦ZÂIÀ»"Åª¨ú"«ö¶s¶i¤J´åÀ¸. ¨CÓ³æ¿Wªº
+¶i«×¦sÀÉ¤¤³£¥]§t¤F©Ò¦³ªº´åÀ¸¦^¦X, ¦]¦¹±zºÉ¥i¥ý¿ï¾Ü¬YÓ
 §ó¦ªº´åÀ¸¦~¥N, ¹Á¸Õ¥t¤@Ïúµ¦²¤, ¤]³\·|¦³¤£¤@¼Ëªºµ²ªG.\\
 !¦a¹Ï½s¿è\
+Àq»{³]¸m¤U, ´åÀ¸±N¥HÀHÉó¦a¹Ï¶}©l; ¤]¥i¥Î´åÀ¸¤º¸mªº½s¿è¾¹
+¦Û¦æ³Ð«Ø¦a¹Ï.  ¦b"¦a¹Ï½s¿è"¶±¿ï¾Ü"ÀHÉó¦a¹Ï", µM¦Z³]©w
 ¥@¬É¤Ø¤o©M³°¦a¤ñ¨Ò, ¦AÂI¿ï"½s¿è"¹B¦æ½s¿è¾¹.\\
+º~¤Æª©¥»¤¤¥]§t¤F¤@´Úº~¤ÆªÌ¦Û¦æÉ¬¤Æªº¦a¹Ï(¥@¬É¤Ø¤o50%,
+³°¦a¤ñ¨Ò30%), §A¤]¥i±q©x¤è¥D¶¤U¸ü¨ä¥L°ª¤â³]pªº¦a¹Ï,
+¤U¸ü¦a¹Ï¸ÑÀ£¦Z©ñ¸m¦b´åÀ¸¥Ø¿ýªºMaps¤l¥Ø¿ý¤U§Y¥i¨Ï¥Î.
+$游戲開始畫面\
+!新建游戲\
+游戲開始畫面包含了三張頁面, 要新建游戲, 請在"新建游戲"
+頁面設定競爭种族的數量, 游戲難度, 以及游戲的最后年限.
+如果您安裝了其他AI模塊, 可單擊AI框進行設定. 全部設置
+結束后, 按"開始"按鈕進入游戲.\\
+!自定義玩家\
+勾選"自定義玩家"框, 打開更多詳細設置. 在自定義畫面中,
+不僅可以對競爭种族AI, 電腦游戲難度, 人類玩家數量等等
+進行詳細設置, 也可展開電腦AI模塊的快速對決, 或選擇
+"超級用戶"模式, 以上帝的角度觀看整個世界的休戚興衰.
+單擊方框可選擇人類玩家或電腦AI,  方框左側的"3"字若為
+勾選狀態, 則這方框代表了3名玩家的共同設定. 由此可知,
+游戲玩家的上限數量為15名.\\
+方框左側的指示條代表了玩家的游戲難度, 1為簡單, 3為困難.
+如果想盡可能地提高游戲難度, 可將人類玩家的難度設為最高,
+并將所有AI玩家的難度設置為最低.\\
+難度越高, 人口增長, 生產速度和研究進度都會變慢, 新型兵种
+的造价也會變得更為昂貴.\\
+!讀取進度\
+在讀取進度頁面中, 可選擇曾經的游戲進度, 繼續先前的征程.
+選擇需要的進度, 然后點擊"讀取"按鈕進入游戲. 每個單獨的
+進度存檔中都包含了所有的游戲回合, 因此您盡可先選擇某個
+更早的游戲年代, 嘗試另一种策略, 也許會有不一樣的結果.\\
+!地圖編輯\
+默認設置下, 游戲將以隨机地圖開始; 也可用游戲內置的編輯器
+自行創建地圖.  在"地圖編輯"頁面選擇"隨机地圖", 然后設定
+世界尺寸和陸地比例, 再點選"編輯"運行編輯器.\\
+漢化版本中包含了一款漢化者自行优化的地圖(世界尺寸50%,
+陸地比例30%), 你也可從官方主頁下載其他高手設計的地圖,
+下載地圖解壓后放置在游戲目錄的Maps子目錄下即可使用.
 #MAPEDIT
 $¦a¹Ï½s¿è¾¹\
 !¦a¹Ï½s¿è¾¹\
+´åÀ¸¤¤¥]§t¤F¤@´ÚÂ²³æªº¦a¹Ï½s¿è¾¹. n¹B¦æ¦a¹Ï½s¿è¾¹,
+¦b´åÀ¸¶}©lµe±¤¤ÂIÀ»"¦a¹Ï½s¿è"¶±, µM¦Z¿ï¾Ün½s¿è
+ªº¦a¹Ï, ÂI¿ï"½s¿è"«ö¶s. ¦pªGn³Ð«Ø·sªº¦a¹Ï, ½Ð¿ï¾Ü
 "ÀHÉó¦a¹Ï", ¦A³]©w¥@¬É¤Ø¤o©M³°¦a¤ñ¨Ò, ¦A¿ï"½s¿è"«ö¶s.\\
+½s¿è¾¹ªº¨Ï¥Î¤èªk«D±`Â²³æ. ¥ý±q«Ì¹õ©³³¡¿ï¾Ü©Ò»Ý¦a§Î
+©Î¶µ¥Ø, µM¦Z¥Î¹«¼Ð¥ªÁä³æÀ»¦a¹Ï, §Y¥i²K¥[©Ò¿ï¶µ¥Ø.
+§O§Ñ¤F±N¤TÏú²{¥N¸ê·½(¹\/¹W/¤ô»È)²K¥[¦b¦a¹Ï¤W, ¨CÏú
 ¸ê·½¦Ü¤Ö¤@³B, §_«h³Ì²×ªº´Þ¥Á¸²î«Ø³]µLªk§¹¦¨.\\
+¦³¤@ÂI¶·¥[ª`·N: ¥²¶·³]¸mÏú±Úªì©l¦ì¸m(§Y¶µ¥Ø¦Cªí¤¤ªº
 °_º¤G¶µ), YµLªì©l¦ì¸m, ³o±i¦a¹Ï¬O¤£¯à¶i¦æ´åÀ¸ªº. \\
+¬°¤F¨Ï±z¨î§@ªº¦a¹Ï§ó¥[®e©ö¿ëÃÑ, ±z¥i¬°¦a¹Ï¤å¥ó²K¥[¬ÛÀ³
+ªºÁY²¤¹Ï¤ù.  ÁY²¤¹Ï¶·¬°BMP®æ¦¡, ¤å¥ó¦WÉO¦a¹Ï¦WºÙ¬Û¦P,
 ±N¨ä©ñ¸m¦b´åÀ¸ªºmaps¤l¥Ø¿ý, ¹Ï¤ù¤Ø¤o¤W¬°192x96¹³¯À.
+$地圖編輯器\
+!地圖編輯器\
+游戲中包含了一款簡單的地圖編輯器. 要運行地圖編輯器,
+在游戲開始畫面中點擊"地圖編輯"頁面, 然后選擇要編輯
+的地圖, 點選"編輯"按鈕. 如果要創建新的地圖, 請選擇
+"隨机地圖", 再設定世界尺寸和陸地比例, 再選"編輯"按鈕.\\
+編輯器的使用方法非常簡單. 先從屏幕底部選擇所需地形
+或項目, 然后用鼠標左鍵單擊地圖, 即可添加所選項目.
+別忘了將三种現代資源(鈾/鈷/水銀)添加在地圖上, 每种
+資源至少一處, 否則最終的殖民飛船建設無法完成.\\
+有一點須加注意: 必須設置种族初始位置(即項目列表中的
+起首二項), 若無初始位置, 這張地圖是不能進行游戲的. \\
+為了使您制作的地圖更加容易辨識, 您可為地圖文件添加相應
+的縮略圖片.  縮略圖須為BMP格式, 文件名与地圖名稱相同,
+將其放置在游戲的maps子目錄, 圖片尺寸上限為192x96像素.
 #AIT
 $¹q¸£¹ï¨M\
 !¹q¸£¹ï¨M\
+¦pªG¦w¸Ë¤F¦hÓAI¼Ò¶ô, §A¥i¥HÅý³o¨Ç¼Ò¶ô¦b¦P¤@¤ù¦a¹Ï¤¤
+¬Û¤¬¼r±þ. ¦b·s«Ø´åÀ¸¬É±, ¿ï¾Ü"¦Û©w¸q´åÀ¸", µM¦Z³æÀ»
+¤¤¶¡ªº¤è¶ô, ¿ï¾Ü"¹q¸£¹ï¨M"¦Z, ¶}©l´åÀ¸. ³o®É¾ãÓ´åÀ¸
+µe±±NÁY¤p¬°¤@Ó¹ï¸Üµ¡¤f, «ö¶}©l´åÀ¸, ¨t²Î±N¦Û°Êºtºâ
+¦^¦Xµ²ªG, ª½¦Ü¬YÓAIÐ`¥X. ºtºâµ²ªG±NÅã¥Ü¦¨Â²³æªº²Îp
 ¼Æ¦r, ®ÚÕu¦^¦X±À¶i¦Ó¦P¨B§ó·s, ¦p¤U¹Ï©Ò¥Ü:\\
+$電腦對決\
+!電腦對決\
+如果安裝了多個AI模塊, 你可以讓這些模塊在同一片地圖中
+相互廝殺. 在新建游戲界面, 選擇"自定義游戲", 然后單擊
+中間的方塊, 選擇"電腦對決"后, 開始游戲. 這時整個游戲
+畫面將縮小為一個對話窗口, 按開始游戲, 系統將自動演算
+回合結果, 直至某個AI胜出. 演算結果將顯示成簡單的統計
+數字, 根据回合推進而同步更新, 如下圖所示:\\
 @AITShot\
 -1: ¸ÓÃC¦âAI¶Õ¤OÄ¹±o´åÀ¸ªº¦¸¼Æ, ÀòÐ`ì¦]¥i¯à¬O´Þ¥Á
 ¸²îµo®g, ¤]¥i¯à¬O®ø·À©Ò¦³¨ä¥L¶Õ¤O.\
 -2: ¸ÓÃC¦âAI¶Õ¤O´åÀ¸¥¢±Ñªº¦¸¼Æ.
+-1: 該顏色AI勢力贏得游戲的次數, 獲胜原因可能是殖民
+飛船發射, 也可能是消滅所有其他勢力.\
+-2: 該顏色AI勢力游戲失敗的次數.
 #HOTKEYS
 $§Ö±¶¾Þ§@\
 ¥Dµe±¤¤ªº¹«¼Ð¾Þ§@:\
 -¥ªÁä³æÀ»¥»¤è³¡¶¤ - ¿ï¤¤³¡¶¤\
 -¥ªÁä³æÀ»¥»¤è«°¥« - ¥´¶}«°¥«µ¡¤f\
 -¥ªÁä³æÀ»¥L°ê³¡¶¤ - ¬d¬Ý«H®§\
 -¥ªÁä³æÀ»¥L°ê«°¥« - ¬d¬Ý«°¥«¨¾±s\
 -¥ªÁä³æÀ»¨ä¥L¦a¶ô - µ¡¤f©~¤¤\
 -¥kÁä³æÀ» - ±N¸Ó³B«ü©w¬°¿ï©w³¡¶¤ªº²¾°Ê¥Ø¼Ð\
 -¥kÁä³æÀ»(¶W¯Å¥Î¤á¼Ò¦¡¤U) - ³Ð«Ø³¡¶¤\\
 ¥Dµe±¤¤ªºÁä½L¾Þ§@:\
 -¤è¦VÁä - ²¾°Ê¿ï©w³¡¶¤\
 -¼Æ¦rÁä½L"+"Áä - µ²§ô¦^¦X\
 -¼Æ¦rÁä1 ~ 7 - ¤p¦a¹Ï®Ç¤@±Æ«ö¶sªº¹ïÀ³§Ö±¶Áä\
 -¨ä¥Lµæ³æ§Ö±¶Áä, ½Ð°Ñ¨£´åÀ¸¤¤¦Uµæ³æ
+$快捷操作\
+主畫面中的鼠標操作:\
+-左鍵單擊本方部隊 - 選中部隊\
+-左鍵單擊本方城市 - 打開城市窗口\
+-左鍵單擊他國部隊 - 查看信息\
+-左鍵單擊他國城市 - 查看城市防御\
+-左鍵單擊其他地塊 - 窗口居中\
+-右鍵單擊 - 將該處指定為選定部隊的移動目標\
+-右鍵單擊(超級用戶模式下) - 創建部隊\\
+主畫面中的鍵盤操作:\
+-方向鍵 - 移動選定部隊\
+-數字鍵盤"+"鍵 - 結束回合\
+-數字鍵1 ~ 7 - 小地圖旁一排按鈕的對應快捷鍵\
+-其他菜單快捷鍵, 請參見游戲中各菜單
 #TRADINGGOODS
 $°Ó«~¶T©ö\
 !°Ó«~¶T©ö\
 ¿ï¾Ü°Ó«~¶T©ö, ©Ò¦³¥Í²£ì®Æ±N³Qª½±µÂà´«¬°²{ª÷§Q¼í.
+$商品貿易\
+!商品貿易\
+選擇商品貿易, 所有生產原料將被直接轉換為現金利潤.
 #MILRES
 $³¡¶¤¬ãµo\
 !³¡¶¤¬ãµo\
 n¥Í²£·s«¬ªº±j¤O³¡¶¤, ¥²¶·¥ý¶i¦æ³¡¶¤¬ãµo.\
 :CLASSES ¬d¬Ý³¡¶¤¬ãµoªº¦³Ãö«H®§
+$部隊研發\
+!部隊研發\
+要生產新型的強力部隊, 必須先進行部隊研發.\
+:CLASSES 查看部隊研發的有關信息
 #ADVHELP
 ªÅ¤¤³¡¶¤ªº³Ì¤j½s¨î¤W¤É¦Ü 7%w.
+*
+*
+*
 ¦a±³¡¶¤ªº³Ì¤j½s¨î¤W¤É¦Ü 10%w.
+*
+*
 ¥i¦bªe¬y¤W¬[¾ô×¸ô.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ¥Í²£¦a±³¡¶¤®É, ¥i°õ¦æ©º¶Ò¥\¯à.
 ¥i¶}©l«Ø³yn¶ë.\::J °Ñ¨£"¦a§Î«Ø³]".
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ©Ò¦³«Ø¦³¹D¸ôªº¥©Z¦a§Î°Ï°ì, %t +1.
 ¥i§ó´«¦a§Î, ¶}¹@¹Bªe.\::J °Ñ¨£"¦a§Î«Ø³]".
 ¥i¶}©l¥Í²£ªÅ¤¤³¡¶¤.
+*
+*
 ¦a±³¡¶¤ªº³Ì¤j½s¨î¤W¤É¦Ü 7%w.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ©Ò¦³ªe¬y³~¸gªº¦a¶ô, %t +1.\¥i¶}©l¥Í²£®ü¤W³¡¶¤.
+*
 ¥i¶}ªö²{¥N¸ê·½.\¦E®É¥N¬ì§Þ: ·í¬Y°ê¹ê²{¤F³W¼Ò¶q²£, ¥þ¥@¬É³£·|Àò±x³o¤@®ø®§.
+*
 ¥i¶}©l«Ø³yx¨Æ°ò¦a.\::J °Ñ¨£"¦a§Î«Ø³]".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
 ¥i¶}¹@¹A³õ.\::J °Ñ¨£"¦a§Î«Ø³]".
+*
+*
+*
+*
 ¥i¶}©l¾Q³]ÅK¸ô.\::J °Ñ¨£"¦a§Î«Ø³]".
+*
 ¥i¶}ªö¤u·~¤Æ¸ê·½.\¦E®É¥N¬ì§Þ: ·í¬Y°ê¹ê²{¤F¬ì¾Ç, ¥þ¥@¬É³£·|Àò±x³o¤@®ø®§.
+*
 ®ü¤W³¡¶¤ªº³Ì¤j½s¨î¤W¤É¦Ü 7%w.
+*
+*
+*
 ®ü¤W³¡¶¤ªº³Ì¤j½s¨î¤W¤É¦Ü 9%w.\¸Ë³Æ¸Ë¥Òªº¤W´£¤É1.
+*
+*
+*
+*
+*
 ¦E®É¥N¬ì§Þ: ·í¬Y°ê¹ê²{¤F¬P»Ú´Þ¥Á, ¥þ¥@¬É³£·|Àò±x³o¤@®ø®§.
+*
+*
 ¥i¶}©l¥Í²£·s«¬¦a±³¡¶¤.
+*
+*
+*
 «Ø¦³¤j¾Çªº«°¥«, ¬ì§Þ+5%\«Ø¦³¹êÅç«Çªº«°¥«, ¬ì§Þ+10%
 «Ø¦³¤uÉDªº«°¥«, ¥Í²£+5%\«Ø¦³¯S°Ïªº«°¥«, ¥Í²£+10%\(¤£·|¼W¥[ÃB¥~¦Ã¬V)
+空中部隊的最大編制上升至 7%w.
+*
+*
+*
+地面部隊的最大編制上升至 10%w.
+*
+*
+可在河流上架橋修路.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+生產地面部隊時, 可執行征募功能.
+可開始建造要塞.\::J 參見"地形建設".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+所有建有道路的平坦地形區域, %t +1.
+可更換地形, 開辟運河.\::J 參見"地形建設".
+可開始生產空中部隊.
+*
+*
+地面部隊的最大編制上升至 7%w.
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+所有河流途經的地塊, %t +1.\可開始生產海上部隊.
+*
+可開采現代資源.\划時代科技: 當某國實現了規模量產, 全世界都會獲悉這一消息.
+*
+可開始建造軍事基地.\::J 參見"地形建設".
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+*
+可開辟農場.\::J 參見"地形建設".
+*
+*
+*
+*
+可開始鋪設鐵路.\::J 參見"地形建設".
+*
+可開采工業化資源.\划時代科技: 當某國實現了科學, 全世界都會獲悉這一消息.
+*
+海上部隊的最大編制上升至 7%w.
+*
+*
+*
+海上部隊的最大編制上升至 9%w.\裝備裝甲的上限提升1.
+*
+*
+*
+*
+*
+划時代科技: 當某國實現了星際殖民, 全世界都會獲悉這一消息.
+*
+*
+可開始生產新型地面部隊.
+*
+*
+*
+建有大學的城市, 科技+5%\建有實驗室的城市, 科技+10%
+建有工厂的城市, 生產+5%\建有特區的城市, 生產+10%\(不會增加額外污染)
+*
+*
 #IMPHELP
+¥i¥Í²£¯S®í³¡¶¤:\\::S7 ¥£Æ×³Ò¤u
 ¨C§ð¥e¤@³B«°¥«, ´N¥iÀò±oì¶Õ¤Oªº°ê®a±¡³ø, ÁÙ¥i±q¸Ó¶Õ¤Oªº¬ì§Þ¦¨ªG¤¤¿ï¤@¶µÅÑ¬°¤v¦³. ÅÑ±oªº¬ì§Þ¦¨ªG©M³q¹L¥æ¯A¦Ó±oªº¤@¼Ë, ¦b´x´¤«e¥²¶·¶i¦æåªR©Ê¬ã¨s, ¬ã¨s³t«×±N¬O¿W¦Û¬ã¨sªº¨â¿, ¥B¤£¥²¬ã¨s¥ý´Á©Ò»Ý¬ì§Þ.
 ¨Fºz¦a§Î¥i§ó´«¬°¥ì©Î¯ó¦a.\©Ò¦³³¡¶¤¹ï´c¤gªºt±®ÄªG§K¬Ì.
 ©_¸ñªº«Ø³y¦¨¥»´î¤Ö¥|¤À¤§¤@.
 ©Ò¦³ªñ®ü¦a¶ô¼W¥[ 1%p. \\¥u¦³ªu®ü«°¥«¤~¯à«Ø³y¦¹©_¸ñ.
 ¾Ö¦³¤j¹Ï®ÑÀ]ªº°ê®a, ¥iÀò±o¨ä¥L¶Õ¤O¤w¬ã±oªº¬ì§Þ¦¨ªG, ±ø¥ó¬O¨ä¥L¶Õ¤O¤¤¤@¥b¥H¤W¤w¾Ö¦³¸Ó¦¨ªG. Àò±oªº¬ì§Þ¦¨ªG©M³q¹L¥æ¯A¦Ó±oªº¤@¼Ë, ¦b´x´¤«e¥²¶·¶i¦æåªR©Ê¬ã¨s, ¬ã¨s³t«×±N¬O¿W¦Û¬ã¨sªº¨â¿, ¥B¤£¥²¬ã¨s¥ý´Á©Ò»Ý¬ì§Þ.
 «Ø¦¨¦Z, ¹ï¤_¥»°ê¤Î¤w«Ø¥ß¥æ©¹ªº°ê®a, ¨C¦^¦X°ê®w±NÀò±oÃB¥~¦¬¤J, ¦¬¤J¼Æ¶qµ¥¦P¤_¸Ó°ê¦x¼qªºÁ`¼Æ.
 ¥H¤U3¶µ¬ì§ÞÄÝ©Ê¥Í®Ä:
+µLµø¬ì¬ã§ë¤J¤ñ¨Ò, ¦b±µ¤U¨Óªº¨â¦^¦X¤¤³sÄò§¹¦¨¨â¶µ·sªº¬ì§Þ¦¨ªG. ¥t¥i¥Í²£¯S®í³¡¶¤:\\::S8 ·Æµ¾Éó
 ¥»°ê©Ò¦³®ü¤W³¡¶¤ªºÉó°Ê¤O +200.\\¥u¦³ªu®ü«°¥«¤~¯à«Ø³y¦¹©_¸ñ.
 ¦bÁÊ¶R¥¼§¹¦¨ªº³]¬I©Î©_¸ñ®É, ÁÊ¶R¤@³æ¦ìì®ÆªºÉ²®æ°¦Ü2%c.
+*
 ¦pªG¬FÊ^¬O§g¥D¨î, ¬ì¬ã¶i«×¥[§Ö¤@¿.
 «°¥«¤¤ªº±Ð°ó¥i¨ÏÃB¥~ªº2¦W¤£¦w¥«¥ÁÅÜ¦¨¦w©w.
+*
 ¨CÓ«°¥«³£¦³¦U¦Ûªº°ø¨×²v, ¨ä¤ô¥¨¬¥Hªý¤î«°¥«ÄÌ¶Ãªºµo¥Í.\\¦pªG¤@Ó«°¥«ªº¶T©ö©Ò±o¤Ó¤Ö, ¥þ³¡¶T©öÃB³£´«¦¨°ø¨×«~, ¤]¤£¨¬¥Hªý¤îÄÌ¶Ãªº¸Ü, ¸Ó©_¸ñ¹ï¦¹±¡ªpµL¯à¬°¤O.
 ©Ò¦³©_¸ñªº®ÄªG¥Ã»·¤£·|¹L´Á. ¤w¹L´Áªº©_¸ñ«·s¥Í®Ä.
 ¬Û·í¤_¦b¨CÓ«°¥«¤¤³y¤@®y¤ô¹q¯¸.\\¥u¦³ªuªe©Î¾aªñ°ª¤sªº«°¥«¤~¯à«Ø³y¦¹©_¸ñ.
 ªuµÛÅK¸ô²¾°Ê®É, µL»Ý¯Ó¶O¥ô¦ó¦æ°ÊÂI.
 ±Ò°Ê§N¾Ô®É¥N. §N¾Ô®É©Ò¦³°ê®aµLªk¶}®i¹ï¥~¥æ¯A. §N¾Ô¦@«ùÄò40¦^¦X.
+¾ãÓ¥@¬É¦a¹Ï±N¥þ³¡¥´¶}, ¦}Àòª¾©Ò¦³³¡¶¤ªº¦æ°Ê, ®ÄªG«ùÄò¤@¦^¦X. Àò±o©Ò¦³¶Õ¤Oªº°ê®a±¡³ø©Mx¨Æ±¡³ø.\\n«Ø³]¦¹©_¸ñ, ¥²¶·¥ý«Ø\::B66 ¤ÓªÅ´ä
+*
+*
+*
+*
+*
+*
+*
+*
+«°¥«¥Í²£ªº¦a±³¡¶¤ª½±µ¤É¬°¾ú½m³¡¶¤.  ¨ü¶Ëªº¦a±³¡¶¤¦b¦¹«°¤¤¯d¦u, ¨C¦^¦Xª¬ºA«ìÎ`³t«×¥[¿.
 «°¥«³W¼Ò¼Wªø¦Z, Â³¹Àx¶q¤£¬O¥þªÅ, ¦Ó¬O¥bº¡.
+可生產特殊部隊:\\::S7 奴勞工
+每攻占一處城市, 就可獲得原勢力的國家情報, 還可從該勢力的科技成果中選一項竊為己有. 竊得的科技成果和通過交涉而得的一樣, 在掌握前必須進行剖析性研究, 研究速度將是獨自研究的兩倍, 且不必研究先期所需科技.
+沙漠地形可更換為平原或草地.\所有部隊對惡土的負面效果免疫.
+奇跡的建造成本減少四分之一.
+所有近海地塊增加 1%p. \\只有沿海城市才能建造此奇跡.
+擁有大圖書館的國家, 可獲得其他勢力已研得的科技成果, 條件是其他勢力中一半以上已擁有該成果. 獲得的科技成果和通過交涉而得的一樣, 在掌握前必須進行剖析性研究, 研究速度將是獨自研究的兩倍, 且不必研究先期所需科技.
+建成后, 對于本國及已建立交往的國家, 每回合國庫將獲得額外收入, 收入數量等同于該國寺廟的總數.
+以下3項科技屬性生效:
+無視科研投入比例, 在接下來的兩回合中連續完成兩項新的科技成果. 另可生產特殊部隊:\\::S8 滑翔机
+本國所有海上部隊的机動力 +200.\\只有沿海城市才能建造此奇跡.
+在購買未完成的設施或奇跡時, 購買一單位原料的价格降至2%c.
+*
+如果政体是君主制, 科研進度加快一倍.
+城市中的教堂可使額外的2名不安市民變成安定.
+*
+每個城市都有各自的奢侈率, 其水平足以阻止城市騷亂的發生.\\如果一個城市的貿易所得太少, 全部貿易額都換成奢侈品, 也不足以阻止騷亂的話, 該奇跡對此情況無能為力.
+所有奇跡的效果永遠不會過期. 已過期的奇跡重新生效.
+相當于在每個城市中造一座水電站.\\只有沿河或靠近高山的城市才能建造此奇跡.
+沿著鐵路移動時, 無需耗費任何行動點.
+啟動冷戰時代. 冷戰時所有國家無法開展對外交涉. 冷戰共持續40回合.
+整個世界地圖將全部打開, 并獲知所有部隊的行動, 效果持續一回合. 獲得所有勢力的國家情報和軍事情報.\\要建設此奇跡, 必須先建\::B66 太空港
+*
+*
+*
+*
+*
+*
+*
+*
+城市生產的地面部隊直接升為歷練部隊.  受傷的地面部隊在此城中留守, 每回合狀態恢复速度加倍.
+城市規模增長后, 糧食儲量不是全空, 而是半滿.
 +2%m.
 µ|¦¬©M°ø¨×¥Í²£ +50%.
 ¬ì¾Ç¥Í²£ +50%.
 ¦¬¶°¶T©ö§Q¼í, ¨CÓ¦a¶ôªº¶T©ö¶q¨S¦³¤W, ¦}´î¤Ö50%ªº»G±Ñ.
 ¦u½Ã³¡¶¤¦b¾D¹J¦a±³¡¶¤Å§À»®É, ¨¾±s¤O +200%. ·í¦u½Ã³¡¶¤³Q¼Ä¤è¦a±³¡¶¤ºR·´®É, «°¥«¤H¤f¤£·|´î¤Ö.
 «°¥«³W¼Ò¤W±q8ÅÜ¦¨12.
 µ|¦¬©M°ø¨×¥Í²£ +75%.
+稅收和奢侈生產 +50%.
+科學生產 +50%.
+收集貿易利潤, 每個地塊的貿易量沒有上限, 并減少50%的腐敗.
+守衛部隊在遭遇地面部隊襲擊時, 防御力 +200%. 當守衛部隊被敵方地面部隊摧毀時, 城市人口不會減少.
+城市規模上限從8變成12.
+稅收和奢侈生產 +75%.
 +4%m.
 ¬ì¾Ç¥Í²£ +75%.
 ¨CÓªñ®ü¦a¶ô +1%f.\\¦¹³]¬I¥u¯à«Ø¦bªu®ü«°¥«.
+科學生產 +75%.
+每個近海地塊 +1%f.\\此設施只能建在沿海城市.
 +4%m.
 ì®Æ¥Í²£ +50%, ¦Ã¬V +50%.
 ì®Æ¥Í²£ +50%, ¦Ã¬V +50%.
 §¹¥þ®ø°£¦Ã¬V²{¶H.
 µo¹q³]¬I, ¨Ï¤uÉD©M¯S°Ïªºì®Æ¥Í²£®ÄªG¥[¿.\(«Î`«Ø³yµo¹q³]¬I, ®ÄªG¤£·|Å|¥[.)\¦Ã¬V +50%.
 µo¹q³]¬I, ¨Ï¤uÉD©M¯S°Ïªºì®Æ¥Í²£®ÄªG¥[¿.\(«Î`«Ø³yµo¹q³]¬I, ®ÄªG¤£·|Å|¥[.)\¦Ã¬V -50%.\\¦¹³]¬I¥u¯à«Ø¦bªuªe©ÎÁ{ªñ°ª¤sªº«°¥«.
 µo¹q³]¬I, ¨Ï¤uÉD©M¯S°Ïªºì®Æ¥Í²£®ÄªG¥[¿.\(«Î`«Ø³yµo¹q³]¬I, ®ÄªG¤£·|Å|¥[.)\¤£·|²£¥Í¥ô¦ó¦Ã¬V.
 ¨CÓªñ®ü¦a¶ô +1%p.\\¦¹³]¬I¥u¯à«Ø¦bªu®ü«°¥«.
 ¦¬¶°«°¥«¶T©ö§Q¼íªº°òÂ¦³]¬I. ¨CÓ¦a¶ô³Ì¦h¥X²£ 3%t.
 «°¥«³W¼Ò¤W±q12ÅÜ¦¨30.
 ¹A³õ¥Í²£ªºÂ³¹²£¶q +50%.
 ¨Ï¨®½üªº¶T©ö¥[¦¨®ÄªG¦A¥[¿.
 ¬ì¾Ç¥Í²£ +75%.
 ¦u½Ã³¡¶¤¦b¾D¹JªÅ¤¤³¡¶¤©ÎÅF¬µÅ§À»®É, ¨¾±s¤O +100%.
 ¦u½Ã³¡¶¤¦b¾D¹J®ü¤W³¡¶¤©ÎÅF¬µÅ§À»®É, ¨¾±s¤O +100%.\\¦¹³]¬I¥u¯à«Ø¦bªu®ü«°¥«.
 «°¥«¥Í²£ªºªÅ¤¤³¡¶¤ª½±µ¤É¬°¾ú½m³¡¶¤. ¨ü¶ËªºªÅ¤¤³¡¶¤¦b¦¹«°¤¤¯d¦u, ¨C¦^¦Xª¬ºA«ìÎ`³t«×¥[¿.
 «°¥«¥Í²£ªº®ü¤W³¡¶¤ª½±µ¤É¬°¾ú½m³¡¶¤. ¨ü¶Ëªº®ü¤W³¡¶¤¦b¦¹«°¤¤¯d¦u, ¨C¦^¦Xª¬ºA«ìÎ`³t«×¥[¿.
+¨Ï©Ò¦b«°¥«ªº¶T©ö¸ê·½²£¶q¨S¦³¤W, ¦Ó¥B¤£·|²£¥Í¥ô¦ó»G±Ñ²{¶H. ©Ò¦b«°¥«¦Û°Ê¦¨¬°°ê®aº³£. ±ý¤F¸Ñº³£ÉO¨ä¥L«°¥«»G±ÑªºÃö¨t, ½Ð°Ñ¨£:\:RESOURCES "¸ê·½ÏúÃþ"¥½¸`
 ¬Û·í¤_¦b¦P¤@¶ô¤j³°¤Wªº¨C®y«°¥«¤¤³y¤@¹D«°Àð.
 ¨Ï¦w©w¥«¥Áªº¼Æ¶q¼W¥[, ¼WÈµ¥¦P¤_«°¥«ªº³W¼ÒÈ.
 ©Ò¦b«°¥«ªº¬ì¾Ç¸ê·½²£¶q¥[¿.
 ©Ò¦b«°¥«¥Í²£ªº©Ò¦³¦a±³¡¶¤ª½±µ¤É¬°ºë^³¡¶¤. ¨ü¶Ëªº¦a±³¡¶¤¦b¦¹«°¤¤¯d¦u, ¨C¦^¦Xª¬ºA«ìÎ`³t«×¥[¿.
 ©Ò¦b«°¥«¤¤, ¾n¦u³¡¶¤¨¾±s¤O +100%.
 ©Ò¦b«°¥« +12%f
 ©Ò¦³»È¦æªº®ÄªG¥[¿.
 ¯S®í¸ê·½ +100%.\\¥i¥H¶}©l«Ø³y´Þ¥Á¸²î³¡¥ó. ¦pªG¨S¦³¤ÓªÅ´ä, ´Þ¥Á¸²î¤uµ{±N¤Æ¬°¯Q¦³. ¦pªG¤ÓªÅ´ä³Q¨ä¥L¾Ö¦³¤ÓªÅ´äªº¶Õ¤O¥e»â, «h´Þ¥Á¸²î¤]±N¸¨¤J¥e»âªÌªº¤â¤¤.
+原料生產 +50%, 污染 +50%.
+原料生產 +50%, 污染 +50%.
+完全消除污染現象.
+發電設施, 使工厂和特區的原料生產效果加倍.\(重复建造發電設施, 效果不會疊加.)\污染 +50%.
+發電設施, 使工厂和特區的原料生產效果加倍.\(重复建造發電設施, 效果不會疊加.)\污染 -50%.\\此設施只能建在沿河或臨近高山的城市.
+發電設施, 使工厂和特區的原料生產效果加倍.\(重复建造發電設施, 效果不會疊加.)\不會產生任何污染.
+每個近海地塊 +1%p.\\此設施只能建在沿海城市.
+收集城市貿易利潤的基礎設施. 每個地塊最多出產 3%t.
+城市規模上限從12變成30.
+農場生產的糧食產量 +50%.
+使車輪的貿易加成效果再加倍.
+科學生產 +75%.
+守衛部隊在遭遇空中部隊或轟炸襲擊時, 防御力 +100%.
+守衛部隊在遭遇海上部隊或轟炸襲擊時, 防御力 +100%.\\此設施只能建在沿海城市.
+城市生產的空中部隊直接升為歷練部隊. 受傷的空中部隊在此城中留守, 每回合狀態恢复速度加倍.
+城市生產的海上部隊直接升為歷練部隊. 受傷的海上部隊在此城中留守, 每回合狀態恢复速度加倍.
+使所在城市的貿易資源產量沒有上限, 而且不會產生任何腐敗現象. 所在城市自動成為國家首都. 欲了解首都与其他城市腐敗的關系, 請參見:\:RESOURCES "資源种類"末節
+相當于在同一塊大陸上的每座城市中造一道城牆.
+使安定市民的數量增加, 增值等同于城市的規模值.
+所在城市的科學資源產量加倍.
+所在城市生產的所有地面部隊直接升為精英部隊. 受傷的地面部隊在此城中留守, 每回合狀態恢复速度加倍.
+所在城市中, 駐守部隊防御力 +100%.
+所在城市 +12%f
+所有銀行的效果加倍.
+特殊資源 +100%.\\可以開始建造殖民飛船部件. 如果沒有太空港, 殖民飛船工程將化為烏有. 如果太空港被其他擁有太空港的勢力占領, 則殖民飛船也將落入占領者的手中.
+*
 …
 #FEATUREHELP
 §ðÀ»¤O°òÈ +1.
 ¨¾±s¤O°òÈ +1.\ª`·N: ¦a±³¡¶¤¸Ë¥Ò¤W¬°2³æ¦ì, ªÅ¤¤©M®ü¤W³¡¶¤ªº¸Ë¥Ò¤W¬°3³æ¦ì.
 Éó°Ê¤O+50.
 ¦a±³¡¶¤¹B¸ü°òÈ +1.
 ªÅ¤¤³¡¶¤¹B¸ü°òÈ +1.\¥ÀÄ¥¤£¯à·f¸ü¹B¿éÉó.\¥]§t¤F¹p¹FÁn¯ÇÄÝ©Ê.
 Éó°Ê¤O+200.
 ¸Éó°_¯è¦Z, ¹ï¦a±©Î®ü¤W³¡¶¤¹ê¦æº¦¸¥´À»®É, §ðÀ»¤O°òÈ +2.
 ¨C¼W¥[¤@ÂI¿Uªo, ¸Éó¥i¦b¥~¦h°±¯d¤@¦^¦X, µL»Ýªð¦^«°¥«/¥ÀÄ¥/x¨Æ°ò¦a.
 ¦a±³¡¶¤¹B¸ü°òÈ +1.\¥ÀÄ¥¤£¯à·f¸ü¹B¿éÉó.
 ®ü¤W³¡¶¤¥i¦b»·¬v¯è¦æ.
 µø³¥S³òÂX¼e¬°2®æ, ¥iµo²{Á{ªñªº¼Ä¤è¼ç¸¥.
 ¨ã³Æ¼ç¯è¯à¤O, ¼Ä¤è¶Õ¤O¤£¥i¨£.
 §ðÀ»«°¥«®É, ¼Ä¤è«°Àðªº¨¾±s¥[¦¨µL®Ä. ¦a±³¡¶¤¥i§ðÀ»¾F±µªº®ü¤W³¡¶¤.\®ü¤W³¡¶¤¥i§ðÀ»¾F±µªº«°¥«©Î¦a±³¡¶¤.
 ¦b¦UÏú¦a§Î¤W²¾°Ê®É, ®ø¯Ó¦æ°ÊÂI¼Æµ¥¦P¤_¹D¸ô²¾°Ê.
 ¹B¸üªº³¡¶¤¨C¦^¦Xª¬ºA³vº¥«ìÎ`.
 §ðÀ»¤O¤Î¨¾±s¤O°òÈ¤À§O +1. »Ýn«°¥«2¿ªº¨Ñµ¹. ¸Ë³ÆÃB¥~t«ªº³¡¶¤, ¥u¯àªuµÛ¹D¸ô/ªe¬y/¹Bªe²¾°Ê, ²¾°Ê®ø¯Ó¦æ°ÊÂI¼Æ¬O´¶³q³¡¶¤ªº2¿. ¤]¥iªuµÛÅK¸ô²¾°Ê, ®ø¯Ó¦æ°ÊÂI¼Æµ¥¦P¤_´¶³q³¡¶¤. µLªk·f¼¹B¿é¤u¨ã.
 ¹ïªÅ¤¤³¡¶¤ªº¨¾±s¤O +100%.
 ¥i°»¹î¾Fªñ«°¥«, ¥H¤Î¦P¤@¦a¶ôªº¦hÓ³¡¶¤ (¥]¬AÁô§Î¸Éó).
 Éó°Ê¤O+100.
 Éó°Ê¤O+100.
 Éó°Ê¤O+400.
 ¨ã³ÆÁô§Î¯à¤O, ¼Ä¤è¶Õ¤O¤£¥i¨£.
 ·í±a¦³¦¹ÄÝ©Êªº³¡¶¤°}¤`®É, ·|µ¹¼Ä¤H³y¦¨¨â¿ªº¶Ë®`.\\¦b¦P¤@¦a¶ô¦s¦b¦h¤ä³¡¶¤®É, ¨g¼öªº¦a±³¡¶¤±N¬O¨¾±sªº¥ýÀY¤O¶q.\\·í°ê®a¬FÊ^¬O¦@©M¨î, ¥Á¥D¨î©Î¥¼¨Ó¨î®É, ¦¹ÄÝ©Ê¥¢®Ä.
 ·í³¡¶¤±N¼Äx¤@Á|Äè·À®É, ³¡¶¤¨ü¨ìªº¶Ë®`¬O³q±`ªº¤G¤À¤§¤@.
 §Y¨Ï§ðÀ»®É³Ñ§E¦æ°ÊÂI¤£¨¬1ÂI, ³¡¶¤¤]¯à¨Ï¥X¥þ³¡ªº§ðÀ»¤O.
 µø³¥S³òÂX¼e¬°2®æ, ¦pªG«Ý©R®É©|§E¤@¥b¦æ°ÊÂI, ³¡¶¤¦Û°ÊÂà¤J¾n¦uª¬ºA.
 ³sÄò¥Í²£¦PÏú³¡¶¤ªº¥Í²£¶O¥Î´î¥b, ¦ýY§ï¬°¥Í²£¨ä¥L³¡¶¤, ¥Í²£¶O¥Î¥[¿.
+攻擊力基值 +1.
+防御力基值 +1.\注意: 地面部隊裝甲上限為2單位, 空中和海上部隊的裝甲上限為3單位.
+机動力+50.
+地面部隊運載基值 +1.
+空中部隊運載基值 +1.\母艦不能搭載運輸机.\包含了雷達聲納屬性.
+机動力+200.
+飛机起航后, 對地面或海上部隊實行首次打擊時, 攻擊力基值 +2.
+每增加一點燃油, 飛机可在外多停留一回合, 無需返回城市/母艦/軍事基地.
+地面部隊運載基值 +1.\母艦不能搭載運輸机.
+海上部隊可在遠洋航行.
+視野范圍擴寬為2格, 可發現臨近的敵方潛艇.
+具備潛航能力, 敵方勢力不可見.
+攻擊城市時, 敵方城牆的防御加成無效. 地面部隊可攻擊鄰接的海上部隊.\海上部隊可攻擊鄰接的城市或地面部隊.
+在各种地形上移動時, 消耗行動點數等同于道路移動.
+運載的部隊每回合狀態逐漸恢复.
+攻擊力及防御力基值分別 +1. 需要城市2倍的供給. 裝備額外負重的部隊, 只能沿著道路/河流/運河移動, 移動消耗行動點數是普通部隊的2倍. 也可沿著鐵路移動, 消耗行動點數等同于普通部隊. 無法搭乘運輸工具.
+對空中部隊的防御力 +100%.
+可偵察鄰近城市, 以及同一地塊的多個部隊 (包括隱形飛机).
+机動力+100.
+机動力+100.
+机動力+400.
+具備隱形能力, 敵方勢力不可見.
+當帶有此屬性的部隊陣亡時, 會給敵人造成兩倍的傷害.\\在同一地塊存在多支部隊時, 狂熱的地面部隊將是防御的先頭力量.\\當國家政体是共和制, 民主制或未來制時, 此屬性失效.
+當部隊將敵軍一舉殲滅時, 部隊受到的傷害是通常的二分之一.
+即使攻擊時剩余行動點不足1點, 部隊也能使出全部的攻擊力.
+視野范圍擴寬為2格, 如果待命時尚余一半行動點, 部隊自動轉入駐守狀態.
+連續生產同种部隊的生產費用減半, 但若改為生產其他部隊, 生產費用加倍.
 #GOVHELP
 -©Ò¦³«°¥«³´¤JÄÌ¶Ã.\-«°¥«³]¬IµL»Ý¸êª÷ºû«ù.\-Æ×ÄÝ³¡¶¤µL»Ý«°¥«¨Ñµ¹.\-«ùÄò3Ó¦^¦X.
 -¨CÓ¦a¶ô¸ê·½¤W¬°:  3%f, 2%p, 2%t.\-ÄY«»G±Ñ. (»G±Ñ¦]¤l=3)\-¨CÓ¥«¥Á¥i¤ä«ù1¤äµL»Ý¨Ñµ¹ªº³¡¶¤.\-¨S¦³¦Ã¬V.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 1%f.
 -»´·L»G±Ñ. (»G±Ñ¦]¤l=1)\-¨C2Ó¥«¥Á¥i¤ä«ù1¤äµL»Ý¨Ñµ¹ªº³¡¶¤.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 1%f.
 -©Ò¦³>0ªº¶T©ö¸ê·½¼W¥[1ÂI¶T©ö.\-¤¤µ¥µ{«×ªº»G±Ñ. (»G±Ñ¦]¤l=2)\-¦b¥»¤è©Î·ùx¶Õ¤O»â¤g¤§¥~ªº§ðÀ»³¡¶¤(§ðÀ»¤O>0), ·|¨ÏÆ×ÄÝ«°¥«ªº¦w©w¥«¥ÁÂà¬°¤£¦w, 1¤ä³¡¶¤¼vÅT2¦ì¥«¥Á.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 2%f.
 -»´·L»G±Ñ. (»G±Ñ¦]¤l=1)\-©Ò¦³³¡¶¤µL»Ý«°¥«¨Ñµ¹.\-¥þ¥Á«H¥õ, ¥þÊ^¥«¥Á³B¤_¦w©wª¬ºA.\-¬ì¬ã¶i«×´îºC¬°ì¥ýªº¤@¥b.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 1%f.
 -©Ò¦³>1%pªº¸ê·½ÃB¥~¼W¥[1ÂI.\-¨S¦³»G±Ñ²{¶H.\-¨C2Ó¥«¥Á¥i¤ä«ù1¤äµL»Ý¨Ñµ¹ªº³¡¶¤.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 2%f.
 -©Ò¦³>0ªº¶T©ö¸ê·½¼W¥[1ÂI¶T©ö.\-¨S¦³»G±Ñ²{¶H.\-¦b¥»¤è©Î·ùx¶Õ¤O»â¤g¤§¥~ªº§ðÀ»³¡¶¤(§ðÀ»¤O>0), ·|¨ÏÆ×ÄÝ«°¥«ªº¦w©w¥«¥ÁÂà¬°¤£¦w, 1¤ä³¡¶¤¼vÅT2¦ì¥«¥Á.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 2%f.
 -©Ò¦³>0ªº¶T©ö¸ê·½¼W¥[1ÂI¶T©ö.\-¬ãµo¥¼¨Ó¬ì§Þ®É, ¶È»Ý´¶³q¬ì§Þªº2¿¬ãµo®É¶¡, ¦Ó¤£¬O4¿.\-¨S¦³»G±Ñ²{¶H.\-¦b¥»¤è©Î·ùx¶Õ¤O»â¤g¤§¥~ªº§ðÀ»³¡¶¤(§ðÀ»¤O>0), ·|¨ÏÆ×ÄÝ«°¥«ªº¦w©w¥«¥ÁÂà¬°¤£¦w, 1¤ä³¡¶¤¼vÅT2¦ì¥«¥Á.\-¦h§EªºÂ³¹±Nª½±µÂà´«¦¨ª÷¿ú.\-«°¥«¤H¤f¤£¦A¼Wªø.\-¨C¤ä²¾¥Á³¡¶¤¨C¦^¦X®ø¯Ó 2%f.
+-所有城市陷入騷亂.\-城市設施無需資金維持.\-屬部隊無需城市供給.\-持續3個回合.
+-每個地塊資源上限為:  3%f, 2%p, 2%t.\-嚴重腐敗. (腐敗因子=3)\-每個市民可支持1支無需供給的部隊.\-沒有污染.\-每支移民部隊每回合消耗 1%f.
+-輕微腐敗. (腐敗因子=1)\-每2個市民可支持1支無需供給的部隊.\-每支移民部隊每回合消耗 1%f.
+-所有>0的貿易資源增加1點貿易.\-中等程度的腐敗. (腐敗因子=2)\-在本方或盟軍勢力領土之外的攻擊部隊(攻擊力>0), 會使屬城市的安定市民轉為不安, 1支部隊影響2位市民.\-每支移民部隊每回合消耗 2%f.
+-輕微腐敗. (腐敗因子=1)\-所有部隊無需城市供給.\-全民信仰, 全体市民處于安定狀態.\-科研進度減慢為原先的一半.\-每支移民部隊每回合消耗 1%f.
+-所有>1%p的資源額外增加1點.\-沒有腐敗現象.\-每2個市民可支持1支無需供給的部隊.\-每支移民部隊每回合消耗 2%f.
+-所有>0的貿易資源增加1點貿易.\-沒有腐敗現象.\-在本方或盟軍勢力領土之外的攻擊部隊(攻擊力>0), 會使屬城市的安定市民轉為不安, 1支部隊影響2位市民.\-每支移民部隊每回合消耗 2%f.
+-所有>0的貿易資源增加1點貿易.\-研發未來科技時, 僅需普通科技的2倍研發時間, 而不是4倍.\-沒有腐敗現象.\-在本方或盟軍勢力領土之外的攻擊部隊(攻擊力>0), 會使屬城市的安定市民轉為不安, 1支部隊影響2位市民.\-多余的糧食將直接轉換成金錢.\-城市人口不再增長.\-每支移民部隊每回合消耗 2%f.
 #TECHAGE
+¦´Á¬ì§Þ
+¤u·~¤Æ¬ì§Þ
+²{¥N¬ì§Þ
+¥¼¨Ó¬ì§Þ
+早期科技
+工業化科技
+現代科技
+未來科技
 #SPECIALMODEL
 -¥i¥H§ï³y¦a§Î, «Ø¥ß«°¥«.\-»Ýn«°¥«¨Ñµ¹Â³¹.
 -¥i¥H§ï³y¦a§Î, «Ø¥ß«°¥«.\-»Ýn«°¥«¨Ñµ¹Â³¹.\-¹ï´c¤gªºt±®ÄªG¦³§K¬Ì.
+*
 -¦u«°®É¨¾±s¤O +100%.\-©l²×»Ýn«°¥«¨Ñµ¹Â³¹.\-¦b¥£Æ×±M¨îªÀ·|¤¤, ¨CÓ¦u«°ªº½Ã§L¥i©è®ø2¦W«°¤º¥«¥Áªº¤£¦w.
 :SPYMISSIONS ¥i°õ¦æ¯µ±K¦æ°Ê.\-¥i°»¹î¾Fªñ«°¥«, ¥H¤Î¦P¤@¦a¶ôªº¦hÓ³¡¶¤ (¥]¬AÁô§Î¸Éó).\-µø³¥S³ò¬°2®æ.\-¤£¨ã³Æ¦a°ì±±¨îªº¯à¤O.\-¤£·|¦bÆ×ÄÝ«°¥«¤Þ°_¥«¥Áªº¤£¦w.
 -«Ø³]¶¤¥i¥Î"¥[¤J«°¥«"ªº¤èªk, ±N¦Û¨¤T¤À¤§¤Gªº¥Í²£ì®Æ ¥[¤J·í«e«°¥«ªº«Ø³]¶µ¥Ø¤§¤¤ (´Þ¥Á¸²î³¡¥óªº«Ø³]°£¥~).
 -¥i·f¸ü¹B¿é¨â¤ä³¡¶¤.
 -¥i¥H§ï³y¦a§Î.\-µL»Ý«°¥«¨Ñµ¹Â³¹.
 -¦b¥»¤è¦^¦X¤¤, ¥i¦bªÅ¤¤¸¦æ; ¦b¨ä¥L¶Õ¤Oªº¦^¦X¤¤, ±N³Q·í§@¦a±³¡¶¤.\-¥i°»¹î¾Fªñ«°¥«, ¥H¤Î¦P¤@¦a¶ôªº¦hÓ³¡¶¤.\-¦pªG¦b¥»¤è¦^¦Xµ²§ô®É, ·Æµ¾Éó¤´¦b®ü±, ´N·|¼Y·´.\-¤£¥i·f¸üÄ¥²î.
+-可以改造地形, 建立城市.\-需要城市供給糧食.
+-可以改造地形, 建立城市.\-需要城市供給糧食.\-對惡土的負面效果有免疫.
+*
+-守城時防御力 +100%.\-始終需要城市供給糧食.\-在奴專制社會中, 每個守城的衛兵可抵消2名城內市民的不安.
+:SPYMISSIONS 可執行秘密行動.\-可偵察鄰近城市, 以及同一地塊的多個部隊 (包括隱形飛机).\-視野范圍為2格.\-不具備地域控制的能力.\-不會在屬城市引起市民的不安.
+-建設隊可用"加入城市"的方法, 將自身三分之二的生產原料 加入當前城市的建設項目之中 (殖民飛船部件的建設除外).
+-可搭載運輸兩支部隊.
+-可以改造地形.\-無需城市供給糧食.
+-在本方回合中, 可在空中飛行; 在其他勢力的回合中, 將被當作地面部隊.\-可偵察鄰近城市, 以及同一地塊的多個部隊.\-如果在本方回合結束時, 滑翔机仍在海面, 就會墜毀.\-不可搭載艦船.
 #JOBHELP
 :MOVEMENT ³¡¶¤²¾°Ê®É¯Ó¶O§ó¤Ö¦æ°ÊÂI, ³¡¶¤²¾°ÊS³ò¼W¤j.\::A29 °t¦X¨®½ü¬ì§Þ, ´£°ª¶T©ö§Q¼í.
 :MOVEMENT ³¡¶¤²¾°Ê®É¯Ó¶O§ó¤Ö¦æ°ÊÂI, ³¡¶¤²¾°ÊS³ò¼W¤j.\-©Ò¦b¦a¶ôªºì®Æ¸ê·½¥Í²£ +50%.\-¥u¯à¦b¤w¦³¹D¸ôªº¦a¶ô¤W¾Q³]ÅK¸ô. ¹D¸ôªºì¦³®ÄªG¨ÌµM«O¯d.
 -¨Ï²î¥u¥i³q¦æ¤J¤º³°.\-¥i©è®ø´c¤gªºt±®ÄÀ³.\-¤£¥i¦b°ª¤s©Î¦Bì¤W¶}¹@¹Bªe.
 -¼W¥[Â³¹²£¶q, ¼W¥[´T«×¦]¦a§Î¦ÓÉÝ.
 ::B51 ¦³¶W¥«ªº«°¥«¤¤, Â³¹²£¶q +50%\-¥u¯à¦b¤wÄéµ@ªº¦a¶ô¤W¶}¾Á¹A³õ. Äéµ@ªºì¦³®ÄªG¨ÌµM«O¯d.
 -¼W¥[ÄqÂÃ²£¶q, ¼W¥[´T«×¦]¦a§Î¦ÓÉÝ.
 -¦b¤º¾n¦uªº¦a±³¡¶¤¨¾±s¤O +100%.\-µø³¥S³ò©Ý¬°2®æ.\:COMBAT ¨ä¥L®ÄªG,¸Ô¨£"¾Ô¤æ¤j¥þ".
 -¥i©è®ø´c¤gªºt±®ÄÀ³.\-µø³¥S³ò©Ý¬°2®æ.\:COMBAT ¾Ô¤æ¤Î«ìÎ`®ÄªG, ¸Ô¨£"¾Ô¤æ¤j¥þ".\::F6 ¸Éó¥i¦b¦¹¥[¸Ë¬µ¼u.\-Y¾F±µ¹Bªe, ²î¥u¥i¦bx¨Æ°ò¦a¤º°±ªy.
+:MOVEMENT 部隊移動時耗費更少行動點, 部隊移動范圍增大.\::A29 配合車輪科技, 提高貿易利潤.
+:MOVEMENT 部隊移動時耗費更少行動點, 部隊移動范圍增大.\-所在地塊的原料資源生產 +50%.\-只能在已有道路的地塊上鋪設鐵路. 道路的原有效果依然保留.
+-使船只可通行入內陸.\-可抵消惡土的負面效應.\-不可在高山或冰原上開辟運河.
+-增加糧食產量, 增加幅度因地形而异.
+::B51 有超市的城市中, 糧食產量 +50%\-只能在已灌溉的地塊上開墾農場. 灌溉的原有效果依然保留.
+-增加礦藏產量, 增加幅度因地形而异.
+-在內駐守的地面部隊防御力 +100%.\-視野范圍拓為2格.\:COMBAT 其他效果,詳見"戰斗大全".
+-可抵消惡土的負面效應.\-視野范圍拓為2格.\:COMBAT 戰斗及恢复效果, 詳見"戰斗大全".\::F6 飛机可在此加裝炸彈.\-若鄰接運河, 船只可在軍事基地內停泊.

branches/highdpi/Localization/zh-Hant/Language.txt

-              r464
+              r465
 #GAME ¶i«× %d
 #MAP ¦a¹Ï %d
 #BC ¤½¤¸«e %d ¦~
 #AD ¤½¤¸ %d ¦~
+#GAME 進度 %d
+#MAP 地圖 %d
+#BC 公元前 %d 年
+#AD 公元 %d 年
 #SHARE %d/%d
 #SHORTNAME #S
 #OWNED #A %s
 #GENCITY #S %d
 #GENMODEL #A ¼Ò¶ô %d
+#GENMODEL #A 模塊 %d
 #TILESIZE %dx%d
 'City Screen Text
 #HAPPINESS ¦w©w
 #CONTROL §ÙÄY
 #FAITH «H¥õ
 #UNREST ¤£¦w
 #HAPPINESSDEMAND ¤H¤f
 #HAPPINESSPLUS ³Ñ§E
 #STORAGE ¦sÂ³
 #FOOD Â³¹
 #DEMAND »Ý¨D
 #SURPLUS ¦h§E
 #LACK ¯Ê¥F
 #MATERIAL ì®Æ
 #PROD ¥Í²£
 #POLL ¦Ã¬V
 #SUPPORT ºû«ù
 #PROFIT §Q¼í
 #TRADE ¶T©ö
 #CORR »G±Ñ
 #SCIENCE ¬ì¬ã
 #TAX µ|¦¬
 #LUX °ø¨×
 #DUMP ¼o®Æ
 #SUPUNITS Æ×ÄÝ³¡¶¤
+#HAPPINESS 安定
+#CONTROL 戒嚴
+#FAITH 信仰
+#UNREST 不安
+#HAPPINESSDEMAND 人口
+#HAPPINESSPLUS 剩余
+#STORAGE 存糧
+#FOOD 糧食
+#DEMAND 需求
+#SURPLUS 多余
+#LACK 缺乏
+#MATERIAL 原料
+#PROD 生產
+#POLL 污染
+#SUPPORT 維持
+#PROFIT 利潤
+#TRADE 貿易
+#CORR 腐敗
+#SCIENCE 科研
+#TAX 稅收
+#LUX 奢侈
+#DUMP 廢料
+#SUPUNITS 屬部隊
 'Class Screen Text
 #UNITOWNER (#A)
 #UNITSPEED Éó°Ê
 #UNITSTRENGTH ¾Ô¤æ
 #UNITTRANSPORT ¹B¿é
 #UNITCOST ³yÉ²
 #UNITBUILT ½s¨î
 #UNITINTRO ©l³Ð¤_
 #UNITADOPT ¤Þ¶i¤_
 #UNITLOST Äë¬¹
 #UNITDESTROYED °}¤`
 #UNITAVAILABLE ²{§Ð
 #UNITINPROD ¦b«Ø
 #UNITKNOWN ¦b§ÐÁ`p
 #UNITSPECIAL ¯S®í³¡¶¤
+#UNITSPEED 机動
+#UNITSTRENGTH 戰斗
+#UNITTRANSPORT 運輸
+#UNITCOST 造价
+#UNITBUILT 編制
+#UNITINTRO 始創于
+#UNITADOPT 引進于
+#UNITLOST 犧牲
+#UNITDESTROYED 陣亡
+#UNITAVAILABLE 現役
+#UNITINPROD 在建
+#UNITKNOWN 在役總計
+#UNITSPECIAL 特殊部隊
 'Diplomacy Screen Text
 #FRSTATGOV ¬FÊ^: %s
 #FRSTATPOP ¤H¤f: %d¦ÊÉE
 #FRSTATTER »â¤g: %d¦ÊÉE¥¤è¤½¨½
 #FRSTATTECH ¬ì§Þ: %d%%
 #FRSTATEXP ±´¯Á: %d%%
 #FRLASTCONTACT ¤W¦¸±µàD:
 #FRNOCONTACT ¥¼´¿±µàD¡A¶È¾Ì¶Ç»D
 #FRNOVISIT ©|¥¼«ô³X
 #FROLDCIVILREP (±q%s³BÀò±o)
 #FRNOCIVILREP (©|µL°ê®a³ø§i)
 #FROURATT §Ú¤èºA«×: %s
 #FREXTINCT ·Àµ´¤_
 #FRTREATY Ãö¨t:
+#FRSTATGOV 政体: %s
+#FRSTATPOP 人口: %d百万
+#FRSTATTER 領土: %d百万平方公里
+#FRSTATTECH 科技: %d%%
+#FRSTATEXP 探索: %d%%
+#FRLASTCONTACT 上次接触:
+#FRNOCONTACT 未曾接触，僅憑傳聞
+#FRNOVISIT 尚未拜訪
+#FROLDCIVILREP (從%s處獲得)
+#FRNOCIVILREP (尚無國家報告)
+#FROURATT 我方態度: %s
+#FREXTINCT 滅絕于
+#FRTREATY 關系:
 #FRAND ,
 #FRCREDIBILITY (%d%% «H¥Î«×)
 #FRTREASURY °ê®w: %d%%c
 #FRRELATIONS ¥L°êÃö¨t:
+#FRCREDIBILITY (%d%% 信用度)
+#FRTREASURY 國庫: %d%%c
+#FRRELATIONS 他國關系:
 'Other Dialog Text
 #PRESENT ·í«e³¡¶¤
 #SHOWSTRENGTH ¾Ô¤æ¤O: %d/%d
 #RIVER ªe¬y
 #INITUNIT ³¡¶¤¬ãµo
 #TECHFOCUS ¥Ø¼Ð¡G%s
 #NEXUS ³s±µ
 #SCIENCEREPORT_EXTINCT %s (·Àµ´)
 #MODELDRAFT ·s³¡¶¤¬ãµo (%s)
 #TAXRATE µ|¦¬
+#PRESENT 當前部隊
+#SHOWSTRENGTH 戰斗力: %d/%d
+#RIVER 河流
+#INITUNIT 部隊研發
+#TECHFOCUS 目標：%s
+#NEXUS 連接
+#SCIENCEREPORT_EXTINCT %s (滅絕)
+#MODELDRAFT 新部隊研發 (%s)
+#TAXRATE 稅收
 #MONEYGAINPOS +%d%%c
 #MONEYGAINNEG %d%%c
 #TECHGAIN +%d%%r
 #TECHWAIT %s (%d ¦^¦X)
 #COSTDIFF1 ¤JªùÃø«×: -25%
 #COSTDIFF2 ¤¤¶¡Ãø«×: ?
 #COSTDIFF3 ÅÜºAÃø«×: +25%
+#TECHWAIT %s (%d 回合)
+#COSTDIFF1 入門難度: -25%
+#COSTDIFF2 中間難度: ?
+#COSTDIFF3 變態難度: +25%
 #NATEXISTS (%s)
 #CONSCRIPTS ©º¶Ò %s
+#CONSCRIPTS 征募 %s
 #WONDEROF %s (%s)
 #WONDEROWNER (#A)
 #EXPIRED (¤w¹L´Á)
 #DESTROYED (¤w³Q·´)
 #NOWONDER ©|µL©_¸ñ«Ø¦¨
 #BUILDORDER ¥ý¿ï©w«°¥«Ãþ«¬¡A¦A³]©w«Ø³]¦¸§Ç¡G
 #BUILDREST ©|¥¼³]©w¦¸§Çªº³]¬I:
 #ENHANCE %s: %s ¦æ°ÊÂI
 #SHIPCOMP ¸²î²Õ¥ó
 #SHIPPOW °Ê¤O¿µ
 #SHIPHAB ©~¦í¿µ
 #SEARCH ·j¯Á
 #RANMAP ÀHÉó¦a¹Ï
+#EXPIRED (已過期)
+#DESTROYED (已被毀)
+#NOWONDER 尚無奇跡建成
+#BUILDORDER 先選定城市類型，再設定建設次序：
+#BUILDREST 尚未設定次序的設施:
+#ENHANCE %s: %s 行動點
+#SHIPCOMP 飛船組件
+#SHIPPOW 動力艙
+#SHIPHAB 居住艙
+#SEARCH 搜索
+#RANMAP 隨机地圖
 #TWOTERRAINS %s / %s
 #MPMAP ¦h¤H¼Ò¦¡
 #NOGAMES ©|µL¶i«×
 #AIT_ROUND ²Ä%d¦^¦X,
+#MPMAP 多人模式
+#NOGAMES 尚無進度
+#AIT_ROUND 第%d回合,
 'Dialog Titles
 #TITLE_TRIBE ¿ï¾ÜÏú±Ú
 #TITLE_GOV ¿ï¾Ü¬F©²
 #TITLE_TECHSELECT ½Ð«ü©w¬ì¬ã¶µ¥Ø(«ö¦íShift³æÀ»¬ÝÀ°§U)
 #TITLE_FARTECH ½Ð³]©w¬ì¬ã¥Ø¼Ð
 #TITLE_CITIES #A«°¥«
 #TITLE_EVENTS ¦b%sµo¥Í¨Æ¥ó
 #TITLE_MODELS #A³¡¶¤
 #TITLE_DIAGRAMS ¾ú¥v¹Ïªí
 #TITLE_SHIPS ´Þ¥Á¸²î
 #TITLE_SHIP #A ´Þ¥Á¸²î
 #TITLE_EMODELS ¨ä¥L¶Õ¤O¬ãµo³¡¶¤
 #TITLE_EDEFENSE «°¥«¨¾±s
 #TITLE_RATES ¸gÀÙ
 #TITLE_DRAFT ³¡¶¤¬ãµo
 #TITLE_WONDERS ¥@¬É©_¸ñ
 #TITLE_ENHANCE ¦a§Î§ï³y
 #TITLE_CITYTYPES «°¥«Ãþ«¬
 #TITLE_PROJECT ½Ð«ü©wn«Ø³]ªº³æ¦ì
 #TITLE_CITYNAME «°¥«¦WºÙ
 #TITLE_MODELNAME ·s«¬³¡¶¤¦WºÙ
 #TITLE_ERROR ¿ù»~
 #TITLE_SCIENCE ¬ì§Þ³ø§i
 #TITLE_OFFERDELIVER ²K¥[´£Ä³
 #TITLE_OFFERCOST ²K¥[»Ý¨D
 #TITLE_NUMBER ¼Æ¦r
 #TITLE_AMOUNT ¼Æ¶q
 #TITLE_CHOOSETECH ¿ï¾Ü¬ì§Þ
 #TITLE_CHOOSEMODEL ¿ï¾Ü³]p³æ¦ì
 #TITLE_CHOOSESHIPPART ¿ï¾ÜÃþ§O
 #TITLE_CHOOSECITY ¿ï¾Ü«°¥«
 #TITLE_BOOKNAME ´åÀ¸¦WºÙ
 #TITLE_MAPNAME ¦a¹Ï¦WºÙ
+#TITLE_TRIBE 選擇种族
+#TITLE_GOV 選擇政府
+#TITLE_TECHSELECT 請指定科研項目(按住Shift單擊看幫助)
+#TITLE_FARTECH 請設定科研目標
+#TITLE_CITIES #A城市
+#TITLE_EVENTS 在%s發生事件
+#TITLE_MODELS #A部隊
+#TITLE_DIAGRAMS 歷史圖表
+#TITLE_SHIPS 殖民飛船
+#TITLE_SHIP #A 殖民飛船
+#TITLE_EMODELS 其他勢力研發部隊
+#TITLE_EDEFENSE 城市防御
+#TITLE_RATES 經濟
+#TITLE_DRAFT 部隊研發
+#TITLE_WONDERS 世界奇跡
+#TITLE_ENHANCE 地形改造
+#TITLE_CITYTYPES 城市類型
+#TITLE_PROJECT 請指定要建設的單位
+#TITLE_CITYNAME 城市名稱
+#TITLE_MODELNAME 新型部隊名稱
+#TITLE_ERROR 錯誤
+#TITLE_SCIENCE 科技報告
+#TITLE_OFFERDELIVER 添加提議
+#TITLE_OFFERCOST 添加需求
+#TITLE_NUMBER 數字
+#TITLE_AMOUNT 數量
+#TITLE_CHOOSETECH 選擇科技
+#TITLE_CHOOSEMODEL 選擇設計單位
+#TITLE_CHOOSESHIPPART 選擇類別
+#TITLE_CHOOSECITY 選擇城市
+#TITLE_BOOKNAME 游戲名稱
+#TITLE_MAPNAME 地圖名稱
 #TITLE_NATION #N
+#TITLE_SPYMISSION ¯µ±K¦æ°Ê
+#TITLE_SUICIDE ¦Û±þ¦æ°Ê
+#FRMILREP x¨Æ³ø§i
+#TITLE_SPYMISSION 秘密行動
+#TITLE_SUICIDE 自殺行動
+#TITLE_MESSAGE Message
+#FRMILREP 軍事報告
 'Message Text
 #NOALTAI ¥¼¦w¸Ë¥ô¦óAI¼Ò¶ô.\½Ð¨ì´åÀ¸©x¤èÊI¯¸¤U¸ü¬ÛÃöAI¼Ò¶ô, ©Î¦Û¦æ³Ð«ØAI¼Ò¶ô
 #REVOLUTION ¦b«Ø¥ß·s¬FÊ^¤§«e, #a«Ò°ê±N³B¤_µL¬F©²ª¬ºA, ³o¬O²©R«e¥²¸gªº°}µh, ¬O§_ÚÌ©w²©R?
 #AUTOREVOLUTION ·s¬FÊ^¤w¸g§¹¦¨: \%s\\¬°¤FÂà´«¦Ü¸Ó¬FÊ^,¥²¶·¼o±ó·í«eªº¬FÊ^§Î¦¡, ¸g¾ú¤@¬qµL¬F©²®É´Á. ¬O§_¶}©l²©R?
 #NOALTGOVS µo°Ê¤@³õ²©R, ¥i¥H±N·í«eªº¬FÊ^ §ó´«¬°¨ä¥L¬FÊ^. ¦ý¥Ø«e§ÚÌ¥u¾Ö¦³ ¥£Æ×±M¨î¤@Ïú¬FÊ^§Î¦¡, µLªk§ó´«·sªº¬FÊ^.
 #AGE0 = %s =\¥Û¾¹®É¥N¤wªñ§ÀÁn, ¬°¤F§JªA´åªª¥Í¬¡ªº¤£«K, §ÚÌ¨M©w¦b³o¤ù¨U¤g ¤W«Ø¥ß¦Û¤vªº®a¶é, ¥Ã¤[©w©~¤_¦¹, ¦}©w¦W¬°%s.
 #AGE1 = %s =\¤d¦Ê¦~¨Ó, ²Îªv¶¥¼h¬°¤Fºò´¤¯SÅv, Ãö¤_³oÓ¥@¬Éªºª¾ÃÑ ¤@ª½¥Ñ©v±Úªø¦Ñ¶Ç±Â¤ä°t. ²{¦b¤@¤Á³£¤w§ïÅÜ. ¥Ñ©v±Ð«H¥õ´yÃ¸ªºÂÂ¥@¬ÉÆ[, ¤w³Q¸gÅç©M²z©Êª¾ÃÑ¨ú¥N, ³o´N¬O³Ìªìªº"¬ì¾Ç"
 #AGE2 = %s =\¤j³W¼Ò¥Í²£ªº¥X²{, ¨Ï±o¦Û¥j¥H¨ÓÅv¶Q¥D®_°]´Iªº³W«ß\³Q¹ý©³¥´¯}.  ¥Í²£ªºµÞªÞ¥|³B¶}ªá, «æ³tÂX±iªº¥«³õ±N\¤j¶q¥Á¶¡¸êª÷ºÉ¼Æ¯Ç¤JÊI¤¤.  ¤@Ó¥þ·s®É¥N´N¦¹½Ï¥Í.
 #AGE3 = %s =\¤HÃþ¥j¦Ñªº¹Ú·Q²×¤_¦¨¬°²{¹ê. \§ÚÌ²{¦bªº§Þ³N¤w¸g¥i¥H\±N²¾¥Á°e©¹»»»·ªº¤Ñ¥~¬P²y. \¬ã¨sªí©ú, ¦¹¶µ§»°¶¶µ¥Ø§¹¦¨ªºÃöÁä\¬O¯SÏúª÷ÄÝ¸ê·½ªº¶}©ñ§Q¥Î.
 #ENDTURN ¥»¦^¦X©Ò¦³³¡¶¤³£¤wµ²§ô¦æ°Ê.\½Ð¿ï¾Üµ²§ô¦^¦X, ¶i¤J¤U¤@¦^¦X.
 #CREDUP §Ú°êªº«H¥Î¤w¤É¯Å¬° "%s".
 #CREDDOWN §Ú°êªº«H¥Î¤w°¯Å¬° "%s".
 #FOREIGNCITY ³Ìªñ©Òª¾Æ×ÄÝ°ê:\#N\(³Ìªñ±¡³øÀò¨ú¤_%s)
 #EXTINCTCITY ³Ìªñ©Òª¾Æ×ÄÝ°ê:\·Àµ´\(³Ìªñ±¡³øÀò¨ú¤_%s)
 #CAPTURE #N¥e»â¤F%s!
 #BOMBARD #N¥¿¦bÅF¬µ¤£³]¨¾ªº%s!
 #EXPEL #a»â¤g¤Wªº¨ä¥L¶Õ¤O³¡¶¤¤w³QÅX³v.
 #DISPOSE %s\\±N¦¹«Øµ®±ÀË««Ø¡H
 #SPDESTRUCTQUERY \(ª`·N: ¦pªG©î°£¤ÓªÅ´ä, ¦¹¦aªº´Þ¥Á¸²î¶µ¥Ø±N³Q¼o°£!)
 #SELL %s\\±N¦¹«Øµ®ÅÜ½æ®M²{¡H
 #LOSEMAT Y§¹¥þ§ó§ï«Ø³]Ãþ«¬, ·í«e«Ø³]¤¤ªº¶µ¥Ø±N³QÅÜ½æ. %d%%p ªºÅÜ½æÉ²®æ¬° %d%%c.
 #LOSEMAT3 Yn§ó§ï¬°¦PÃþ«¬ªº¨ä¥L«Ø³]¶µ¥Ø, ±N·l¥¢1/3ªº«Ø³]¶i«×. ¬O§_Ä~Äò?
 #DOUBLESTATEIMP %s\\%s¤w«Ø¦³¦¹¶µ«°¥«³]¬I. ¬O§_±N¦b·í«eªº«°¥«««Ø¸Ó³]¬I, «Ø¦¨¦ZÅÜ½æì¦³ªº¦P¦W³]¬I?
 #READY ¸Ó«Ø³]±N¦b¤U¦^¦X¶}©l®É§¹¦¨
 #NOMONEY ²{¦³ª÷¿ú¤£¨¬,\µLªk´£«e§¹¤u.\(»Ýn%d%%c, ²{¦³%d%%c)
 #BUY ¤ä¥I%d%%c, Åý¦¹¶µ¥Ø¦b¤U¦^¦X§¹¤u?
 #EMIGRATE Ä~Äò©º¶Ò²¾¥Á³¡¶¤, ¦³¥i¯à¾ÉP¥»«°¥«¯î¼o. ¬O§_¼È½w©º¶Òp¦E, µ¥¨ì«°¥«¤H¤f¼Wªø¨ì ¤@©w³W¼Ò¦Z¦A¦æ©º¶Ò?
 #ADDTOMAXSIZE ¦¹«°¥«ªº³W¼Ò¤w¹F¤W.
 #CITYMANAGEOFF ¨ú®ø«°¥«¸ê·½ªº¦Û°Ê¤À°t?
 #GLIDERLOST §Ú¤è·Æµ¾Éó¦b®ü±¼Y·´
 #PLANELOST §Ú¤è¸Éó¿Uªo¯ÓºÉ
 #DAMAGED_UTILIZE ¾ã½s¨ü·lªº³¡¶¤,©ÒÀò®ÄªG±N¬ÛÀ³°§C. ¬O§_Ä~Äò?
 #NOBB §ÚÌ©|¥¼´x´¤¦bªe¬y¤W·f«Ø¾ô±çªº¬ì§Þ
 #NOCITY ¦¹¦a§Î¤£Óì¦X©w©~«Ø«°. ¥t³V¤@¶ô¥iÄéµ@ªº¤g¦a©w©~§a.
 #NOCAPTURER ¥¥Á³æ¦ìµLªk¥e»â¨ä¥L¶Õ¤Oªº«°¥«.
 #NOBOMBARDER ¨S¦³Äâ±aªZ¾¹, ¤£¯àÅF¬µ«°¥«.
 #ZOC ¸Ó³¡¶¤¤£¯à¦b¼Ä¤è±±¨îªº¦a°ÏÀH·N²¾°Ê.
 #FASTATTACK ¥H%d%%ªº¤O¶q§ðÀ»¥Ø¼Ð¤\¡H
 #NOTIMELOADGROUND ¸Ó³¡¶¤©Ò³Ñ¦æ°ÊÂI¤£¨¬%s, µLªk§¹¦¨¸Ë¹B/¨ø¹B.
 #NOTIMELOADAIR ¸Ó¸Éó©Ò³Ñ¦æ°ÊÂI¤£¨¬100, µLªk¦b¥ÀÄ¥¤W°_°.
 #NOTIMEBOMBARD ÅF¬µ«°¥«»Ýn100¦æ°ÊÂI.
 #NOTIMEEXPEL ¸Ó³¡¶¤©Ò³Ñ¦æ°ÊÂI¤£¨¬100, µLªkÅX³v.
 #NOROAD ¸Ó³¡¶¤¥u¯àªuµÛ¹D¸ô©ÎÅK¸ô²¾°Ê.
 #NONAV ¸Ó²î¥u¨S¦³»·¬v¯è¦æ¯à¤O.
 #NOTRANSPORT ¸Ó²î¥u¨S¦³¹B¿é¯à¤O.
 #FULLTRANSPORT ¸Ó²î¥uªº¹B¸üªÅ¶¡¤wº¡.
 #LOWFUEL ³o¬[¸Éó¿Uªo§Y±N¯ÓºÉ. ¦pªGÄ~Äò«e¦æ, ±NµLªkªð¯è. ¬O§_Ä~Äò«e¦æ?
 #LOWFUEL_GLIDER ³o¬[·Æµ¾Éó¥²¶·¦b¦^¦Xµ²§ô®É¦^¨ì³°¦a, ¦pªGÄ~Äò¦V«e, ¦³¼Y·´ªº¦MÀI. ¬O§_Ä~Äò?
 #UNREST_FOREIGN %s\\³o¨½¤w¬O#aªº¦a¬É. ¦pªGÄ~Äò¦V«e, ±N¾ÉP¸Ó³¡¶¤Æ×ÄÝ«°¥«ªº©~¥Á¤£¦w. ¬O§_Ä~Äò?
 #UNREST_NOTOWN %s\\¦pªGÖÃ¶}#sªº»â¤g, ±N¾ÉP¸Ó³¡¶¤Æ×ÄÝ«°¥«ªº©~¥Á¤£¦w. ¬O§_Ä~Äò?
 #NOATTACKER ¦¹³¡¶¤¤£¬Ox¨Æ³æ¦ì, µLªk®i¶}§ðÀ».
 #ATTACKSUB µLªkÚÌ©w¼Ä¤è¼ç¸¥ªº¦ì¸m.
 #ATTACKSTEALTH µLªkÚÌ©w¼Ä¤èÁô§Î¸Éóªº¦ì¸m.
 #PEACE_NOATTACK §ÚÌÉO#nÃ±q¤F©M¬ù.
 #PEACE_NOMOVE §ÚÌÉO#nÃ±q¤F©M¬ù, ¤£¯à¶i¤J¹ï¤è»â¤g.
 #PEACE_NOWORK ³o¨½¬O#aªº»â¤g!\§ÚÌ©M¸Ó°êÃ±¦³©M¬ù, ¤£±o«I¥Ç.
 #NOFOREIGNINFO ¥¼µo²{·sªº±¡³ø.
 #FOREIGNINFO Àò±o·sªº±¡³ø, ¤º®e¦p¤U:
 #DOSSIER_PREPARED §ÚÌÀò±o¤F#aªº°ê®a±¡³ø,¥]¬A#aªº²Îp¹Ïªí¥H¤Î¸Ó°ê·í«eªº¬ì¬ã³ø§i.
 #VIOLATION §Ú¤è³¡¶¤«I¥Ç¤F#aªº»â¤g!\#Nn¨D§ÚÌ¦b%s¤§«e±N³¡¶¤ºMÖÃ.
 #EVIOLATION #N¦]¹H¤Ï©M¬ù±ø´Ú¤@¨Æ ¯S¦V§Ú¤è¹Dºp. ¥LÌµªÀ³¦b%s¤§«eºM¨«³¡¶¤.
 #WITHDRAW §Ú¤è³¡¶¤³Q°Ç¥O±q#a»â¤g¤WºMÖÃ.
 #WONDERBUILT #N«Ø¦¨¤F·sªº¥@¬É©_¸ñ:\%s
 #WONDERBUILTEXP ¬Y°ê«Ø¦¨¤F·sªº¥@¬É©_¸ñ:\%s\\¦ý³o¶µ©_¸ñ¤w¸g¹L®É, ¨S¦³¥ô¦ó²{¹ê·N¸q.
 #WONDERBUILTOWN §Ú°ê«Ø¦¨¤F·sªº¥@¬É©_¸ñ:\%s
 #WONDERCAPT #N¥e»â¤F¤@¶µ¥@¬É©_¸ñ:\%s
 #WONDERCAPTOWN §Ú°ê¥e»â¤F¤@¶µ¥@¬É©_¸ñ:\%s
 #WONDEREXP ¥@¬É©_¸ñ: %s ªº®ÄªG¤w¤£Î`¦s¦b.
 #WONDERDEST ¤@¶µ¥@¬É©_¸ñ³QºR·´¤F:\%s
 #COLDWAR ¥Ñ¤_®Ö¾Ôªº¥@¬É©Ê«Â¯Ù, ©Ò¦³¶Õ¤Oªº¥~¥æ¥ß³õÅÜ±oÃø¥H°Ê·n, ¥æ¯A¤w¤£¦A¦³®Ä. ¥þ²y§N¾Ô¶}©l¤F.
 #COLDWAREND §N¾Ôµ²§ô¤F.
 #SHIPBUILT #Nè§¹¦¨¤F´Þ¥Á¸²îªº¬Y³¡¥ó¥Í²£.
 #SHIPBITRADE1 #S ©M
 #SHIPBITRADE2 #s ¥æ´«¤F¦U¦Ûªº´Þ¥Á¸²î³¡¥ó.
 #SHIPUNITRADE1 #N ±q #s ³BÀò±o¤F
 #SHIPUNITRADE2 ¥ó´Þ¥Á¸²î³¡¥ó¡C
 #SHIPCAPTURE1 #N¹Ü¨ú¤F
 #SHIPCAPTURE2 #aªº´Þ¥Á¸²î³¡¥ó!
 #SHIPDESTROYED #Nªº´Þ¥Á¸²î¶µ¥Ø³Q¼o°£¤F
 #LOWFUNDS °ê®w¤wªñ¬\ºÜ, ¦pªG¤£ºÉ§Öªö¨ú±¹¬I, §ÚÌ¥u¯à¾aÅÜ½æ«°¥«³]¬I«×¤é.\¬O§_Ä~Äò¦æ°Ê?
 #DISORDER %s±N³´¤JÄÌ¶Ã.\¬O§_Ä~Äò¦æ°Ê?
 #DISORDER_UNREST ¥Ñ¤_«°¥«¤£¦w¤H¤fÅÜ¬°¦h¼Æ, %s±N³´¤JµL¬F©²ª¬ºA.\¬O§_Ä~Äò¦æ°Ê?
 #FAMINE %s¦³ÃzµoÄÈ¯îªº¦MÀI.\¬O§_Ä~Äò¦æ°Ê?
 #FAMINE_TILES %s¦³ÃzµoÄÈ¯îªº¦MÀI. ¥»«°©ÒÄÝ¦a¶ô¥X²£ªºÂ³¹¤£¨¬.\¬O§_Ä~Äò¦æ°Ê?
 #FAMINE_UNREST %s¦³ÃzµoÄÈ¯îªº¦MÀI. ¬°¤F±±¨î¥Á²³¤£¦w±¡ºü, ³¡¤À¤H¤f±q¸ê·½¥Í²£Âà¬°«°¥«§ÙÄY³¡¶¤, ¦¹Á|±¹±N¨Ï¥»«°©ÒÄÝ¦a¶ô¥X²£ªºÂ³¹¤£¨¬.\\¬O§_Ä~Äò¦æ°Ê?
 #LOWSUPPORT ¥H%sªº¥Í²£¤ô¥, µLªk«OÃÒÆ×ÄÝ³¡¶¤ªº³Ì§C¨Ñµ¹.\¬O§_Ä~Äò¦æ°Ê?
 #LOWSUPPORT_TILES ¥H%sªº¥Í²£¤ô¥, µLªk«OÃÒÆ×ÄÝ³¡¶¤ªº³Ì§C¨Ñµ¹. ¥»«°©ÒÄÝ¦a¶ô¥X²£ªºì®Æ¤£¨¬.\¬O§_Ä~Äò¦æ°Ê?
 #LOWSUPPORT_UNREST ¥H%sªº¥Í²£¤ô¥, µLªk«OÃÒÆ×ÄÝ³¡¶¤ªº³Ì§C¨Ñµ¹. ¬°¤F±±¨î¥Á²³¤£¦w±¡ºü, ³¡¤À¤H¤f±q¸ê·½¥Í²£Âà¬°«°¥«§ÙÄY³¡¶¤, ¦¹Á|±¹±N¨Ï¥»«°©ÒÄÝ¦a¶ô¥X²£ªºì®Æ¤£¨¬.\\¬O§_Ä~Äò¦æ°Ê?
 #RESIGN §Y±NÃö³¬¦¹´åÀ¸.\¬O§_«O¦s·í«eªº¶i«×?
 #ENDTOUR ¬O§_«O¦s¶i«×, ¥H«K¤µ¦Z¦b¶W¯Å¥Î¤á¼Ò¦¡¤¤«·s¥´¶}?
 #MODELAVAILABLE ·s³¡¶¤¬ãµo¦¨¥\, ¥iÀH®É§ë¤J¥Í²£.
 #RESEARCH_GENERAL §Ú¤è³Ì·s¬ì¬ã¦¨ªG¡G%s¡I
 #GRLIB_GENERAL ±q¤j¹Ï®ÑÀ]¤¤¡A§ÚÌÀò±o¤F %s ªºª¾ÃÑ¡I
 #ORACLEINCOME ¦¬¤J: %d%%c
 #NOSELLAGAIN %s\\¤@¦^¦X¤º¡A¨C®y«°¥«¥u¯àÅÜ½æ ©Î««Ø¤@Ïú«Øµ®
 #OUTOFCONTROL %s\\³o®y«°¥«©|¥¼«ìÎ`¥¿±`¯´§Ç
 #NOCHANGEINANARCHY §Ú°ê¥¿³B¤_µL¬F©²ª¬ºA¡A©Ò¦³«°¥««Øµ®¼È®É¥¢®Ä.
 #EXTINCT = %s =\#n«Ò°ê·´·À¤F, ¥LÌªº¥ú½÷¤å©ú ±q¦¹³Q«Ê¦s¦b¶Ç»¡¤¤.
 #EXTINCTALL \\§ÚÌ¦¨¬°¦a²y¤W°ß¤@¯d¦sªº¤å©ú
 #GAMEOVER #N ©Ò¦³«°¥«³£¤w¥¢¦u\\´åÀ¸µ²§ô
 #TIMEUP ´åÀ¸®É¶¡¨ì.\ºÉºÞ#n¸gÀÙÁcºa, ¬ì§Þ»â¥ý, ¦b¥@¬É¦U°ê¤¤¨ú±o¤F¤@©wªº¼vÅT, ¦ý²×¨s¨S¯à´x´¤²×Ìå¤å©ú.\\´åÀ¸µ²§ô
 #TIMEUPSUPER ´åÀ¸®É¶¡¨ì.\¨S¦³¤@Ó°ê®a§¹¦¨´Þ¥Á¸²îªº«Ø³].
 #SPACESHIP1 #Nªº´Þ¥Á¸²î¤wµo®g¤ÉªÅ.\
 #SPACESHIP2 ¬P»Ú´Þ¥Áp¦Eªº¦¨¥\, ¦LÃÒ¤F¸Ó°ê¤å©úªº¥þ±»â¥ýÉ¬¶Õ.\\´åÀ¸µ²§ô
 #MYSPACESHIP ¾ú¸gµL¼Æªº³h½a¨aÃø, µL¼Æªº¬y¦åÄë¬¹, µL¼Æªº®É¥N§ó¡, ¤HÃþ¥j¦Ñªº¹Ú·Q²×¤_¦b§ÚÌ¤â¤¤ÅÜ¬°²{¹ê. §ÚÌªº¸²î¦VµÛ¤ÓªÅ¤¤¥¼ª¾ªº¥@¬É¸¥h, ¬°¦Z¥Nªº¥Í¬¡´M§ä¥þ·sªº®a¶é.\\®¥³ßÄ¹±o´åÀ¸Ð`§Q
 #SHAREDWIN (ÉO %s ¦@¨ÉÐ`§Q)
+#NOALTAI 未安裝任何AI模塊.\請到游戲官方网站下載相關AI模塊, 或自行創建AI模塊
+#REVOLUTION 在建立新政体之前, #a帝國將處于無政府狀態, 這是革命前必經的陣痛, 是否确定革命?
+#AUTOREVOLUTION 新政体已經完成: \%s\\為了轉換至該政体,必須廢棄當前的政体形式, 經歷一段無政府時期. 是否開始革命?
+#NOALTGOVS 發動一場革命, 可以將當前的政体 更換為其他政体. 但目前我們只擁有 奴專制一种政体形式, 無法更換新的政体.
+#AGE0 = %s =\石器時代已近尾聲, 為了克服游牧生活的不便, 我們決定在這片沃土 上建立自己的家園, 永久定居于此, 并定名為%s.
+#AGE1 = %s =\千百年來, 統治階層為了緊握特權, 關于這個世界的知識 一直由宗族長老傳授支配. 現在一切都已改變. 由宗教信仰描繪的舊世界觀, 已被經驗和理性知識取代, 這就是最初的"科學"
+#AGE2 = %s =\大規模生產的出現, 使得自古以來權貴主宰財富的規律\被徹底打破.  生產的萌芽四處開花, 急速擴張的市場將\大量民間資金盡數納入网中.  一個全新時代就此誕生.
+#AGE3 = %s =\人類古老的夢想終于成為現實. \我們現在的技術已經可以\將移民送往遙遠的天外星球. \研究表明, 此項宏偉項目完成的關鍵\是特种金屬資源的開放利用.
+#ENDTURN 本回合所有部隊都已結束行動.\請選擇結束回合, 進入下一回合.
+#CREDUP 我國的信用已升級為 "%s".
+#CREDDOWN 我國的信用已降級為 "%s".
+#FOREIGNCITY 最近所知屬國:\#N\(最近情報獲取于%s)
+#EXTINCTCITY 最近所知屬國:\滅絕\(最近情報獲取于%s)
+#CAPTURE #N占領了%s!
+#BOMBARD #N正在轟炸不設防的%s!
+#EXPEL #a領土上的其他勢力部隊已被驅逐.
+#DISPOSE %s\\將此建筑推倒重建？
+#SPDESTRUCTQUERY \(注意: 如果拆除太空港, 此地的殖民飛船項目將被廢除!)
+#SELL %s\\將此建筑變賣套現？
+#LOSEMAT 若完全更改建設類型, 當前建設中的項目將被變賣. %d%%p 的變賣价格為 %d%%c.
+#LOSEMAT3 若要更改為同類型的其他建設項目, 將損失1/3的建設進度. 是否繼續?
+#DOUBLESTATEIMP %s\\%s已建有此項城市設施. 是否將在當前的城市重建該設施, 建成后變賣原有的同名設施?
+#READY 該建設將在下回合開始時完成
+#NOMONEY 現有金錢不足,\無法提前完工.\(需要%d%%c, 現有%d%%c)
+#BUY 支付%d%%c, 讓此項目在下回合完工?
+#EMIGRATE 繼續征募移民部隊, 有可能導致本城市荒廢. 是否暫緩征募計划, 等到城市人口增長到 一定規模后再行征募?
+#ADDTOMAXSIZE 此城市的規模已達上限.
+#CITYMANAGEOFF 取消城市資源的自動分配?
+#GLIDERLOST 我方滑翔机在海面墜毀
+#PLANELOST 我方飛机燃油耗盡
+#DAMAGED_UTILIZE 整編受損的部隊,所獲效果將相應降低. 是否繼續?
+#NOBB 我們尚未掌握在河流上搭建橋梁的科技
+#NOCITY 此地形不适合定居建城. 另覓一塊可灌溉的土地定居吧.
+#NOCAPTURER 平民單位無法占領其他勢力的城市.
+#NOBOMBARDER 沒有攜帶武器, 不能轟炸城市.
+#ZOC 該部隊不能在敵方控制的地區隨意移動.
+#FASTATTACK 以%d%%的力量攻擊目標么？
+#NOTIMELOADGROUND 該部隊所剩行動點不足%s, 無法完成裝運/卸運.
+#NOTIMELOADAIR 該飛机所剩行動點不足100, 無法在母艦上起降.
+#NOTIMEBOMBARD 轟炸城市需要100行動點.
+#NOTIMEEXPEL 該部隊所剩行動點不足100, 無法驅逐.
+#NOROAD 該部隊只能沿著道路或鐵路移動.
+#NONAV 該船只沒有遠洋航行能力.
+#NOTRANSPORT 該船只沒有運輸能力.
+#FULLTRANSPORT 該船只的運載空間已滿.
+#LOWFUEL 這架飛机燃油即將耗盡. 如果繼續前行, 將無法返航. 是否繼續前行?
+#LOWFUEL_GLIDER 這架滑翔机必須在回合結束時回到陸地, 如果繼續向前, 有墜毀的危險. 是否繼續?
+#UNREST_FOREIGN %s\\這里已是#a的地界. 如果繼續向前, 將導致該部隊屬城市的居民不安. 是否繼續?
+#UNREST_NOTOWN %s\\如果离開#s的領土, 將導致該部隊屬城市的居民不安. 是否繼續?
+#NOATTACKER 此部隊不是軍事單位, 無法展開攻擊.
+#ATTACKSUB 無法确定敵方潛艇的位置.
+#ATTACKSTEALTH 無法确定敵方隱形飛机的位置.
+#PEACE_NOATTACK 我們与#n簽訂了和約.
+#PEACE_NOMOVE 我們与#n簽訂了和約, 不能進入對方領土.
+#PEACE_NOWORK 這里是#a的領土!\我們和該國簽有和約, 不得侵犯.
+#NOFOREIGNINFO 未發現新的情報.
+#FOREIGNINFO 獲得新的情報, 內容如下:
+#DOSSIER_PREPARED 我們獲得了#a的國家情報,包括#a的統計圖表以及該國當前的科研報告.
+#VIOLATION 我方部隊侵犯了#a的領土!\#N要求我們在%s之前將部隊撤离.
+#EVIOLATION #N因違反和約條款一事 特向我方道歉. 他們答應在%s之前撤走部隊.
+#WITHDRAW 我方部隊被勒令從#a領土上撤离.
+#WONDERBUILT #N建成了新的世界奇跡:\%s
+#WONDERBUILTEXP 某國建成了新的世界奇跡:\%s\\但這項奇跡已經過時, 沒有任何現實意義.
+#WONDERBUILTOWN 我國建成了新的世界奇跡:\%s
+#WONDERCAPT #N占領了一項世界奇跡:\%s
+#WONDERCAPTOWN 我國占領了一項世界奇跡:\%s
+#WONDEREXP 世界奇跡: %s 的效果已不复存在.
+#WONDERDEST 一項世界奇跡被摧毀了:\%s
+#COLDWAR 由于核戰的世界性威脅, 所有勢力的外交立場變得難以動搖, 交涉已不再有效. 全球冷戰開始了.
+#COLDWAREND 冷戰結束了.
+#SHIPBUILT #N剛完成了殖民飛船的某部件生產.
+#SHIPBITRADE1 #S 和
+#SHIPBITRADE2 #s 交換了各自的殖民飛船部件.
+#SHIPUNITRADE1 #N 從 #s 處獲得了
+#SHIPUNITRADE2 件殖民飛船部件。
+#SHIPCAPTURE1 #N奪取了
+#SHIPCAPTURE2 #a的殖民飛船部件!
+#SHIPDESTROYED #N的殖民飛船項目被廢除了
+#LOWFUNDS 國庫已近枯竭, 如果不盡快采取措施, 我們只能靠變賣城市設施度日.\是否繼續行動?
+#DISORDER %s將陷入騷亂.\是否繼續行動?
+#DISORDER_UNREST 由于城市不安人口變為多數, %s將陷入無政府狀態.\是否繼續行動?
+#FAMINE %s有爆發饑荒的危險.\是否繼續行動?
+#FAMINE_TILES %s有爆發饑荒的危險. 本城所屬地塊出產的糧食不足.\是否繼續行動?
+#FAMINE_UNREST %s有爆發饑荒的危險. 為了控制民眾不安情緒, 部分人口從資源生產轉為城市戒嚴部隊, 此舉措將使本城所屬地塊出產的糧食不足.\\是否繼續行動?
+#LOWSUPPORT 以%s的生產水平, 無法保證屬部隊的最低供給.\是否繼續行動?
+#LOWSUPPORT_TILES 以%s的生產水平, 無法保證屬部隊的最低供給. 本城所屬地塊出產的原料不足.\是否繼續行動?
+#LOWSUPPORT_UNREST 以%s的生產水平, 無法保證屬部隊的最低供給. 為了控制民眾不安情緒, 部分人口從資源生產轉為城市戒嚴部隊, 此舉措將使本城所屬地塊出產的原料不足.\\是否繼續行動?
+#RESIGN 即將關閉此游戲.\是否保存當前的進度?
+#ENDTOUR 是否保存進度, 以便今后在超級用戶模式中重新打開?
+#MODELAVAILABLE 新部隊研發成功, 可隨時投入生產.
+#RESEARCH_GENERAL 我方最新科研成果：%s！
+#GRLIB_GENERAL 從大圖書館中，我們獲得了 %s 的知識！
+#ORACLEINCOME 收入: %d%%c
+#NOSELLAGAIN %s\\一回合內，每座城市只能變賣 或重建一种建筑
+#OUTOFCONTROL %s\\這座城市尚未恢复正常秩序
+#NOCHANGEINANARCHY 我國正處于無政府狀態，所有城市建筑暫時失效.
+#EXTINCT = %s =\#n帝國毀滅了, 他們的光輝文明 從此被封存在傳說中.
+#EXTINCTALL \\我們成為地球上唯一留存的文明
+#GAMEOVER #N 所有城市都已失守\\游戲結束
+#TIMEUP 游戲時間到.\盡管#n經濟繁榮, 科技領先, 在世界各國中取得了一定的影響, 但終究沒能掌握終极文明.\\游戲結束
+#TIMEUPSUPER 游戲時間到.\沒有一個國家完成殖民飛船的建設.
+#SPACESHIP1 #N的殖民飛船已發射升空.\
+#SPACESHIP2 星際殖民計划的成功, 印證了該國文明的全面領先优勢.\\游戲結束
+#MYSPACESHIP 歷經無數的貧窮災難, 無數的流血犧牲, 無數的時代更迭, 人類古老的夢想終于在我們手中變為現實. 我們的飛船向著太空中未知的世界飛去, 為后代的生活尋找全新的家園.\\恭喜贏得游戲胜利
+#SHAREDWIN (与 %s 共享胜利)
 #SHAREDWIN_CONCAT %s, %s
 #NOAI ¥¼µo²{¦w¸ËªºAI´¡¥ó¡I
 #FILENOTFOUND ¥¼µo²{¦W¬° "%s" ªº¤å¥ó.
 #AIEXCEPTION AI´¡¥ó%s¤¤¥X²{ÄY«¿ù»~¡I
 #LOADERR ¦¹´åÀ¸¶i«×ÉO·í«eªº´åÀ¸ª©¥»¤£¯àÝ®e
 #NOFILENAME µL®Äªº´åÀ¸¶i«×¦W; ¤£¤¹³\¥X²{¦r²Å'%s'
 #DLLERROR  %s µLªkÅª¨ú
 #AIERROR ¥¼µo²{¥H %s ¬°¦WªºAI´¡¥ó
 #MISSDEACT ª±®a%dÉÝ±`°h¥X, ¤¤¤î¤F´åÀ¸
 #CLIENTERROR µLªk§ä¨ì¥Î¤á%s
 #LOADERROR ¸Ó´åÀ¸¶i«×¦s¦b¤º³¡¿ù»~, ¥i¯àµLªk¥¿±`¶i¦æ´åÀ¸.\\¥i±N¦¹¶i«×µo°eµ¹³]pªÌ, ¤W³ø¿ù»~.\¬O§_µn³°ÊI¯¸, µo°e¿ù»~¤ÏõX«H®§?
 #NOSTARTPOS ¸Ó¦a¹Ï¥¼©w¸qª±®a°_©l¦ì¸m, µLªk¥Î¨ä¶i¦æ´åÀ¸.
 #TOOFEWTRIBES Ävª§¹ï¤âªº¼Æ¥Ø¤£±o¶W¹L´åÀ¸¤¤©w¸qªº°ê®a¼Æ¶q.
 #DELETEQUERY ´åÀ¸¶i«×¤w§R°£
 #MAPDELETEQUERY ¦a¹Ï¤w§R°£
+#NOAI 未發現安裝的AI插件！
+#FILENOTFOUND 未發現名為 "%s" 的文件.
+#AIEXCEPTION AI插件%s中出現嚴重錯誤！
+#LOADERR 此游戲進度与當前的游戲版本不能兼容
+#NOFILENAME 無效的游戲進度名; 不允許出現字符'%s'
+#DLLERROR  %s 無法讀取
+#AIERROR 未發現以 %s 為名的AI插件
+#MISSDEACT 玩家%d异常退出, 中止了游戲
+#CLIENTERROR 無法找到用戶%s
+#LOADERROR 該游戲進度存在內部錯誤, 可能無法正常進行游戲.\\可將此進度發送給設計者, 上報錯誤.\是否登陸网站, 發送錯誤反饋信息?
+#NOSTARTPOS 該地圖未定義玩家起始位置, 無法用其進行游戲.
+#TOOFEWTRIBES 競爭對手的數目不得超過游戲中定義的國家數量.
+#DELETEQUERY 游戲進度已刪除
+#MAPDELETEQUERY 地圖已刪除
 #TURN #N\%s
 #SUPERTURN ¶W¯Å¥Î¤á\%s
 #FRNEWNATION §ÚÌ¤w¦P#n«Ø¥ß¤F¥~¥æÁp¨t.
 #FRCONTACT #nªº¨Ï¸`·QÂÑ¨£¤j¤H.\¬O§_±µ¨£?
 #FRREJECTED #N¤£º@±µ¨£§Ú¤è¨Ï¸`.
 #FRCANCELQUERY_CEASEFIRE ¼¹·´°±¤õ±ø¬ù?
 #FRCANCELQUERY_PEACE ¦V¹ï¤è«Å¾Ô¤\¡H
 #FRCANCELQUERY_FRIENDLY ²×¤îÉO¹ï¤èªº©M¥±ø¬ù?
 #FRCANCELQUERY_ALLIANCE ²×¤îÉO¹ï¤èªº·ù¬ù?
 #FRCANCELBYREJECT_PEACE #¨Ï¸`:\§ÚÌªº@¤ß¤w¸g¯ÓºÉ.\ã³Æªï¾Ô§a!
 #FRCANCELBYREJECT_FRIENDLY #¨Ï¸`:\±q¤µ¤é°_, ©M¥±ø¬ù¤wÅÜ¦¨¤@¯ÈªÅ¤å!
 #FRCANCELBYREJECT_ALLIANCE #¨Ï¸`:\¬JµM§A¤è¤£ªÖ¦X§@, ¨º§ÚÌªº·ù¬ù¤]µLªkÄ~Äò¤F. ¬O§AÅý§ÚÌ¨S¤F¿ï¾Üªº.
 #FRMYALLIANCE1 #N¤w¦V§Ú¤è·ù¤Í¶}¾Ô, «Å¾Ô¹ï¶H¬°
 #FRMYALLIANCE2 #n. §ÚÌ¥i¥H¿ï¾Ü¤ä«ù#a, ¤Ï¹ï³¥ÆZªº¾Ôª§¦æ¬°.
 #FRENEMYALLIANCE #N¨M©w¤ä«ù¨ä·ù¤Í, ¥[¤JÉO§Ú¤èªº¾Ôª§. §Ú¤è¥ý«eÉO#Nªº±ø¬ù¦Û°Ê¥¢®Ä.
 #FRANARCHY #a³B¤_µL¬F©²ª¬ºA, §Ú¤è¨Ï¸`§ä¤£¨ì³~®|ÉO¹ï¤è·í§½±µàD.
 #FRMYANARCHY §ÚÌ¥¿³B¤_µL¬F©²ª¬ºA, ¥²¶·µ¥¨ì§½¶ÕÃ©w¦Z, ¤~¯à¶}®i¥~¥æ¬¡°Ê.
 #FRCOLDWAR ¥Ø«e³B¤_§N¾Ô´Á, µLªkÉO¨ä¥L¶Õ¤O¥æ¯A.
 #MAX2WANTS ¤@¦^¦X¥æ¯A¤¤³Ì¦h´£¥X¨â¶µn¨D.
 #MAX2OFFERS ¤@¦^¦X¥æ¯A¤¤³Ì¦hµ¹¥X¨â¶µ´£Ä³.
 #NOOFFER ¸Ó´£Ä³µL®Ä¡I
 #CANCELTREATYRUSH ¦b3Ó¦^¦X¤º¡AÉO¦P¤@°ê®a³Ì¦h²×¤î¤@¶µ¥~¥æ¨óÄ³.
 #NOSPACEPORT §Ú¤è¨S¦³¤ÓªÅ´ä, µLªk¥¿±`±µ¦¬¹ï¤èªº¸²î³¡¥ó, ¬O§_°õ·N±µ¦¬?
 #SUICIDE Åý³o¨Ç¥iÌ°ªº®a¥ë\½ñ¤W¶À¬u¤£Âk¸ô?
 #RATES ½Ð¨î©w°ê¥Á¸gÀÙªº¤À°t¤ñ¨Ò
 #NORATES ¦Û¥Ñ¤k¯«¹³\¤w¸g¥Í®Ä.
+#SUPERTURN 超級用戶\%s
+#FRNEWNATION 我們已同#n建立了外交聯系.
+#FRCONTACT #n的使節想覲見大人.\是否接見?
+#FRREJECTED #N不愿接見我方使節.
+#FRCANCELQUERY_CEASEFIRE 撕毀停火條約?
+#FRCANCELQUERY_PEACE 向對方宣戰么？
+#FRCANCELQUERY_FRIENDLY 終止与對方的和平條約?
+#FRCANCELQUERY_ALLIANCE 終止与對方的盟約?
+#FRCANCELBYREJECT_PEACE #使節:\我們的耐心已經耗盡.\准備迎戰吧!
+#FRCANCELBYREJECT_FRIENDLY #使節:\從今日起, 和平條約已變成一紙空文!
+#FRCANCELBYREJECT_ALLIANCE #使節:\既然你方不肯合作, 那我們的盟約也無法繼續了. 是你讓我們沒了選擇的.
+#FRMYALLIANCE1 #N已向我方盟友開戰, 宣戰對象為
+#FRMYALLIANCE2 #n. 我們可以選擇支持#a, 反對野蠻的戰爭行為.
+#FRENEMYALLIANCE #N決定支持其盟友, 加入与我方的戰爭. 我方先前与#N的條約自動失效.
+#FRANARCHY #a處于無政府狀態, 我方使節找不到途徑与對方當局接触.
+#FRMYANARCHY 我們正處于無政府狀態, 必須等到局勢穩定后, 才能開展外交活動.
+#FRCOLDWAR 目前處于冷戰期, 無法与其他勢力交涉.
+#MAX2WANTS 一回合交涉中最多提出兩項要求.
+#MAX2OFFERS 一回合交涉中最多給出兩項提議.
+#NOOFFER 該提議無效！
+#CANCELTREATYRUSH 在3個回合內，与同一國家最多終止一項外交協議.
+#NOSPACEPORT 我方沒有太空港, 無法正常接收對方的飛船部件, 是否執意接收?
+#SUICIDE 讓這些可怜的家伙\踏上黃泉不歸路?
+#RATES 請制定國民經濟的分配比例
+#NORATES 自由女神像\已經生效.
 'Diplomatic Statements, do not use '\'!
 #FRSTART_NOTREATY ÂÔ¥Nªí#n¥Á¨Ó¦¹ÉO¶Q°ê¥æ¯A.
 #FRSTART_PEACE ÂÔ¥Nªí#n¦V»Õ¤UP·q, ¦³¨Ç¨Æ±¡·Q½Ð»Õ¤U·r°u.
 #FRCANCELTREATY_PEACE §ÚÌ¥¿¦¡¦V¶Q°ê«Å¾Ô.
 #FRCANCELTREATY_FRIENDLY §ÚÌnÉO¶Q°ê²×¤î¤Í¦nÃö¨t.
 #FRCANCELTREATY_ALLIANCE ¨â°êÄ~Äòµ²·ù¤w²@µL·N¸q, ±q¤µ°_¥¿¦¡¸Ñ°£·ù¬ù.
 #FRNOTICE §ÚÌ¦A¤]¤£º@§Ô¨ü º¸µ¥¤ÏÎ`¤p¤Hªº¨õ¦H¦æ®|.
 #FRBREAK ¨S¥²nÄ~Äò½Í§P¤F. ¤U¦¸¦A¬ù®É¶¡§a.
 #FROFFER §ÚÌº@·N¥Î\-%s\¨Ó¥æ´«¶Q°êªº\-%s
 #FRPRESENT §ÚÌº@±N:\-%s ©^°eµ¹¶Q°ê§@¬°Â§ª«.
 #FRDEMAND_STRONG §â\-%s ¥æ¥X¨Ó¡A\§_«h¦³§AÌ¨üªº!
 #FRDONE ÁÙ¦³§Oªºn»¡¤\?
 #FRCEASEFIRE §ÚÌ·QÃ±¸p°±¾Ô¨óÄ³.
 #FRPEACE ¬°¸Ñ¨M¨â°ê¶¡µL¥ð¤îªº¯Éª§, ¤¬¬Û©Ó»{¹ï¤èªº°ê¬É, §Ú¤è«ØÄ³Ã±¸p¤@¥÷¥Ã¤[©Ê©M¥±ø¬ù. ¬O§_º@·NÃ±¦r?
 #FRFRIENDLY §ÚÌ¹ï#a ¥ý¶iªº¤å¤Æ§Þ³N¥õ¼}¤w¤[. Åý§ÚÌ¦@¸p¤Í¦n±ø¬ù, ¦b¤Íµ½ªº°òÂ¦¤W¥æ¬yµo®i§a.
 #FRALLIANCE ¬°¤F¥[±j¨â°ê¤H¥Áªººò±K¦X§@, ¬O§_º@·NÉO§Ú¤èÃ±¸p¦P·ù¨ó©w, ¤µ¦ZÁp¤â¹ï§Ü¨Ó¥Çªº¼Ä¤H?
 #FRACCEPTCEASEFIRE §ÚÌ±µ¨ü§Aªº±ø¥ó, ¼È½w¦æ°Ê.
 #FRACCEPTTREATY §ÚÌµªÀ³§A, §Æ±æ³o¥÷±ø¬ù¯à¦b¨â°ê ¥æ¬y¥v¤W¼g¤U¹ñ·sªº½g³¹.
 #FRNOTACCEPTTREATY YÉO¶Q°êÃ±¸p±ø¬ù, ¹ï#n¦Ó¨¥¦}µL¦n³B.
 #FRENDTREATY_PEACE ²×¤î©M¥±ø¬ù
 #FRENDTREATY_FRIENDLY ²×¤î¤Í¦n±ø¬ù
 #FRENDTREATY_ALLIANCE ²×¤î·ù¬ù
 #FRACCEPTOFFER ³o±ø¥ó«Ü¤½¥, §ÚÌ¦P·N¤F.
 #FRACCEPTPRESENT #N«Ü°ª¿³¦¬¤U³o¥÷Â§ª«.
 #FRACCEPTDEMAND_STRONG ¬°¤Fºû«ù©¼¦¹ªº¤Í¦nÃö¨t, §ÚÌ¨M©w¦P·N§Aªº±ø¥ó.
 #FRNOTACCEPTOFFER ³o¶µ´£Ä³¹ï§Ú¤è¦}µL§U¯q.
 #FRNOTACCEPTPRESENT #N¤£»Ýn³o¼Ë¤@¥÷Â§ª«.
 #FRNOTACCEPTDEMAND_STRONG §A¤Ó³g°ý, §O¥Õ¤é°µ¹Ú¤F.
 #FRDELCHOICE §ÚÌ¹ï¶Q°êªº\-%s «D±`·P¿³½ì.\½Ð°Ý¶Q°êªº¥æ´«±ø¥ó¬O¤°¤\?
 #FRCOSTCHOICE ¦pªG¸Û¤ßn§ÚÌªº\-%s,\½Ð°Ý¶Q°ê·Q®³¤°¤\¨Ó¥æ´«©O?
 #FRBYE ²{¦b¤£¦æ, ¥»¦¸½Í§P´N¦¹¬°¤î. ¦A¨£.
 #PRICE_CHOOSE ¿ï¾ÜªºÉ²®æ
 #PRICE_CIVIL #nªº°ê®a±¡³ø
 #PRICE_MIL #nªºx¨Æ±¡³ø
 #PRICE_MAP #aªº¥@¬É¦a¹Ï
 #PRICE_SHIPCOMP %d ´Þ¥Á¸²î²Õ¥ó
 #PRICE_SHIPPOW %d °Ê¤O¿µ
 #PRICE_SHIPHAB %d ©~¦í¿µ
 #PRICE_TRIBUTE ¨C¦^¦X%d%%c
 #PRICE_ALLTECH #a©Ò¦³ªº¬ì§Þ¦¨ªG
 #PRICE_ALLMODEL #a©Ò¦³ªº¬ãµo³¡¶¤
+#FRSTART_NOTREATY 謹代表#n民來此与貴國交涉.
+#FRSTART_PEACE 謹代表#n向閣下致敬, 有些事情想請閣下斟酌.
+#FRCANCELTREATY_PEACE 我們正式向貴國宣戰.
+#FRCANCELTREATY_FRIENDLY 我們要与貴國終止友好關系.
+#FRCANCELTREATY_ALLIANCE 兩國繼續結盟已毫無意義, 從今起正式解除盟約.
+#FRNOTICE 我們再也不愿忍受 爾等反复小人的卑劣行徑.
+#FRBREAK 沒必要繼續談判了. 下次再約時間吧.
+#FROFFER 我們愿意用\-%s\來交換貴國的\-%s
+#FRPRESENT 我們愿將:\-%s 奉送給貴國作為禮物.
+#FRDEMAND_STRONG 把\-%s 交出來，\否則有你們受的!
+#FRDONE 還有別的要說么?
+#FRCEASEFIRE 我們想簽署停戰協議.
+#FRPEACE 為解決兩國間無休止的紛爭, 互相承認對方的國界, 我方建議簽署一份永久性和平條約. 是否愿意簽字?
+#FRFRIENDLY 我們對#a 先進的文化技術仰慕已久. 讓我們共署友好條約, 在友善的基礎上交流發展吧.
+#FRALLIANCE 為了加強兩國人民的緊密合作, 是否愿意与我方簽署同盟協定, 今后聯手對抗來犯的敵人?
+#FRACCEPTCEASEFIRE 我們接受你的條件, 暫緩行動.
+#FRACCEPTTREATY 我們答應你, 希望這份條約能在兩國 交流史上寫下嶄新的篇章.
+#FRNOTACCEPTTREATY 若与貴國簽署條約, 對#n而言并無好處.
+#FRENDTREATY_PEACE 終止和平條約
+#FRENDTREATY_FRIENDLY 終止友好條約
+#FRENDTREATY_ALLIANCE 終止盟約
+#FRACCEPTOFFER 這條件很公平, 我們同意了.
+#FRACCEPTPRESENT #N很高興收下這份禮物.
+#FRACCEPTDEMAND_STRONG 為了維持彼此的友好關系, 我們決定同意你的條件.
+#FRNOTACCEPTOFFER 這項提議對我方并無助益.
+#FRNOTACCEPTPRESENT #N不需要這樣一份禮物.
+#FRNOTACCEPTDEMAND_STRONG 你太貪婪, 別白日做夢了.
+#FRDELCHOICE 我們對貴國的\-%s 非常感興趣.\請問貴國的交換條件是什么?
+#FRCOSTCHOICE 如果誠心要我們的\-%s,\請問貴國想拿什么來交換呢?
+#FRBYE 現在不行, 本次談判就此為止. 再見.
+#PRICE_CHOOSE 選擇的价格
+#PRICE_CIVIL #n的國家情報
+#PRICE_MIL #n的軍事情報
+#PRICE_MAP #a的世界地圖
+#PRICE_SHIPCOMP %d 殖民飛船組件
+#PRICE_SHIPPOW %d 動力艙
+#PRICE_SHIPHAB %d 居住艙
+#PRICE_TRIBUTE 每回合%d%%c
+#PRICE_ALLTECH #a所有的科技成果
+#PRICE_ALLMODEL #a所有的研發部隊
 #PRICE_CONCAT %s\-%s
 #PRICECAT_ALLTECH ©Ò¦³¬ì§Þ¦¨ªG
 #PRICECAT_ALLMODEL ©Ò¦³³¡¶¤¬ãµo
+#PRICECAT_ALLTECH 所有科技成果
+#PRICECAT_ALLMODEL 所有部隊研發
 'Button Captions
 #BTN_OK ÚÌ©w
 #BTN_CANCEL ¨ú®ø
 #BTN_YES ¬O
 #BTN_NO §_
 #BTN_INFO À°§U
+#BTN_OK 确定
+#BTN_CANCEL 取消
+#BTN_YES 是
+#BTN_NO 否
+#BTN_INFO 幫助
 #BTN_RESET Reset
 'Button Tooltips
 #BTN_SELECT ¿ï¾Ü
 #BTN_PAGE ¤U¶
 #BTN_SUPPORT Æ×ÄÝ³¡¶¤
 #BTN_IMPRS «°¥«³]¬I
 #BTN_CLASSES ³¡¶¤
 #BTN_WONDERS ©_¸ñ
 #BTN_BUY ÁÊ¶R
 #BTN_DELETE §R°£
 #BTN_RENAME §ó¦W
 #BTN_OBSOLETE °±¤î¥Í²£
 #BTN_NONOBSOLETE ¤¹³\¥Í²£
 #BTN_ALLOWCONSCRIPTS ¤¹³\©º¶Ò
 #BTN_NOCONSCRIPTS °±¤î©º¶Ò
 #BTN_ENDTURN µ²§ô¦^¦X¡I
 #BTN_SKIP ¤£¦AÅã¥Ü¨ä¥L¶Õ¤O²¾°Ê
 #BTN_NOAUTOMOVE °±¤î¦V¥Ø¼Ð²¾°Ê
 #BTN_STOP °±¤î
 #BTN_NEGO Ä~Äò½Í§P
 #BTN_DIALOG Ápµ¸¦¹°ê
 #BTN_BREAK ²×¤î¥»¦¸½Í§P
 #BTN_PASS µ²§ô¥»¤è´£Ä³
 #BTN_CNTREATY ¼¹·´¨óÄ³
 #BTN_ACCEPT ±µ¨ü´£Ä³
 #BTN_NOTICE ¤wÀò±x¨M©w
 #BTN_REPLAY ¾ú¥v«©ñ
 #BTN_RENGAME ´åÀ¸§ó¦W
 #BTN_DELGAME ´åÀ¸§R°£
 #BTN_RENMAP ¦a¹Ï§ó¦W
 #BTN_DELMAP ¦a¹Ï§R°£
 #BTN_CONTENTS ¥Ø¿ý
 #BTN_BACK ªð¦^
 #BTN_SEARCH ·j¯Á
 #BTN_WANTCEASEFIRE n¨D°±¤õ
 #BTN_OFFERCEASEFIRE ´£Ä³°±¤õ
 #BTN_WANTPEACE n¨D©M¥
 #BTN_OFFERPEACE ´£Ä³©M¥
 #BTN_WANTENDPEACE n¨D¤¤¤î©M¥
 #BTN_OFFERENDPEACE ´£Ä³¤¤¤î©M¥
 #BTN_WANTFRIENDLY n¨D¤Í¦n¬Û³B
 #BTN_OFFERFRIENDLY ´£Ä³¤Í¦n¬Û³B
 #BTN_WANTALLIANCE n¨DÁp·ù
 #BTN_OFFERALLIANCE ´£Ä³Áp·ù
 #BTN_WANTENDALLIANCE n¨D¸Ñ°£Áp·ù
 #BTN_OFFERENDALLIANCE ´£Ä³¸Ñ°£Áp·ù
 #BTN_NEGOEARLIER ¦¥ýªº³¡¤À
 #BTN_NEGOLATER ¦Z¨Óªº³¡¤À
+#BTN_SELECT 選擇
+#BTN_PAGE 下頁
+#BTN_SUPPORT 屬部隊
+#BTN_IMPRS 城市設施
+#BTN_CLASSES 部隊
+#BTN_WONDERS 奇跡
+#BTN_BUY 購買
+#BTN_DELETE 刪除
+#BTN_RENAME 更名
+#BTN_OBSOLETE 停止生產
+#BTN_NONOBSOLETE 允許生產
+#BTN_ALLOWCONSCRIPTS 允許征募
+#BTN_NOCONSCRIPTS 停止征募
+#BTN_ENDTURN 結束回合！
+#BTN_SKIP 不再顯示其他勢力移動
+#BTN_NOAUTOMOVE 停止向目標移動
+#BTN_STOP 停止
+#BTN_NEGO 繼續談判
+#BTN_DIALOG 聯絡此國
+#BTN_BREAK 終止本次談判
+#BTN_PASS 結束本方提議
+#BTN_CNTREATY 撕毀協議
+#BTN_ACCEPT 接受提議
+#BTN_NOTICE 已獲悉決定
+#BTN_REPLAY 歷史重放
+#BTN_RENGAME 游戲更名
+#BTN_DELGAME 游戲刪除
+#BTN_RENMAP 地圖更名
+#BTN_DELMAP 地圖刪除
+#BTN_CONTENTS 目錄
+#BTN_BACK 返回
+#BTN_SEARCH 搜索
+#BTN_WANTCEASEFIRE 要求停火
+#BTN_OFFERCEASEFIRE 提議停火
+#BTN_WANTPEACE 要求和平
+#BTN_OFFERPEACE 提議和平
+#BTN_WANTENDPEACE 要求中止和平
+#BTN_OFFERENDPEACE 提議中止和平
+#BTN_WANTFRIENDLY 要求友好相處
+#BTN_OFFERFRIENDLY 提議友好相處
+#BTN_WANTALLIANCE 要求聯盟
+#BTN_OFFERALLIANCE 提議聯盟
+#BTN_WANTENDALLIANCE 要求解除聯盟
+#BTN_OFFERENDALLIANCE 提議解除聯盟
+#BTN_NEGOEARLIER 早先的部分
+#BTN_NEGOLATER 后來的部分
 'Morphing Menu Entries
 #SUPER ¶W¯Å¥Î¤á
 #HUMAN ¥»¦aª±®a
 #AIT ¹q¸£¹ï¨M
 #RANDOMAI ÀHÉó¿ï¾ÜAI¼Ò¶ô
 #BTN_FOUND ©w©~
 #BTN_ADD ¥[¤J«°¥«
 #BTN_SETHOME §ï¬°¥»«°³¡¶¤
 #BTN_MOVEHOME ªð¦^³Ìªñ«°¥«
 #BTN_BUILDROAD ×«Ø¹D¸ô
 #BTN_BUILDBRIDGE ¬[³]¹D¸ô¾ô
 #BTN_BUILDRR ×«ØÅK¸ô
 #BTN_BUILDRRBRIDGE ¬[³]ÅK¸ô¾ô
 #BTN_CLEAR ²M°£´ËªL
 #BTN_DRAIN ©â¤zªh¿A
 #BTN_UNDESERT ¾ã¬°¥ì
 #FARTECH ³]©w¥Ø¼Ð
 #NOFARTECH ¨S¦³¥Ø¼Ð
 #UTILIZE °Ñ«Ø
 #INTEGRATE ¾ã½s
+#SUPER 超級用戶
+#HUMAN 本地玩家
+#AIT 電腦對決
+#RANDOMAI 隨机選擇AI模塊
+#BTN_FOUND 定居
+#BTN_ADD 加入城市
+#BTN_SETHOME 改為本城部隊
+#BTN_MOVEHOME 返回最近城市
+#BTN_BUILDROAD 修建道路
+#BTN_BUILDBRIDGE 架設道路橋
+#BTN_BUILDRR 修建鐵路
+#BTN_BUILDRRBRIDGE 架設鐵路橋
+#BTN_CLEAR 清除森林
+#BTN_DRAIN 抽干沼澤
+#BTN_UNDESERT 整為平原
+#FARTECH 設定目標
+#NOFARTECH 沒有目標
+#UTILIZE 參建
+#INTEGRATE 整編
 #NETWORK_SERVER Network Server
 #NETWORK_CLIENT Network Client
 'Busy Messages
 #BUSY_START ³Ð«Ø¥@¬É¡K
 #BUSY_MOD %s¸ü¤J¤¤¡K
 #BUSY_MODLH ¹Ï§Îªì©l¤Æ¡K
 #BUSY_INIT ª±®aªì©l¤Æ¡K
 #BUSY_LOAD ¸ü¤J´åÀ¸¶i«×¡K
+#BUSY_START 創建世界…
+#BUSY_MOD %s載入中…
+#BUSY_MODLH 圖形初始化…
+#BUSY_INIT 玩家初始化…
+#BUSY_LOAD 載入游戲進度…
 'Map Editor
 #MAP_START ¹q¸£Ïú±Úªì©l¦ì¸m
 #MAP_PREFSTART ª±®aÏú±Úªì©l¦ì¸m
 #MAP_RANDOM ©ñ±ó·í«eªº¦a¹Ï, «·sÀHÉó¥Í¦¨·sªº¦a¹Ï¡H
 #MAP_CLOSE ¿ï¾ÜÃö³¬·í«eªº¦a¹Ï¡C\¬O§_«O¦s¡H
+#MAP_START 電腦种族初始位置
+#MAP_PREFSTART 玩家种族初始位置
+#MAP_RANDOM 放棄當前的地圖, 重新隨机生成新的地圖？
+#MAP_CLOSE 選擇關閉當前的地圖。\是否保存？
 #STARTCONTROLS
+°h¥X
+¶}©l
+Åª¨ú
+·s«Ø´åÀ¸
+Åª¨ú¶i«×
+¥@¬É¤Ø¤o¡G
+³°¦a¤ñ¨Ò¡G
+¦Û©w¸qª±®a
+¦~¥N¡G
 %sªºÃø«×
+¦~¡G
+¦a¹Ï½s¿è
+½s¿è
+À°§U
+Ãø«×¡G
+Ävª§Ïú±Ú¡G
 AI¼Ò¶ô¡G
+退出
+開始
+讀取
+新建游戲
+讀取進度
+世界尺寸：
+陸地比例：
+自定義玩家
+年代：
+%s的難度
+年限：
+地圖編輯
+編輯
+幫助
+難度：
+競爭种族：
+AI模塊：
 #AUTODIFF
+¤Jªù
+Â²³æ
+¥¿±`
+§xÃø
+ÅÜºA
+入門
+簡單
+正常
+困難
+變態
 #CONTROLS
+¨ú®ø©R¥O
+Ãö³¬
+¸gÀÙ¤Îµ|¦¬¡K
+ªø«°«OÅ@°Ï°ì
+¬d¬Ý¦a§Î
+¥@¬É©_¸ñ¡K
+´åÀ¸«ü«n
+´ú¸Õ
+x¨Æ±¡³ø¡K
 AI´ú¸Õ«H®§¡K
+«°¥«Ãþ«¬¡K
+¬É±©~¤¤
+¥Ø¼Ð²¾°Ê
+³¡¶¤©R¥O
+³¡¶¤«H®§
+«Ø¥ßx¨Æ°ò¦a
+§ó´«¦a§Î
+²M°£¦Ã¬V
+±°¹Ü
+«Ø³yn¶ë
+¾ú¥v¹Ïªí¡K
+¾n¨¾Äµ§Ù
+¶}¹@¹Bªe
+·f¼¹B¿é¤u¨ã
+µy¦Z¦æ°Ê
+ì¦aµ¥«Ý
+Åã¥Ü¤è¦ì¥N½X
+¦a§Î«Ø³]
+¿ï¶µ
+³¡¶¤²¾°Ê
+µ¡¤f¼Ò¦¡Åã¥Ü
+¦^¦Xµ²§ô´£¥Ü
+µø³¥¥~¦a°ÏÅÜ·t
+«°¥«³ø§i¿ï¶µ
+«°¥«¦WºÙ
+°ê®aÃä¬É
+«°¥«³ø§i¡K
+¬ì¬ã³ø§i¡K
+¦a§Î§ï³y
+¦a§Î§ï³y¡K
+´Þ¥Á¸²î¡K
+§Ö³t§»¾Þ§@
+¤Þ¤ôÄéµ@
+¶}¹@¹A³õ
+´Ó¾ð³yªL
+¶}ªöÄqÂÃ
+³Ð«Ø³¡¶¤
+ÊI®æ
 AI´ú¸Õ¦a¹Ï
+¥~°ê³¡¶¤¡K
+¬Fªvª©¹Ï
+¥uÅã¥Ü§ðÀ»¤Î¥e»â¦æ°Ê
+¤£Åã¥Ü
+¸õ¹L20¦^¦X
+°ê®a±¡³ø¡K
+§@¹ú
+©Ò¦³¬ì§Þ¬ãµo¦¨¥\
+¨C¦^¦X¥Í²£§Ö³t§¹¤u
+¨C¦^¦X¬ì§Þ§Ö³t¬ã±o
+¨C¦^¦X«°¥««ùÄò¼Wªø
+¥´¶}©Ò¦³¦a¹Ï
+©Ò¦³°ê®a¬ÛÃÑ
+¹B¦æ¦Ü´åÀ¸µ²§ô
+¥L°ê«°¥«¡K
+«°¥«³ø§i¦Cªí
+«°¥«³ø§i«Ì¹õ
+¦WºÙ
+µL»Ý²{¥N¸ê·½
+«ìÎ`¥ð¾ã
+©ñ¥X¹B¿é³¡¶¤
+ÀHÉó¦a¹Ï
+¸Ñ´²
+¸Ë¸ü¹B¿é³¡¶¤
+¹ï¤â²¾°Ê
+ºC³t
+§Ö³t
+Ìå§Ö
+ºC³t
+§Ö³t
+µ®Ä
+Ãö³¬
 ¶}±Ò(Àq»{µ®Ä)
 ¶}±Ò(´À¥Nµ®Ä)
+ºu«Ì
+ºC³t
+§Ö³t
+Ãö³¬
+³X°Ý©x¤èÊI¯¸
+µo°Ê¬FÊ^²©R¡I
+·ùx¦æ°Ê
+ºC³t
+§Ö³t
+¤£Åã¥Ü
+¥uÅã¥Ü¨µÅÞ¡B§ðÀ»¤Î¥e»â¦æ°Ê
+¥uÅã¥Ü¨µÅÞ¡B§ðÀ»¤Î¥e»â¦æ°Ê
+¦a¶ô¤Ø¤o
+取消命令
+關閉
+經濟及稅收…
+長城保護區域
+查看地形
+世界奇跡…
+游戲指南
+測試
+軍事情報…
+AI測試信息…
+城市類型…
+界面居中
+目標移動
+部隊命令
+部隊信息
+建立軍事基地
+更換地形
+清除污染
+掠奪
+建造要塞
+歷史圖表…
+駐防警戒
+開辟運河
+搭乘運輸工具
+稍后行動
+原地等待
+顯示方位代碼
+地形建設
+選項
+部隊移動
+窗口模式顯示
+回合結束提示
+視野外地區變暗
+城市報告選項
+城市名稱
+國家邊界
+城市報告…
+科研報告…
+地形改造
+地形改造…
+殖民飛船…
+快速宏操作
+引水灌溉
+開辟農場
+植樹造林
+開采礦藏
+創建部隊
+网格
+AI測試地圖
+外國部隊…
+政治版圖
+只顯示攻擊及占領行動
+不顯示
+跳過20回合
+國家情報…
+作弊
+所有科技研發成功
+每回合生產快速完工
+每回合科技快速研得
+每回合城市持續增長
+打開所有地圖
+所有國家相識
+運行至游戲結束
+他國城市…
+城市報告列表
+城市報告屏幕
+名稱
+無需現代資源
+恢复休整
+放出運輸部隊
+隨机地圖
+解散
+裝載運輸部隊
+對手移動
+慢速
+快速
+极快
+慢速
+快速
+音效
+關閉
+開啟(默認音效)
+開啟(替代音效)
+滾屏
+慢速
+快速
+關閉
+訪問官方网站
+發動政体革命！
+盟軍行動
+慢速
+快速
+不顯示
+只顯示巡邏、攻擊及占領行動
+只顯示巡邏、攻擊及占領行動
+地塊尺寸
 Small
 Medium
 …
 #ADVANCES
+´¼¯à¸¦æ
+¨âÑá§@¾Ô
+¤Ñ¤å¾Ç
+ì¤l¾Ç»¡
+¨T¨®
+¼u¹D¾Ç
+»È¦æ·~
+¾ô±ç«Ø³]
+«C»ÉÅ±³y
+¸®Â§»ö¦¡
+¤Æ¾Ç
+ÃM¤h¨î«×
+Î`¦X§÷®Æ
+ªk«ß±ø¤å
+²Õ¦X§LÏú
+¤º¿UÉó
+¦@²£¥D¸q
+pºâÉó
+©º§L¨î«×
+«Øµ®
+¥ø·~µ²ÌÛ
+¬P»Ú¸¦æ
+³f¹ô
+¥Á¥D¥D¸q
+¸gÀÙ¾Ç
+µo¹q
+¹q¤l¾Ç
+¤uµ{¾Ç
+Àô¹Ò«OÅ@
+¨®½ü
+¬µÃÄ
+¸¦æ
+±¡³ø¤u§@
+¤õÃÄ
+ÃM³N
+¯ß¨RÅX°Ê
+²£·~¤Æ
+´¼¯àªZ¾¹
+µo©ú
+Å±ÅK§M·Ò
+¿E¥ú
+®Ö¯à
+¤å¾Ç
+¤¬ÁpÊI
+¹qºÏ¾Ç
+¦a¹ÏÃ¸¨î
+¨î¿j
+³W¼Ò¶q²£
+¼Æ¾Ç
+ÂåÃÄ
+§Mª÷
+¤p«¬¤Æ
+Éó°Ê§@¾Ô
+§g¥D¬Fªv
+¯«¯µ¥D¸q
+®ü¤W¾É¯è
+®ÖµõÅÜ
+õ¾Ç
+ª«²z
+¶ì®Æ
+¸Öºq
+¨î³³
+µL½u¹q
+¦A´`Àô
+§C·Å§N«o
+¤@¯«½×
+¦@©M¥D¸q
+Éó¾¹¤H
+¼QÉaÅX°Ê
+ÅK¸ô
+½Ã¥Í³]¬I
+¬ì¾Ç
+®Ñ¼g
+¯è®ü
+¼ÒÀÀ¥ÍºA
+Áô§Î§Þ³N
+»]¨T¤ÞÀº
+¿ûÅK
+¤H³y¹«~
+¾Ô³N
+¯«¾Ç
+«¤O¾Ç»¡
+¶T©ö
+¬P»Ú´Þ¥Á
+¤j¾Ç
+´¼¯à¤õ½b
+©|ªZ²ß«U
+¦r¥À
+¦h¯«½×
+´£¯Â
+¹q¸£¬ì§Þ
+¯Ç¦Ì§Þ³N
+§÷®Æ¬ì¾Ç
+¤H¤u´¼¯à
+智能飛行
+兩栖作戰
+天文學
+原子學說
+汽車
+彈道學
+銀行業
+橋梁建設
+青銅鑄造
+葬禮儀式
+化學
+騎士制度
+复合材料
+法律條文
+組合兵种
+內燃机
+共產主義
+計算机
+征兵制度
+建筑
+企業結构
+星際飛行
+貨幣
+民主主義
+經濟學
+發電
+電子學
+工程學
+環境保護
+車輪
+炸藥
+飛行
+情報工作
+火藥
+騎術
+脈沖驅動
+產業化
+智能武器
+發明
+鑄鐵冶煉
+激光
+核能
+文學
+互聯网
+電磁學
+地圖繪制
+制磚
+規模量產
+數學
+醫藥
+冶金
+小型化
+机動作戰
+君主政治
+神秘主義
+海上導航
+核裂變
+哲學
+物理
+塑料
+詩歌
+制陶
+無線電
+再循環
+低溫冷卻
+一神論
+共和主義
+机器人
+噴气驅動
+鐵路
+衛生設施
+科學
+書寫
+航海
+模擬生態
+隱形技術
+蒸汽引擎
+鋼鐵
+人造食品
+戰術
+神學
+重力學說
+貿易
+星際殖民
+大學
+智能火箭
+尚武習俗
+字母
+多神論
+提純
+電腦科技
+納米技術
+材料科學
+人工智能
 #IMPROVEMENTS
+ª÷¦r¶ð
+©z´µ¯«¼q
+ªÅ¤¤ªá¶é
+¤Ó¶§¯«¹³
+¥¨«¬¿O¶ð
+¤j¹Ï®ÑÀ]
+¯«¿Ù±Ò¥Ü
+®]ªZ¾Ç°|
+¹Fªâ©_¤u©Ð
+³ÁõÛ»·©º
+Éo¥ÀÂ§«ô°ó
+*
+¤û¹y¤j¾Ç
+¤Ú»®¤j±Ð°ó
+*
+¦Û¥Ñ¤k¯«¹³
+®Jµáº¸ÅK¶ð
+¤T®l¤jÅò
+·s¤z½u¯S§Ö
+°Ò«¢¹yp¦E
+ªñ¦aªÅ¶¡¯¸
+*
+*
+*
+*
+*
+*
+*
+°Ó«~¶T©ö
+§LÀç
+¨¦Ü
+¦x¼q
+¥«³õ
+¹Ï®ÑÀ]
+ªk°|
+«°Àð
+¤ô´ë
+»È¦æ
+±Ð°ó
+¤j¾Ç
+´ä¤f
+¼@°|
+¤uÉD
+¯S°Ï
+¦^¦¬¯¸
+¤õ¹q¯¸
+¤ô¹q¯¸
+®Ö¹q¯¸
+®ü¤W¥¥x
+¥«¬FÆU
+±Æ¦ÃºÞ
+¶W¥«
+¥ß¥æ
+¹êÅç«Ç
+¨¾ªÅ¬¶
+¸M³ù
+Éó³õ
+²î¶õ
+®c·µ
+ªø«°
+¤j¼@³õ
+¤Ñ¤å¥x
+x¨Æ¾Ç®Õ
+§@¾Ô±»Ê^
+¤ôÄ¦¹A³õ
+ªÑ²¼¥æ©ö
+¤ÓªÅ´ä
+´Þ¥Á¸²î²Õ¥ó
+¸²î°Ê¤O¿µ
+¸²î©~¦í¿µ
+金字塔
+宙斯神廟
+空中花園
+太陽神像
+巨型燈塔
+大圖書館
+神諭啟示
+孫武學院
+達芬奇工房
+麥哲倫遠征
+圣母禮拜堂
+*
+牛頓大學
+巴赫大教堂
+*
+自由女神像
+埃菲爾鐵塔
+三峽大壩
+新干線特快
+曼哈頓計划
+近地空間站
+*
+*
+*
+*
+*
+*
+*
+商品貿易
+兵營
+谷倉
+寺廟
+市場
+圖書館
+法院
+城牆
+水渠
+銀行
+教堂
+大學
+港口
+劇院
+工厂
+特區
+回收站
+火電站
+水電站
+核電站
+海上平台
+市政廳
+排污管
+超市
+立交
+實驗室
+防空炮
+碉堡
+机場
+船塢
+宮殿
+長城
+大劇場
+天文台
+軍事學校
+作戰掩体
+水藻農場
+股票交易
+太空港
+殖民飛船組件
+飛船動力艙
+飛船居住艙
 #FEATURES
 ªZ¾¹(§ð)
 ¸Ë¥Ò(¨¾)
 Éó°Ê(²¾)
+®ü¹B
+¥ÀÄ¥
+´õ½ü
+ªÅÅ§
+¿Uªo
+ªÅ¹B
+®ü¤W¾É¯è
+¹p¹FÁn¯Ç
+¤ô¤U¼ç¯è
+»·µ{¬¶À»
+§Ö³t¦æx
+²î¤W±Ï¥Í
+ÃB¥~t«
+¨¾ªÅªZ¾¹
+¶¡¿Ò¸Éó
+»]¨T°Ê¤O
+®Ö¤l°Ê¤O
+¼QÉa¤ÞÀº
+Áô§Î§Þ³N
+¨g¼ö¤À¤l
+¤@À»¨î¼Ä
+Éa§]¤æ¤û
+¤[¸g¨F³õ
+¬y¤ô§@·~
+武器(攻)
+裝甲(防)
+机動(移)
+海運
+母艦
+渦輪
+空襲
+燃油
+空運
+海上導航
+雷達聲納
+水下潛航
+遠程炮擊
+快速行軍
+船上救生
+額外負重
+防空武器
+間諜飛机
+蒸汽動力
+核子動力
+噴气引擎
+隱形技術
+狂熱分子
+一擊制敵
+气吞斗牛
+久經沙場
+流水作業
 #TERRAIN
+»·¬v
+ªñ®ü
+¯ó³õ
+¨Fºz
+¯î¦a
+aì
+¦Bì
+ªh¿A
+ÂOªL
+´ËªL
+¥C³®
+°ª¤s
+*
+º®³õ
+¥ì
+ºñ¬w
+¤p³Á
+¶Àª÷
+Ã~¥Ö
+ªd¬´
+¤ôªG
+Âyª«
+¬ü°s
+ÅKÄq
+*
+¿øÄq
+*
+¥Ûªo
+¾T¤g
+¿UÉa
+*
+*
+¯Q¤ì
+Äq¬u
+·Ñ¬´
+Æp¥Û
+´c¤g
+¹WÄq
+¹\Äq
+¤ô»È
+遠洋
+近海
+草場
+沙漠
+荒地
+苔原
+冰原
+沼澤
+叢林
+森林
+丘陵
+高山
+*
+漁場
+平原
+綠洲
+小麥
+黃金
+獸皮
+泥炭
+水果
+獵物
+美酒
+鐵礦
+*
+錳礦
+*
+石油
+鋁土
+燃气
+*
+*
+烏木
+礦泉
+煤炭
+鑽石
+惡土
+鈷礦
+鈾礦
+水銀
 #DOMAIN
+³°x
+®üx
+ªÅx
+陸軍
+海軍
+空軍
 #EXPERIENCE
+·s§L
+¨ü°V
+¾ú½m
+¦Ñ§L
+ºë¾U
+新兵
+受訓
+歷練
+老兵
+精銳
 #UNITSTATUS
+¾n¨¾ª¬ºA
+ÅF¬µ¸Ë³Æ
+¤s°Ï²¾°Ê
+©º¶Ò³¡¶¤
+ºMÖÃ³¡¶¤
+*
+*
+*
+¹B¸ü³¡¶¤
+¾ÉP¤£¦w
+ì¦a°±¯d
+*
+¦V«ü©w¥Ø¼Ð²¾°Ê
+¦a§Î§ï³y
+¨ü·l«ìÎ`
+駐防狀態
+轟炸裝備
+山區移動
+征募部隊
+撤离部隊
+*
+*
+*
+運載部隊
+導致不安
+原地停留
+*
+向指定目標移動
+地形改造
+受損恢复
 #GOVERNMENT
+µL¬F©²
+¥£Æ×¨î
+§g¥D¨î
+¦@©M¨î
+©v±Ð¨î
+¦@²£¨î
+¥Á¥D¨î
+¥¼¨Ó¨î
+無政府
+奴制
+君主制
+共和制
+宗教制
+共產制
+民主制
+未來制
 #TREATY
+¥æ¾Ô
+°±¾Ô
+©M¥
+¤Í¦n
+Áp·ù
+交戰
+停戰
+和平
+友好
+聯盟
 #HAVETREATY
+ÉO#n«Ø¥æ
+ÉO#n°±¾Ô
+ÉO#n©M¥
+ÉO#n¤Í¦n
 #ÉO#nÁp·ù
+与#n建交
+与#n停戰
+与#n和平
+与#n友好
+#与#n聯盟
 #ATTITUDE
+¼Ä¹ï
+§N²H
+¤£¦X
+¤¤¥ß
+±µ¨ü
+¤Íµ½
+¼ö±¡
+敵對
+冷淡
+不合
+中立
+接受
+友善
+熱情
 #CREDIBILITY
+¨¥¦ÓµL«H
+®»ºN¤£©w
+«¿Õ¦u«H
+¨¥¥X¥²¦æ
+言而無信
+捉摸不定
+重諾守信
+言出必行
 #CITYEVENTS
+¥«¥ÁÄÌ¶Ã
+¥Í²£§¹¤u
+¤H¤f¼Wªø
+¤H¤f´î¤Ö
+³¡¶¤¸Ñ´²
+³]¬IÅÜ½æ
+¥Í²£¾D·´
+¹F¨ì¤W
+¥X²{¦Ã¬V
+«°¥«³Q³ò
+©_¸ñ«Î`
+²¾¥Á©µ´Á
+«°¥««Ø¥ß
+«°¥«¦wÎ`
+«°¥«³Q¥e
+µL®Ä«°¥«Ãþ«¬
+市民騷亂
+生產完工
+人口增長
+人口減少
+部隊解散
+設施變賣
+生產遭毀
+達到上限
+出現污染
+城市被圍
+奇跡重复
+移民延期
+城市建立
+城市安复
+城市被占
+無效城市類型
 #CITYTYPE
+´¶³q«¬«°¥«
+¬ì§Þ«¬«°¥«
+¤u·~«¬«°¥«
+¶W¯Å¤j³£¥«
+普通型城市
+科技型城市
+工業型城市
+超級大都市
 #DIAGRAM
+¤H¤f
+»â¤g
+x¨Æ
+¬ì§Þ
+±´¯Á
+¯Ñ§@
+人口
+領土
+軍事
+科技
+探索
+耕作
 #JOBRESULT
+*
+¹D¸ô
+ÅK¸ô
+²M°£´ËªL
+Äéµ@
+¹A³õ
+´Ó¾ð³yªL
+ªöÄq
+¹Bªe
+¦a§Î§ó§ï
+n¶ë
+²M°£¦Ã¬V
+x¨Æ°ò¦a
+±°¹Ü
+©w©~
+¹D¸ô¾ô
+ÅK¸ô¾ô
+²¾°£³]¬I
+ÅÜ¬°¥ì
+©â¤zªh¿A
+道路
+鐵路
+清除森林
+灌溉
+農場
+植樹造林
+采礦
+運河
+地形更改
+要塞
+清除污染
+軍事基地
+掠奪
+定居
+道路橋
+鐵路橋
+移除設施
+變為平原
+抽干沼澤
 #ARMYLOST
 #A³¡¶¤³QÄè·À
 #AÄ¥¶¤³QÄè·À
 #A³¡¶¤¶°¸s³QÄè·À
+#A部隊被殲滅
+#A艦隊被殲滅
+#A部隊集群被殲滅
 #SPYMISSION
+¯}§¥¥Í²£
+ÅÑ¨ú¦a¹Ï
+Àò±o²Ä¤T°ê±¡³ø
+¥´§v°ê®a±¡³ø
+¥´§vx¨Æ±¡³ø
+破坏生產
+竊取地圖
+獲得第三國情報
+打听國家情報
+打听軍事情報
 #WANT
+¯Án°ê®a±¡³ø
+¯Ánx¨Æ±¡³ø
+¯Án¥@¬É¦a¹Ï
+*
+¯Án¬ì§Þ¦¨ªG
+¯Án³¡¶¤¬ãµo
+¯ÁnÂ§ª÷
+*
+*
+*
+¯Án¸²î³¡¥ó
+Åý¹ï¤è¦Û¦æ¥XÉ²
+索要國家情報
+索要軍事情報
+索要世界地圖
+*
+索要科技成果
+索要部隊研發
+索要禮金
+*
+*
+*
+索要飛船部件
+讓對方自行出价
 #OFFER
+©^°e°ê®a±¡³ø
+©^°ex¨Æ±¡³ø
+©^°e¥@¬É¦a¹Ï
+*
+©^°e¬ì§Þ¦¨ªG
+©^°e³¡¶¤¬ãµo
+©^°eÂ§ª÷
+*
+*
+*
+©^°e¸²î³¡¥ó
+Åý¹ï¤è¦Û¦ænÉ²
+奉送國家情報
+奉送軍事情報
+奉送世界地圖
+*
+奉送科技成果
+奉送部隊研發
+奉送禮金
+*
+*
+*
+奉送飛船部件
+讓對方自行要价
 #CITYMANAGETYPE
+¤â°Ê¤À°t
+¬ì¬ã³Ì¤j¤Æ
+¬ì¬ãÉ¬¥ý
+¼Wªø³Ì¤j¤Æ
+¥Í²£É¬¥ý
+¥Í²£³Ì¤j¤Æ
+手動分配
+科研最大化
+科研优先
+增長最大化
+生產优先
+生產最大化
 #SETTINGS

branches/highdpi/Localization/zh-Hant/ReadMe.txt

-              r124
+              r465
 C-EVO(¤å©ú¶i¤Æ¥v)º~¤Æ»¡©ú
+C-EVO(文明進化史)漢化說明
+¹CÀ¸¤¶²Ð¡G
 C-EVO¬O¤@´Ú±q¤å©ú(Civilization)¨t¦Cl¥Í¦Ó¥XªºWindows¥¥x¶}·½¦Û¥Ñ¹CÀ¸¡A¦b¿í´`¤å©ú¨t¦C
+°ò¥»ì«hªº°òÂ¦¤W¡A°µ¤F³\¦h¦³³Ð·N©M¤H©Ê¤Æªº²·s¡A¬O¤@´Úºë¬ü¦³½ìªº¤å©úÃþ¹CÀ¸¡A¤å©ú°g¤£¥i¤£ª±¡C
 ©x¤è¥D¶¡Ghttp://www.c-evo.org
 ìª©¹CÀ¸(V1.10¡A¹ïÀ³º~¤Æ¥])¤U¸ü¶±¡Ghttp://www.c-evo.org/files/download.php
+遊戲介紹：
+C-EVO是一款從文明(Civilization)系列衍生而出的Windows平台開源自由遊戲，在遵循文明系列
+基本原則的基礎上，做了許多有創意和人性化的革新，是一款精美有趣的文明類遊戲，文明迷不可不玩。
+官方主頁：http://www.c-evo.org
+原版遊戲(V1.10，對應漢化包)下載頁面：http://www.c-evo.org/files/download.php
+º~¤Æ¥]¨Ï¥Î¤èªk¡G
+¦w¸Ëìª©¹CÀ¸«á¡A±Nº~¤Æ¥]¤ºªº¤å¥ó¸ÑÀ£¨ì¹CÀ¸¦w¸Ë¥Ø¿ý¡A°È¥²ÂÐ»\ì¤å¥ó¡]Language.txt, Help\Help.txt¡^¡A
+µM«á°õ¦æ¹CÀ¸µ{§Ç¡C
+漢化包使用方法：
+安裝原版遊戲後，將漢化包內的文件解壓到遊戲安裝目錄，務必覆蓋原文件（Language.txt, Help\Help.txt），
+然後執行遊戲程序。
+º~¤Æ»¡©ú¡G
 . °ò¥»§¹¥þº~¤Æª©¡A°£¤F¹CÀ¸Ãö©ó³¡¤À¥~¨ä¥L¤º®e¤å¦r¥þ³¡º~¤Æ¡A¥]¬AÀ°§U«ü«n¡A¤å¦r¶q¬ù70KB¡C
 . º~¤Æ¥]¤¤ªþ±a¤Fº~¤ÆªÌ¦Û¦æ³]pªº¤@´Ú¹CÀ¸¦a¹Ï¡A¥Dn¹ïª±®aªº°_©l¦ì¸m°µ¤FÀu¤Æ¡C
 . º~¤Æ¥]¤¤²K¥[¤F¹CÀ¸«ü«nªº§Ö±¶¹B¦æ¤è¦¡¡A¤è«Kª±®a¬d¾\¡C
 . ¹CÀ¸«ü«n¤¤ªº¬Y¨Ç³¡¤À¡A¦p¬ì§Þ¡B³]¬I¡B©_¸ñµ¥À°§Uµ¡¤f¡Aµ¡¤f¼ÐÃD¤U¤èªºº¦æ¡]¤å¦r¤º®e»Pµ¡¤f¼ÐÃD¬Û¦P¡^
+¬°¶Ã½X¡A¬°µ{§ÇÝ®e°ÝÃD¡]º¦r¥À¤j¼g¥X¿ù¡^¡AµL§«¹CÀ¸¡FÁcÅé¤¤¤åª©¤¤«°¥«ªº¦WºÙY¬°¤¤¤å¡A¦b«°¥«µ¡¤f¤¤¥u¯àÅã¥Ü«°¥«¦Wªºº¦r¡A¬G«O¯d^¤å¦W
+漢化說明：
+. 基本完全漢化版，除了遊戲關於部分外其他內容文字全部漢化，包括幫助指南，文字量約70KB。
+. 漢化包中附帶了漢化者自行設計的一款遊戲地圖，主要對玩家的起始位置做了優化。
+. 漢化包中添加了遊戲指南的快捷運行方式，方便玩家查閱。
+. 遊戲指南中的某些部分，如科技、設施、奇跡等幫助窗口，窗口標題下方的首行（文字內容與窗口標題相同）
+為亂碼，為程序兼容問題（首字母大寫出錯），無妨遊戲；繁體中文版中城市的名稱若為中文，在城市窗口中只能顯示城市名的首字，故保留英文名
 V1.10ª©§ó·s·§n¡G
 ¡B¹CÀ¸¬É±§@¤F½Õ¾ã¡A·s¬É±§óª½Æ[¤Í¦n
 ¡B«°¥«µ¡¤f¤¤¼W³]¤F¸ê·½¦Û°Ê¤À°t¼Ò¦¡¡A¤è«Kª±®a§Ö³t³]¸m¡A´î¤Ö¤F¤¾Ácªº²Ó¸`¾Þ§@
 ¡B®Ú¾Úª±®a¤ÏõX¡A×§ï¤F¤T¶µ©_¸ñªº®ÄªG
 ¡B½Õ¾ã¤F«°¥«¦w©wÈªº¼vÅT°Ñ¼Æ¥H¤Îªì©l¤ô¥
 ¡B¼W¥[¤F¥æ¾Ôµ²ªG¹w´ú
 ¡B¥æ¯A«ü¥Oªº¤Ö¶q½Õ¾ã¡A¥h°£¤F¦~°^³¡¤À¡A¨Ã½Õ¾ã¤F²×¤î±ø¬ùªº³¡¤À³]©w
 ¡B¨ä¥L¤è±ªº·L½Õ
+V1.10版更新概要：
+、遊戲界面作了調整，新界面更直觀友好
+、城市窗口中增設了資源自動分配模式，方便玩家快速設置，減少了冗繁的細節操作
+、根據玩家反饋，修改了三項奇跡的效果
+、調整了城市安定值的影響參數以及初始水平
+、增加了交戰結果預測
+、交涉指令的少量調整，去除了年貢部分，並調整了終止條約的部分設定
+、其他方面的微調
+º~¤Æ§ó·s¡G
 .06.18  1.10ª©º~¤Æ¥]»s§@§¹¦¨¡A¹ïÀ³·s±À¥Xªº1.10^¤åª©¡]080526¡^
 .04.18        1.04ª©º~¤Æ¥]»s§@§¹¦¨¡A¹ïÀ³ì¥ýªº1.04^¤åª©
+漢化更新：
+.06.18  1.10版漢化包製作完成，對應新推出的1.10英文版（080526）
+.04.18    1.04版漢化包製作完成，對應原先的1.04英文版
+¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X¡X
+º~¤Æ¡]¦½¤Æ¡^¤£®e©ö¡AÂà¸ü®É½Ð«O¯dº~¤ÆªÌ¡AÁÂÁÂ¡C
+—————————————————————————————————————
+漢化（汗化）不容易，轉載時請保留漢化者，謝謝。
 NapTID¡]µL¦W¡^2008.06.18
+NapTID（無名）2008.06.18

branches/highdpi/Localization/zh-Hant/Tribes/Americans.tribe.txt

-              r123
+              r465
 #CHOOSE ¬ü°ê
 #n ¬ü°ê¤H
 #s ¬ü°ê
 #a ¬ü§Q°í
+#CHOOSE 美國
+#n 美國人
+#s 美國
+#a 美利堅
 #COLOR FFAFAF
 #SYMBOLS Nation1, 48
 …
 #CITIES
         Washington
         New York
         Boston
         Philadelphia
         Atlanta
         Chicago
         San Francisco
         Buffalo
         St. Louis
         Detroit
         New Orleans
         Baltimore
         Denver
         Cincinnati
         Dallas
         Los Angeles
         Kansas City
         San Diego
         Richmond
         Las Vegas
         Phoenix
         Seattle
         Albuquerque
         Portland
         Minneapolis
         Houston
         Riverside
         Anaheim
         Nassau-Suffolk
         Tampa
         Oakland
         Pittsburgh
         St. Louis
         Cleveland
         Newark
         Fort Worth
         San Jose
         Orlando
         Sacramento
         Fort Lauderdale
         Indianapolis
         San Antonio
         Norfolk
         Columbus
         Milwaukee
         Charlotte
         Paterson
         Salt Lake City
         Greensboro
         Austin
         Nashville-Davidson
         Providence
         Raleigh
         Hartford
         New Brunswick
         Memphis
         West Palm Beach
         Long Branch
         Jacksonville
         Rochester
         Grand Rapids
         Oklahoma City
         Louisville
         Greenville
         Dayton
         Fresno
         Birmingham
         Honolulu
         Albany
         Tucson
         Tulsa
         Oxnard
         Syracuse
         Omaha
         Tacoma
         Akron
         Knoxville
         El Paso
         Bakersfield
         Allentown
         Gary
         Harrisburg
         Scranton
         Toledo
         Jersey City
         Baton Rouge
         Youngstown
         Springfield
         Sarasota
         Wilmington
         Little Rock
         Ann Arbor
         McAllen
         Stockton
         Charleston
         Wichita
         New Haven
         Mobile
         Columbia
         Colorado Springs
+    Washington
+    New York
+    Boston
+    Philadelphia
+    Atlanta
+    Chicago
+    San Francisco
+    Buffalo
+    St. Louis
+    Detroit
+    New Orleans
+    Baltimore
+    Denver
+    Cincinnati
+    Dallas
+    Los Angeles
+    Kansas City
+    San Diego
+    Richmond
+    Las Vegas
+    Phoenix
+    Seattle
+    Albuquerque
+    Portland
+    Minneapolis
+    Houston
+    Riverside
+    Anaheim
+    Nassau-Suffolk
+    Tampa
+    Oakland
+    Pittsburgh
+    St. Louis
+    Cleveland
+    Newark
+    Fort Worth
+    San Jose
+    Orlando
+    Sacramento
+    Fort Lauderdale
+    Indianapolis
+    San Antonio
+    Norfolk
+    Columbus
+    Milwaukee
+    Charlotte
+    Paterson
+    Salt Lake City
+    Greensboro
+    Austin
+    Nashville-Davidson
+    Providence
+    Raleigh
+    Hartford
+    New Brunswick
+    Memphis
+    West Palm Beach
+    Long Branch
+    Jacksonville
+    Rochester
+    Grand Rapids
+    Oklahoma City
+    Louisville
+    Greenville
+    Dayton
+    Fresno
+    Birmingham
+    Honolulu
+    Albany
+    Tucson
+    Tulsa
+    Oxnard
+    Syracuse
+    Omaha
+    Tacoma
+    Akron
+    Knoxville
+    El Paso
+    Bakersfield
+    Allentown
+    Gary
+    Harrisburg
+    Scranton
+    Toledo
+    Jersey City
+    Baton Rouge
+    Youngstown
+    Springfield
+    Sarasota
+    Wilmington
+    Little Rock
+    Ann Arbor
+    McAllen
+    Stockton
+    Charleston
+    Wichita
+    New Haven
+    Mobile
+    Columbia
+    Colorado Springs
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation1
+,      134,    »´ÃM§L
+,     136,    ÁÂº¸°Ò©Z§J
+,     202,    ÅK¥ÒÄ¥
+,  134,    輕騎兵
+, 136,    謝爾曼坦克
+, 202,    鐵甲艦

branches/highdpi/Localization/zh-Hant/Tribes/Babyl.tribe.txt

-              r123
+              r465
 #CHOOSE ¤Ú¤ñÛ
 #n ¤Ú¤ñÛ¤H
 #s ¤Ú¤ñÛ
 #a ¤Ú¤ñÛ
+#CHOOSE 巴比倫
+#n 巴比倫人
+#s 巴比倫
+#a 巴比倫
 #COLOR EFCB47
 #SYMBOLS Nation2, 92
 …
 #CITIES
         Babylon
         Ur
         Borsippa
         Nineveh
         Ashur
         Agade
         Uruk
         Akshak
         Lugalzagesi
         Eridu
         Samarra
         Lagash
         Kish
         Nippur
         Shuruppak
         Sippar
         Larsa
         Zamua
         Tell Wilaya
         Umma
         Adab
         Ebla
         Calah
         Dur Sharrukin
         Cunaxa
         Singara
         Nisibis
         Harran
         Opis
         Tarsus
         Gasur
         Aleppo
         Basra
         Charax
         Hassuna
         Larak
         Bad-tibira
         Cuthah
         Isin
         Arpad
         Guabba
         Jarmo
         Tell Halaf
         Shubat Enlil
         Mari
         Dur-Kurigalzu
+    Babylon
+    Ur
+    Borsippa
+    Nineveh
+    Ashur
+    Agade
+    Uruk
+    Akshak
+    Lugalzagesi
+    Eridu
+    Samarra
+    Lagash
+    Kish
+    Nippur
+    Shuruppak
+    Sippar
+    Larsa
+    Zamua
+    Tell Wilaya
+    Umma
+    Adab
+    Ebla
+    Calah
+    Dur Sharrukin
+    Cunaxa
+    Singara
+    Nisibis
+    Harran
+    Opis
+    Tarsus
+    Gasur
+    Aleppo
+    Basra
+    Charax
+    Hassuna
+    Larak
+    Bad-tibira
+    Cuthah
+    Isin
+    Arpad
+    Guabba
+    Jarmo
+    Tell Halaf
+    Shubat Enlil
+    Mari
+    Dur-Kurigalzu
 #UNITS Nation2
+,     010,    ²¾¥ÁªÌ
+,     040,    ¥Á§L
+,     101,    ªø¥Ù¤â
+,     101,    ½b¤â
+,     102,    ¥Ù¤M¤â
+,     103,    ¤õºj¤â
+,     131,    ÃM§L
+,     132,    ¾Ô¨®
+, 010,    移民者
+, 040,    民兵
+, 101,    長矛手
+, 101,    箭手
+, 102,    矛刀手
+, 103,    火槍手
+, 131,    騎兵
+, 132,    戰車

branches/highdpi/Localization/zh-Hant/Tribes/British.tribe.txt

-              r123
+              r465
 #CHOOSE ¤£¦CÄA
 #n ¤£¦CÄA¤H
 #s ^°ê
 #a ¤j¤£¦CÄA
+#CHOOSE 不列顛
+#n 不列顛人
+#s 英國
+#a 大不列顛
 #COLOR 978367
 #SYMBOLS Nation2, 95
 …
 #CITIES
         London
         York
         Nottingham
         Hastings
         Canterbury
         Coventry
         Warwick
         Newcastle
         Oxford
         Liverpool
         Dover
         Brighton
         Norwich
         Leeds
         Reading
         Birmingham
         Richmond
         Exeter
         Cambridge
         Manchester
         Bristol
         Leicester
         Carlisle
         Ipswich
         Portsmouth
         Berwick
         Sheffield
         Kingston upon Hull
         Bradford
         Stoke-on-Trent
         Wolverhampton
         Plymouth
         Derby
         Southampton
         Dudley
         Newcastle upon Tyne
         Sunderland
         Northampton
         Preston
         Walsall
         Luton
         Richmond
         Southend-on-Sea
         Bournemouth
         Middlesbrough
         West Bromwich
         Blackpool
         Oldbury
         Swindon
         Huddersfield
         Bolton
         Poole
         Peterborough
         Stockport
         Rotherham
         Watford
         Slough
         St Helens
         Sutton Coldfield
         Blackburn
         Oldham
         Basildon
         Woking
         Chelmsford
         Colchester
         Worthing
         Gillingham
         Eastbourne
         Solihull
         Rochdale
         Birkenhead
         Cheltenham
         Halifax
         Southport
         Maidstone
         Grimsby
         Crawley
         Hartlepool
         Darlington
         Wigan
         Bath
         South Shields
         Stockton-on-Tees
         Gateshead
         Warrington
         Worcester
         St Albans
         Lincoln
         Chester
         Salford
         Hemel Hempstead
         Basingstoke
         Stevenage
         Scunthorpe
         Barnsley
         Burnley
         Harlow
         Wakefield
         Bedford
         Newcastle-under-Lyme
         Redditch
         Chesterfield
         Mansfield
         High Wycombe
         Chatham
+    London
+    York
+    Nottingham
+    Hastings
+    Canterbury
+    Coventry
+    Warwick
+    Newcastle
+    Oxford
+    Liverpool
+    Dover
+    Brighton
+    Norwich
+    Leeds
+    Reading
+    Birmingham
+    Richmond
+    Exeter
+    Cambridge
+    Manchester
+    Bristol
+    Leicester
+    Carlisle
+    Ipswich
+    Portsmouth
+    Berwick
+    Sheffield
+    Kingston upon Hull
+    Bradford
+    Stoke-on-Trent
+    Wolverhampton
+    Plymouth
+    Derby
+    Southampton
+    Dudley
+    Newcastle upon Tyne
+    Sunderland
+    Northampton
+    Preston
+    Walsall
+    Luton
+    Richmond
+    Southend-on-Sea
+    Bournemouth
+    Middlesbrough
+    West Bromwich
+    Blackpool
+    Oldbury
+    Swindon
+    Huddersfield
+    Bolton
+    Poole
+    Peterborough
+    Stockport
+    Rotherham
+    Watford
+    Slough
+    St Helens
+    Sutton Coldfield
+    Blackburn
+    Oldham
+    Basildon
+    Woking
+    Chelmsford
+    Colchester
+    Worthing
+    Gillingham
+    Eastbourne
+    Solihull
+    Rochdale
+    Birkenhead
+    Cheltenham
+    Halifax
+    Southport
+    Maidstone
+    Grimsby
+    Crawley
+    Hartlepool
+    Darlington
+    Wigan
+    Bath
+    South Shields
+    Stockton-on-Tees
+    Gateshead
+    Warrington
+    Worcester
+    St Albans
+    Lincoln
+    Chester
+    Salford
+    Hemel Hempstead
+    Basingstoke
+    Stevenage
+    Scunthorpe
+    Barnsley
+    Burnley
+    Harlow
+    Wakefield
+    Bedford
+    Newcastle-under-Lyme
+    Redditch
+    Chesterfield
+    Mansfield
+    High Wycombe
+    Chatham
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation2
+,     21,     ¯S¤u
+,     201,    ¤T®é¦|²î
+,     132,    ÃM¤h
+, 21, 特工
+, 201,    三桅帆船
+, 132,    騎士

branches/highdpi/Localization/zh-Hant/Tribes/Chinese.tribe.txt

-              r123
+              r465
 #CHOOSE ¤¤°ê
 #n ¤¤°ê¤H
 #s ¤¤°ê
 #a ¤¤µØ
+#CHOOSE 中國
+#n 中國人
+#s 中國
+#a 中華
 #COLOR 00FFFF
 #SYMBOLS Nation1, 41
 …
 #CITIES
         Beijing
         Shanghai
         Guangzhou
         Nanjing
         Qingdao
         Xinjian
         Chengdu
         Changchun
         Tianjin
         Datong
         Macao
         Anyang
         Shantou
         Jinan
         Kaifeng
         Ningpo
         Baoding
         Dongying
         Shenyang
         Dalian
         Harbin
         Xi'an
         Jiulong
         Wuhan
         T'aipei
         Taiyuan
         Kaohsiung
         Fushun
         Anshan
         Lanzhou
         Zhengzhou
         Nanchang
         Changsha
         Hangzhou
         Kunming
         Urumqi
         Qiqihar
         Tangshan
         Jilin
         Xianggang
         Guiyang
         Shijiazhuang
         Baotou
         Wuxi
         T'aichung
         Fuzhou
         Zibo
         Handan
         Xuzhou
         Benxi
         Yichun
         Hefei
         Luoyang
         Nanning
         T'ainan
         Suzhou
         Daqing
         Huainan
         Hohhot
         Jinzhou
         Jixi
         Fuxin
         Liuzhou
         Hengyang
         Liaoyang
         Mudanjiang
         Xining
         Yingkou
         Ningbo
         Zhangjiakou
         Dandong
         Changzhou
         T'aipeihsien
         Hegang
         Xiangtan
         Xiangfan
         Xinxiang
         Sha Tin
         Jiamusi
         Hunjiang
         Nantong
         Tuen Mun
         Shenzhen
         Wuhu
         Pingdingshan
         Bengbu
         Zhuzhou
         Huangshi
         Panzhihua
         Yantai
         Baoji
         Wenzhou
         Shuangyashan
         Xiamen
         Chungho
         Jiaozuo
         Zigong
         Zhanjiang
         Chilung
         Tonghua
+    Beijing
+    Shanghai
+    Guangzhou
+    Nanjing
+    Qingdao
+    Xinjian
+    Chengdu
+    Changchun
+    Tianjin
+    Datong
+    Macao
+    Anyang
+    Shantou
+    Jinan
+    Kaifeng
+    Ningpo
+    Baoding
+    Dongying
+    Shenyang
+    Dalian
+    Harbin
+    Xi'an
+    Jiulong
+    Wuhan
+    T'aipei
+    Taiyuan
+    Kaohsiung
+    Fushun
+    Anshan
+    Lanzhou
+    Zhengzhou
+    Nanchang
+    Changsha
+    Hangzhou
+    Kunming
+    Urumqi
+    Qiqihar
+    Tangshan
+    Jilin
+    Xianggang
+    Guiyang
+    Shijiazhuang
+    Baotou
+    Wuxi
+    T'aichung
+    Fuzhou
+    Zibo
+    Handan
+    Xuzhou
+    Benxi
+    Yichun
+    Hefei
+    Luoyang
+    Nanning
+    T'ainan
+    Suzhou
+    Daqing
+    Huainan
+    Hohhot
+    Jinzhou
+    Jixi
+    Fuxin
+    Liuzhou
+    Hengyang
+    Liaoyang
+    Mudanjiang
+    Xining
+    Yingkou
+    Ningbo
+    Zhangjiakou
+    Dandong
+    Changzhou
+    T'aipeihsien
+    Hegang
+    Xiangtan
+    Xiangfan
+    Xinxiang
+    Sha Tin
+    Jiamusi
+    Hunjiang
+    Nantong
+    Tuen Mun
+    Shenzhen
+    Wuhu
+    Pingdingshan
+    Bengbu
+    Zhuzhou
+    Huangshi
+    Panzhihua
+    Yantai
+    Baoji
+    Wenzhou
+    Shuangyashan
+    Xiamen
+    Chungho
+    Jiaozuo
+    Zigong
+    Zhanjiang
+    Chilung
+    Tonghua
 #UNITS Nation1
+,      040,    ¥Á§L
+,     104,    ´åÀ»¶¤
+,     072,    ¤pQªO
+,  040,    民兵
+, 104,    游擊隊
+, 072,    小舢板

branches/highdpi/Localization/zh-Hant/Tribes/Egyptians.tribe.txt

-              r123
+              r465
 #CHOOSE ®J¤Î
 #n ®J¤Î¤H
 #s ®J¤Î
 #a ®J¤Î
+#CHOOSE 埃及
+#n 埃及人
+#s 埃及
+#a 埃及
 #COLOR 37CFAF
 #SYMBOLS Nation1, 42
 …
 #CITIES
         Thebes
         Memphis
         Heliopolis
         Elephantine
         Alexandria
         Pi-Ramesses
         Giza
         Byblos
         El-Amarna
         Hieraconpolis
         Abydos
         Al-Qaira
         Asyut
         Avaris
         Lisht
         Buto
         Edfu
         Pithom
         Busiris
         Kahun
         Athribis
         Mendes
         El-Ashmunein
         Tenis
         Naukratis
         Syene
         Medinet Habu
         Buhen
         Hatnub
         El-Kharga
         Qift
         Quessir
         Fawakhir
         Deir El-Medina
         Fayyum
         Sais
         Maidum
         Abusir
         Zawyet al-Aryan
         Saqqara
         Mazghuma
         Hawara
         Saylah
         Dara
         Tukh
         El-Kula
         Karnak
         Kom Ombo
         Phile
         Rosetta
         Tjel
         Edwa
         Gebel el-Tarif
         Hipponius
         Dishasha
         Kafr Hammar
         Tarkhan
         Esna
         Armant
         Naga ed-Dair
         Deir el-Bahari
         Naqada
         El-Ballas
         Tentyra
         Qaw el-Kebir
+        Ikkur
         Quban
         Kumma
         Semma
         Uronarti
         Shalfak
         Mirgissa
         Faras
         Abu Simbel
         Bir Nakhlai
         Aniba
+    Thebes
+    Memphis
+    Heliopolis
+    Elephantine
+    Alexandria
+    Pi-Ramesses
+    Giza
+    Byblos
+    El-Amarna
+    Hieraconpolis
+    Abydos
+    Al-Qaira
+    Asyut
+    Avaris
+    Lisht
+    Buto
+    Edfu
+    Pithom
+    Busiris
+    Kahun
+    Athribis
+    Mendes
+    El-Ashmunein
+    Tenis
+    Naukratis
+    Syene
+    Medinet Habu
+    Buhen
+    Hatnub
+    El-Kharga
+    Qift
+    Quessir
+    Fawakhir
+    Deir El-Medina
+    Fayyum
+    Sais
+    Maidum
+    Abusir
+    Zawyet al-Aryan
+    Saqqara
+    Mazghuma
+    Hawara
+    Saylah
+    Dara
+    Tukh
+    El-Kula
+    Karnak
+    Kom Ombo
+    Phile
+    Rosetta
+    Tjel
+    Edwa
+    Gebel el-Tarif
+    Hipponius
+    Dishasha
+    Kafr Hammar
+    Tarkhan
+    Esna
+    Armant
+    Naga ed-Dair
+    Deir el-Bahari
+    Naqada
+    El-Ballas
+    Tentyra
+    Qaw el-Kebir
+    Ikkur
+    Quban
+    Kumma
+    Semma
+    Uronarti
+    Shalfak
+    Mirgissa
+    Faras
+    Abu Simbel
+    Bir Nakhlai
+    Aniba
 #UNITS Nation1
+,      040,    ¥Á§L
+,     101,    ½b¤â
+,     102,    ªø¥Ù¤â
+,  040,    民兵
+, 101,    箭手
+, 102,    長矛手

branches/highdpi/Localization/zh-Hant/Tribes/French.tribe.txt

-              r123
+              r465
 #CHOOSE ªkÄõ¦è
 #n ªkÄõ¦è¤H
 #s ªk°ê
 #a ªkÄõ¦è
+#CHOOSE 法蘭西
+#n 法蘭西人
+#s 法國
+#a 法蘭西
 #COLOR 576FC7
 #SYMBOLS Nation1, 43
 …
 #CITIES
         Paris
         Orleans
         Lyon
         Reims
         Tours
         Marseille
         Chartres
         Avignon
         Besancon
         Rouen
         Grenoble
         Dijon
         Amiens
         Cherbourg
         Poitiers
         Toulouse
         Bayonne
         Strasbourg
         Brest
         Bordeaux
         Lille
         Nice
         Nantes
         Saint-Etienne
         Montpellier
         Rennes
         Le Havre
         Toulon
         Angers
         Le Mans
         Clermont-Ferrand
         Aix-en-Provence
         Limoges
         Nimes
         Villeurbanne
         Metz
         Caen
         Mulhouse
         Boulogne-Billancourt
         Perpignan
         Nancy
         Roubaix
         Argenteuil
         Tourcoing
         Montreuil
         Saint-Denis
         Versailles
         Nanterre
         Creteil
         Aulnay-sous-Bois
         Pau
         Vitry-sur-Seine
         Calais
         Colombes
         La Rochelle
         Asnieres
         Champigny-sur-Marne
         Rueil-Malmaison
         Saint-Maur-des-Fosses
         Bourges
         Antibes
         Dunkerque
         Courbevoie
         Beziers
         Cannes
         Saint-Nazaire
         Colmar
         Villeneuve-d'Ascq
         Valence
         Lorient
         Aubervilliers
         Drancy
         Merignac
         Troyes
         La Seyne-sur-Mer
         Quimper
         Antony
         Saint-Quentin
         Neuilly-sur-Seine
         Noisy-le-Grand
         Sarcelles
         Niort
         Pessac
         Venissieux
         Chambery
         Charleville-Mezieres
         Beauvais
         Cergy
         Levallois-Perret
         Cholet
         Issy-les-Moulineaux
         Montauban
         Vannes
         Hyeres
         Evreux
         Maisons-Alfort
         Laval
         Fontenay-sous-Bois
         Ivry-sur-Seine
         Saint-Malo
         Arles
         Belfort
         Annecy
         Sartrouville
         Clichy
         Chalon-sur-SaäÝe
         Pantin
         Chateauroux
         Meaux
         La Roche-sur-Yon
         Blois
         Brive-la-Gaillarde
         Evry
         Clamart
         Villejuif
         Chalons-sur-Marne
         Sevran
         Le Blanc-Mesnil
         Bondy
         Frejus
         Narbonne
         Epinay-sur-Seine
         Tarbes
         Albi
         Saint-Brieuc
         Chelles
         Boulogne-sur-Mer
         Bobigny
         Carcassonne
+    Paris
+    Orleans
+    Lyon
+    Reims
+    Tours
+    Marseille
+    Chartres
+    Avignon
+    Besancon
+    Rouen
+    Grenoble
+    Dijon
+    Amiens
+    Cherbourg
+    Poitiers
+    Toulouse
+    Bayonne
+    Strasbourg
+    Brest
+    Bordeaux
+    Lille
+    Nice
+    Nantes
+    Saint-Etienne
+    Montpellier
+    Rennes
+    Le Havre
+    Toulon
+    Angers
+    Le Mans
+    Clermont-Ferrand
+    Aix-en-Provence
+    Limoges
+    Nimes
+    Villeurbanne
+    Metz
+    Caen
+    Mulhouse
+    Boulogne-Billancourt
+    Perpignan
+    Nancy
+    Roubaix
+    Argenteuil
+    Tourcoing
+    Montreuil
+    Saint-Denis
+    Versailles
+    Nanterre
+    Creteil
+    Aulnay-sous-Bois
+    Pau
+    Vitry-sur-Seine
+    Calais
+    Colombes
+    La Rochelle
+    Asnieres
+    Champigny-sur-Marne
+    Rueil-Malmaison
+    Saint-Maur-des-Fosses
+    Bourges
+    Antibes
+    Dunkerque
+    Courbevoie
+    Beziers
+    Cannes
+    Saint-Nazaire
+    Colmar
+    Villeneuve-d'Ascq
+    Valence
+    Lorient
+    Aubervilliers
+    Drancy
+    Merignac
+    Troyes
+    La Seyne-sur-Mer
+    Quimper
+    Antony
+    Saint-Quentin
+    Neuilly-sur-Seine
+    Noisy-le-Grand
+    Sarcelles
+    Niort
+    Pessac
+    Venissieux
+    Chambery
+    Charleville-Mezieres
+    Beauvais
+    Cergy
+    Levallois-Perret
+    Cholet
+    Issy-les-Moulineaux
+    Montauban
+    Vannes
+    Hyeres
+    Evreux
+    Maisons-Alfort
+    Laval
+    Fontenay-sous-Bois
+    Ivry-sur-Seine
+    Saint-Malo
+    Arles
+    Belfort
+    Annecy
+    Sartrouville
+    Clichy
+    Chalon-sur-Sa鬾e
+    Pantin
+    Chateauroux
+    Meaux
+    La Roche-sur-Yon
+    Blois
+    Brive-la-Gaillarde
+    Evry
+    Clamart
+    Villejuif
+    Chalons-sur-Marne
+    Sevran
+    Le Blanc-Mesnil
+    Bondy
+    Frejus
+    Narbonne
+    Epinay-sur-Seine
+    Tarbes
+    Albi
+    Saint-Brieuc
+    Chelles
+    Boulogne-sur-Mer
+    Bobigny
+    Carcassonne
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation1
+,      103,    ¤õºj¤â
+,     104,    °ê¥Á½Ã¶¤
+,     134,    ¨BÃM§L
+,  103,    火槍手
+, 104,    國民衛隊
+, 134,    步騎兵

branches/highdpi/Localization/zh-Hant/Tribes/Germans.tribe.txt

-              r123
+              r465
 #CHOOSE ¤é¦Õ°Ò
 #n ¤é¦Õ°Ò¤H
 #s ¼w°ê
 #a ¤é¦Õ°Ò
+#CHOOSE 日耳曼
+#n 日耳曼人
+#s 德國
+#a 日耳曼
 #COLOR AFAFAF
 #SYMBOLS Nation1, 44
 …
 #CITIES
         Berlin
         Koln
         Aachen
         Frankfurt
         Trier
         Regensburg
         Hamburg
         Konigsberg
         Stettin
         Dortmund
         Augsburg
         Munchen
         Bremen
         Nurnberg
         Lubeck
         Stuttgart
         Dusseldorf
         Dresden
         Hannover
         Duisburg
         Leipzig
         Essen
         Chemnitz
         Karlsruhe
         Munster
         Bochum
         Wuppertal
         Bielefeld
         Mannheim
         Bonn
         Gelsenkirchen
         Halle
         Wiesbaden
         Monchengladbach
         Braunschweig
         Krefeld
         Magdeburg
         Kiel
         Oberhausen
         Rostock
         Hagen
         Erfurt
         Freiburg
         Kassel
         Saarbrucken
         Mainz
         Hamm
         Herne
         Mulheim
         Osnabruck
         Ludwigshafen
         Solingen
         Leverkusen
         Oldenburg
         Neuss
         Heidelberg
         Darmstadt
         Potsdam
         Paderborn
         Gottingen
         Bremerhaven
         Wurzburg
         Recklinghausen
         Wolfsburg
         Bottrop
         Heilbronn
         Remscheid
         Gera
         Cottbus
         Pforzheim
         Offenbach
         Ulm
         Salzgitter
         Ingolstadt
         Siegen
         Schwerin
         Reutlingen
         Furth
         Koblenz
         Moers
         Bergisch Gladbach
         Hildesheim
         Witten
         Kaiserslautern
         Zwickau
         Erlangen
         Iserlohn
         Jena
         Gutersloh
         Marl
         Lunen
         Velbert
         Duren
         Ratingen
         Esslingen
         Wilhelmshaven
         Dessau
         Hanau
         Ludwigsburg
         Flensburg
         Minden
         Brandenburg
         Ludenscheid
         Neumunster
         Tubingen
         Dorsten
         Villingen-Schwenningen
         Worms
         Castrop-Rauxel
         Gladbeck
         Arnsberg
         Delmenhorst
         Frankfurt/Oder
         Konstanz
         Neubrandenburg
         Viersen
         Marburg
         Rheine
         Detmold
         Bayreuth
         Celle
         Giessen
         Bocholt
         Troisdorf
         Norderstedt
         Dinslaken
         Bamberg
         Herten
         Neuwied
         Unna
         Aschaffenburg
         Lippstadt
         Plauen
         Aalen
         Luneburg
         Herford
         Kempten
         Grevenbroich
         Gorlitz
         Garbsen
         Stralsund
         Schwabisch Gmund
         Kerpen
         Dormagen
         Fulda
         Weimar
+    Berlin
+    Koln
+    Aachen
+    Frankfurt
+    Trier
+    Regensburg
+    Hamburg
+    Konigsberg
+    Stettin
+    Dortmund
+    Augsburg
+    Munchen
+    Bremen
+    Nurnberg
+    Lubeck
+    Stuttgart
+    Dusseldorf
+    Dresden
+    Hannover
+    Duisburg
+    Leipzig
+    Essen
+    Chemnitz
+    Karlsruhe
+    Munster
+    Bochum
+    Wuppertal
+    Bielefeld
+    Mannheim
+    Bonn
+    Gelsenkirchen
+    Halle
+    Wiesbaden
+    Monchengladbach
+    Braunschweig
+    Krefeld
+    Magdeburg
+    Kiel
+    Oberhausen
+    Rostock
+    Hagen
+    Erfurt
+    Freiburg
+    Kassel
+    Saarbrucken
+    Mainz
+    Hamm
+    Herne
+    Mulheim
+    Osnabruck
+    Ludwigshafen
+    Solingen
+    Leverkusen
+    Oldenburg
+    Neuss
+    Heidelberg
+    Darmstadt
+    Potsdam
+    Paderborn
+    Gottingen
+    Bremerhaven
+    Wurzburg
+    Recklinghausen
+    Wolfsburg
+    Bottrop
+    Heilbronn
+    Remscheid
+    Gera
+    Cottbus
+    Pforzheim
+    Offenbach
+    Ulm
+    Salzgitter
+    Ingolstadt
+    Siegen
+    Schwerin
+    Reutlingen
+    Furth
+    Koblenz
+    Moers
+    Bergisch Gladbach
+    Hildesheim
+    Witten
+    Kaiserslautern
+    Zwickau
+    Erlangen
+    Iserlohn
+    Jena
+    Gutersloh
+    Marl
+    Lunen
+    Velbert
+    Duren
+    Ratingen
+    Esslingen
+    Wilhelmshaven
+    Dessau
+    Hanau
+    Ludwigsburg
+    Flensburg
+    Minden
+    Brandenburg
+    Ludenscheid
+    Neumunster
+    Tubingen
+    Dorsten
+    Villingen-Schwenningen
+    Worms
+    Castrop-Rauxel
+    Gladbeck
+    Arnsberg
+    Delmenhorst
+    Frankfurt/Oder
+    Konstanz
+    Neubrandenburg
+    Viersen
+    Marburg
+    Rheine
+    Detmold
+    Bayreuth
+    Celle
+    Giessen
+    Bocholt
+    Troisdorf
+    Norderstedt
+    Dinslaken
+    Bamberg
+    Herten
+    Neuwied
+    Unna
+    Aschaffenburg
+    Lippstadt
+    Plauen
+    Aalen
+    Luneburg
+    Herford
+    Kempten
+    Grevenbroich
+    Gorlitz
+    Garbsen
+    Stralsund
+    Schwabisch Gmund
+    Kerpen
+    Dormagen
+    Fulda
+    Weimar
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation1
+,      105,    ¨B§L
+,     106,    ¬ðÀ»¶¤
+,     300,    ºÖ§J¾Ô¤æÉó
+,  105,    步兵
+, 106,    突擊隊
+, 300,    福克戰斗机

branches/highdpi/Localization/zh-Hant/Tribes/Greeks.tribe.txt

-              r123
+              r465
 #CHOOSE ¥j§ÆÛK
 #n §ÆÛK¤H
 #s §ÆÛK
 #a §ÆÛK
+#CHOOSE 古希腊
+#n 希腊人
+#s 希腊
+#a 希腊
 #COLOR FF00BF
 #SYMBOLS Nation2, 90
 …
 #CITIES
         Athens
         Sparta
         Corinth
         Pharsalos
         Delphi
         Knossos
         Troy
         Mycenae
         Argos
         Thermopylae
         Herakleia
         Ephesos
         Rhodos
         Eretria
         Syracuse
         Thessalonica
         Marathon
         Halicarnassos
         Pergamon
         Olympia
         Miletos
         Artemisium
         Apollonia
         Megara
         Cithera
         Gythium
         Sellasia
         Messene
         Mothone
         Pherae
         Bassae
         Megalopolis
         Tegea
         Mantinea
         Stymphalus
         Philus
         Tiryns
         Troezen
         Aegina
         Halieis
         Epidaurus
         Sicyon
         Cerynia
         Elis
         Brauron
         Colonus
         Oropus
         Decelea
         Tanagra
         Ascra
         Haliartus
         Thebai
         Orchomenus
         Naupactus
         Stratus
         Actium
         Histiaea
         Chalcis
         Carystus
         Ambracia
         Dodona
         Corcyra
         Buthrotum
         Lamia
         Iolcus
         Larissa
         Gonnus
         Pydna
         Aegae
         Beroea
         Mieza
         Pella
         Stobi
         Edessa
         Olynthus
         Potidaea
         Acanthus
         Uranopolis
         Stagirus
         Amphipolis
         Thasos
         Drerus
         Gortyna
         Hierapytna
         Miletus
         Ephesus
         Mytilene
         Atarneus
         Pergamum
         Sigeum
         Sestus
         Abdera
+    Athens
+    Sparta
+    Corinth
+    Pharsalos
+    Delphi
+    Knossos
+    Troy
+    Mycenae
+    Argos
+    Thermopylae
+    Herakleia
+    Ephesos
+    Rhodos
+    Eretria
+    Syracuse
+    Thessalonica
+    Marathon
+    Halicarnassos
+    Pergamon
+    Olympia
+    Miletos
+    Artemisium
+    Apollonia
+    Megara
+    Cithera
+    Gythium
+    Sellasia
+    Messene
+    Mothone
+    Pherae
+    Bassae
+    Megalopolis
+    Tegea
+    Mantinea
+    Stymphalus
+    Philus
+    Tiryns
+    Troezen
+    Aegina
+    Halieis
+    Epidaurus
+    Sicyon
+    Cerynia
+    Elis
+    Brauron
+    Colonus
+    Oropus
+    Decelea
+    Tanagra
+    Ascra
+    Haliartus
+    Thebai
+    Orchomenus
+    Naupactus
+    Stratus
+    Actium
+    Histiaea
+    Chalcis
+    Carystus
+    Ambracia
+    Dodona
+    Corcyra
+    Buthrotum
+    Lamia
+    Iolcus
+    Larissa
+    Gonnus
+    Pydna
+    Aegae
+    Beroea
+    Mieza
+    Pella
+    Stobi
+    Edessa
+    Olynthus
+    Potidaea
+    Acanthus
+    Uranopolis
+    Stagirus
+    Amphipolis
+    Thasos
+    Drerus
+    Gortyna
+    Hierapytna
+    Miletus
+    Ephesus
+    Mytilene
+    Atarneus
+    Pergamum
+    Sigeum
+    Sestus
+    Abdera
 #UNITS Nation2
+,     010,    ²¾¥ÁªÌ
+,     040,    ¥Á§L
+,     101,    «¸Ë¨B§L
+,     102,    ¤è°}§L
+,     131,    ÃM§L
+,     132,    ¾Ô¨®
+,     200,    ¤T¼Õ¾Ô²î
+, 010,    移民者
+, 040,    民兵
+, 101,    重裝步兵
+, 102,    方陣兵
+, 131,    騎兵
+, 132,    戰車
+, 200,    三槳戰船

branches/highdpi/Localization/zh-Hant/Tribes/Japanese.tribe.txt

-              r123
+              r465
 #CHOOSE ¤é¥»
 #n ¤é¥»¤H
 #s ¤é¥»
 #a ¤é¥»
+#CHOOSE 日本
+#n 日本人
+#s 日本
+#a 日本
 #COLOR 57AB27
 #SYMBOLS Nation1, 45
 …
 #CITIES
         Kyoto
         Osaka
         Edo
         Satsuma
         Kagoshima
         Nara
         Nagoya
         Izumo
         Nagasaki
         Yokohama
         Shimonoseki
         Matsuyama
         Sapporo
         Hakodate
         Ise
         Toyama
         Fukushima
         Suo
         Bizen
         Echizen
         Izumi
         Omi
         Echigo
         Kozuke
         Sado
         Tokyo
         Kobe
         Fukuoka
         Kawasaki
         Hiroshima
         Kitakyushu
         Sendai
         Chiba
         Sakai
         Kumamoto
         Okayama
         Sagamihara
         Hamamatsu
         Funabashi
         Higashiosaka
         Hachioji
         Niigata
         Amagasaki
         Shizuoka
         Himeji
         Matsudo
         Kanazawa
         Urawa
         Kawaguchi
         Ichikawa
         Utsunomiya
         Omiya
         Yokosuka
         Oita
         Kurashiki
         Gifu
         Hirakata
         Toyonaka
         Wakayama
         Nishinomiya
         Fukuyama
         Fujisawa
         Takatsuki
         Asahikawa
         Machida
         Iwaki
         Nagano
         Toyohashi
         Suita
         Toyota
         Takamatsu
         Koriyama
         Kawagoe
         Okazaki
         Kochi
         Tokorozawa
         Kashiwa
         Akita
         Naha
         Miyazaki
         Koshigaya
         Aomori
         Akashi
         Morioka
         Yokkaichi
         Maebashi
         Kasugai
         Ichihara
         Yao
         Otsu
         Tokushima
         Ichinomiya
         Kakogawa
         Neyagawa
         Ibaraki
         Fukui
         Yamagata
         Hiratsuka
         Mito
         Sasebo
+    Kyoto
+    Osaka
+    Edo
+    Satsuma
+    Kagoshima
+    Nara
+    Nagoya
+    Izumo
+    Nagasaki
+    Yokohama
+    Shimonoseki
+    Matsuyama
+    Sapporo
+    Hakodate
+    Ise
+    Toyama
+    Fukushima
+    Suo
+    Bizen
+    Echizen
+    Izumi
+    Omi
+    Echigo
+    Kozuke
+    Sado
+    Tokyo
+    Kobe
+    Fukuoka
+    Kawasaki
+    Hiroshima
+    Kitakyushu
+    Sendai
+    Chiba
+    Sakai
+    Kumamoto
+    Okayama
+    Sagamihara
+    Hamamatsu
+    Funabashi
+    Higashiosaka
+    Hachioji
+    Niigata
+    Amagasaki
+    Shizuoka
+    Himeji
+    Matsudo
+    Kanazawa
+    Urawa
+    Kawaguchi
+    Ichikawa
+    Utsunomiya
+    Omiya
+    Yokosuka
+    Oita
+    Kurashiki
+    Gifu
+    Hirakata
+    Toyonaka
+    Wakayama
+    Nishinomiya
+    Fukuyama
+    Fujisawa
+    Takatsuki
+    Asahikawa
+    Machida
+    Iwaki
+    Nagano
+    Toyohashi
+    Suita
+    Toyota
+    Takamatsu
+    Koriyama
+    Kawagoe
+    Okazaki
+    Kochi
+    Tokorozawa
+    Kashiwa
+    Akita
+    Naha
+    Miyazaki
+    Koshigaya
+    Aomori
+    Akashi
+    Morioka
+    Yokkaichi
+    Maebashi
+    Kasugai
+    Ichihara
+    Yao
+    Otsu
+    Tokushima
+    Ichinomiya
+    Kakogawa
+    Neyagawa
+    Ibaraki
+    Fukui
+    Yamagata
+    Hiratsuka
+    Mito
+    Sasebo
 #UNITS Nation1
+,      040,    ¥Á§L
+,      101,    ªZ¤h
+,     102,    §ÔªÌ
+,     300,    ¹s¦¡Éó
+,  040,    民兵
+,  101,    武士
+, 102,    忍者
+, 300,    零式机

branches/highdpi/Localization/zh-Hant/Tribes/Mongols.tribe.txt

-              r123
+              r465
 #CHOOSE »X¥j
 #n »X¥j¤H
 #s »X¥j
 #a »X¥j
+#CHOOSE 蒙古
+#n 蒙古人
+#s 蒙古
+#a 蒙古
 #COLOR 8367B3
 #SYMBOLS Nation2, 91
 …
 #CITIES
         Karakorum
         Shangtu
         Iske Kazan
         Ulan-Bator
         Ulan-Ude
         Erdenet
         Darhan
         Cojbalsan
         Moron
         Ulaangom
         Hovd
         Uliastaj
         Bajanhongor
         Olgij
         Suhbaatar
         Arvajheer
         Cecerleg
         Sajnsand
         Altaj
         Ondorhaan
         Bulgan
         Zuunmod
         Baruun-Urt
         Dalanzadgad
         Mandalgovi
         Zuunharaa
         Cojr
         Batshireet
         Batsumber
         Berh
         Dariganga
         Dasincilen
         Hanh
         Har-Ajrag
         Hagtal
         Hutag
         Nalajh
         Tes
         Tosontsengel
         Tsetserleg
         Tumentsogt
+    Karakorum
+    Shangtu
+    Iske Kazan
+    Ulan-Bator
+    Ulan-Ude
+    Erdenet
+    Darhan
+    Cojbalsan
+    Moron
+    Ulaangom
+    Hovd
+    Uliastaj
+    Bajanhongor
+    Olgij
+    Suhbaatar
+    Arvajheer
+    Cecerleg
+    Sajnsand
+    Altaj
+    Ondorhaan
+    Bulgan
+    Zuunmod
+    Baruun-Urt
+    Dalanzadgad
+    Mandalgovi
+    Zuunharaa
+    Cojr
+    Batshireet
+    Batsumber
+    Berh
+    Dariganga
+    Dasincilen
+    Hanh
+    Har-Ajrag
+    Hagtal
+    Hutag
+    Nalajh
+    Tes
+    Tosontsengel
+    Tsetserleg
+    Tumentsogt
 #UNITS Nation2
+,     010,    ²¾¥ÁªÌ
+,     040,    ¥Á§L
+,     102,    ½b¤â
+,     102,    ¤M¤â
+,     103,    ¤õºj¤â
+,     131,    °¨¤}¤â
+,     132,    »X¥jÃM§L
+,     200,    ¦|²î
+, 010,    移民者
+, 040,    民兵
+, 102,    箭手
+, 102,    刀手
+, 103,    火槍手
+, 131,    馬弓手
+, 132,    蒙古騎兵
+, 200,    帆船

branches/highdpi/Localization/zh-Hant/Tribes/Persians.tribe.txt

-              r123
+              r465
 #CHOOSE ªi´µ
 #n ªi´µ¤H
 #s ªi´µ
 #a ªi´µ
+#CHOOSE 波斯
+#n 波斯人
+#s 波斯
+#a 波斯
 #COLOR EB830B
 #SYMBOLS Nation1, 46
 …
 #CITIES
         Persepolis
         Pasargadae
         Susa
         Arbela
         Bactra
         Ecbatana
         Ergili
         Dariush Kabir
         Ghulaman
         Zohak
         Istakhr
         Zanjan
         Borazjan
         Artacoana
         Phrada
         Dakyanus
         Bampur
         Tureng Tepe
         Bukhara
         Nishapur
         Tabriz
         Kabul
         Ormuz
         Khorasan
         Kerman
         Ctesiphon
         Hatra
         Rhagae
         Hecatompylos
         Maracanda
         Tashkent
         Kyreshata
         Bisitun
         Jiruft
         Darabgird
         Siraf
         Gur
         Shiraz
         Shushtar
         Kandahar
         Tepe Hissar
         Kashan
         Anshan
         Ahvaz
         Dezful
         Mohammerah
         Awan
         Simash
         Tepe Sialk
+    Persepolis
+    Pasargadae
+    Susa
+    Arbela
+    Bactra
+    Ecbatana
+    Ergili
+    Dariush Kabir
+    Ghulaman
+    Zohak
+    Istakhr
+    Zanjan
+    Borazjan
+    Artacoana
+    Phrada
+    Dakyanus
+    Bampur
+    Tureng Tepe
+    Bukhara
+    Nishapur
+    Tabriz
+    Kabul
+    Ormuz
+    Khorasan
+    Kerman
+    Ctesiphon
+    Hatra
+    Rhagae
+    Hecatompylos
+    Maracanda
+    Tashkent
+    Kyreshata
+    Bisitun
+    Jiruft
+    Darabgird
+    Siraf
+    Gur
+    Shiraz
+    Shushtar
+    Kandahar
+    Tepe Hissar
+    Kashan
+    Anshan
+    Ahvaz
+    Dezful
+    Mohammerah
+    Awan
+    Simash
+    Tepe Sialk
 #UNITS Nation1
+,      040,    ¥Á§L
+,     101,    ªø¥Ù¤â
+,     102,    Ås¤M¤â
+,  040,    民兵
+, 101,    長矛手
+, 102,    彎刀手

branches/highdpi/Localization/zh-Hant/Tribes/Phoenicians.tribe.txt

-              r123
+              r465
 #CHOOSE ÔÚ¥§°ò
 #n ÔÚ¥§°ò¤H
 #s ÔÚ¥§°ò
 #a ÔÚ¥§°ò
+#CHOOSE 婓尼基
+#n 婓尼基人
+#s 婓尼基
+#a 婓尼基
 #COLOR B3FF00
 #SYMBOLS Nation1, 40
 …
 #CITIES
         Carthago
         Byblus
         Sidon
         Tyre
         Berot
         Tripolis
         Baalbeck
         Aradus
         Joppa
         Ashkalon
         Acre
         Ugarit
         Simyra
         Sarafand
         Gadir
         Utica
         Malaca
         Baria
         Carmona
         Sexi
         Abdera
         Caralis
         Panormus
         Leptis Parva
         Cartenna
         Rusicade
         Rusucurru
         Girba
         Leptis Magna
         Oea
         Sabratha
         Carthago Nova
         Wy't
         Tinx
         Rusaddit
         Theveste
         Bulla Regia
         Thugga
         Hadrumetum
         Zama Regia
         Thysdris
         Madauros
         Hippou Akra
         Cirta
         Cuicul
         Tipasa
         Lix
         Volubilis
         Ilici
         Hispalis
         Eryx
         Motya
         Drepanon
         Lilybaion
         Icosium
         Iol
         Eivissa
+    Carthago
+    Byblus
+    Sidon
+    Tyre
+    Berot
+    Tripolis
+    Baalbeck
+    Aradus
+    Joppa
+    Ashkalon
+    Acre
+    Ugarit
+    Simyra
+    Sarafand
+    Gadir
+    Utica
+    Malaca
+    Baria
+    Carmona
+    Sexi
+    Abdera
+    Caralis
+    Panormus
+    Leptis Parva
+    Cartenna
+    Rusicade
+    Rusucurru
+    Girba
+    Leptis Magna
+    Oea
+    Sabratha
+    Carthago Nova
+    Wy't
+    Tinx
+    Rusaddit
+    Theveste
+    Bulla Regia
+    Thugga
+    Hadrumetum
+    Zama Regia
+    Thysdris
+    Madauros
+    Hippou Akra
+    Cirta
+    Cuicul
+    Tipasa
+    Lix
+    Volubilis
+    Ilici
+    Hispalis
+    Eryx
+    Motya
+    Drepanon
+    Lilybaion
+    Icosium
+    Iol
+    Eivissa
 #UNITS Nation1
+,      040,    ¥Á§L
+,     131,    ¶H§L
+,     201,    ¤p¦|²î
+,  040,    民兵
+, 131,    象兵
+, 201,    小帆船

branches/highdpi/Localization/zh-Hant/Tribes/Romans.tribe.txt

-              r123
+              r465
 #CHOOSE ¥jÃ¹°¨
 #n Ã¹°¨¤H
 #s Ã¹°¨
 #a Ã¹°¨
+#CHOOSE 古羅馬
+#n 羅馬人
+#s 羅馬
+#a 羅馬
 #COLOR FFFFFF
 #SYMBOLS Nation1, 49
 …
 #CITIES
         Roma
         Ostia
         Paestum
         Capua
         Tarquinia
         Neapolis
         Pompeii
         Ercolanum
         Alba Longa
         Aquileia
         Tarracina
         Casinum
         Beneventum
         Saturnia
         Clusium
         Arretium
         Casilinum
         Genua
         Mediolanum
         Sabatia
         Asculum
         Populonia
         Castrum Novum
         Fanum Fortunae
         Venusia
         Brundisium
         Canusium
         Panormus
         Opitergium
         Altinum
         Patavium
         Regium Lepicum
         Augusta Taurinorum
         Cremona
         Mutina
         Forum Livi
         Forum Sempronii
         Florentia
         Pisae
         Reate
         Amiternum
         Tarentum
         Pometia
         Tusculum
         Nomentum
         Lavinium
         Signia
         Antium
         Velitrae
         Praeneste
         Aquilonia
         Bonomia
         Patavium
         Volaterrae
         Vetulonia
         Potentia
         Pisaurum
         Aeclanum
         Grumentum
         Liternum
         Puteoli
         Fabrateria Nova
         Sipontum
         Buxentum
         Castrum Hannibalis
         Minervium
         Augusta Praetoria
         Brixia
         Sena Iulia
         Hispellum
+    Roma
+    Ostia
+    Paestum
+    Capua
+    Tarquinia
+    Neapolis
+    Pompeii
+    Ercolanum
+    Alba Longa
+    Aquileia
+    Tarracina
+    Casinum
+    Beneventum
+    Saturnia
+    Clusium
+    Arretium
+    Casilinum
+    Genua
+    Mediolanum
+    Sabatia
+    Asculum
+    Populonia
+    Castrum Novum
+    Fanum Fortunae
+    Venusia
+    Brundisium
+    Canusium
+    Panormus
+    Opitergium
+    Altinum
+    Patavium
+    Regium Lepicum
+    Augusta Taurinorum
+    Cremona
+    Mutina
+    Forum Livi
+    Forum Sempronii
+    Florentia
+    Pisae
+    Reate
+    Amiternum
+    Tarentum
+    Pometia
+    Tusculum
+    Nomentum
+    Lavinium
+    Signia
+    Antium
+    Velitrae
+    Praeneste
+    Aquilonia
+    Bonomia
+    Patavium
+    Volaterrae
+    Vetulonia
+    Potentia
+    Pisaurum
+    Aeclanum
+    Grumentum
+    Liternum
+    Puteoli
+    Fabrateria Nova
+    Sipontum
+    Buxentum
+    Castrum Hannibalis
+    Minervium
+    Augusta Praetoria
+    Brixia
+    Sena Iulia
+    Hispellum
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation1
+,      101,    Ã¹°¨¨B§L
+,     131,    Ã¹°¨ÃM§L
+,     200,    ¦h¼Õ²î
+,  101,    羅馬步兵
+, 131,    羅馬騎兵
+, 200,    多槳船

branches/highdpi/Localization/zh-Hant/Tribes/Russians.tribe.txt

-              r123
+              r465
 #CHOOSE «X°ê
 #n «X°ê¤H
 #s «X°ê
 #a «XÃ¹´µ
+#CHOOSE 俄國
+#n 俄國人
+#s 俄國
+#a 俄羅斯
 #COLOR E70000
 #SYMBOLS Nation2, 94
 …
 #CITIES
         Moskva
         Sankt-Peterburg
         Kiev
         Minsk
         Odesa
         Sverdlovsk
         Vladivostok
         Novgorod
         Kharkov
         Krasnojarsk
         Rostov-na-Donu
         Kursk
         Samara
         Magnitogorsk
         Jaroslavl
         Novosibirsk
         Omsk
         Smolensk
         Perm
         Voronezh
         Sevastopol
         Ufa
         Krivoy Rog
         Niznij Novgorod
         Chelabinsk
         Dnipropetrovsk
         Donetsk
         Volgograd
         Voronezh
         Saratov
         Zaporizhzhya
         Lviv
         Toljatti
         Simbirsk
         Izhevsk
         Krasnodar
         Chabarovsk
         Irkutsk
         Barnaul
         Novokuzneck
         Penza
         Razan
         Orenburg
         Lipeck
         Naberezhnyje Chelny
         Mykolayiv
         Tula
         Gomel
         Tumen
         Kemerovo
         Mariupol
         Astrachan
         Tomsk
         Kirov
         Ivanovo
         Luhansk
         Bransk
         Cheboksary
         Tver
         Nizhnij Tagil
         Makiyivka
         Murmansk
         Mogilev
         Kurgan
         Archangelsk
         Sochi
         Vitebsk
         Vinnytsya
         Orel
         Stavropol
         Simferopol
         Kaluga
         Vladimir
         Belgorod
         Machachkala
         Kherson
         Cherepovec
         Poltava
         Saransk
         Tambov
         Chita
         Vladikavkaz
         Grodno
         Vologda
         Chernihiv
         Komsomolsk-na-Amure
         Cherkasy
         Sumy
         Horlivka
         Volzhskij
         Kostroma
         Taganrog
         Zhytomyr
         Petrozavodsk
         Dzerzhinsk
         Surgut
         Orsk
         Angarsk
         Sterlitamak
+    Moskva
+    Sankt-Peterburg
+    Kiev
+    Minsk
+    Odesa
+    Sverdlovsk
+    Vladivostok
+    Novgorod
+    Kharkov
+    Krasnojarsk
+    Rostov-na-Donu
+    Kursk
+    Samara
+    Magnitogorsk
+    Jaroslavl
+    Novosibirsk
+    Omsk
+    Smolensk
+    Perm
+    Voronezh
+    Sevastopol
+    Ufa
+    Krivoy Rog
+    Niznij Novgorod
+    Chelabinsk
+    Dnipropetrovsk
+    Donetsk
+    Volgograd
+    Voronezh
+    Saratov
+    Zaporizhzhya
+    Lviv
+    Toljatti
+    Simbirsk
+    Izhevsk
+    Krasnodar
+    Chabarovsk
+    Irkutsk
+    Barnaul
+    Novokuzneck
+    Penza
+    Razan
+    Orenburg
+    Lipeck
+    Naberezhnyje Chelny
+    Mykolayiv
+    Tula
+    Gomel
+    Tumen
+    Kemerovo
+    Mariupol
+    Astrachan
+    Tomsk
+    Kirov
+    Ivanovo
+    Luhansk
+    Bransk
+    Cheboksary
+    Tver
+    Nizhnij Tagil
+    Makiyivka
+    Murmansk
+    Mogilev
+    Kurgan
+    Archangelsk
+    Sochi
+    Vitebsk
+    Vinnytsya
+    Orel
+    Stavropol
+    Simferopol
+    Kaluga
+    Vladimir
+    Belgorod
+    Machachkala
+    Kherson
+    Cherepovec
+    Poltava
+    Saransk
+    Tambov
+    Chita
+    Vladikavkaz
+    Grodno
+    Vologda
+    Chernihiv
+    Komsomolsk-na-Amure
+    Cherkasy
+    Sumy
+    Horlivka
+    Volzhskij
+    Kostroma
+    Taganrog
+    Zhytomyr
+    Petrozavodsk
+    Dzerzhinsk
+    Surgut
+    Orsk
+    Angarsk
+    Sterlitamak
 #UNITS Nation2
+,     010,    ²¾¥ÁªÌ
+,     040,    ¥Á§L
+,     102,    ªø¥Ù¤â
+,     104,    ¨Bºj¤â
+,     133,    ôÂÄ§JÃM§L
+,     134,    »´ÃM§L
+,     135,    T-34©Z§J
 ,     301,    ¦Ì®æ-29
+, 010,    移民者
+, 040,    民兵
+, 102,    長矛手
+, 104,    步槍手
+, 133,    哥薩克騎兵
+, 134,    輕騎兵
+, 135,    T-34坦克
+, 301,    米格-29

branches/highdpi/Localization/zh-Hant/Tribes/Spanish.tribe.txt

-              r123
+              r465
 #CHOOSE ¦è¯Z¤ú
 #n ¦è¯Z¤ú¤H
 #s ¦è¯Z¤ú
 #a ¦è¯Z¤ú
+#CHOOSE 西班牙
+#n 西班牙人
+#s 西班牙
+#a 西班牙
 #COLOR FFFF00
 #SYMBOLS Nation1, 47
 …
 #CITIES
         Madrid
         Sevilla
         Toledo
         Cordoba
         Valencia
         Salamanca
         Barcelona
         Valladolid
         Zaragoza
         Cadiz
         Bilbao
         Granada
         Malaga
         Pamplona
         Vigo
         Avila
         Leon
         Burgos
         Oviedo
         Santander
         Ciudad Rodrigo
         Calatrava
         Cartagena
         Murcia
         Las Palmas
         Palma de Mallorca
         Alicante
         Gijon
         L'Hospitalet
         A Coruna
         Vitoria-Gasteiz
         Santa Cruz de Tenerife
         Badalona
         Elche
         Mostoles
         Sabadell
         Jerez de la Frontera
         Donostia-San Sebastian
         Fuenlabrada
         Terrassa
         Leganes
         Alcala de Henares
         Almeria
         Getafe
         Albacete
         Alcorcon
         Castellon de la Plana
         Huelva
         Badajoz
         La Laguna
         Logrono
         Santa Coloma de Gramanet
         Tarragona
         Lleida
         Jaen
         Marbella
         Ourense
         Mataro
         Algeciras
         Dos Hermanas
         Torrejon de Ardoz
         Barakaldo
         Santiago de Compostela
         Alcobendas
         Reus
         Telde
         Lugo
         San Fernando
         Getxo
         Aviles
         Caceres
         Cornella
         Palencia
         Ferrol
         Sant Boi
         Coslada
         Parla
         Lorca
         El Puerto de Santa Maria
         Talavera de la Reina
         Pontevedra
         Ceuta
         Girona
         Melilla
         Pozuelo de Alarcon
         Guadalajara
         Zamora
         Torrent
         Manresa
         Ponferrada
         El Prat
         Chiclana de la Frontera
         Sanlucar de Barrameda
         Ciudad Real
         La Linea de la Concepcion
         Rubi
         Alcoy
         Gandia
         San Sebastian de los Reyes
         Las Rozas de Madrid
         Torrevieja
         Alcala de Guadaira
+    Madrid
+    Sevilla
+    Toledo
+    Cordoba
+    Valencia
+    Salamanca
+    Barcelona
+    Valladolid
+    Zaragoza
+    Cadiz
+    Bilbao
+    Granada
+    Malaga
+    Pamplona
+    Vigo
+    Avila
+    Leon
+    Burgos
+    Oviedo
+    Santander
+    Ciudad Rodrigo
+    Calatrava
+    Cartagena
+    Murcia
+    Las Palmas
+    Palma de Mallorca
+    Alicante
+    Gijon
+    L'Hospitalet
+    A Coruna
+    Vitoria-Gasteiz
+    Santa Cruz de Tenerife
+    Badalona
+    Elche
+    Mostoles
+    Sabadell
+    Jerez de la Frontera
+    Donostia-San Sebastian
+    Fuenlabrada
+    Terrassa
+    Leganes
+    Alcala de Henares
+    Almeria
+    Getafe
+    Albacete
+    Alcorcon
+    Castellon de la Plana
+    Huelva
+    Badajoz
+    La Laguna
+    Logrono
+    Santa Coloma de Gramanet
+    Tarragona
+    Lleida
+    Jaen
+    Marbella
+    Ourense
+    Mataro
+    Algeciras
+    Dos Hermanas
+    Torrejon de Ardoz
+    Barakaldo
+    Santiago de Compostela
+    Alcobendas
+    Reus
+    Telde
+    Lugo
+    San Fernando
+    Getxo
+    Aviles
+    Caceres
+    Cornella
+    Palencia
+    Ferrol
+    Sant Boi
+    Coslada
+    Parla
+    Lorca
+    El Puerto de Santa Maria
+    Talavera de la Reina
+    Pontevedra
+    Ceuta
+    Girona
+    Melilla
+    Pozuelo de Alarcon
+    Guadalajara
+    Zamora
+    Torrent
+    Manresa
+    Ponferrada
+    El Prat
+    Chiclana de la Frontera
+    Sanlucar de Barrameda
+    Ciudad Real
+    La Linea de la Concepcion
+    Rubi
+    Alcoy
+    Gandia
+    San Sebastian de los Reyes
+    Las Rozas de Madrid
+    Torrevieja
+    Alcala de Guadaira
 #UNITS StdUnits
+,     040,    ¥Á§L
+, 040,    民兵
 #UNITS Nation1
+,      103,    ¤õºj¤â
+,     133,    »´ÃM§L
+,     201,    xÄ¥
+,  103,    火槍手
+, 133,    輕騎兵
+, 201,    軍艦

branches/highdpi/Localization/zh-Hant/Tribes/StdUnits.txt

-              r123
+              r465
 ,      074,    ¥£Æ×³Ò¤u
 ,      075,    ¦Û¥Ñ¥Á²³
 ,      071,    ¤p¼ç¸¥
 ,      073,    ·Æµ¾Éó
 ,      064,    ³æ®é¦|²î
 ,     010,    ©Ý¯îªÌ
 ,     011,    ¤uµ{®v
 ,     021,    ¯SÏú§L
 ,     030,    «Ø³]¶¤
 ,     017,    «Ø«°¦a
 ,     041,    ¦u«°½Ã§L
 ,     100,    ÆZ¾Ô¤h
 ,     100,    ¤}§L
 ,     100,    ÆZ¾Ô¤h
 ,     100,    ÆZ¾Ô¤h
 ,     101,    Ã¹°¨x¹Î
 ,     101,    ªø¥Ù¤â
 ,     101,    ¤è°}§L
 ,     101,    ½b¤â
 ,     102,    ¦u½Ã
 ,     102,    ¦u½Ã
 ,     102,    ¦u½Ã
 ,     102,    ¦u½Ã
 ,     103,    ¤õºj¤â
 ,     103,    ¤õºj¤â
 ,     103,    ¤õºj¤â
 ,     103,    ¤õºj¤â
 ,     104,    ¨Bºj¤â
 ,     104,    ¨Bºj¤â
 ,     104,    ¨Bºj¤â
 ,     104,    ¨Bºj¤â
 ,     105,    ¨B§L
 ,     105,    ¨B§L
 ,     105,    ¨B§L
 ,     105,    ¨B§L
 ,     106,    ³°¾Ô¶¤
 ,     106,    ³°¾Ô¶¤
 ,     106,    ³°¾Ô¶¤
 ,     106,    ³°¾Ô¶¤
 ,     110,    ¸Ë¥Ò¨B§L
 ,     110,    ¸Ë¥Ò¨B§L
 ,     110,    ¸Ë¥Ò¨B§L
 ,     110,    ¸Ë¥Ò¨B§L
 ,     130,    ÃM§L
 ,     130,    ÃM§L
 ,     130,    ÃM§L
 ,     130,    ÃM§L
 ,     131,    ÃM§L
 ,     131,    ÃM§L
 ,     131,    ÃM§L
 ,     131,    ÃM§L
 ,     132,    ÃM¤h
 ,     132,    ÃM¤h
 ,     132,    ÃM¤h
 ,     132,    ÃM¤h
 ,     133,    ÀsÃM§L
 ,     133,    ÀsÃM§L
 ,     133,    ÀsÃM§L
 ,     133,    ÀsÃM§L
 ,     134,    »´ÃM§L
 ,     134,    »´ÃM§L
 ,     134,    »´ÃM§L
 ,     134,    »´ÃM§L
 ,     135,    ©Z§J
 ,     135,    ©Z§J
 ,     135,    ©Z§J
 ,     135,    ©Z§J
 ,     136,    ¸Ë¥Ò¨®
 ,     136,    ¸Ë¥Ò¨®
 ,     136,    ¸Ë¥Ò¨®
 ,     136,    ¸Ë¥Ò¨®
 ,    170,    §ë¥Û¨®
 ,    170,    §ð«°¶ð
 ,    170,    ©¸¬¶
 ,    170,    ©¸¬¶
 ,    171,    ¥[¹A¬¶
 ,    171,    ¥[¹A¬¶
 ,    171,    ¥[¹A¬¶
 ,    171,    ¥[¹A¬¶
 ,    172,    ºh¼u¬¶
 ,    172,    ºh¼u¬¶
 ,    172,    ºh¼u¬¶
 ,    172,    ºh¼u¬¶
 ,    173,    ¤õ½b¬¶
 ,    173,    ¤õ½b¬¶
 ,    173,    ¤õ½b¬¶
 ,    173,    ¤õ½b¬¶
 ,    200,    ¦|²î
 ,    200,    ¦|²î
 ,    200,    ¦|²î
 ,    200,    ¦|²î
 ,    201,    ¤j¦|²î
 ,    201,    §Ö³t¦|²î
 ,    201,    Å@½ÃÄ¥
 ,    201,    Å@½ÃÄ¥
 ,    202     ÅK¥ÒÄ¥
 ,    202,    ÅX³vÄ¥
 ,    202,    ¨µ¬vÄ¥
 ,    202,    ¨µ¬vÄ¥
 ,    203,    ¾É¼u¨µ¬vÄ¥
 ,    203,    ¾Ô¦CÄ¥
 ,    203,    ¾Ô¦C¨µ¬vÄ¥
 ,    203,    ¾Ô¦CÄ¥
 ,    210,    ¹B¿éÄ¥
 ,    210,    ¹B¿éÄ¥
 ,    210,    ¹B¿éÄ¥
 ,    210,    ¹B¿éÄ¥
 ,    220,    ¯è¥À
 ,    220,    ¯è¥À
 ,    220,    ¯è¥À
 ,    220,    ¯è¥À
 ,    240,    ¼ç¸¥
 ,    240,    ¼ç¸¥
 ,    240,    ¼ç¸¥
 ,    240,    ¼ç¸¥
 ,    300,    ¾Ô¤æÉó
 ,    300,    ¾Ô¤æÉó
 ,    300,    ¾Ô¤æÉó
 ,    300,    ¾Ô¤æÉó
 ,    301,    ¼QÉa¾Ô¤æÉó
 ,    301,    ¼QÉa¾Ô¤æÉó
 ,    301,    ª½¤ÉÉó
 ,    301,    ¼QÉa¾Ô¤æÉó
 ,    310,    ÅF¬µÉó
 ,    310,    ÅF¬µÉó
 ,    310,    ¸¸¥
 ,    310,    ÅF¬µÉó
 ,    311,    ²{¥NÅF¬µÉó
 ,    311,    ²{¥NÅF¬µÉó
 ,    311,    ²{¥NÅF¬µÉó
 ,    311,    ²{¥NÅF¬µÉó
+,  074,    奴勞工
+,  075,    自由民眾
+,  071,    小潛艇
+,  073,    滑翔机
+,  064,    單桅帆船
+, 010,    拓荒者
+, 011,    工程師
+, 021,    特种兵
+, 030,    建設隊
+, 017,    建城地
+, 041,    守城衛兵
+, 100,    蠻戰士
+, 100,    弓兵
+, 100,    蠻戰士
+, 100,    蠻戰士
+, 101,    羅馬軍團
+, 101,    長矛手
+, 101,    方陣兵
+, 101,    箭手
+, 102,    守衛
+, 102,    守衛
+, 102,    守衛
+, 102,    守衛
+, 103,    火槍手
+, 103,    火槍手
+, 103,    火槍手
+, 103,    火槍手
+, 104,    步槍手
+, 104,    步槍手
+, 104,    步槍手
+, 104,    步槍手
+, 105,    步兵
+, 105,    步兵
+, 105,    步兵
+, 105,    步兵
+, 106,    陸戰隊
+, 106,    陸戰隊
+, 106,    陸戰隊
+, 106,    陸戰隊
+, 110,    裝甲步兵
+, 110,    裝甲步兵
+, 110,    裝甲步兵
+, 110,    裝甲步兵
+, 130,    騎兵
+, 130,    騎兵
+, 130,    騎兵
+, 130,    騎兵
+, 131,    騎兵
+, 131,    騎兵
+, 131,    騎兵
+, 131,    騎兵
+, 132,    騎士
+, 132,    騎士
+, 132,    騎士
+, 132,    騎士
+, 133,    龍騎兵
+, 133,    龍騎兵
+, 133,    龍騎兵
+, 133,    龍騎兵
+, 134,    輕騎兵
+, 134,    輕騎兵
+, 134,    輕騎兵
+, 134,    輕騎兵
+, 135,    坦克
+, 135,    坦克
+, 135,    坦克
+, 135,    坦克
+, 136,    裝甲車
+, 136,    裝甲車
+, 136,    裝甲車
+, 136,    裝甲車
+,    170,    投石車
+,    170,    攻城塔
+,    170,    弩炮
+,    170,    弩炮
+,    171,    加農炮
+,    171,    加農炮
+,    171,    加農炮
+,    171,    加農炮
+,    172,    榴彈炮
+,    172,    榴彈炮
+,    172,    榴彈炮
+,    172,    榴彈炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    173,    火箭炮
+,    200,    帆船
+,    200,    帆船
+,    200,    帆船
+,    200,    帆船
+,    201,    大帆船
+,    201,    快速帆船
+,    201,    護衛艦
+,    201,    護衛艦
+,    202 鐵甲艦
+,    202,    驅逐艦
+,    202,    巡洋艦
+,    202,    巡洋艦
+,    203,    導彈巡洋艦
+,    203,    戰列艦
+,    203,    戰列巡洋艦
+,    203,    戰列艦
+,    210,    運輸艦
+,    210,    運輸艦
+,    210,    運輸艦
+,    210,    運輸艦
+,    220,    航母
+,    220,    航母
+,    220,    航母
+,    220,    航母
+,    240,    潛艇
+,    240,    潛艇
+,    240,    潛艇
+,    240,    潛艇
+,    300,    戰斗机
+,    300,    戰斗机
+,    300,    戰斗机
+,    300,    戰斗机
+,    301,    噴气戰斗机
+,    301,    噴气戰斗机
+,    301,    直升机
+,    301,    噴气戰斗机
+,    310,    轟炸机
+,    310,    轟炸机
+,    310,    飛艇
+,    310,    轟炸机
+,    311,    現代轟炸机
+,    311,    現代轟炸机
+,    311,    現代轟炸机
+,    311,    現代轟炸机

branches/highdpi/Localization/zh-Hant/Tribes/Vikings.tribe.txt

-              r123
+              r465
 #CHOOSE ºû¨Ê
 #n ºû¨Ê¤H
 #s ºû¨Ê
 #a ºû¨Ê
+#CHOOSE 維京
+#n 維京人
+#s 維京
+#a 維京
 #COLOR 9FBB8B
 #SYMBOLS Nation2, 93
 …
 #CITIES
         Trondheim
         Kaupang
         Uppsala
         Hladir
         Arhus
         Viborg
         Roskilde
         The Udal
         Lindholm
         Jorvik
         Westness
         Skara
         Ravning Enge
         Birka
         Jarlshof
         Sigtuna
         Odense
         Lund
         Larne
         Hedeby
         Aldeigjuborg
         Nonnebakken
         Stockholm
         Oslo
         Kobenhavn
         Goteborg
         Malmo
         Bergen
         Aalborg
         Linkoping
         Vasteras
         Orebro
         Norrkopping
         Helsingborg
         Jonkoping
         Reykjavik
         Stavanger
         Umea
         Baerum
         Boras
         Sundsvall
         Gavle
         Frederiksberg
         Eskilstuna
         Halmstad
         Huddinge
         Esbjerg
         Karlstad
         Sodertalje
         Nacka
         Kristianstad
         Vaxjo
         Botkyrka
         Skelleftea
         Lulea
         Kristiansand
         Haninge
         Gentofte
         Fredrikstad
         Kungsbacka
         Randers
         Gladsakse
         Kolding
         Karlskrona
         Jarfalla
         Taby
         Kalmar
         Helsingor
         Ostersund
         Tromso
         Sollentuna
         Herning
         Gotland
         Solna
         Horsens
         Molndal
         Ornskoldsvik
         Falun
         Drammen
         Vejle
         Trollhattan
         Varberg
         Norrtalje
         Silkeborg
         Sandnes
         Lyngby-Tarbaek
         Skien
         Skovde
         Hvidovre
         Nykoping
         Uddevalla
         Hassleholm
         Asker
         Fredericia
         Greve
         Borlange
         Sarpsborg
         Naestved
         Hoje Tastrup
         Ballerup
         Svendborg
         Lillehammer
         Kopavogur
         Hafnarfjordur
         Akureyri
         Godthab
         Holsteinsborg
+    Trondheim
+    Kaupang
+    Uppsala
+    Hladir
+    Arhus
+    Viborg
+    Roskilde
+    The Udal
+    Lindholm
+    Jorvik
+    Westness
+    Skara
+    Ravning Enge
+    Birka
+    Jarlshof
+    Sigtuna
+    Odense
+    Lund
+    Larne
+    Hedeby
+    Aldeigjuborg
+    Nonnebakken
+    Stockholm
+    Oslo
+    Kobenhavn
+    Goteborg
+    Malmo
+    Bergen
+    Aalborg
+    Linkoping
+    Vasteras
+    Orebro
+    Norrkopping
+    Helsingborg
+    Jonkoping
+    Reykjavik
+    Stavanger
+    Umea
+    Baerum
+    Boras
+    Sundsvall
+    Gavle
+    Frederiksberg
+    Eskilstuna
+    Halmstad
+    Huddinge
+    Esbjerg
+    Karlstad
+    Sodertalje
+    Nacka
+    Kristianstad
+    Vaxjo
+    Botkyrka
+    Skelleftea
+    Lulea
+    Kristiansand
+    Haninge
+    Gentofte
+    Fredrikstad
+    Kungsbacka
+    Randers
+    Gladsakse
+    Kolding
+    Karlskrona
+    Jarfalla
+    Taby
+    Kalmar
+    Helsingor
+    Ostersund
+    Tromso
+    Sollentuna
+    Herning
+    Gotland
+    Solna
+    Horsens
+    Molndal
+    Ornskoldsvik
+    Falun
+    Drammen
+    Vejle
+    Trollhattan
+    Varberg
+    Norrtalje
+    Silkeborg
+    Sandnes
+    Lyngby-Tarbaek
+    Skien
+    Skovde
+    Hvidovre
+    Nykoping
+    Uddevalla
+    Hassleholm
+    Asker
+    Fredericia
+    Greve
+    Borlange
+    Sarpsborg
+    Naestved
+    Hoje Tastrup
+    Ballerup
+    Svendborg
+    Lillehammer
+    Kopavogur
+    Hafnarfjordur
+    Akureyri
+    Godthab
+    Holsteinsborg
 #UNITS Nation2
+,     010,    ²¾¥ÁªÌ
+,     040,    ¥Á§L
+,     101,    ªø¥Ù¤â
+,     101,    ÆZ¾Ô¤h
+,     102,    ½b¤â
+,     102,    ¼C¤h
+,     102,    ¼C¤h
+,     133,    ·ÃM§L
+, 010,    移民者
+, 040,    民兵
+, 101,    長矛手
+, 101,    蠻戰士
+, 102,    箭手
+, 102,    劍士
+, 102,    劍士
+, 133,    風騎兵

branches/highdpi/Log.pas

-              r412
+              r465
 uses
   UDpiControls, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  UDpiControls, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   StdCtrls, Menus;
 …
     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: TDpiForm;
     procedure Add(Level, Turn: Integer; Text: pchar);
+    procedure Add(Level, Turn: Integer; Text: PChar);
   private
     MaxLevel: Integer;
 …
 begin
   MaxLevel := TDpiMenuItem(Sender).Tag;
   TDpiMenuItem(Sender).Checked := true;
+  TDpiMenuItem(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
 …
 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
 …
         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
 …
 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

branches/highdpi/Messg.pas

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

branches/highdpi/MiniMap.pas

-              r464
+              r465
 {$INCLUDE Switches.inc}
 unit UMiniMap;
+unit MiniMap;
 interface
 …
 uses
   ScreenTools, UPixelPointer, Global, GameServer, IsoEngine, Tribes;
+  ScreenTools, PixelPointer, Global, GameServer, IsoEngine, Tribes;
 const
 …
 procedure TMiniMap.PaintRandom(Brightness, StartLandMass: Integer; WorldSize: TPoint);
 var
+  i, x, y, xm, cm: Integer;
+  i, x, y, xm: Integer;
+  cm: Int64;
   MiniPixel: TPixelPointer;
   Map: ^TTileList;
 …
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
   MiniPixel := PixelPointer(Bitmap);
+  MiniPixel := TPixelPointer.Create(Bitmap);
   for y := 0 to ScaleToNative(Size.Y) - 1 do begin
     for x := 0 to ScaleToNative(Size.X) - 1 do begin
 …
 procedure TMiniMap.PaintFile(SaveMap: TMapArray);
 var
+  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
+  cm: Int64;
+  i, x, y, xm, Tile, OwnColor, EnemyColor: integer;
   MiniPixel: TPixelPointer;
   PrevMiniPixel: TPixelPointer;
 …
   if Mode = mmPicture then begin
     Bitmap.BeginUpdate;
     MiniPixel := PixelPointer(Bitmap);
     PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+    MiniPixel := TPixelPointer.Create(Bitmap);
+    PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
     for y := 0 to ScaleToNative(Size.Y) - 1 do begin
       for x := 0 to ScaleToNative(Size.X) - 1 do begin
 …
           MiniPixel.SetX(xm);
           Tile := SaveMap[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
+          if Tile > 11 then Tile := fUnknown;
           if Tile and fTerrain = fUNKNOWN then
             cm := $000000
 …
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
   MiniPixel := PixelPointer(Bitmap);
   PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+  MiniPixel := TPixelPointer.Create(Bitmap);
+  PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
   for y := 0 to ScaleToNative(Size.Y) - 1 do begin
     for x := 0 to ScaleToNative(Size.X) - 1 do begin
 …
 end;
 end.

branches/highdpi/Network/NetworkClient.pas

-              r464
+              r465
+unit UNetworkClient;
+{$mode delphi}
+unit NetworkClient;
 interface
 uses
   Classes, SysUtils{$IFDEF LINUX}, fpAsync, fpsock{$ENDIF}, Protocol;
+  Classes, SysUtils{$IFDEF UNIX}, fpAsync, fpsock{$ENDIF}, Protocol;
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 type
   { TTCPClientThread }
 …
 uses
   LocalPlayer{$IFDEF LINUX}, Global, UNetworkCommon{$ENDIF};
+  LocalPlayer{$IFDEF UNIX}, Global, NetworkCommon{$ENDIF};
 procedure Client(Command, Player: Integer; var Data);
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 var
   Cmd: TCommand;
 {$ENDIF}
 begin
   {$IFDEF LINUX}
+  {$IFDEF UNIX}
   Cmd := TCommand(Command);
   case Cmd of
 …
 end;
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 function LocalServer(Command, Player, Subject: Integer; var Data): Integer; stdcall;
 begin
 …
 end.

branches/highdpi/Network/NetworkCommon.pas

-              r464
+              r465
+unit UNetworkCommon;
+{$mode delphi}
+unit NetworkCommon;
 interface
 …
 procedure StreamAppend(Stream: TStream; SourceStream: TStream);
 procedure StreamRemoveRead(Stream: TMemoryStream);
 implementation
 …
 end.

branches/highdpi/Network/NetworkServer.pas

-              r464
+              r465
+unit UNetworkServer;
+{$mode delphi}
+unit NetworkServer;
 interface
 uses
+  Classes, SysUtils{$IFDEF LINUX}, fgl, fpAsync, fpsock, fphttpclient{$ENDIF}, Protocol;
+{$IFDEF LINUX}
+  Classes, SysUtils{$IFDEF UNIX}, Generics.Collections, fpAsync, fpsock,
+  fphttpclient{$ENDIF}, Protocol;
+{$IFDEF UNIX}
 type
   TNetworkServer = class;
 …
   { TNetworkServerPlayers }
   TNetworkServerPlayers = class(TFPGObjectList<TNetworkServerPlayer>)
+  TNetworkServerPlayers = class(TObjectList<TNetworkServerPlayer>)
     function SearchById(Id: Integer): TNetworkServerPlayer;
   end;
 …
   private
     Players: TNetworkServerPlayers;
     Connections: TFPGObjectList<TNetworkServerConnection>;
+    Connections: TObjectList<TNetworkServerConnection>;
     TCPServerThread: TTCPServerThread;
     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;
 …
 {$ENDIF}
 procedure Client(Command, Player: integer; var Data); stdcall;
+procedure Client(Command, Player: Integer; var Data); stdcall;
 implementation
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 uses
   Global, UNetworkCommon;
+  Global, NetworkCommon;
 {$ENDIF}
 procedure Client(Command, Player: integer; var Data);
 begin
   {$IFDEF LINUX}
+procedure Client(Command, Player: Integer; var Data);
+begin
+  {$IFDEF UNIX}
   if not Assigned(NetworkServer) then begin
     NetworkServer := TNetworkServer.Create;
 …
 end;
 {$IFDEF LINUX}
+{$IFDEF UNIX}
 { TNetworkServerPlayers }
 …
   Players := TNetworkServerPlayers.Create;
   ServerEventLoop := TEventLoop.Create;
   Connections := TFPGObjectList<TNetworkServerConnection>.Create;
+  Connections := TObjectList<TNetworkServerConnection>.Create;
   TCPServer := TTCPServer.Create(nil);
   with TCPServer do begin
 …
 end.

branches/highdpi/NoTerm.pas

-              r378
+              r465
     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;
 …
     procedure NewStat;
     procedure EndPlaying;
     procedure ShowActive(p: integer; Active: boolean);
+    procedure ShowActive(P: Integer; Active: Boolean);
     procedure ShowYear;
   end;
 …
   NoTermDlg: TNoTermDlg;
+procedure Client(Command, Player: integer; var Data); stdcall;
+procedure Client(Command, Player: Integer; var Data); stdcall;
 implementation
 uses
   GameServer, log;
+  GameServer, Log;
 {$R *.lfm}
 …
   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,
 , 0, -36);
 var
   FormsCreated: boolean;
+  FormsCreated: Boolean;
 procedure TNoTermDlg.FormCreate(Sender: TObject);
 …
 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
 …
   else
     EndCommand := sResign;
   Server(EndCommand, me, 0, nil^)
 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);
+  Server(EndCommand, Me, 0, nil^);
+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);
 end;
 …
   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));
   DpiBitCanvas(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;
+    + ' ' + TurnToString(G.RO[Me].Turn));
+  DpiBitBltCanvas(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;
   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:
 …
         Shade := TDpiBitmap.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 := TDpiBitmap.Create;
         State.SetSize(192, 20);
 …
     cNewGame, cLoadGame:
       begin
         inc(Round);
+        Inc(Round);
         if Mode = rmRunning then
         begin
 …
           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
 …
     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
 …
         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;
         DpiApplication.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
 …
           TotalStatTime := TotalStatTime + ActiveDuration;
           if not DisallowShowActive[Active] then
             ShowActive(Active, false);
+            ShowActive(Active, False);
           DisallowShowActive[Active] := (ActiveDuration < TurnTime * 0.25) and
             (ActiveDuration < ShowActiveThreshold);
 …
         LastShowTurnChange := nowt;
         Active := integer(Data);
+        Active := Integer(Data);
         if (Active >= 0) and not DisallowShowActive[Active] then
           ShowActive(Active, true);
+          ShowActive(Active, True);
       end;
   end;
 …
     GoBtn.ButtonIndex := 23;
     GoBtn.Update;
     Server(sTurn, me, 0, nil^);
+    Server(sTurn, Me, 0, nil^);
   end;
 end;
 …
 procedure TNoTermDlg.FormPaint(Sender: TObject);
 var
   i, TimeShare: integer;
+  I, TimeShare: Integer;
 begin
   Fill(Canvas, 3, 3, ClientWidth - 6, ClientHeight - 6, 0, 0);
 …
 , 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
         DpiBitCanvas(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
+        DpiBitBltCanvas(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,
 , 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,
 + 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,
 , 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,
 + 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,
 …
 end;
 procedure Client(Command, Player: integer; var Data);
+procedure Client(Command, Player: Integer; var Data);
 begin
   if not FormsCreated then
   begin
     FormsCreated := true;
+    FormsCreated := True;
     DpiApplication.CreateForm(TNoTermDlg, NoTermDlg);
   end;
 …
 end;
 procedure TNoTermDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TNoTermDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin

branches/highdpi/Packages/DpiControls/DpiControls.lpk

-              r265
+              r465
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
+  <Package Version="5">
     <Name Value="DpiControls"/>
     <Type Value="RunAndDesignTime"/>
 …
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-${BuildMode}"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+        </SyntaxOptions>
+      </Parsing>
     </CompilerOptions>
     <Description Value="Controls with dimensions independent to screen DPI setting. The controls use internally VCL controls. All positions and sizes are scaled from DPI independent values."/>
 …
       </Item2>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="3">
       <Item1>

branches/highdpi/Packages/DpiControls/UDpiControls.pas

-              r463
+              r465
 unit UDpiControls;
-{$mode objfpc}{$H+}
 interface
 …
 uses
   {$IFDEF WINDOWS}Windows, {$ENDIF}Classes, SysUtils, LCLProc, LResources, Forms,
   FormEditingIntf, ProjectIntf, Controls, StdCtrls, fgl, Graphics, ComCtrls,
   ExtCtrls, LCLType, GraphType, Types, CustApp, LMessages, LCLIntf, Menus, Math,
   UPixelPointer2, Grids, Spin;
+  Generics.Collections, FormEditingIntf, ProjectIntf, Controls, StdCtrls, Graphics,
+  ComCtrls, ExtCtrls, LCLType, GraphType, Types, CustApp, LMessages, LCLIntf,
+  Menus, Math, UPixelPointer2, Grids, Spin;
 const
   FixedDpi = -1;
+  FixedDpi = 192;
 type
 …
     procedure SetName(AValue: string);
     procedure SetNativeFont(AValue: TFont);
-    procedure SetOnChange(AValue: TNotifyEvent);
     procedure SetPixelsPerInch(AValue: Integer);
     procedure SetSize(AValue: Integer);
 …
     property PixelsPerInch: Integer read GetPixelsPerInch write SetPixelsPerInch;
     property Height: Integer read GetHeight write SetHeight default 0;
     property OnChange: TNotifyEvent read FOnChange write SetOnChange;
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 …
     procedure SetFont(AValue: TDpiFont);
     procedure SetHint(AValue: string);
-    procedure SetOnChangeBounds(AValue: TNotifyEvent);
     procedure SetOnClick(AValue: TNotifyEvent);
     procedure SetOnDblClick(AValue: TNotifyEvent);
-    procedure SetOnResize(AValue: TNotifyEvent);
     procedure SetParentFont(AValue: Boolean);
     procedure SetShowHint(AValue: Boolean);
 …
     property Constraints: TDpiSizeConstraints read FConstraints write FConstraints;
     property Cursor: TCursor read GetCursor write SetCursor default crDefault;
     property OnResize: TNotifyEvent read FOnResize write SetOnResize;
     property OnChangeBounds: TNotifyEvent read FOnChangeBounds write SetOnChangeBounds;
+    property OnResize: TNotifyEvent read FOnResize write FOnResize;
+    property OnChangeBounds: TNotifyEvent read FOnChangeBounds write FOnChangeBounds;
     property OnClick: TNotifyEvent read GetOnClick write SetOnClick;
     property OnDblClick: TNotifyEvent read GetOnDblClick write SetOnDblClick;
 …
   end;
   TDpiControls = specialize TFPGObjectList<TDpiControl>;
+  TDpiControls = TObjectList<TDpiControl>;
   { TDpiControlBorderSpacing }
 …
   public
     property NativeCanvas: TCanvas read FNativeCanvas write SetNativeCanvas;
     procedure RoundRect(const Rect: TRect; RX, RY: Integer);
+    procedure RoundRect(const Rect: TRect; RX, RY: Integer); overload;
     procedure RoundRect(X1, Y1, X2, Y2: Integer; RX,RY: Integer); overload; virtual;
     procedure Polygon(const Points: array of TPoint; Winding: Boolean;
       StartIndex: Integer = 0; NumPts: Integer = -1);
     procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); virtual;
     procedure Polygon(const Points: array of TPoint);
+      StartIndex: Integer = 0; NumPts: Integer = -1); overload;
+    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); virtual; overload;
+    procedure Polygon(const Points: array of TPoint); overload;
     procedure PolyBezier(const Points: array of TPoint;
       Filled: Boolean = False; Continuous: boolean = True);
+      Filled: Boolean = False; Continuous: boolean = True); overload;
     procedure PolyBezier(Points: PPoint; NumPts: Integer;
+      Filled: Boolean = False; Continuous: Boolean = True); virtual;
+    procedure Polyline(const Points: array of TPoint);
+    procedure Polyline(Points: PPoint; NumPts: Integer); virtual;
+    procedure Ellipse(x1, y1, x2, y2: Integer); virtual;
+    procedure Ellipse(const ARect: TRect); virtual;
+    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); virtual;
+      Filled: Boolean = False; Continuous: Boolean = True); virtual; overload;
+    procedure Polyline(const Points: array of TPoint); overload;
+    procedure Polyline(Points: PPoint; NumPts: Integer); virtual; overload;
+    procedure Ellipse(x1, y1, x2, y2: Integer); virtual; overload;
+    procedure Ellipse(const ARect: TRect); virtual; overload;
+    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); virtual; overload;
+    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual; overload;
     procedure Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2,
       StartX, StartY, EndX, EndY: Integer); virtual;
-    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual;
     procedure FrameRect(Rect: TRect);
     procedure Rectangle(X1, Y1, X2, Y2: Integer); overload;
 …
     procedure LineTo(X, Y: Integer);
     procedure Line(const p1, p2: TPoint);
     procedure FillRect(const ARect: TRect); virtual;
     procedure FillRect(X1, Y1, X2, Y2: Integer);
+    procedure FillRect(const ARect: TRect); virtual; overload;
+    procedure FillRect(X1, Y1, X2, Y2: Integer); overload;
     procedure Draw(X, Y: Integer; Source: TDpiGraphic);
     procedure CopyRect(Dest: TRect; SrcCanvas: TDpiCanvas; Source: TRect);
 …
   end;
   TDpiForms = specialize TFPGObjectList<TDpiForm>;
+  TDpiForms = TObjectList<TDpiForm>;
   { TDpiEdit }
 …
     procedure UpdateScreen;
     procedure UpdateActiveFormFromNativeScreen;
     function DisableForms(SkipForm: TDpiForm; DisabledList: TList = nil): TList;
     procedure EnableForms(var AFormList: TList);
+    function DisableForms(SkipForm: TDpiForm; DisabledList: Classes.TList = nil): Classes.TList;
+    procedure EnableForms(var AFormList: Classes.TList);
     property FormCount: Integer read GetFormCount;
     property Forms[Index: Integer]: TDpiForm read GetForms;
 …
   public
     NativePopupMenu: TPopupMenu;
     procedure PopUp;
     procedure PopUp(X, Y: Integer); virtual;
+    procedure PopUp;  overload;
+    procedure PopUp(X, Y: Integer); virtual; overload;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
 …
   if not Assigned(NativeListView) then begin
     NativeListView := TListView.Create(nil);
     NativeListView.OnCustomDrawItem := @DoCustomDrawItem;
+    NativeListView.OnCustomDrawItem := DoCustomDrawItem;
   end;
   Result := NativeListView;
 …
     NativeMenuItem := TMenuItem.Create(nil);
     NativeMenuItem.Name := 'Native' + Name;
     NativeMenuItem.OnClick := @OnClickHandler;
+    NativeMenuItem.OnClick := OnClickHandler;
   end;
   Result := NativeMenuItem;
 …
 begin
   if (FMainForm = nil)
   and (FCreatingForm=AForm)
+  and (FCreatingForm = AForm)
   //and (not (AppDestroying in FFlags))
   and not (AForm.FormStyle in [fsMDIChild, fsSplash])
 …
 var
   Instance: TComponent;
   ok: Boolean;
+  Ok: Boolean;
   AForm: TDpiForm;
 begin
 …
   TComponent(Reference) := Instance;
   ok := False;
+  Ok := False;
   try
     if (FCreatingForm = nil) and (Instance is TDpiForm) then
       FCreatingForm := TDpiForm(Instance);
     Instance.Create(Self);
     ok := true;
+    Ok := true;
   finally
     if not ok then begin
+    if not Ok then begin
       TComponent(Reference) := nil;
       if FCreatingForm = Instance then
 …
 begin
   inherited;
   TGraphicControlEx(GetNativeGraphicControl).OnPaint := @PaintHandler;
+  TGraphicControlEx(GetNativeGraphicControl).OnPaint := PaintHandler;
 end;
 …
 begin
   Result := NativeFont;
-end;
-procedure TDpiFont.SetOnChange(AValue: TNotifyEvent);
-begin
-  if FOnChange = AValue then Exit;
-  FOnChange := AValue;
 end;
 …
 begin
   inherited;
   GetNativeWinControl.OnKeyDown := @KeyDownHandler;
+  GetNativeWinControl.OnKeyDown := KeyDownHandler;
 end;
 …
 begin
   Controls := TDpiControls.Create;
   Controls.FreeObjects := False;
+  Controls.OwnsObjects := False;
   inherited;
 end;
 …
 end;
 function TDpiScreen.DisableForms(SkipForm: TDpiForm; DisabledList: TList
   ): TList;
+function TDpiScreen.DisableForms(SkipForm: TDpiForm; DisabledList: Classes.TList
+  ): Classes.TList;
 begin
   Result := Screen.DisableForms(SkipForm.GetNativeForm, DisabledList);
 end;
 procedure TDpiScreen.EnableForms(var AFormList: TList);
+procedure TDpiScreen.EnableForms(var AFormList: Classes.TList);
 begin
   Screen.EnableForms(AFormList);
 …
 begin
   FForms := TDpiForms.Create;
   FForms.FreeObjects := False;
+  FForms.OwnsObjects := False;
   FPrevActiveForms := TDpiForms.Create;
   FPrevActiveForms.FreeObjects := False;
+  FPrevActiveForms.OwnsObjects := False;
   // Screen.PixelsPerInch is not initialized at this point
   Dpi := 96;
 …
 begin
   Font.NativeFont := GetNativeControl.Font;
   GetNativeControl.OnResize := @NativeFormResize;
   GetNativeControl.OnChangeBounds := @NativeChangeBounds;
   TControlEx(GetNativeControl).OnMouseDown := @MouseDownHandler;
   TControlEx(GetNativeControl).OnMouseUp := @MouseUpHandler;
   TControlEx(GetNativeControl).OnMouseMove := @MouseMoveHandler;
   TControlEx(GetNativeControl).OnMouseEnter := @MouseEnterHandler;
   TControlEx(GetNativeControl).OnMouseLeave := @MouseLeaveHandler;
   TControlEx(GetNativeControl).OnMouseWheel := @MouseWheelHandler;
+  GetNativeControl.OnResize := NativeFormResize;
+  GetNativeControl.OnChangeBounds := NativeChangeBounds;
+  TControlEx(GetNativeControl).OnMouseDown := MouseDownHandler;
+  TControlEx(GetNativeControl).OnMouseUp := MouseUpHandler;
+  TControlEx(GetNativeControl).OnMouseMove := MouseMoveHandler;
+  TControlEx(GetNativeControl).OnMouseEnter := MouseEnterHandler;
+  TControlEx(GetNativeControl).OnMouseLeave := MouseLeaveHandler;
+  TControlEx(GetNativeControl).OnMouseWheel := MouseWheelHandler;
 end;
 …
   inherited;
   FFont := TDpiFont.Create;
   FFont.OnChange := @FontChanged;
+  FFont.OnChange := FontChanged;
   FConstraints := TDpiSizeConstraints.Create;
   if Assigned(TheOwner) and (TheOwner is TDpiWinControl) then
 …
 end;
-procedure TDpiControl.SetOnChangeBounds(AValue: TNotifyEvent);
-begin
-  if FOnChangeBounds = AValue then Exit;
-  FOnChangeBounds := AValue;
-end;
 procedure TDpiControl.SetOnClick(AValue: TNotifyEvent);
 begin
 …
 begin
   TControlEx(GetNativeControl).OnDblClick := AValue;
-end;
-procedure TDpiControl.SetOnResize(AValue: TNotifyEvent);
-begin
-  if FOnResize = AValue then Exit;
-  FOnResize := AValue;
 end;
 …
   if not Assigned(NativeForm) then begin
     NativeForm := TFormEx.CreateNew(nil);
     (NativeForm as TFormEx).OnMessage := @FormMessageHandler;
+    (NativeForm as TFormEx).OnMessage := FormMessageHandler;
     //NativeForm := TForm.Create(nil);
   end;
 …
 begin
   inherited;
   GetNativeForm.OnActivate := @ActivateHandler;
   GetNativeForm.OnDeactivate := @DeactivateHandler;
   GetNativeForm.OnClose := @CloseHandler;
   GetNativeForm.OnCloseQuery := @CloseQueryHandler;
+  GetNativeForm.OnActivate := ActivateHandler;
+  GetNativeForm.OnDeactivate := DeactivateHandler;
+  GetNativeForm.OnClose := CloseHandler;
+  GetNativeForm.OnCloseQuery := CloseQueryHandler;
   GetNativeForm.Name := Name + 'Native';
 end;

branches/highdpi/Packages/DpiControls/UPixelPointer2.pas

r265	r465
1	1	unit UPixelPointer2;
2
3		~~{$mode delphi}{$H+}~~
4	2
5	3	interface

branches/highdpi/Platform.pas

-              r303
+              r465
 unit Platform;
-{$mode delphi}{$H+}
 interface
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
   {$IFDEF Linux}Unix,{$ENDIF}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
+  {$IFDEF UNIX}Unix,{$ENDIF}
   Classes, SysUtils, DateUtils, SyncObjs;
 function NowPrecise: TDateTime;
 implementation
 {$IFDEF Windows}
+{$IFDEF WINDOWS}
 var
   PerformanceFrequency: Int64;
 …
 function NowPrecise: TDateTime;
 var
   {$IFDEF Linux}T: TimeVal;{$ENDIF}
   {$IFDEF Windows}TimerValue: Int64;{$ENDIF}
+  {$IFDEF UNIX}T: TimeVal;{$ENDIF}
+  {$IFDEF WINDOWS}TimerValue: Int64;{$ENDIF}
 begin
 //  Result := Now;
   //try
     //NowPreciseLock.Acquire;
     {$IFDEF Windows}
+    {$IFDEF WINDOWS}
     QueryPerformanceCounter(TimerValue);
     //Result := Int64(TimeStampToMSecs(DateTimeToTimeStamp(Now)) * 1000) // an alternative Win32 timebase
 …
     {$ENDIF}
     {$IFDEF Linux}
+    {$IFDEF UNIX}
     fpgettimeofday(@t, nil);
      // Build a 64 bit microsecond tick from the seconds and microsecond longints
 …
 initialization
 {$IFDEF Windows}
+{$IFDEF WINDOWS}
 QueryPerformanceFrequency(PerformanceFrequency);
 {$ENDIF}
 …
 end.

branches/highdpi/Protocol.pas

-              r378
+              r465
   ExpCost = 50; { received damage required for next experience level }
   MaxFutureTech = 25;
   // maximum number of future techs of one kind except computing technology
+  // Maximum number of future techs of one kind except computing technology
   MaxFutureTech_Computing = 100;
   // maximum number of computing technology future techs
+  // Maximum number of computing technology future techs
   CountryRadius = 9;
   MaxCitySize = 30;
 …
   CancelTreatyTurns = 3;
   PeaceEvaTurns = 5;
   // should be less then 2*CancelTreatyTurns, so that you can't attack an ally without re-entering
+  // Should be less then 2*CancelTreatyTurns, so that you can't attack an ally without re-entering
   ColdWarTurns = 40;
   DesertThurst = 20; // damage for turn in desert
 …
   InitialCredibility = 95;
   // ai module flags (for TInitModuleData.Flags)
+  // AI module flags (for TInitModuleData.Flags)
   aiThreaded = $01;
   // difficulty settings
+  // Difficulty settings
   MaxDiff = 4; { maximum difficulty level }
   StorageSize: array [1 .. MaxDiff] of Integer = (30, 40, 50, 60);
 …
   BuildCostMod: array [1 .. MaxDiff] of Integer = (9, 12, 15, 18); // in 1/12
   // test flags
+  // Test flags
   nTestFlags = 7; // max. 11
   tfAllTechs = $001; { all nations get all techs }
 …
   tfTested = $800; // at least one test flag was set
   { server commands
+  { Server commands
     IMPORTANT: lowest 4 bits must indicate size in DWORDS of data parameter,
     except for request commands }
 …
   sSetCityTiles = $7201;
   // free command space
+  // Free command space
   sctUnused = $3800;
   { client commands }
+  { Client commands }
   cInitModule = $0000;
   cReleaseModule = $0100;
 …
   cRefreshDebugMap = $3F90;
   // diplomacy commands equal to server, see below
+  // Diplomacy commands equal to server, see below
   cDebugMessage = $7000;
   cShowNego = $7010;
   // commands same for server and client
+  // Commands same for server and client
   scContact = $4900; // + concerned player shl 4 for server call
   scReject = $4A00;
 …
   scDipBreak = $4BF0;
   { server return codes: flags }
+  { Server return codes: flags }
   rExecuted = $40000000;
   rEffective = $20000000;
 …
   rEnemySpotted = $08000000;
   { server return codes: command executed }
   // note: the same return code might have a different meaning for different server functions!
+  { Server return codes: command executed }
+  // Note: the same return code might have a different meaning for different server functions!
   eOK = $60000000; // ok
   eEnemySpotted = $68000000; // unit move ok, new enemy unit/city spotted
   eDied = $70000000; // move executed, unit died due to hostile terrain
   eEnemySpotted_Died = $78000000;
   // unit move ok, new enemy unit/city spotted, unit died due to hostile terrain
+  // Unit move ok, new enemy unit/city spotted, unit died due to hostile terrain
   eLoaded = $60000002; // unit move caused loading to transport ship
   eLost = $70000004; // attack executed, battle lost, unit is dead
 …
   eExpelled = $60000007; // friendly unit expelled
   eMissionDone = $70000008;
   // spy moved into city: mission done, spy no longer exists
+  // Spy moved into city: mission done, spy no longer exists
   eJobDone = $60000001; // settler job started and already done
   eJobDone_Died = $70000001;
   // settler job started and already done, unit died due to hostile terrain
+  // Settler job started and already done, unit died due to hostile terrain
   eCity = $70000002; // city founded, settler no more exists
   eRemoved = $70000000; // sRemoveUnit: unit removed
 …
   eNotChanged = $40000000;
   // ok, but no effect (e.g. current city project set again)
   { server return codes: command not executed }
+  // Ok, but no effect (e.g. current city project set again)
+  { Server return codes: command not executed }
   eHiddenUnit = $20000013;
   // unit move: not possible, destination tile occupied by hidden foreign submarine
+  // Unit move: not possible, destination tile occupied by hidden foreign submarine
   eStealthUnit = $2000001A;
   // unit move: not possible, destination tile occupied by foreign stealth unit
+  // Unit move: not possible, destination tile occupied by foreign stealth unit
   eZOC_EnemySpotted = $28000014;
   // unit move: not possible, new enemy unit spotted, ZOC violation
+  // Unit move: not possible, new enemy unit spotted, ZOC violation
   eInvalid = $0000; // command not allowed now or parameter out of allowed range
 …
   eDomainMismatch = $0011;
   // move/attack: action not allowed for this unit domain
+  // Move/attack: action not allowed for this unit domain
   eNoCapturer = $0012;
   // unit move: this type of unit is not allowed to capture a city
+  // Unit move: this type of unit is not allowed to capture a city
   eZOC = $0014; // unit move: not possible, ZOC violation
   eTreaty = $0015; // move/attack: not possible, peace treaty violation
 …
   eMaxSize = $0020;
   // add to city: bigger size not allowed due to missing aqueduct/sewer
+  // Add to city: bigger size not allowed due to missing aqueduct/sewer
   eNoCityTerrain = $0022; // found city: not possible in this terrain
   eNoBridgeBuilding = $0023;
 …
   eNoWorkerAvailable = $0051;
   eOnlyOnce = $0058;
   // sell/rebuild city improvement: only once per city and turn!
+  // Sell/rebuild city improvement: only once per city and turn!
   eObsolete = $0059; // city project: more advanced improvement already exists
   eOutOfControl = $005A;
   // buy/sell/rebuild improvement: not in anarchy, not in captured cities
+  // Buy/sell/rebuild improvement: not in anarchy, not in captured cities
   eNoWay = $0100; // sGetMoveAdvice: no way found
   // chart types
+  // Chart types
   nStat = 6;
   stPop = 0;
 …
   stWork = 5;
   { tile flags: terrain type }
+  { Tile flags: terrain type }
   fTerrain = $1F; // mask for terrain type
   fOcean = $00;
 …
   fUNKNOWN = fTerrain;
   { tile flags: terrain improvements }
+  { Tile flags: terrain improvements }
   fTerImp = $0000F000; // mask for terrain improvement
   tiNone = $00000000;
 …
   tiBase = $00005000;
   { tile flags: add ons }
+  { Tile flags: add ons }
   fSpecial = $00000060;
   fSpecial1 = $00000020;
 …
   fRiver = $00000080;
   fRoad = $00000100;
   fRR = $00000200;
+  fRR = $00000200; // railroad
   fCanal = $00000400;
   fPoll = $00000800;
 …
   fMercury = $06000000;
   { tile flags: redundant helper info }
+  { Tile flags: redundant helper info }
   fGrWall = $00010000; // tile protected by great wall
   fSpiedOut = $00020000;
 …
   fOwnZoCUnit = $10000000; // own ZoC unit present at this tile
   fInEnemyZoC = $20000000;
   // tile is adjacent to known foreign ZoC unit (not allied)
+  // Tile is adjacent to known foreign ZoC unit (not allied)
   fPeace = $40000000;
   // tile belongs to territory of nation that we are in peace with but not allied
   // city project flags
+  // City project flags
   cpIndex = $1FF;
   cpConscripts = $200; // produce unit as conscripts
   cpDisbandCity = $400;
   // allow to disband city when settlers/conscripts are produced
+  // Allow to disband city when settlers/conscripts are produced
   cpImp = $800; // 0: index refers to model, 1: index refers to city improvement
   cpRepeat = $1000;
 …
   cpAuto = $F000; // for internal use only
   // tech status indicators
+  // Tech status indicators
   tsNA = -2;
   tsSeen = -1;
 …
   tsApplicable = tsResearched;
   // nation treaties
+  // Nation treaties
   trNoContact = -1;
   trNone = 0;
 …
   trAlliance = 4;
   // attitudes
+  // Attitudes
   nAttitude = 7;
   atHostile = 0;
 …
   atEnth = 6;
   // offer prices
+  // Offer prices
   opChoose = $00000000;
   opCivilReport = $11000000; // + turn + concerned player shl 16
 …
   opMask = $FF000000;
   // improvement kinds
+  // Improvement kinds
   ikTrGoods = 0;
   ikCommon = 1;
 …
   ikNA = $7F;
   { model domains }
+  { Model domains }
   nDomains = 3;
   dGround = 0;
 …
   dAir = 2;
   { model kinds }
+  { Model kinds }
   mkSelfDeveloped = $00;
   mkEnemyDeveloped = $01;
 …
   mkFreight = $24;
   { unit flags }
+  { Unit flags }
   unFortified = $01;
   unBombsLoaded = $02;
 …
   unMulti = $80;
   // unit report flags
+  // Unit report flags
   urfAlwaysSupport = $01;
   urfDeployed = $02;
   // unit moves
+  // Unit moves
   umCapturing = $0100;
   umSpyMission = $0200;
 …
   umPlaneUnloading = $8000;
   { model flags }
+  { Model flags }
   mdZOC = $01;
   mdCivil = $02;
   mdDoubleSupport = $04;
   { player happened flags }
+  { Player happened flags }
   phTech = $01;
   phStealTech = $02;
 …
   phGameEnd = $F000;
   { city happened flags }
+  { City happened flags }
   chDisorder = $01;
   chProduction = $02;
 …
   chImprovementSold = $80000000;
   { city info flags }
+  { City info flags }
   ciCapital = $01;
   ciWalled = $02;
 …
   ciSpacePort = $20;
   { city tile available values }
+  { City tile available values }
   faAvailable = 0;
   faNotAvailable = 1;
 …
   faInvalid = $FF;
   // battle history flags
+  // Battle history flags
   bhEnemyAttack = $01;
   bhMyUnitLost = $02;
   bhEnemyUnitLost = $04;
   { move advice special destinations }
+  { Move advice special destinations }
   maNextCity = -1;
   { goverment forms }
+  { Goverment forms }
   nGov = 8;
   gAnarchy = 0;
 …
   gFuture = 7;
   // ship change reasons
+  // Ship change reasons
   scrProduction = 0;
   scrDestruction = 1;
 …
   scrCapture = 3;
   { unit jobs }
+  { Unit jobs }
   nJob = 15;
   jNone = 0;
 …
   jCity = 14;
   // job preconditions are:
+  // Job preconditions are:
   // technology JobPreq is available, no city, plus the following:
   // jRoad: no river when bridge building unavailable
 …
   // jCity, jFort, jBase: none
   // spy mission
+  // Spy mission
   nSpyMission = 5;
   smSabotageProd = 0;
 …
   smStealMilReport = 4;
   // resource weights
+  // Resource weights
   rwOff = $00000000;
   rwMaxGrowth = $3F514141; // 120*F + 1/8*P + 1/16*T + 1/16*S
 …
   rwForceScience = $F1010101; // F^1/2 * (1*P + 1*T + 1*S)
   { advances }
+  { Advances }
   adAdvancedFlight = 0;
   adAmphibiousWarfare = 1;
 …
   adMilitary = $800; // Military Research
   { wonders }
+  { Wonders }
   woPyramids = 00;
   woZeus = 01;
 …
   woMir = 20;
   { city improvements }
+  { City improvements }
   imTrGoods = 28;
   imBarracks = 29;
 …
   // in 1/2*city size
   // special prerequisite values
+  // Special prerequisite values
   preNone = -1;
   preLighthouse = -2;
 …
     adExplosives, adConstruction, preNone, adMedicine, preNone, preNone);
   AdvPreq: array [0 .. nAdv - 1, 0 .. 2] of Integer = { advance prerequisites }
+  AdvPreq: array [0 .. nAdv - 1, 0 .. 2] of Integer = { Advance prerequisites }
     ((adFlight, adRobotics, preNone), // adAdvancedFlight
     (adNavigation, adTactics, preNone), // adAmphibiousWarfare
 …
     (adSmartWeapons, preNone, preNone)); // futMissileTechnology
 Imp: array [0 .. nImp - 1] of // city improvements
+Imp: array [0 .. nImp - 1] of // City improvements
 record
   Kind: Integer;
 …
   Cost: Integer;
   Maint: Integer;
   Expiration: integer;
+  Expiration: Integer;
 end
 = ((Kind: ikWonder; Preq: adMathematics; Cost: 400; Maint: 0;
 …
   (NewImp: imMilAcademy; OldImp: imBarracks));
 // colony ship
+// Colony ship
 nShipPart = 3;
 spComp = 0;
 …
   TradeRes: (0, 0, 7); Filler: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))); { Mou }
 // settler work required MP
+// Settler work required MP
 PillageWork = 100;
 CityWork = 900;
 …
 PollWork = 1800;
 // upgrades for new unit models
+// Upgrades for new unit models
 // upgrade[domain,0].preq is domain precondition advance
 // cost values accumulate if prerequisite is future tech / are maximized if not
 nUpgrade = 15;
 upgrade: array [0 .. nDomains - 1, 0 .. nUpgrade - 1] of record
+Upgrade: array [0..nDomains - 1, 0..nUpgrade - 1] of record
   Preq: Integer;
   Strength: Integer;
   Trans: Integer;
   Cost: integer;
+  Cost: Integer;
 end
 = (((Preq: adWarriorCode; Strength: 4; Trans: 0; Cost: 3),
 …
   (Preq: preNA; Strength: 0; Trans: 0; Cost: 0)));
 { model features }
+{ Model features }
 nFeature = 27;
 mcWeapons = 0;
 …
 AutoFeature: set of mcFirstNonCap .. nFeature - 1 = [mcNav, mcSE, mcNP, mcJet,
   mcAcademy];
 // unit class advances, automatically applied if available
 Feature: array [0 .. nFeature - 1] of { unit model features }
+// Unit class advances, automatically applied if available
+Feature: array [0 .. nFeature - 1] of { Unit model features }
   record
     Domains: Integer;
 …
 INFIN = 999999;
 // for backward compatibility
+// For backward compatibility
 fRare = fDeadLands;
 fRare1 = fCobalt;
 …
     cmRefreshDebugMap = $3F90,
     // diplomacy commands equal to server, see below
+    // Diplomacy commands equal to server, see below
     cmDebugMessage = $7000,
 …
     Cost: Word;
     MStrength: Word;
     // construction time multipliers, only valid if kind is mkSelfDeveloped or mkEnemyDeveloped
+    // Construction time multipliers, only valid if kind is mkSelfDeveloped or mkEnemyDeveloped
     MTrans: Byte;
     MCost: Byte;
     Weight: Byte;
     MaxWeight: Byte;
     // weight and maximum weight (construction time)
+    // Weight and maximum weight (construction time)
     Upgrades: Cardinal; // bitarray indicating all upgrades
     Flags: Cardinal;
 …
   TCityReportNew = record
     HypoTiles: Integer;
     // tiles that should be considered as exploited (for the current adjustment, set this to -1 or to TCity.Tiles of the city)
+    // Tiles that should be considered as exploited (for the current adjustment, set this to -1 or to TCity.Tiles of the city)
     HypoTaxRate: Integer;
     HypoLuxuryRate: Integer;
     // tax and luxury rate that should be assumed (for current rates, set this to -1 or to RO.TaxRate resp. RO.LuxRate)
+    // Tax and luxury rate that should be assumed (for current rates, set this to -1 or to RO.TaxRate resp. RO.LuxRate)
     Morale: Integer;
     FoodSupport: Integer;
     MaterialSupport: Integer;
     // food and material taken for unit support
+    // Food and material taken for unit support
     ProjectCost: Integer; // material cost of current project
     Storage: Integer; // size of food storage
 …
     CollectedMaterial: Integer;
     CollectedTrade: Integer;
     // raw control, food, material and trade as collected by the citizens
+    // Raw control, food, material and trade as collected by the citizens
     Working: Integer; // number of exploited tiles including city tile
     FoodSurplus: Integer;
     Production: Integer;
     AddPollution: Integer;
     // food surplus, production gain and pollution after all effects
+    // Food surplus, production gain and pollution after all effects
     Corruption: Integer;
     Tax: Integer;
     Science: Integer;
     Luxury: Integer;
     // corruption, tax, science and wealth after all effects
+    // Corruption, tax, science and wealth after all effects
     HappinessBalance: Integer;
     // = (Morale+Wealth+Control) - (Size+Unrest), value < 0 means disorder
 …
   TGetCityData = record
     Owner: Integer;
     c: TCity;
+    C: TCity;
   end;
 …
     Movement: Integer;
     EndHealthDef: Integer;
     EndHealthAtt: Integer; // must be same as in TBattleForecast
+    EndHealthAtt: Integer; // Must be same as in TBattleForecast
     AStr: Integer;
     DStr: Integer;
 …
   TCreateUnitData = record
     Loc: Integer;
     p: Integer;
+    P: Integer;
     mix: Integer;
   end;
 …
   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;
 …
     Data: Pointer;
     Map: ^TTileList;
     { the playground, a list of tiles with index = location, see tile flags }
+    { The playground, a list of tiles with index = location, see tile flags }
     MapObservedLast: ^TTileObservedLastList;
     // turn in which the tile was observed last, index = location
+    // Turn in which the tile was observed last, index = location
     Territory: ^TOwnerList; // nation to which's territory a tile belongs, -1 indicates none
     Un: ^TUnList; { units }
 …
     LuxRate: Integer;
     Research: Integer;
     { collected research points for currently researched tech }
+    { Collected research points for currently researched tech }
     ResearchTech: Integer; // currently researched tech
     DevModel: TModel; { unit model currently under development }
 …
     MaxTurn: Integer;
     Difficulty: array [0 .. nPl - 1] of Integer;
     { difficulty levels of the players, if it's 0 this player is the supervisor,
+    { Difficulty levels of the players, if it's 0 this player is the supervisor,
       -1 for unused slots }
     RO: array [0 .. nPl - 1] of ^TPlayerContext;
 …
     RND: Integer;
     Difficulty: array [0 .. nPl - 1] of Integer;
     { difficulty levels of the players, if it's 0 this player is the supervisor,
+    { Difficulty levels of the players, if it's 0 this player is the supervisor,
       -1 for unused slots }
     Controlled: Integer;
 …
 const
   { predefined unit models: }
+  { Predefined unit models: }
   nSpecialModel = 9;
   SpecialModel: array [0 .. nSpecialModel - 1] of TModel = ((Status: 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,
 …
   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;
 …
 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.Kind := mkSelfDeveloped // important for IsSameModel()
+  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;
 …
   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])
 …
 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;
     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
+    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
       else
         result := 0
     else { formula for special resources }
+        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;
     end
+        Result := 0;
+    end;
   end;
 end;

branches/highdpi/Settings.lfm

-              r412
+              r465
   Width = 483
   BorderStyle = bsNone
   Caption = 'LocaleDlg'
+  Caption = 'Settings'
   ClientHeight = 448
   ClientWidth = 483
+  Color = clBtnFace
   DesignTimePPI = 144
   FormStyle = fsStayOnTop
 …
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '2.0.12.0'
+  LCLVersion = '2.2.0.4'
   Scaled = False
   object ListLanguages: TDpiListBox
     Tag = 15360
     Left = 16
     Height = 267
+    Height = 320
     Top = 32
     Width = 144
 …
   object Up2Btn: TButtonC
     Tag = 6912
     Left = 432
+    Left = 452
     Height = 12
     Top = 328
+    Top = 360
     Width = 12
     Down = False
 …
   object Down2Btn: TButtonC
     Tag = 6912
     Left = 432
+    Left = 452
     Height = 12
     Top = 340
+    Top = 372
     Width = 12
     Down = False
 …
     Tag = 15360
     Left = 176
     Height = 192
+    Height = 264
     Top = 32
     Width = 288
 …
   object EditShortCutPrimary: TDpiEdit
     Left = 176
+    Height = 19
+        BorderStyle = bsNone
+    Top = 256
+    Height = 27
+    Top = 325
     Width = 136
+    BorderStyle = bsNone
     Color = clBlack
     Enabled = False
-    Font.Charset = DEFAULT_CHARSET
     Font.Color = 4176863
     Font.Height = -15
 …
   object EditShortCutSecondary: TDpiEdit
     Left = 328
+    Height = 19
+        BorderStyle = bsNone
+    Top = 257
+    Height = 27
+    Top = 325
     Width = 136
+    BorderStyle = bsNone
     Color = clBlack
     Enabled = False
-    Font.Charset = DEFAULT_CHARSET
     Font.Color = 4176863
     Font.Height = -15

branches/highdpi/Settings.pas

-              r412
+              r465
 unit Settings;
-{$mode delphi}
 interface
 …
 uses
   UDpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   LCLProc, ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg,
   ButtonC, UKeyBindings, ULanguages;
+  LCLProc, ScreenTools, Messg, ButtonA, Directories, DrawDlg, ButtonC,
+  KeyBindings, Languages;
 type
 …
 {$R *.lfm}
+uses
+  Start;
 var
   SFullScreen, SGamma, SRestartMsg, SShortCutPrimary, SShortCutSecondary,
 …
 procedure TSettingsDlg.FormCreate(Sender: TObject);
 begin
+  Color := clBlack;
   LocalKeyBindings := TKeyBindings.Create;
 …
   Shift: TShiftState);
 begin
   if Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
+  if (Sender is TDpiEdit) and Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
     CurrentKeyBinding.ShortCut := Key or
       (scShift * Integer(ssShift in Shift)) or
 …
   var Key: Word; Shift: TShiftState);
 begin
   if Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
+  if (Sender is TDpiEdit) and Assigned(CurrentKeyBinding) and not (Key in [16..18]) then begin
     CurrentKeyBinding.ShortCut2 := Key or
       (scShift * Integer(ssShift in Shift)) or
 …
 procedure TSettingsDlg.FormShow(Sender: TObject);
 begin
+  Caption := Phrases2.Lookup('ACTIONHEADER_CONFIG');
   ReloadLanguages;
   Languages.LoadToStrings(ListLanguages.Items);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items);
   ListLanguages.Font.Color := MainTexture.ColorMark;
   ListKeyBindings.Font.Color := MainTexture.ColorMark;
 …
 procedure TSettingsDlg.LoadData;
 begin
+  ListLanguages.ItemIndex := Languages.Search(LocaleCode);
+  if (ListLanguages.ItemIndex = -1) and (Languages.Count > 0) then
+    ListLanguages.ItemIndex := 0;
+  StartDlg.Translator.Language := StartDlg.Translator.Languages.SearchByCode(LocaleCode);
+  StartDlg.Translator.LanguageListToStrings(ListLanguages.Items, False);
+  ListLanguages.ItemIndex := ListLanguages.Items.IndexOfObject(StartDlg.Translator.Language);
+  if ListLanguages.ItemIndex = -1 then ListLanguages.ItemIndex := 0;
   if FullScreen then ButtonFullscreen.ButtonIndex := 3
     else ButtonFullscreen.ButtonIndex := 2;
   LocalGamma := Gamma;
   LocalKeyBindings.Assign(KeyBindings);
+  LocalKeyBindings.Assign(KeyBindings.KeyBindings);
 end;
 …
 begin
   NeedRestart := Gamma <> LocalGamma;
+  LocaleCode := Languages[ListLanguages.ItemIndex].ShortName;
+  if ListLanguages.ItemIndex <> -1 then begin
+    StartDlg.Translator.Language := TLanguage(ListLanguages.Items.Objects[ListLanguages.ItemIndex]);
+    LocaleCode := StartDlg.Translator.Language.Code;
+  end else begin
+    StartDlg.Translator.Language := nil;
+    LocaleCode := '';
+  end;
   FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
   Gamma := LocalGamma;
   if NeedRestart then SimpleMessage(SRestartMsg);
   KeyBindings.Assign(LocalKeyBindings);
+  KeyBindings.KeyBindings.Assign(LocalKeyBindings);
 end;
 end.

branches/highdpi/Start.lfm

r378	r465
26	26	OnShow = FormShow
27	27	LCLVersion = '2.0.12.0'
	28	ShowInTaskBar = stNever
28	29	Scaled = False
29	30	object StartBtn: TButtonA

branches/highdpi/Start.pas

-              r405
+              r465
   UDpiControls, GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
+  Menus, Registry,  DrawDlg, fgl, Protocol, UMiniMap, UBrain;
+  Menus, Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain,
+  Translator;
 type
   { TPlayerSlot }
 …
   end;
   TPlayerSlots = class(TFPGObjectList<TPlayerSlot>)
+  TPlayerSlots = class(TObjectList<TPlayerSlot>)
   end;
 …
     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);
 …
     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);
 …
     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;
+    procedure LoadLanguages;
     procedure LoadAiBrainsPictures;
     procedure UpdateInterface;
 …
   public
     EmptyPicture: TDpiBitmap;
+    Translator: TTranslator;
     procedure UpdateFormerGames;
     procedure UpdateMaps;
 …
 uses
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UKeyBindings;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, KeyBindings,
+  Languages;
 {$R *.lfm}
 …
   // 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;
 …
   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);
 …
   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,
 + 2 + 8 + 128, 1 + 2 + 8 + 32 + 128, 1 + 2 + 8 + 16 + 64 + 128,
 + 2 + 4 + 16 + 32 + 64 + 256, 511 - 32, 511, 511 - 32, 511, 511 - 32, 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,
 + 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 }
 …
 procedure TStartDlg.FormCreate(Sender: TObject);
 var
   x, i: Integer;
+  X, I: Integer;
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
 …
   LoadConfig;
   LoadAssets;
+  LoadLanguages;
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
 …
   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;
 …
   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;
 …
     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;
 …
   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
 …
     CustomizeBtn.ButtonIndex := 2;
+  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, 1, 111);
+  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, HGrSystem2.Data, 66, 111);
+  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, 131, 111);
+  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, HGrSystem2.Data, 131, 46);
+  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainNoTerm.Left, GBrainNoTerm.Top);
+  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainSuperVirtual.Left, GBrainSuperVirtual.Top);
+  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainTerm.Left, GBrainTerm.Top);
+  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, HGrSystem2.Data, GBrainRandom.Left, GBrainRandom.Top);
   LoadAiBrainsPictures;
 …
 begin
   SaveConfig;
+  FreeAndNil(Translator);
   FreeAndNil(FormerGames);
   FreeAndNil(Maps);
 …
 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 := DpiCreateRectRgn(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 := DpiCreateRectRgn(left, top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
 …
     DeleteObject(r1);
   end;
   InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
 …
   end;
   KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+  KeyBindings.KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
 end;
 …
   end;
+  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+  KeyBindings.KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+end;
+procedure TStartDlg.LoadLanguages;
+var
+  I: Integer;
+begin
+  Translator := TTranslator.Create(nil);
+  with Translator, Languages do begin
+    SearchByCode('').Available := True;
+    for I := 1 to Languages.Count - 1 do
+    with Languages[I] do begin
+      Available := DirectoryExists(HomeDir + 'Localization' + DirectorySeparator + Code) or (Code = 'en');
+    end;
+  end;
 end;
 procedure TStartDlg.LoadAiBrainsPictures;
 var
+  AIBrains: TBrains;
+  I: Integer;
+  TextSize: TSize;
+begin
+  AIBrains := TBrains.Create(False);
+  Brains.GetByKind(btAI, AIBrains);
+  for i := 0 to AIBrains.Count - 1 do
+  with AIBrains[I] do begin
+    if not LoadGraphicFile(AIBrains[i].Picture, GetAiDir + DirectorySeparator +
+      FileName + DirectorySeparator + FileName + '.png', [gfNoError]) then begin
+      with AIBrains[i].Picture.Canvas do begin
+        Brush.Color := $904830;
+        FillRect(Rect(0, 0, 64, 64));
+        Font.Assign(UniFont[ftTiny]);
+        Font.Style := [];
+        Font.Color := $5FDBFF;
+        TextSize := TextExtent(FileName);
+        Textout(32 - TextSize.Width div 2,
+- TextSize.Height div 2, FileName);
+      end;
+    end;
+  end;
+  FreeAndNil(AIBrains);
+  AiBrains: TBrains;
+begin
+  AiBrains := TBrains.Create(False);
+  try
+    Brains.GetByKind(btAI, AiBrains);
+    AiBrains.LoadPictures;
+  finally
+    FreeAndNil(AiBrains);
+  end;
 end;
 …
     DeleteObject(r1);
     r1 := DpiCreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
       QuitBtn.top + QuitBtn.Height);
+      QuitBtn.Top + QuitBtn.Height);
     CombineRgn(r0, r0, r1, RGN_OR);
     DeleteObject(r1);
 …
   end else begin
     BoundsRect := Bounds((DpiScreen.Width - Width) div 2,
       (DpiScreen.Height - Height) div 2, Width, Height)
+      (DpiScreen.Height - Height) div 2, Width, Height);
   end;
 end;
 …
 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);
   DpiBitCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
     xActionIcon - 2, y - 2);
+  DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
+    xActionIcon - 2, Y - 2);
   GlowFrame(LogoBuffer, 8, 8, 34, 34, $202020);
   DpiBitCanvas(Canvas, xActionIcon - 2, y - 2, 50, 50,
+  DpiBitBltCanvas(Canvas, xActionIcon - 2, Y - 2, 50, 50,
     LogoBuffer.Canvas, 0, 0);
   DpiBitCanvas(Canvas, xActionIcon, y, 40, 40, BigImp.Canvas,
+  DpiBitBltCanvas(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;
 …
   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;
 …
   // 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;
 …
   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,
 + 2 * integer(Tab <> Tab2), s);
+      (TabSize - BiColorTextWidth(Canvas, S)) div 2,
++ 2 * Integer(Tab <> Tab2), S);
   end;
   Frame(Canvas, TabOffset + 4 * TabSize + 1, -1, ClientWidth, TabHeight,
 …
   // Paint menu logo
   UnshareBitmap(LogoBuffer);
   DpiBitCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
 + 2 * integer(Tab <> tbMain));
+  DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, MenuLogo.Width, MenuLogo.Height, Canvas, 6,
++ 2 * Integer(Tab <> tbMain));
   ImageOp_BCC(LogoBuffer, Templates.Data, 0, 0, MenuLogo.Left, MenuLogo.Top,
 …
   ImageOp_BCC(LogoBuffer, Templates.Data, 10, 27, MenuLogo.Left + 10,
     MenuLogo.Top + 27, MenuLogo.Width - 10, 9, $BFBF20, $4040DF); // logo part 2
   DpiBitCanvas(Canvas, 6, 3 + 2 * integer(Tab <> tbMain), MenuLogo.Width, MenuLogo.Height,
+  DpiBitBltCanvas(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);
         DpiBitCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
           ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
+        DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, W, H, Canvas,
+          ActionSideBorder + I * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
           - 8);
         MakeBlue(LogoBuffer, 0, 0, w, h);
         DpiBitCanvas(Canvas, ActionSideBorder + i * wBuffer,
           yAction + Integer(SelectedAction) * ActionPitch - 8, w, h,
+        MakeBlue(LogoBuffer, 0, 0, W, H);
+        DpiBitBltCanvas(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]);
               UnshareBitmap(LogoBuffer);
               DpiBitCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
                 xActionIcon, y + 2);
+              DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, LinkArrows.Width, LinkArrows.Height, Canvas,
+                xActionIcon, Y + 2);
               ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), LinkArrows.BoundsRect, 0,
                 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]);
               DpiBitCanvas(Canvas, xActionIcon, y + 2, LinkArrows.Width, LinkArrows.Height,
+              DpiBitBltCanvas(Canvas, xActionIcon, Y + 2, LinkArrows.Width, LinkArrows.Height,
                 LogoBuffer.Canvas, 0, 0);
             end;
         end;
       Inc(y, ActionPitch);
+      Inc(Y, ActionPitch);
     end;
   end
 …
       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
+          DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+      for I := 12 to 19 do
+        if (I < 13) or (I > 17) then begin
+          DpiBitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);
           DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+          DpiBitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Data.Canvas, Ornament.Left, Ornament.Top, SRCPAINT);
         end;
 …
         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, 0, 0, true)
+          if Assigned(PlayersBrain[I]) then
+            FrameImage(Canvas, PlayersBrain[I].Picture, xBrain[I], yBrain[I],
+, 64, 0, 0, True)
           else
             FrameImage(Canvas, EmptyPicture, xBrain[i], yBrain[i], 64, 64,
 , 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, True);
+          if Assigned(PlayersBrain[I]) and (PlayersBrain[I].Kind in [btTerm, btRandom, btAI]) then
           begin
             DpiBitCanvas(Canvas, xBrain[i] - 18, yBrain[i] + 19, 12, 14,
               HGrSystem.Data.Canvas, 134 + (Difficulty[i] - 1) *
+            DpiBitBltCanvas(Canvas, xBrain[I] - 18, yBrain[I] + 19, 12, 14,
+              HGrSystem.Data.Canvas, 134 + (Difficulty[I] - 1) *
 , 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;
 …
                 PlayerSlots[I].MultiBtn.left + 12, PlayerSlots[I].MultiBtn.top + 12,
                 MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
               DpiBitCanvas(Canvas, xBrain[i] - 31, yBrain[i], 13, 12,
+              DpiBitBltCanvas(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;
 …
         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,
 …
       if AutoDiff = 1 then
         FrameImage(Canvas, Brains.GetBeginner.Picture, xDefault, yDefault, 64,
 , 0, 0, false)
+, 0, 0, False)
       else
         FrameImage(Canvas, BrainDefault.Picture, xDefault, yDefault, 64, 64,
 , 0, true);
+, 0, True);
       DLine(Canvas, 56, 272, y0Mini + 61 + 19, MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
 …
       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
+          DpiBitCanvas(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
+          DpiBitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Mask.Canvas, Ornament.Left, Ornament.Top, SRCAND);
           DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, Ornament.Width, Ornament.Height,
+          DpiBitBltCanvas(Canvas, 9 + I * 27, yLogo - 2, Ornament.Width, Ornament.Height,
             HGrSystem2.Data.Canvas, Ornament.Left, Ornament.Top, SRCPAINT);
         end;
 …
         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
 …
   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;
 …
       MainTexture.ColorBevelLight);
     s := '';
+    S := '';
     if MiniMap.Mode = mmPicture then
     begin
       DpiBitCanvas(Canvas, xMini + 2, yMini + 2, MiniMap.Size.X * 2, MiniMap.Size.Y,
+      DpiBitBltCanvas(Canvas, xMini + 2, yMini + 2, MiniMap.Size.X * 2, MiniMap.Size.Y,
         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;
 …
 procedure TStartDlg.FormShow(Sender: TObject);
 begin
+  {$IFDEF UNIX}
+  ShowInTaskBar := stAlways;
+  {$ENDIF}
   MainTexture.Age := -1;
   List.Font.Color := MainTexture.ColorMark;
 …
       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)
 …
         with Reg do
         try
           OpenKey(AppRegistryKey, true);
+          OpenKey(AppRegistryKey, True);
           if ValueExists('GameCount') then GameCount := ReadInteger('GameCount')
             else GameCount := 0;
 …
           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;
 …
   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;
 …
 var
   I: Integer;
   FixedLines: integer;
+  FixedLines: Integer;
   MenuItem: TDpiMenuItem;
   AIBrains: TBrains;
 …
     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);
 …
         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;
 …
     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),
 …
 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;
 …
 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);
 …
         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;
 …
           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
 …
               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
 …
           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;
 …
               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
 …
   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;
 …
 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
 …
   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);
 …
   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'))
 …
       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);
 …
       if MaxTurn < 1400 then
       begin
         inc(MaxTurn, 200);
+        Inc(MaxTurn, 200);
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 82);
       end;
 …
       if LoadTurn < LastTurn then
       begin
         inc(LoadTurn);
+        Inc(LoadTurn);
         SmartInvalidate(xTurnSlider - 2, y0Mini + 61, xTurnSlider + wTurnSlider
           + 2, yTurnSlider + 9);
 …
       if StartLandMass < 96 then
       begin
         inc(StartLandMass, 5);
+        Inc(StartLandMass, 5);
         PaintInfo;
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 61 + 21);
 …
       if MaxTurn > 400 then
       begin
         dec(MaxTurn, 200);
+        Dec(MaxTurn, 200);
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 82);
       end;
 …
       if LoadTurn > 0 then
       begin
         dec(LoadTurn);
+        Dec(LoadTurn);
         SmartInvalidate(xTurnSlider - 2, y0Mini + 61, xTurnSlider + wTurnSlider
           + 2, yTurnSlider + 9);
 …
       if StartLandMass > 10 then
       begin
         dec(StartLandMass, 5);
+        Dec(StartLandMass, 5);
         PaintInfo;
         SmartInvalidate(344, y0Mini + 61, 514, y0Mini + 61 + 21);
 …
 procedure TStartDlg.RenameBtnClick(Sender: TObject);
 var
   i: integer;
+  I: Integer;
   NewName: string;
   f: file;
   ok: boolean;
+  F: file;
+  ok: Boolean;
   MapPictureFileName: string;
 begin
 …
       (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');
 …
         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;
 …
 procedure TStartDlg.DeleteBtnClick(Sender: TObject);
 var
   iDel: integer;
   f: file;
+  iDel: Integer;
+  F: file;
 begin
   if List.ItemIndex >= 0 then
 …
     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
 …
           List.Invalidate;
           if Page = pgLoad then
             TurnValid := false;
+            TurnValid := False;
           PaintInfo;
           if Page = pgLoad then
 …
 procedure TStartDlg.FormMouseUp(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   Tracking := False;
 …
 procedure TStartDlg.FormMouseMove(Sender: TObject; Shift: TShiftState;
   x, y: integer);
+  X, Y: Integer);
 var
   OldLoadTurn: Integer;
 …
   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
 …
   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;
 …
 end;
 end.

branches/highdpi/UnitProcessing.pas

-              r303
+              r465
   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
 procedure InitGame;
 procedure ReleaseGame;
 implementation
 …
 type
   TToWorkList = array [0 .. INFIN, 0 .. nJob - 1] of word;
+  TToWorkList = array [0 .. INFIN, 0 .. nJob - 1] of Word;
 var
 …
     ____________________________________________________________________
+  }
 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);
 …
       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
     end;
   end
 end;
 function GetMoveCost(p, mix, FromLoc, ToLoc, MoveLength: integer;
   var MoveCost: integer): integer;
+          Result := coTrue; // p does not observe tile
+    end;
+  end;
+end;
+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
 …
           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
 …
               MoveCost := 20
           else if Cap[mcOver] > 0 then
             result := eNoRoad
+            Result := eNoRoad
           else
             case Terrain[ToTile and fTerrain].MoveCost of
 …
 :
                 begin
                   assert(Speed - 150 <= 600);
+                  Assert(Speed - 150 <= 600);
                   MoveCost := 50 + (Speed - 150) * 13 shr 7; // heavy terrain
                 end;
 …
                 begin
                   MoveCost := Speed;
                   result := eMountains;
                   exit
+                  Result := eMountains;
+                  Exit;
                 end;
             end;
 …
         end
         else
           result := eDomainMismatch;
+          Result := eDomainMismatch;
       dSea:
 …
             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:
         MoveCost := 50 * MoveLength; { always valid move }
     end
   end
 end;
 function CalculateMove(p, uix, ToLoc, MoveLength: integer; TestOnly: boolean;
   var MoveInfo: TMoveInfo): integer;
+    end;
+  end;
+end;
+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;
 …
     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;
 …
       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
 …
           if PModel.Flags and mdCivil <> 0 then
           begin
             result := eNoCapturer;
             exit
+            Result := eNoCapturer;
+            Exit;
           end;
           MoveInfo.MoveType := mtCapture;
 …
           if (PModel.Domain = dSea) and (PModel.Cap[mcArtillery] = 0) then
           begin
             result := eDomainMismatch;
             exit
+            Result := eDomainMismatch;
+            Exit;
           end
           else if (PModel.Attack = 0) and
 …
           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
 …
       then
       begin
         result := eViolation;
         exit
+        Result := eViolation;
+        Exit;
       end;
       if MoveInfo.MoveType = mtBombard then
 …
         MoveInfo.EndHealth := BattleForecast.EndHealthAtt;
         MoveInfo.EndHealthDef := BattleForecast.EndHealthDef;
       end
+      end;
     end
     else // if MoveInfo.MoveType in [mtMove,mtCapture,mtSpyMission] then
 …
         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
 …
               (TroopLoad < Model[mix].MTrans * Model[mix].Cap[mcSeaTrans]) then
             begin
               result := eLoaded;
+              Result := eLoaded;
               MoveInfo.Cost := PModel.Speed;
               MoveInfo.ToMaster := uix1;
 …
               (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)
               then
                 Break;
             end
+            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
 …
       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
         end
+          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
 …
       MoveInfo.Defender := RealMap[ToLoc] shr 27;
       SearchCity(ToLoc, MoveInfo.Defender, MoveInfo.Dcix);
     end
   end
 end; // CalculateMove
 function GetBattleForecast(Loc: integer; var BattleForecast: TBattleForecast;
   var Duix, Dcix, AStr, DStr, ABaseDamage, DBaseDamage: integer): integer;
 var
   Time, Defender, ABon, DBon, DCnt, MultiDamage: integer;
+    end;
+  end;
+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;
   PModel, DModel: ^TModel;
 begin
 …
     if (Defender < 0) or (Defender = pAtt) then
     begin
       result := eOK;
       exit
+      Result := eOK;
+      Exit;
     end; // no attack, simple move
 …
       EndHealthAtt := HealthAtt;
       EndHealthDef := RW[Defender].Un[Duix].Health;
       result := eOK;
       exit
+      Result := eOK;
+      Exit;
     end;
 …
         (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;
 …
       (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;
 …
         (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
 …
         DBaseDamage := 1;
       if DBaseDamage > RW[Defender].Un[Duix].Health then
         DBaseDamage := RW[Defender].Un[Duix].Health
+        DBaseDamage := RW[Defender].Un[Duix].Health;
     end;
 …
         ABaseDamage := 1;
       if ABaseDamage > HealthAtt then
         ABaseDamage := HealthAtt
+        ABaseDamage := HealthAtt;
     end;
 …
     if EndHealthDef > 0 then
       result := eLost
+      Result := eLost
     else if EndHealthAtt > 0 then
       result := eWon
+      Result := eWon
     else
       result := eBloody
   end
 end; // GetBattleForecast
 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
+      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
     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)
 …
               begin
                 ToMaster := uix1;
                 Break
+                Break;
               end
               else if ToMaster < 0 then
 …
             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);
         end
       end
     end
   end
 end;
 function UnloadUnit(p, uix: integer; TestOnly: boolean): integer;
 var
   Cost: integer;
 begin
   result := eOK;
   with RW[p].Un[uix] do
+        end;
+      end;
+    end;
+  end;
+end;
+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)
 …
     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;
     end
 end;
 procedure Recover(p, uix: integer);
 var
   cix, Recovery: integer;
 begin
   with RW[p], Un[uix] do
+    end;
+end;
+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
 …
       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
 …
     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
 …
   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
 …
             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
 …
           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
 …
           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:
 …
           maxmov := Speed;
           initmov := 0;
         end
     end;
   FromLoc := RW[p].Un[uix].Loc;
+        end;
+    end;
+  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;
       Break
+      Break;
     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
 …
       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
 …
         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
 …
           // calculate move cost, must be identic to GetMoveCost function
           AddDamage := 0;
           MountainDelay := false;
+          MountainDelay := False;
           case MoveInfo of
 …
                     begin
                       MoveCost := maxmov;
                       MountainDelay := true;
+                      MountainDelay := True;
                     end;
                 end;
 …
           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
 …
                 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) -
 ) 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) -
 ) div maxmov + 1);
 …
                 From[Loc1] := Loc;
                 Damage[Loc1] := Damage[Loc] + AddDamage;
               end
           end
         end
       end
     end
+              end;
+          end;
+        end;
+      end;
+    end;
   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; // GetMoveAdvice
 function CanPlaneReturn(p, uix: integer;
   PlaneReturnData: TPlaneReturnData): boolean;
+end;
+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
 …
         (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);
 …
     if T >= (PlaneReturnData.Fuel + 1) shl 20 then
     begin
       result := false;
       Break
+      Result := False;
+      Break;
     end;
     if MapFlags[Loc] and mfEnd <> 0 then
     begin
       result := true;
       Break
+      Result := True;
+      Break;
     end;
     FromTile := Map[Loc];
 …
             T1 := T + MoveCost shl 8;
           Q.Put(Loc1, T1);
         end
       end
     end
+        end;
+      end;
+    end;
   end;
   FreeAndNil(Q);
 end; // CanPlaneReturn
+end;
+{
 …
   ____________________________________________________________________
+}
 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
 …
       jCity:
         if RealMap[Loc] and fCity <> 0 then
           result := eInvalid
+          Result := eInvalid
         else if IrrEff = 0 then
           result := eNoCityTerrain
+          Result := eNoCityTerrain
         else
           JobWork := CityWork;
 …
           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
 …
           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:
 …
           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:
 …
           JobWork := MoveCost * FortWork
         else
           result := eInvalid;
+          Result := eInvalid;
       jCanal:
         if (RealMap[Loc] and fCanal = 0) and (TerrType in TerrType_Canalable)
 …
           JobWork := CanalWork
         else
           result := eInvalid;
+          Result := eInvalid;
       jTrans:
         begin
           JobWork := TransWork;
           if JobWork <= 0 then
             result := eInvalid
+            Result := eInvalid;
         end;
       jPoll:
 …
           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; // CalculateJobWork
 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
 …
       if not TestOnly then
         Job := jNone;
       exit
+      Exit;
     end;
     Loc0 := Loc;
 …
       (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
 …
     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
     end
   end; // with
 end; // StartJob
 function Work(p, uix: integer): boolean;
 var
   uix1, j0: integer;
 begin
   result := false;
   with RW[p].Un[uix] do
+      end;
+    end;
+  end;
+end;
+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
     end
 end; // work
 function GetJobProgress(p, Loc: integer;
   var JobProgressData: TJobProgressData): integer;
 var
   Job, JobResult, uix: integer;
+end;
+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
 …
       else
         JobProgressData[Job].Done := JobProgressData[Job].Required -
           ToWork[Loc, Job]
+          ToWork[Loc, Job];
     end
     else
 …
     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;

branches/highdpi/readme.txt

-              r405
+              r465
 ===================
 * Developed with: Lazarus 2.0.12 (https://www.lazarus-ide.org/)
+* Developed with: Lazarus 2.2.0 (https://www.lazarus-ide.org/)
 * Supported platforms: Windows and Linux
 * Supported architectures: 32-bit and 64-bit x86
 …
 * Home page: https://app.zdechov.net/c-evo/
 * Source code: https://svn.zdechov.net/c-evo/
 * Developed in [http://www.lazarus-ide.org/ Lazarus/FPC] 2.0.12
+* Developed in [http://www.lazarus-ide.org/ Lazarus/FPC] 2.2.0
 * To build new Windows installer run Install/build.bat. InnoSetup (http://www.jrsoftware.org/isdl.php) needs to be installed).

Context Navigation

Legend:

Download in other formats: