Changeset 303 for branches/highdpi/LocalPlayer

Timestamp:

Mar 9, 2021, 9:19:49 AM (4 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

Location:

branches/highdpi/LocalPlayer

Files:

• CityScreen.pas (modified) (6 diffs)
• ClientTools.pas (modified) (10 diffs)
• Draft.pas (modified) (1 diff)
• Enhance.pas (modified) (1 diff)
• Help.pas (modified) (10 diffs)
• IsoEngine.pas (modified) (8 diffs)
• MessgEx.pas (modified) (1 diff)
• NatStat.pas (modified) (1 diff)
• Select.pas (modified) (1 diff)
• TechTree.lfm (modified) ( previous)
• TechTree.pas (modified) (3 diffs)
• Term.pas (modified) (54 diffs)
• Tribes.pas (modified) (3 diffs)
• UKeyBindings.pas (added)
• UnitStat.pas (modified) (3 diffs)

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -216 +216 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png',
+    [gfNoGamma]);
   CityMapTemplate := TDpiBitmap.Create;
   CityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png',
+    [gfNoGamma]);
   SmallCityMapTemplate := TDpiBitmap.Create;
   SmallCityMapTemplate.PixelFormat := pf24bit;
   LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
-    gfNoGamma);
+    [gfNoGamma]);
   SmallCityMap := TDpiBitmap.Create;
   SmallCityMap.PixelFormat := pf24bit;
@@ -1397 +1399 @@
 
 procedure TCityDlg.ChooseProject;
-const
-  ptSelect = 0;
-  ptTrGoods = 1;
-  ptUn = 2;
-  ptCaravan = 3;
-  ptImp = 4;
-  ptWonder = 6;
-  ptShip = 7;
-  ptInvalid = 8;
-
-  function ProjectType(Project: integer): integer;
+type
+  TProjectType = (
+    ptSelect = 0,
+    ptTrGoods = 1,
+    ptUn = 2,
+    ptCaravan = 3,
+    ptImp = 4,
+    ptWonder = 6,
+    ptShip = 7,
+    ptInvalid = 8
+  );
+
+  function ProjectType(Project: integer): TProjectType;
   begin
     if Project and cpCompleted <> 0 then
-      result := ptSelect
+      Result := ptSelect
     else if Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-      result := ptTrGoods
-    else if Project and cpImp = 0 then
+      Result := ptTrGoods
+    else if Project and cpImp = 0 then begin
       if MyModel[Project and cpIndex].Kind = mkCaravan then
-        result := ptCaravan
-      else
-        result := ptUn
+        Result := ptCaravan
+      else Result := ptUn;
+    end
     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
-    else
-      result := ptImp
+      Result := ptShip
+    else
+      Result := ptImp;
   end;
 
 var
-  NewProject, OldMoney, pt0, pt1, cix1: integer;
+  NewProject, OldMoney, cix1: integer;
+  pt0, pt1: TProjectType;
   QueryOk: boolean;
 begin
-  assert(not supervising);
+  Assert(not supervising);
   ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
   if ModalSelectDlg.result <> -1 then
@@ -1444 +1449 @@
     else
     begin
-      NewProject := ModalSelectDlg.result;
-      QueryOk := true;
+      NewProject := ModalSelectDlg.Result;
+      QueryOk := True;
       if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
         (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
@@ -1453 +1458 @@
           while (cix1 >= 0) and
             (MyCity[cix1].Built[NewProject and cpIndex] = 0) do
-            dec(cix1);
+            Dec(cix1);
           MessgText := Format(Phrases.Lookup('DOUBLESTATEIMP'),
             [Phrases.Lookup('IMPROVEMENTS', NewProject and cpIndex),
@@ -1465 +1470 @@
         end;
       if not QueryOk then
-        exit;
+        Exit;
 
       if (MyCity[cix].Prod > 0) then
@@ -1476 +1481 @@
             (cpImp or cpIndex) then
           begin // loss of material -- do query
+            DpiApplication.ProcessMessages; // TODO: Needed for Gtk2, Lazarus gtk2 bug?
             if (pt1 = ptTrGoods) or (pt1 = ptShip) or (pt1 <> pt0) and
-              (pt0 <> ptCaravan) then
+              (pt0 <> ptCaravan) then begin
               QueryOk := SimpleQuery(mkOkCancel,
                 Format(Phrases.Lookup('LOSEMAT'), [MyCity[cix].Prod0,
                 MyCity[cix].Prod0]), 'MSG_DEFAULT') = mrOK
-            else if MyCity[cix].Project and (cpImp or cpIndex) = MyCity[cix]
-              .Project0 and (cpImp or cpIndex) then
-              QueryOk := SimpleQuery(mkOkCancel, Phrases.Lookup('LOSEMAT3'),
-                'MSG_DEFAULT') = mrOK
+            end else
+            if MyCity[cix].Project and (cpImp or cpIndex) = MyCity[cix]
+              .Project0 and (cpImp or cpIndex) then begin
+                QueryOk := SimpleQuery(mkOkCancel, Phrases.Lookup('LOSEMAT3'),
+                  'MSG_DEFAULT') = mrOK;
+            end;
           end;
         end;
       end;
       if not QueryOk then
-        exit;
+        Exit;
 
       OldMoney := MyRO.Money;

branches/highdpi/LocalPlayer/ClientTools.pas

@@ -13 +13 @@
 
 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;
 
@@ -42 +42 @@
 function CutCityFoodSurplus(FoodSurplus: integer; IsCityAlive: boolean;
   gov, size: integer): integer;
-function CityTaxBalance(cix: integer; const CityReport: TCityReportNew)
-  : integer;
+function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
 procedure SumCities(var TaxSum, ScienceSum: integer);
 function JobTest(uix, Job: integer; IgnoreResults: JobResultSet = []): boolean;
@@ -50 +49 @@
 function UnitExhausted(uix: integer): boolean;
 function ModelHash(const ModelInfo: TModelInfo): integer;
-function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs)
-  : integer;
+function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
 function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
 procedure DebugMessage(Level: integer; Text: string);
@@ -62 +60 @@
 procedure CityOptimizer_EndOfTurn;
 
+
 implementation
 
@@ -72 +71 @@
 begin
   y0 := (Loc + G.lx * 1024) div G.lx - 1024;
-  result := (Loc + (dx + y0 and 1 + G.lx * 1024) shr 1) mod G.lx + G.lx
-    * (y0 + dy)
+  Result := (Loc + (dx + y0 and 1 + G.lx * 1024) shr 1) mod G.lx + G.lx * (y0 + dy);
 end;
 
@@ -80 +78 @@
   dx, dy: integer;
 begin
-  inc(Loc0, G.lx * 1024);
-  inc(Loc1, G.lx * 1024);
-  dx := abs(((Loc1 mod G.lx * 2 + Loc1 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);
+  Inc(Loc0, G.lx * 1024);
+  Inc(Loc1, G.lx * 1024);
+  dx := abs(((Loc1 mod G.lx * 2 + Loc1 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 := abs(Loc1 div G.lx - Loc0 div G.lx);
-  result := dx + dy + abs(dx - dy) shr 1;
+  Result := dx + dy + abs(dx - dy) shr 1;
 end;
 
@@ -92 +90 @@
   uix1: integer;
 begin
-  result := false;
+  Result := False;
   if MyModel[MyUn[uix].mix].Flags and mdCivil = 0 then
     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;
@@ -106 +104 @@
       for uix1 := 0 to MyRO.nUn - 1 do // check transported units too
         if (MyUn[uix1].Loc >= 0) and (MyUn[uix1].Master = uix) then
-          result := result or UnrestAtLoc(uix1, Loc);
+          Result := Result or UnrestAtLoc(uix1, Loc);
 end;
 
@@ -124 +122 @@
       MoveAdviceData.MoreTurns := 999;
       MoveAdviceData.MaxHostile_MovementLeft := MyUn[uix].Health - MinEndHealth;
-      result := Server(sGetMoveAdvice, me, uix, MoveAdviceData);
-      if (MinEndHealth <= 1) or (result <> eNoWay) then
+      Result := Server(sGetMoveAdvice, me, uix, MoveAdviceData);
+      if (MinEndHealth <= 1) or (Result <> eNoWay) then
         exit;
     end;
@@ -135 +133 @@
       25:
         MinEndHealth := 12;
+      else
+        MinEndHealth := 1
+    end;
+  until False;
+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;
+begin
+  Result := False;
+  for p1 := 1 to nPl - 1 do
+    if G.RO[p1] <> nil then
+      Result := True;
+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])
+  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
+    Result := 0;
+    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;
+begin
+  Result := FoodSurplus;
+  if not IsCityAlive or (Result > 0) and ((gov = gFuture) or
+    (size >= NeedAqueductSize) and (Result < 2)) then
+    Result := 0; { no growth }
+end;
+
+function CityTaxBalance(cix: integer; const CityReport: TCityReportNew): integer;
+var
+  i: integer;
+begin
+  Result := 0;
+  if (CityReport.HappinessBalance >= 0) { no disorder } and
+    (MyCity[cix].Flags and chCaptured = 0) then // not captured
+  begin
+    Inc(Result, CityReport.Tax);
+    if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) and
+      (CityReport.Production > 0) then
+      Inc(Result, CityReport.Production);
+    if ((MyRO.Government = gFuture) or (MyCity[cix].size >=
+      NeedAqueductSize) and (CityReport.FoodSurplus < 2)) and
+      (CityReport.FoodSurplus > 0) then
+      Inc(Result, CityReport.FoodSurplus);
+  end;
+  for i := 28 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
+  TaxSum := MyRO.OracleIncome;
+  ScienceSum := 0;
+  if MyRO.Government = gAnarchy then
+    exit;
+  for cix := 0 to MyRO.nCity - 1 do
+    if MyCity[cix].Loc >= 0 then
+    begin
+      CityReport.HypoTiles := -1;
+      CityReport.HypoTaxRate := -1;
+      CityReport.HypoLuxuryRate := -1;
+      Server(sGetCityReportNew, me, cix, CityReport);
+      if (CityReport.HappinessBalance >= 0) { no disorder } and
+        (MyCity[cix].Flags and chCaptured = 0) then // not captured
+        ScienceSum := ScienceSum + CityReport.Science;
+      TaxSum := TaxSum + CityTaxBalance(cix, CityReport);
+    end;
+end;
+
+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;
+begin
+  if MyMap[Loc] and fOwned <> 0 then
+  begin
+    Server(sGetDefender, me, Loc, uix);
+    Cnt := 0;
+    for i := 0 to MyRO.nUn - 1 do
+      if MyUn[i].Loc = Loc then
+        Inc(Cnt);
+    MakeUnitInfo(me, MyUn[uix], UnitInfo);
+    if Cnt > 1 then
+      UnitInfo.Flags := UnitInfo.Flags or unMulti;
+  end
+  else
+  begin
+    uix := MyRO.nEnemyUn - 1;
+    while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
+      Dec(uix);
+    UnitInfo := MyRO.EnemyUn[uix];
+  end;
+end; { GetUnitInfo }
+
+procedure GetCityInfo(Loc: integer; var cix: integer; var CityInfo: TCityInfo);
+begin
+  if MyMap[Loc] and fOwned <> 0 then
+  begin
+    CityInfo.Loc := Loc;
+    cix := MyRO.nCity - 1;
+    while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+      Dec(cix);
+    with CityInfo do
+    begin
+      Owner := me;
+      ID := MyCity[cix].ID;
+      size := MyCity[cix].size;
+      Flags := 0;
+      if MyCity[cix].Built[imPalace] > 0 then
+        Inc(Flags, ciCapital);
+      if (MyCity[cix].Built[imWalls] > 0) or
+        (MyMap[MyCity[cix].Loc] and fGrWall <> 0) then
+        Inc(Flags, ciWalled);
+      if MyCity[cix].Built[imCoastalFort] > 0 then
+        Inc(Flags, ciCoastalFort);
+      if MyCity[cix].Built[imMissileBat] > 0 then
+        Inc(Flags, ciMissileBat);
+      if MyCity[cix].Built[imBunker] > 0 then
+        Inc(Flags, ciBunker);
+      if MyCity[cix].Built[imSpacePort] > 0 then
+        Inc(Flags, ciSpacePort);
+    end;
+  end
+  else
+  begin
+    cix := MyRO.nEnemyCity - 1;
+    while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
+      Dec(cix);
+    CityInfo := MyRO.EnemyCity[cix];
+  end;
+end;
+
+function UnitExhausted(uix: integer): boolean;
+  // check if another move of this unit is still possible
+var
+  dx, dy: integer;
+begin
+  Result := True;
+  if (MyUn[uix].Movement > 0) or
+    (MyRO.Wonder[woShinkansen].EffectiveOwner = me) then
+    if (MyUn[uix].Movement >= 100) or
+      ((MyModel[MyUn[uix].mix].Kind = mkCaravan) and
+      (MyMap[MyUn[uix].Loc] and fCity <> 0)) then
+      Result := False
     else
-      MinEndHealth := 1
-    end;
-  until false 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;
-  begin
-    result := false;
-    for p1 := 1 to nPl - 1 do
-      if G.RO[p1] <> nil then
-        result := true;
-  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])
-    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
-      result := 0;
-      for i := 1 to 3 do
-        if MyRO.Tech[AgePreq[i]] >= tsApplicable then
-          result := i;
-    end
+      for dx := -2 to 2 do
+        for dy := -2 to 2 do
+          if abs(dx) + abs(dy) = 2 then
+            if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and
+              7 shl 7, me, uix, nil^) >= rExecuted then
+              Result := False;
+end;
+
+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)
     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;
-  begin
-    result := FoodSurplus;
-    if not IsCityAlive or (result > 0) and
-      ((gov = gFuture) or (size >= NeedAqueductSize) and (result < 2)) then
-      result := 0; { no growth }
-  end;
-
-  function CityTaxBalance(cix: integer;
-    const CityReport: TCityReportNew): integer;
-  var
-    i: integer;
-  begin
-    result := 0;
-    if (CityReport.HappinessBalance >= 0) { no disorder }
-      and (MyCity[cix].Flags and chCaptured = 0) then // not captured
-    begin
-      inc(result, CityReport.Tax);
-      if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) and
-        (CityReport.Production > 0) then
-        inc(result, CityReport.Production);
-      if ((MyRO.Government = gFuture) or (MyCity[cix].size >= NeedAqueductSize)
-        and (CityReport.FoodSurplus < 2)) and (CityReport.FoodSurplus > 0) then
-        inc(result, CityReport.FoodSurplus);
+      FeatureCode := 0;
+      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
+            Inc(FeatureCode);
+        end;
+      case Domain of
+        dGround:
+        begin
+          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;
+        end;
+        dSea:
+        begin
+          assert(FeatureCode < 1 shl 9);
+          assert(Attack < 12193);
+          assert(Defense < 6097);
+          assert(Cost < 4381);
+          Hash1 := ((Attack * 6097 + Defense) * 5 +
+            (Speed - 350) div 100) * 2;
+          if Weight >= 6 then
+            Inc(Hash1);
+          Hash2 := ((TTrans * 17 + ATrans_Fuel) shl 9 + FeatureCode) *
+            4381 + Cost;
+        end;
+        dAir:
+        begin
+          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;
+      end;
+      Hash2r := 0;
+      for i := 0 to 7 do
+      begin
+        Hash2r := Hash2r * 13;
+        d := Hash2 div 13;
+        Inc(Hash2r, Hash2 - d * 13);
+        Hash2 := d;
+      end;
+      Result := integer(Domain shl 30 + Hash1 xor Hash2r);
     end;
-    for i := 28 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
-    TaxSum := MyRO.OracleIncome;
-    ScienceSum := 0;
-    if MyRO.Government = gAnarchy then
-      exit;
-    for cix := 0 to MyRO.nCity - 1 do
-      if MyCity[cix].Loc >= 0 then
-      begin
-        CityReport.HypoTiles := -1;
-        CityReport.HypoTaxRate := -1;
-        CityReport.HypoLuxuryRate := -1;
-        Server(sGetCityReportNew, me, cix, CityReport);
-        if (CityReport.HappinessBalance >= 0) { no disorder }
-          and (MyCity[cix].Flags and chCaptured = 0) then // not captured
-          ScienceSum := ScienceSum + CityReport.Science;
-        TaxSum := TaxSum + CityTaxBalance(cix, CityReport);
-      end;
-  end;
-
-  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;
-  begin
-    if MyMap[Loc] and fOwned <> 0 then
-    begin
-      Server(sGetDefender, me, Loc, uix);
-      Cnt := 0;
-      for i := 0 to MyRO.nUn - 1 do
-        if MyUn[i].Loc = Loc then
-          inc(Cnt);
-      MakeUnitInfo(me, MyUn[uix], UnitInfo);
-      if Cnt > 1 then
-        UnitInfo.Flags := UnitInfo.Flags or unMulti;
-    end
-    else
-    begin
-      uix := MyRO.nEnemyUn - 1;
-      while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
-        dec(uix);
-      UnitInfo := MyRO.EnemyUn[uix];
-    end
-  end; { GetUnitInfo }
-
-  procedure GetCityInfo(Loc: integer; var cix: integer;
-    var CityInfo: TCityInfo);
-  begin
-    if MyMap[Loc] and fOwned <> 0 then
-    begin
-      CityInfo.Loc := Loc;
-      cix := MyRO.nCity - 1;
-      while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-        dec(cix);
-      with CityInfo do
-      begin
-        Owner := me;
-        ID := MyCity[cix].ID;
-        size := MyCity[cix].size;
-        Flags := 0;
-        if MyCity[cix].Built[imPalace] > 0 then
-          inc(Flags, ciCapital);
-        if (MyCity[cix].Built[imWalls] > 0) or
-          (MyMap[MyCity[cix].Loc] and fGrWall <> 0) then
-          inc(Flags, ciWalled);
-        if MyCity[cix].Built[imCoastalFort] > 0 then
-          inc(Flags, ciCoastalFort);
-        if MyCity[cix].Built[imMissileBat] > 0 then
-          inc(Flags, ciMissileBat);
-        if MyCity[cix].Built[imBunker] > 0 then
-          inc(Flags, ciBunker);
-        if MyCity[cix].Built[imSpacePort] > 0 then
-          inc(Flags, ciSpacePort);
-      end
-    end
-    else
-    begin
-      cix := MyRO.nEnemyCity - 1;
-      while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
-        dec(cix);
-      CityInfo := MyRO.EnemyCity[cix];
-    end
-  end;
-
-  function UnitExhausted(uix: integer): boolean;
-  // check if another move of this unit is still possible
-  var
-    dx, dy: integer;
-  begin
-    result := true;
-    if (MyUn[uix].Movement > 0) or
-      (MyRO.Wonder[woShinkansen].EffectiveOwner = me) then
-      if (MyUn[uix].Movement >= 100) or
-        ((MyModel[MyUn[uix].mix].Kind = mkCaravan) and
-        (MyMap[MyUn[uix].Loc] and fCity <> 0)) then
-        result := false
-      else
-        for dx := -2 to 2 do
-          for dy := -2 to 2 do
-            if abs(dx) + abs(dy) = 2 then
-              if Server(sMoveUnit - sExecute + dx and 7 shl 4 + dy and 7 shl 7,
-                me, uix, nil^) >= rExecuted then
-                result := false;
-  end;
-
-  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)
-      else
-      begin
-        FeatureCode := 0;
-        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
-              inc(FeatureCode);
-          end;
-        case Domain of
-          dGround:
-            begin
-              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;
-            end;
-          dSea:
-            begin
-              assert(FeatureCode < 1 shl 9);
-              assert(Attack < 12193);
-              assert(Defense < 6097);
-              assert(Cost < 4381);
-              Hash1 := ((Attack * 6097 + Defense) * 5 + (Speed - 350)
-                div 100) * 2;
-              if Weight >= 6 then
-                inc(Hash1);
-              Hash2 := ((TTrans * 17 + ATrans_Fuel) shl 9 + FeatureCode) *
-                4381 + Cost;
-            end;
-          dAir:
-            begin
-              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;
-        end;
-        Hash2r := 0;
-        for i := 0 to 7 do
-        begin
-          Hash2r := Hash2r * 13;
-          d := Hash2 div 13;
-          inc(Hash2r, Hash2 - d * 13);
-          Hash2 := d
-        end;
-        result := integer(Domain shl 30 + Hash1 xor Hash2r)
-      end
-  end;
-
-  function ProcessEnhancement(uix: integer;
-    const Jobs: TEnhancementJobs): integer;
+end;
+
+function ProcessEnhancement(uix: integer; const Jobs: TEnhancementJobs): integer;
   { return values:
     eJobDone - all applicable jobs done
     eOK - enhancement not complete
     eDied - job done and died (thurst) }
-  var
-    stage, NextJob, Tile: integer;
-    Done: Set of jNone .. jPoll;
-  begin
-    Done := [];
-    Tile := MyMap[MyUn[uix].Loc];
-    if Tile and fRoad <> 0 then
-      include(Done, jRoad);
-    if Tile and fRR <> 0 then
-      include(Done, jRR);
-    if (Tile and fTerImp = tiIrrigation) or (Tile and fTerImp = tiFarm) then
-      include(Done, jIrr);
-    if Tile and fTerImp = tiFarm then
-      include(Done, jFarm);
-    if Tile and fTerImp = tiMine then
-      include(Done, jMine);
-    if Tile and fPoll = 0 then
-      include(Done, jPoll);
-
-    if MyUn[uix].Job = jNone then
-      result := eJobDone
-    else
-      result := eOK;
-    while (result <> eOK) and (result <> eDied) do
+var
+  stage, NextJob, Tile: integer;
+  Done: set of jNone .. jPoll;
+begin
+  Done := [];
+  Tile := MyMap[MyUn[uix].Loc];
+  if Tile and fRoad <> 0 then
+    include(Done, jRoad);
+  if Tile and fRR <> 0 then
+    include(Done, jRR);
+  if (Tile and fTerImp = tiIrrigation) or (Tile and fTerImp = tiFarm) then
+    include(Done, jIrr);
+  if Tile and fTerImp = tiFarm then
+    include(Done, jFarm);
+  if Tile and fTerImp = tiMine then
+    include(Done, jMine);
+  if Tile and fPoll = 0 then
+    include(Done, jPoll);
+
+  if MyUn[uix].Job = jNone then
+    Result := eJobDone
+  else
+    Result := eOK;
+  while (Result <> eOK) and (Result <> eDied) do
+  begin
+    stage := -1;
+    repeat
+      if stage = -1 then
+        NextJob := jPoll
+      else
+        NextJob := Jobs[Tile and fTerrain, stage];
+      if (NextJob = jNone) or not (NextJob in Done) then
+        Break;
+      Inc(stage);
+    until stage = 5;
+    if (stage = 5) or (NextJob = jNone) then
     begin
-      stage := -1;
-      repeat
-        if stage = -1 then
-          NextJob := jPoll
-        else
-          NextJob := Jobs[Tile and fTerrain, stage];
-        if (NextJob = jNone) or not(NextJob in Done) then
-          Break;
-        inc(stage);
-      until stage = 5;
-      if (stage = 5) or (NextJob = jNone) then
+      Result := eJobDone;
+      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;
+begin
+  Result := False;
+  if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) or
+    (MyCity[cix].Flags and chProduction <> 0) then
+  begin
+    i := 0;
+    repeat
+      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
       begin
-        result := eJobDone;
+        Result := True;
+        CityOptimizer_CityChange(cix);
         Break;
-      end; // tile enhancement complete
-      result := Server(sStartJob + NextJob shl 4, me, uix, nil^);
-      include(Done, NextJob)
+      end;
+      Inc(i);
+    until False;
+  end;
+end;
+
+procedure CalculateAdvValues;
+var
+  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
+      begin
+        if (AdvPreq[i, 0] >= 0) then
+          MarkPreqs(AdvPreq[i, 0]);
+        if (AdvPreq[i, 1] >= 0) then
+          MarkPreqs(AdvPreq[i, 1]);
+      end;
     end;
   end;
 
-  function AutoBuild(cix: integer; const ImpOrder: TImpOrder): boolean;
-  var
-    i, NewProject: integer;
-  begin
-    result := false;
-    if (MyCity[cix].Project and (cpImp + cpIndex) = cpImp + imTrGoods) or
-      (MyCity[cix].Flags and chProduction <> 0) then
+begin
+  FillChar(AdvValue, SizeOf(AdvValue), 0);
+  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)
+    else if known[adMassProduction] > 0 then
+      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;
+  // return whether a city was marked
+var
+  cix: integer;
+begin
+  Result := False;
+  for cix := 0 to MyRO.nCity - 1 do
+    if (cix <> cixExcept) and (MyCity[cix].Loc >= 0) and
+      (MyCity[cix].Flags and chCaptured = 0) and
+      (Distance(MyCity[cix].Loc, Loc) <= 5) then
     begin
-      i := 0;
-      repeat
-        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
+      CityNeedsOptimize[cix] := True;
+      Result := True;
+    end;
+end;
+
+procedure OptimizeCities(CheckOnly: boolean);
+var
+  cix, fix, dx, dy, Loc1, OptiType: integer;
+  Done: boolean;
+  Advice: TCityTileAdviceData;
+begin
+  repeat
+    Done := True;
+    for cix := 0 to MyRO.nCity - 1 do
+      if CityNeedsOptimize[cix] then
+      begin
+        OptiType := (MyCity[cix].Status shr 4) and $0F;
+        if OptiType <> 0 then
         begin
-          result := true;
-          CityOptimizer_CityChange(cix);
-          Break;
+          Advice.ResourceWeights := OfferedResourceWeights[OptiType];
+          Server(sGetCityTileAdvice, me, cix, Advice);
+          if Advice.Tiles <> MyCity[cix].Tiles then
+            if CheckOnly then
+            begin
+              // TODO: What is this assert for?
+              // Need to optimize city tiles but CheckOnly true?
+              //assert(false)
+            end
+            else
+            begin
+              for fix := 1 to 26 do
+                if MyCity[cix].Tiles and not Advice.Tiles and
+                  (1 shl fix) <> 0 then
+                begin // tile no longer used by this city -- check using it by another
+                  dy := fix shr 2 - 3;
+                  dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
+                  Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
+                  if MarkCitiesAround(Loc1, cix) then
+                    Done := False;
+                end;
+              Server(sSetCityTiles, me, cix, Advice.Tiles);
+            end;
         end;
-        inc(i);
-      until false end end;
-
-      procedure CalculateAdvValues;
-      var
-        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
-            begin
-              if (AdvPreq[i, 0] >= 0) then
-                MarkPreqs(AdvPreq[i, 0]);
-              if (AdvPreq[i, 1] >= 0) then
-                MarkPreqs(AdvPreq[i, 1]);
-            end
-          end
-        end;
-
+        CityNeedsOptimize[cix] := False;
+      end;
+  until Done;
+end;
+
+procedure CityOptimizer_BeginOfTurn;
+var
+  cix: integer;
+begin
+  FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
+  if MyRO.Government <> gAnarchy then
+  begin
+    for cix := 0 to MyRO.nCity - 1 do
+      if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
+      then
+        CityNeedsOptimize[cix] := True;
+    OptimizeCities(False); // optimize all cities
+  end;
+end;
+
+procedure CityOptimizer_CityChange(cix: integer);
+begin
+  if (MyRO.Government <> gAnarchy) and (MyCity[cix].Flags and
+    chCaptured = 0) then
+  begin
+    CityNeedsOptimize[cix] := True;
+    OptimizeCities(False);
+  end;
+end;
+
+procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
+begin
+  if (MyRO.Government <> gAnarchy) and MarkCitiesAround(Loc, -1) then
+    OptimizeCities(False);
+end;
+
+procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
+var
+  fix, dx, dy, Loc1: integer;
+  Done: boolean;
+begin
+  if (MyRO.Government <> gAnarchy) and (ReleasedTiles <> 0) then
+  begin
+    Done := True;
+    for fix := 1 to 26 do
+      if ReleasedTiles and (1 shl fix) <> 0 then
       begin
-        FillChar(AdvValue, SizeOf(AdvValue), 0);
-        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)
-          else if known[adMassProduction] > 0 then
-            inc(AdvValue[i], 2000)
-          else if known[adScience] > 0 then
-            inc(AdvValue[i], 1000)
-        end;
+        dy := fix shr 2 - 3;
+        dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
+        Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
+        if MarkCitiesAround(Loc1, cix) then
+          Done := False;
       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;
-      begin
-        result := false;
-        for cix := 0 to MyRO.nCity - 1 do
-          if (cix <> cixExcept) and (MyCity[cix].Loc >= 0) and
-            (MyCity[cix].Flags and chCaptured = 0) and
-            (Distance(MyCity[cix].Loc, Loc) <= 5) then
-          begin
-            CityNeedsOptimize[cix] := true;
-            result := true;
-          end
-      end;
-
-      procedure OptimizeCities(CheckOnly: boolean);
-      var
-        cix, fix, dx, dy, Loc1, OptiType: integer;
-        Done: boolean;
-        Advice: TCityTileAdviceData;
-      begin
-        repeat
-          Done := true;
-          for cix := 0 to MyRO.nCity - 1 do
-            if CityNeedsOptimize[cix] then begin
-              OptiType := (MyCity[cix].Status shr 4) and $0F;
-              if OptiType <> 0 then begin
-                Advice.ResourceWeights := OfferedResourceWeights[OptiType];
-                Server(sGetCityTileAdvice, me, cix, Advice);
-                if Advice.Tiles <> MyCity[cix].Tiles then
-                  if CheckOnly then begin
-                    // TODO: What is this assert for?
-                    // Need to optimize city tiles but CheckOnly true?
-                    //assert(false)
-                  end else begin
-                    for fix := 1 to 26 do
-                      if MyCity[cix].Tiles and not Advice.Tiles and
-                        (1 shl fix) <> 0 then
-                      begin // tile no longer used by this city -- check using it by another
-                        dy := fix shr 2 - 3;
-                        dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
-                        Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
-                        if MarkCitiesAround(Loc1, cix) then
-                          Done := false;
-                      end;
-                    Server(sSetCityTiles, me, cix, Advice.Tiles);
-                  end;
-              end;
-              CityNeedsOptimize[cix] := false;
-            end;
-        until Done;
-      end;
-
-      procedure CityOptimizer_BeginOfTurn;
-      var
-        cix: integer;
-      begin
-        FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
-        if MyRO.Government <> gAnarchy then
-        begin
-          for cix := 0 to MyRO.nCity - 1 do
-            if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
-            then
-              CityNeedsOptimize[cix] := true;
-          OptimizeCities(false); // optimize all cities
-        end
-      end;
-
-      procedure CityOptimizer_CityChange(cix: integer);
-      begin
-        if (MyRO.Government <> gAnarchy) and
-          (MyCity[cix].Flags and chCaptured = 0) then
-        begin
-          CityNeedsOptimize[cix] := true;
-          OptimizeCities(false);
-        end
-      end;
-
-      procedure CityOptimizer_TileBecomesAvailable(Loc: integer);
-      begin
-        if (MyRO.Government <> gAnarchy) and MarkCitiesAround(Loc, -1) then
-          OptimizeCities(false);
-      end;
-
-      procedure CityOptimizer_ReleaseCityTiles(cix, ReleasedTiles: integer);
-      var
-        fix, dx, dy, Loc1: integer;
-        Done: boolean;
-      begin
-        if (MyRO.Government <> gAnarchy) and (ReleasedTiles <> 0) then
-        begin
-          Done := true;
-          for fix := 1 to 26 do
-            if ReleasedTiles and (1 shl fix) <> 0 then
-            begin
-              dy := fix shr 2 - 3;
-              dx := fix and 3 shl 1 - 3 + (dy + 3) and 1;
-              Loc1 := dLoc(MyCity[cix].Loc, dx, dy);
-              if MarkCitiesAround(Loc1, cix) then
-                Done := false;
-            end;
-          if not Done then
-            OptimizeCities(false);
-        end
-      end;
-
-      procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
-      var
-        uix1: integer;
-      begin
-        if MyRO.Government <> gAnarchy then
-        begin
-          if MyUn[uix].Home >= 0 then
-            CityNeedsOptimize[MyUn[uix].Home] := true;
-
-          // transported units are also removed
-          for uix1 := 0 to MyRO.nUn - 1 do
-            if (MyUn[uix1].Loc >= 0) and (MyUn[uix1].Master = uix) and
-              (MyUn[uix1].Home >= 0) then
-              CityNeedsOptimize[MyUn[uix1].Home] := true;
-        end
-      end;
-
-      procedure CityOptimizer_AfterRemoveUnit;
-      begin
-        if MyRO.Government <> gAnarchy then
-          OptimizeCities(false);
-      end;
-
-      procedure CityOptimizer_EndOfTurn;
-      // all cities should already be optimized here -- only check this
-      var
-        cix: integer;
-      begin
+    if not Done then
+      OptimizeCities(False);
+  end;
+end;
+
+procedure CityOptimizer_BeforeRemoveUnit(uix: integer);
+var
+  uix1: integer;
+begin
+  if MyRO.Government <> gAnarchy then
+  begin
+    if MyUn[uix].Home >= 0 then
+      CityNeedsOptimize[MyUn[uix].Home] := True;
+
+    // transported units are also removed
+    for uix1 := 0 to MyRO.nUn - 1 do
+      if (MyUn[uix1].Loc >= 0) and (MyUn[uix1].Master = uix) and
+        (MyUn[uix1].Home >= 0) then
+        CityNeedsOptimize[MyUn[uix1].Home] := True;
+  end;
+end;
+
+procedure CityOptimizer_AfterRemoveUnit;
+begin
+  if MyRO.Government <> gAnarchy then
+    OptimizeCities(False);
+end;
+
+procedure CityOptimizer_EndOfTurn;
+// all cities should already be optimized here -- only check this
+var
+  cix: integer;
+begin
 {$IFOPT O-}
-        if MyRO.Government <> gAnarchy then
-        begin
-          FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
-          for cix := 0 to MyRO.nCity - 1 do
-            if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
-            then
-              CityNeedsOptimize[cix] := true;
-          OptimizeCities(true); // check all cities
-        end;
+  if MyRO.Government <> gAnarchy then
+  begin
+    FillChar(CityNeedsOptimize, MyRO.nCity - 1, 0); // false
+    for cix := 0 to MyRO.nCity - 1 do
+      if (MyCity[cix].Loc >= 0) and (MyCity[cix].Flags and chCaptured = 0)
+      then
+        CityNeedsOptimize[cix] := True;
+    OptimizeCities(True); // check all cities
+  end;
 {$ENDIF}
-      end;
+end;
 
 initialization
 
-Assert(nImp < 128);
-CalculateAdvValues;
+  Assert(nImp < 128);
+  CalculateAdvValues;
 
 end.

branches/highdpi/LocalPlayer/Draft.pas

@@ -92 +92 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png',
+    [gfNoGamma]);
 end;
 

branches/highdpi/LocalPlayer/Enhance.pas

@@ -366 +366 @@
   Shift: TShiftState);
 begin
-  if Key = VK_ESCAPE then
-    Close
-  else if Key = VK_F1 then
+  if Key = VK_F1 then
     HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
       HelpDlg.TextIndex('MACRO'))

branches/highdpi/LocalPlayer/Help.pas

@@ -127 +127 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
+  UKeyBindings;
 
 {$R *.lfm}
@@ -207 +208 @@
 destructor THyperText.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -1242 +1243 @@
       until FindNext(sr) <> 0;
     FindClose(sr);
-    Plus.Free;
+    FreeAndNil(Plus);
 
     List.Sort;
@@ -1259 +1260 @@
       MainText.AddLine(s);
     end;
-    List.Free;
+    FreeAndNil(List);
   end;
 
@@ -1277 +1278 @@
       MainText.AddLine(s);
     end;
-    List.Free;
+    FreeAndNil(List);
   end;
 
@@ -1439 +1440 @@
             AppendList(List);
           end;
-          List.Free;
+          FreeAndNil(List);
         end
         else // single advance
@@ -1538 +1539 @@
           List.Sort;
           AppendList(List);
-          List.Free;
+          FreeAndNil(List);
         end
         else if no = 201 then
@@ -1827 +1828 @@
             AppendList(List);
           end;
-          List.Free;
+          FreeAndNil(List);
         end
         else
@@ -1988 +1989 @@
     OffscreenPaint;
     Invalidate;
-    HistItem.Free;
+    FreeAndNil(HistItem);
   end;
 end;
@@ -2016 +2017 @@
   Shift: TShiftState);
 begin
-  if Key = VK_F1 then // my key
+  if KeyToShortCut(Key, Shift) = BHelp.ShortCut then // my key
   else
-    inherited
+    inherited;
 end;
 

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -133 +133 @@
   OnInitEnemyModel := InitEnemyModelHandler;
   if NoMap <> nil then
-    NoMap.Free;
+    FreeAndNil(NoMap);
   NoMap := TIsoMap.Create;
 end;
@@ -168 +168 @@
   { prepare dithered ground tiles }
   if LandPatch <> nil then
-    LandPatch.Free;
+    FreeAndNil(LandPatch);
   LandPatch := TDpiBitmap.Create;
   LandPatch.PixelFormat := pf24bit;
@@ -175 +175 @@
   LandPatch.Canvas.FillRect(0, 0, LandPatch.Width, LandPatch.Height);
   if OceanPatch <> nil then
-    OceanPatch.Free;
+    FreeAndNil(OceanPatch);
   OceanPatch := TDpiBitmap.Create;
   OceanPatch.PixelFormat := pf24bit;
@@ -363 +363 @@
       DitherMask.Canvas, 0, 0, SRCAND);
 
-  LandMore.Free;
-  OceanMore.Free;
-  DitherMask.Free;
+  FreeAndNil(LandMore);
+  FreeAndNil(OceanMore);
+  FreeAndNil(DitherMask);
 
   // reduce size of terrain icons
@@ -417 +417 @@
   end;
   Mask24.EndUpdate;
-  Mask24.Free;
+  FreeAndNil(Mask24);
 
   if Borders <> nil then
-    Borders.Free;
+    FreeAndNil(Borders);
   Borders := TDpiBitmap.Create;
   Borders.PixelFormat := pf24bit;
@@ -702 +702 @@
     end;
     Textout(xShield + 2, yShield - 1, LabelTextColor, s);
-  end
+  end;
 end; { PaintCity }
 
@@ -1078 +1078 @@
   if not(FoW and (Tile and fObserved = 0)) then
     PaintBorder;
+
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
     TSprite(x, y, spPlain);
@@ -1287 +1288 @@
   i: integer;
 begin
-  FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   for i := 0 to nx div 2 do

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -218 +218 @@
   end
   else
-    result := inherited ShowModal;
+    result := inherited;
 end;
 

branches/highdpi/LocalPlayer/NatStat.pas

@@ -93 +93 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png',
+    [gfNoGamma]);
 end;
 
 procedure TNatStatDlg.FormDestroy(Sender: TObject);
 begin
-  ReportText.Free;
+  FreeAndNil(ReportText);
   FreeMem(SelfReport);
-  Template.Free;
-  Back.Free;
+  FreeAndNil(Template);
+  FreeAndNil(Back);
 end;
 

branches/highdpi/LocalPlayer/Select.pas

@@ -1605 +1605 @@
   CaptionRight := CloseBtn.Left;
   { TODO:
-  SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - GetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, DpiGetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);

branches/highdpi/LocalPlayer/TechTree.pas

@@ -23 +23 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
-    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CloseBtnClick(Sender: TObject);
   private
@@ -133 +132 @@
   NewHeight: Integer;
 const
-  TransparentColor = $7F007F;
+  TransparentColor: Cardinal = $7F007F;
 begin
   if Image = nil then begin
     Image := TDpiBitmap.Create;
     Image.PixelFormat := pf24bit;
-    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
+    LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png',
+      [gfNoGamma]);
 
     with Image.Canvas do begin
@@ -228 +228 @@
 end;
 
-procedure TTechTreeDlg.FormKeyDown(Sender: TObject; var Key: Word;
-  Shift: TShiftState);
-begin
-  if Key = VK_ESCAPE then
-    Close;
-end;
-
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin

branches/highdpi/LocalPlayer/Term.pas

@@ -235 +235 @@
     Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
       HaveStrategyAdvice, FirstMovieTurn: boolean;
+    PrevWindowState: TWindowState;
+    CurrentWindowState: TWindowState;
     function ChooseUnusedTribe: integer;
     procedure GetTribeList;
@@ -283 +285 @@
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
     procedure SoundPreload(Check: integer);
+    procedure UpdateKeyShortcuts;
+    procedure SetFullScreen(Active: Boolean);
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -307 +311 @@
     FileName: ShortString;
   end;
-
   TCityNameInfo = record
     ID: integer;
-    NewName: ShortString end;
-    TModelNameInfo = record mix: integer;
-    NewName: ShortString end;
-    TPriceSet = Set of $00 .. $FF;
+    NewName: ShortString;
+  end;
+  TModelNameInfo = record
+    mix: integer;
+    NewName: ShortString;
+  end;
+  TPriceSet = Set of $00 .. $FF;
 
 const
@@ -481 +487 @@
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global;
+  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
 
 {$R *.lfm}
@@ -531 +537 @@
   SmallScreen, GameOK, MapValid, skipped, idle: boolean;
 
-  SaveOption: array [0 .. nSaveOption - 1] of integer;
-  MiniColors: array [0 .. $1f, 0 .. 1] of TColor;
+  SaveOption: array [0..nSaveOption - 1] of integer;
+  MiniColors: array [0..11, 0..1] of TColor;
   MainMap: TIsoMap;
   CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
@@ -551 +557 @@
 procedure InitSmallImp;
 const
-  cut = 4;
+  Cut = 4;
   Sharpen = 80;
 type
@@ -742 +748 @@
     ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
       ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
-  result := true
+  result := true;
 end;
 
@@ -786 +792 @@
 function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
 begin
-  if not FileExists(LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
-    '.tribe.txt')) then
-  begin
-    result := false;
-    exit
+  FileName := LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
+    CevoTribeExt);
+  if not FileExists(FileName) then
+  begin
+    Result := False;
+    Exit;
   end;
 
@@ -879 +886 @@
             MyModel[mix].Status := MyModel[mix].Status or msObsolete;
       end;
-      inc(MyData.ToldModels)
+      inc(MyData.ToldModels);
     end;
 end;
@@ -1123 +1130 @@
       if UnitStatDlg.Visible then
         UnitStatDlg.Close;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1151 +1158 @@
       if UnitStatDlg.Visible then
         UnitStatDlg.Close;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1175 +1182 @@
         UnFocus := -1;
         PaintLoc(Loc0);
-      end
+      end;
     end;
     UnFocus := uix;
@@ -1220 +1227 @@
     MovieSpeed3Btn.Visible := false;
     MovieSpeed4Btn.Visible := false;
-  end
+  end;
 end;
 
@@ -1248 +1255 @@
     if AILogo[p] <> nil then
     begin
-      AILogo[p].free;
-      AILogo[p] := nil
-    end
+      FreeAndNil(AILogo[p]);
+    end;
   end
   else
@@ -1256 +1262 @@
     if AILogo[p] = nil then
       AILogo[p] := TDpiBitmap.Create;
-    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', gfNoError) then
-    begin
-      AILogo[p].free;
-      AILogo[p] := nil
-    end
-  end
+    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', [gfNoError]) then
+    begin
+      FreeAndNil(AILogo[p]);
+    end;
+  end;
 end;
 
@@ -1296 +1301 @@
       MapValid := false;
       PaintAllMaps;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -1415 +1420 @@
 begin
   UnusedTribeFiles.Clear;
-  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*.tribe.txt',
+  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
     faArchive + faReadOnly, SearchRec) = 0;
   if not ok then
   begin
     FindClose(SearchRec);
-    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*.tribe.txt'),
+    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
       faArchive + faReadOnly, SearchRec) = 0;
   end;
   if ok then
     repeat
-      SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - 10);
+      SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - Length(CevoTribeExt));
       if GetTribeInfo(SearchRec.Name, Name, Color) then
         UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
@@ -1434 +1439 @@
 function TMainScreen.ChooseUnusedTribe: integer;
 var
-  i, j, ColorDistance, BestColorDistance, TestColorDistance,
-    CountBest: integer;
+  i: Integer;
+  j: Integer;
+  ColorDistance: Integer;
+  BestColorDistance: Integer;
+  TestColorDistance: Integer;
+  CountBest: Integer;
 begin
   assert(UnusedTribeFiles.Count > 0);
@@ -1465 +1474 @@
       if DelphiRandom(CountBest) = 0 then
         result := j
-    end
+    end;
   end;
 end;
@@ -1523 +1532 @@
           IconKind := mikShip;
           IconIndex := Ship2Owner;
-        end
+        end;
     end;
 
@@ -1536 +1545 @@
           MostCost := TestCost;
           IconIndex := imShipComp + i
-        end
+        end;
       end;
     end;
@@ -1619 +1628 @@
   sb := TPVScrollbar.Create(Self);
   sb.OnUpdate := ScrollBarUpdate;
-end; { InitModule }
+end;
 
 procedure TMainScreen.InitTurn(NewPlayer: integer);
@@ -2237 +2246 @@
                     Flags and CityRepMask);
                   UpdatePanel := true;
-                end
+                end;
               end
               else { if mRepList.Checked then }
@@ -2243 +2252 @@
                 if Flags and CityRepMask <> 0 then
                   ShowCityList := true
-              end
-            end
+              end;
+            end;
           end; { city loop }
   end; // ClientMode=cTurn
@@ -2263 +2272 @@
           Play('REVOLUTION');
           Server(sRevolution, me, 0, nil^);
-        end
+        end;
       end;
   end; // ClientMode=cTurn
@@ -2382 +2391 @@
                 else
                   Status := Status and not usWaiting;
-            end
+            end;
           end;
   end; // ClientMode=cTurn
@@ -2480 +2489 @@
               opAllModel:
                 s := s + 'All models';
-            end
+            end;
           end;
           LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
@@ -2488 +2497 @@
           s := s + '--- ACCEPTED! ---';
           LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
-        end
+        end;
       end;
 
@@ -2502 +2511 @@
     cReleaseModule:
       begin
-        SmallImp.free;
-        UnusedTribeFiles.free;
-        TribeNames.free;
-        MainMap.free;
+        FreeAndNil(SmallImp);
+        FreeAndNil(UnusedTribeFiles);
+        FreeAndNil(TribeNames);
+        FreeAndNil(MainMap);
         IsoEngine.Done;
         // AdvisorDlg.DeInit;
@@ -2703 +2712 @@
         for p1 := 0 to nPl - 1 do
           if Tribe[p1] <> nil then
-            Tribe[p1].free;
+            FreeAndNil(Tribe[p1]);
         Tribes.Done;
         RepaintOnResize := false;
@@ -2844 +2853 @@
           // this break will ensure speed of fast forward does not depend on cpu speed
           DpiApplication.ProcessMessages;
-        end
+        end;
       end;
 
@@ -2923 +2932 @@
               DipCall(scReject);
               EndNego
-            end
-          end
+            end;
+          end;
         end;
       end;
@@ -3410 +3419 @@
   i, j: integer;
 begin
+  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+  UpdateKeyShortcuts;
+
   MainFormKeyDown := FormKeyDown;
   BaseWin.CreateOffscreen(Offscreen);
@@ -3512 +3524 @@
   I: Integer;
 begin
+  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   MainFormKeyDown := nil;
   FreeAndNil(sb);
@@ -3615 +3628 @@
     RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
     MapValid := false;
-    PaintAll
-  end
+    PaintAll;
+  end;
 end;
 
@@ -3623 +3636 @@
   CanClose := Closable;
   if not Closable and idle and (me = 0) and (ClientMode < scContact) then
-    MenuClick(mResign)
+    MenuClick(mResign);
 end;
 
@@ -4061 +4074 @@
 var
   uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel, MiniPixel: TPixelPointer;
+  PrevMiniPixel: TPixelPointer;
+  MiniPixel: TPixelPointer;
+  TerrainTile: Cardinal;
 begin
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
@@ -4085 +4100 @@
             ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
           MiniPixel.SetXY(xm, y);
-          cm := MiniColors[MyMap[Loc] and fTerrain, i];
+          TerrainTile := MyMap[Loc] and fTerrain;
+          if TerrainTile > 11 then TerrainTile := 0;
+          cm := MiniColors[TerrainTile, i];
           if ClientMode = cEditMap then
           begin
@@ -6422 +6439 @@
     MapValid := false;
     PaintAllMaps;
-  end
+  end;
+end;
+
+procedure TMainScreen.UpdateKeyShortcuts;
+begin
+  mHelp.ShortCut := BHelp.ShortCut;
+  mUnitStat.ShortCut := BUnitStat.ShortCut;
+  mCityStat.ShortCut := BCityStat.ShortCut;
+  mScienceStat.ShortCut := BScienceStat.ShortCut;
+  mEUnitStat.ShortCut := BEUnitStat.ShortCut;;
+  mDiagram.ShortCut := BDiagram.ShortCut;
+  mWonders.ShortCut := BWonders.ShortCut;
+  mShips.ShortCut := BShips.ShortCut;
+  mNations.ShortCut := BNations.ShortCut;
+  mEmpire.ShortCut := BEmpire.ShortCut;
+  mResign.ShortCut := BResign.ShortCut;
+  mRandomMap.ShortCut := BRandomMap.ShortCut;
+  mDisband.ShortCut := BDisbandUnit.ShortCut;
+  mFort.ShortCut := BFortify.ShortCut;
+  mCentre.ShortCut := BCenterUnit.ShortCut;
+  mStay.ShortCut := BStay.ShortCut;
+  mNoOrders.ShortCut := BNoOrders.ShortCut;
+  mCancel.ShortCut := BCancel.ShortCut;
+  mPillage.ShortCut := BPillage.ShortCut;
+  mTechTree.ShortCut := BTechTree.ShortCut;
+  mWait.ShortCut := BWait.ShortCut;
+  mJump.ShortCut := BJump.ShortCut;;
+  mDebugMap.ShortCut := BDebugMap.ShortCut;
+  mLocCodes.ShortCut := BLocCodes.ShortCut;
+  mNames.ShortCut := BNames.ShortCut;
+  mRun.ShortCut := BRun.ShortCut;
+  mAirBase.ShortCut := BAirBase.ShortCut;
+  mCity.ShortCut := BBuildCity.ShortCut;
+  mEnhance.ShortCut := BEnhance.ShortCut;
+  mGoOn.ShortCut := BGoOn.ShortCut;
+  mHome.ShortCut := BHome.ShortCut;
+  mFarm.ShortCut := BFarmClearIrrigation.ShortCut;
+  mClear.ShortCut := BFarmClearIrrigation.ShortCut;
+  mIrrigation.ShortCut := BFarmClearIrrigation.ShortCut;
+  mLoad.ShortCut := BLoad.ShortCut;
+  mAfforest.ShortCut := BAfforestMine.ShortCut;
+  mMine.ShortCut := BAfforestMine.ShortCut;
+  mCanal.ShortCut := BCanal.ShortCut;
+  MTrans.ShortCut := BTrans.ShortCut;
+  mPollution.ShortCut := BPollution.ShortCut;
+  mRR.ShortCut := BRailRoad.ShortCut;
+  mRoad.ShortCut := BRailRoad.ShortCut;
+  mUnload.ShortCut := BUnload.ShortCut;
+  mRecover.ShortCut := BRecover.ShortCut;
+  mUtilize.ShortCut := BUtilize.ShortCut;
+end;
+
+procedure TMainScreen.SetFullScreen(Active: Boolean);
+begin
+    if Active and (CurrentWindowState <> wsFullScreen) then begin
+      PrevWindowState := WindowState;
+      CurrentWindowState := wsFullScreen;
+      WindowState := CurrentWindowState;
+      {$IFDEF WINDOWS}
+      BorderStyle := bsNone;
+      {$ENDIF}
+      BorderIcons := [];
+    end else
+    if not Active and (CurrentWindowState = wsFullScreen) then begin
+      if PrevWindowState = wsMaximized then begin
+        CurrentWindowState := wsMaximized;
+        WindowState := CurrentWindowState;
+      end else begin
+        CurrentWindowState := wsNormal;
+        WindowState := CurrentWindowState;
+        WindowState := wsFullScreen;
+        WindowState := CurrentWindowState;
+      end;
+      {$IFDEF WINDOWS}
+      BorderStyle := bsSizeable;
+      {$ENDIF}
+      BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+    end;
 end;
 
@@ -6435 +6529 @@
   end;
 
+  procedure SetViewpointMe(p: Integer);
+  begin
+    if p = me then SetViewpoint(p)
+      else SetViewpoint(p);
+  end;
+
+  procedure DoMoveUnit(X, Y: Integer);
+  begin
+    DestinationMarkON := False;
+    PaintDestination;
+    MyUn[UnFocus].Status := MyUn[UnFocus].Status and
+      ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+    MoveUnit(X, Y, muAutoNext);
+  end;
+
 var
-  dx, dy: integer;
-  time0, time1: TDateTime;
-begin
-  if GameMode = cMovie then
-  begin
-    case Key of
-      VK_F4:
-        MenuClick_Check(StatPopup, mScienceStat);
-      VK_F6:
-        MenuClick_Check(StatPopup, mDiagram);
-      VK_F7:
-        MenuClick_Check(StatPopup, mWonders);
-      VK_F8:
-        MenuClick_Check(StatPopup, mShips);
-    end;
-    exit;
-  end;
-
-  if not idle then
-    exit;
-
-  if ClientMode = cEditMap then
-  begin
-    if Shift = [ssCtrl] then
+  Time0, Time1: TDateTime;
+  ShortCut: TShortCut;
+begin
+  ShortCut := KeyToShortCut(Key, Shift);
+
+  if GameMode = cMovie then begin
+    if BScienceStat.Test(ShortCut) then MenuClick_Check(StatPopup, mScienceStat)
+    else if BDiagram.Test(ShortCut) then MenuClick_Check(StatPopup, mDiagram)
+    else if BWonders.Test(ShortCut) then MenuClick_Check(StatPopup, mWonders)
+    else if BShips.Test(ShortCut) then MenuClick_Check(StatPopup, mShips);
+    Exit;
+  end;
+
+  if not Idle then Exit;
+
+  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 Shift = [ssCtrl] then
       case char(Key) of
-        (* 'A':
+         'A':
           begin // auto symmetry
           Server($7F0,me,0,nil^);
@@ -6473 +6578 @@
           if MyMap[dx] and fTerrain>=fGrass then inc(dy);
           dy:=dy
-          end; *)
-        'Q':
-          MenuClick(mResign);
-        'R':
-          MenuClick(mRandomMap);
-      end
-    else if Shift = [] then
-      case char(Key) of
-        char(VK_F1):
-          MenuClick(mHelp);
+          end;
       end;
-    exit;
-  end;
-
-  if Shift = [ssAlt] then
-    case char(Key) of
-      '0':
-        SetDebugMap(-1);
-      '1' .. '9':
-        SetDebugMap(ord(Key) - 48);
+    *)
+    Exit;
+  end;
+
+  if BEndTurn.Test(ShortCut) then EndTurn
+  else if BFullScreen.Test(ShortCut) then begin
+    FullScreen := not FullScreen;
+    SetFullScreen(FullScreen);
+  end
+  else if BHelp.Test(ShortCut) then MenuClick(mHelp)
+  else if BUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mUnitStat)
+  else if BCityStat.Test(ShortCut) then MenuClick_Check(StatPopup, mCityStat)
+  else if BScienceStat.Test(ShortCut) then MenuClick_Check(StatPopup, mScienceStat)
+  else if BEUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mEUnitStat)
+  else if BDiagram.Test(ShortCut) then MenuClick_Check(StatPopup, mDiagram)
+  else if BWonders.Test(ShortCut) then MenuClick_Check(StatPopup, mWonders)
+  else if BShips.Test(ShortCut) then MenuClick_Check(StatPopup, mShips)
+  else if BNations.Test(ShortCut) then MenuClick_Check(StatPopup, mNations)
+  else if BEmpire.Test(ShortCut) then MenuClick_Check(StatPopup, mEmpire)
+
+  else if BSetDebugMap0.Test(ShortCut) then SetDebugMap(-1)
+  else if BSetDebugMap1.Test(ShortCut) then SetDebugMap(1)
+  else if BSetDebugMap2.Test(ShortCut) then SetDebugMap(2)
+  else if BSetDebugMap3.Test(ShortCut) then SetDebugMap(3)
+  else if BSetDebugMap4.Test(ShortCut) then SetDebugMap(4)
+  else if BSetDebugMap5.Test(ShortCut) then SetDebugMap(5)
+  else if BSetDebugMap6.Test(ShortCut) then SetDebugMap(6)
+  else if BSetDebugMap7.Test(ShortCut) then SetDebugMap(7)
+  else if BSetDebugMap8.Test(ShortCut) then SetDebugMap(8)
+  else if BSetDebugMap9.Test(ShortCut) then SetDebugMap(9)
+
+  else if BJump.Test(ShortCut) then MenuClick(mJump)
+  else if BDebugMap.Test(ShortCut) then mShowClick(mDebugMap)
+  else if BLocCodes.Test(ShortCut) then mShowClick(mLocCodes)
+  else if BLogDlg.Test(ShortCut) then begin
+    if LogDlg.Visible then LogDlg.Close
+      else LogDlg.Show;
+  end
+  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 BTestMapRepaint.Test(ShortCut) then begin // test map repaint time
+    Time0 := NowPrecise;
+    MapValid := False;
+    MainOffscreenPaint;
+    Time1 := NowPrecise;
+    SimpleMessage(Format('Map repaint time: %.3f ms',
+      [(Time1 - Time0) / OneMillisecond]));
+  end
+  else if BSetViewpoint0.Test(ShortCut) then SetViewpointMe(0)
+  else if BSetViewpoint1.Test(ShortCut) then SetViewpointMe(1)
+  else if BSetViewpoint2.Test(ShortCut) then SetViewpointMe(2)
+  else if BSetViewpoint3.Test(ShortCut) then SetViewpointMe(3)
+  else if BSetViewpoint4.Test(ShortCut) then SetViewpointMe(4)
+  else if BSetViewpoint5.Test(ShortCut) then SetViewpointMe(5)
+  else if BSetViewpoint6.Test(ShortCut) then SetViewpointMe(6)
+  else if BSetViewpoint7.Test(ShortCut) then SetViewpointMe(7)
+  else if BSetViewpoint8.Test(ShortCut) then SetViewpointMe(8)
+  else if BSetViewpoint9.Test(ShortCut) then SetViewpointMe(9)
+
+  else if BMapBtn0.Test(ShortCut) then MapBtnClick(MapBtn0)
+  else if BMapBtn1.Test(ShortCut) then MapBtnClick(MapBtn1)
+  else if BMapBtn4.Test(ShortCut) then MapBtnClick(MapBtn4)
+  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);
+
+  if UnFocus >= 0 then begin
+    if BDisbandUnit.Test(ShortCut) then MenuClick(mDisband)
+    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 BCancel.Test(ShortCut) then MenuClick_Check(UnitPopup, mCancel)
+    else if BPillage.Test(ShortCut) then MenuClick_Check(UnitPopup, mPillage)
+    else if BSelectTransport.Test(ShortCut) then MenuClick_Check(UnitPopup, mSelectTransport)
+    else if BAirBase.Test(ShortCut) then MenuClick_Check(TerrainPopup, mAirBase)
+    else if BBuildCity.Test(ShortCut) then MenuClick_Check(UnitPopup, mCity)
+    else if BEnhance.Test(ShortCut) then begin
+      InitPopup(TerrainPopup);
+      if mEnhance.Visible and mEnhance.Enabled then MenuClick(mEnhance)
+        else MenuClick(mEnhanceDef)
     end
-  else if Shift = [ssCtrl] then
-    case char(Key) of
-      'J':
-        MenuClick(mJump);
-      'K':
-        mShowClick(mDebugMap);
-      'L':
-        mShowClick(mLocCodes);
-      'M':
-        if LogDlg.Visible then
-          LogDlg.Close
-        else
-          LogDlg.Show;
-      'N':
-        mNamesClick(mNames);
-      'Q':
-        MenuClick_Check(GamePopup, mResign);
-      'R':
-        MenuClick(mRun);
-      '0' .. '9':
-        begin
-          if ord(Key) - 48 = me then
-            SetViewpoint(0)
-          else
-            SetViewpoint(ord(Key) - 48);
-        end;
-      ' ':
-        begin // test map repaint time
-          time0 := NowPrecise;
-          MapValid := false;
-          MainOffscreenPaint;
-          time1 := NowPrecise;
-          SimpleMessage(Format('Map repaint time: %.3f ms',
-            [(time1 - time0) / OneMillisecond]));
-        end
+    else if BGoOn.Test(ShortCut) then MenuClick_Check(UnitPopup, mGoOn)
+    else if BHome.Test(ShortCut) then MenuClick_Check(UnitPopup, mHome)
+    else if BFarmClearIrrigation.Test(ShortCut) then begin
+      if JobTest(UnFocus, jFarm, [eTreaty]) then
+        MenuClick(mFarm)
+      else if JobTest(UnFocus, jClear, [eTreaty]) then
+        MenuClick(mClear)
+      else MenuClick_Check(TerrainPopup, mIrrigation);
     end
-  else if Shift = [] then
-    case char(Key) of
-      char(VK_F1):
-        MenuClick(mHelp);
-      char(VK_F2):
-        MenuClick_Check(StatPopup, mUnitStat);
-      char(VK_F3):
-        MenuClick_Check(StatPopup, mCityStat);
-      char(VK_F4):
-        MenuClick_Check(StatPopup, mScienceStat);
-      char(VK_F5):
-        MenuClick_Check(StatPopup, mEUnitStat);
-      char(VK_F6):
-        MenuClick_Check(StatPopup, mDiagram);
-      char(VK_F7):
-        MenuClick_Check(StatPopup, mWonders);
-      char(VK_F8):
-        MenuClick_Check(StatPopup, mShips);
-      char(VK_F9):
-        MenuClick_Check(StatPopup, mNations);
-      char(VK_F10):
-        MenuClick_Check(StatPopup, mEmpire);
-      char(VK_ADD):
-        EndTurn;
-      '1':
-        MapBtnClick(MapBtn0);
-      '2':
-        MapBtnClick(MapBtn1);
-      '3':
-        MapBtnClick(MapBtn4);
-      '4':
-        MapBtnClick(MapBtn5);
-      '5':
-        MapBtnClick(MapBtn6);
-      'T':
-        MenuClick(mTechTree);
-      'W':
-        MenuClick(mWait);
-    end;
-
-  if UnFocus >= 0 then
-    if Shift = [ssCtrl] then
-      case char(Key) of
-        'C':
-          MenuClick_Check(UnitPopup, mCancel);
-        'D':
-          MenuClick(mDisband);
-        'P':
-          MenuClick_Check(UnitPopup, mPillage);
-        'T':
-          MenuClick_Check(UnitPopup, mSelectTransport);
-      end
-    else if Shift = [] then
-      case char(Key) of
-        ' ':
-          MenuClick(mNoOrders);
-        'A':
-          MenuClick_Check(TerrainPopup, mAirBase);
-        'B':
-          MenuClick_Check(UnitPopup, mCity);
-        'C':
-          MenuClick(mCentre);
-        'E':
-          begin
-            InitPopup(TerrainPopup);
-            if mEnhance.Visible and mEnhance.Enabled then
-              MenuClick(mEnhance)
-            else
-              MenuClick(mEnhanceDef)
-          end;
-        'F':
-          MenuClick_Check(TerrainPopup, mFort);
-        'G':
-          MenuClick_Check(UnitPopup, mGoOn);
-        'H':
-          MenuClick_Check(UnitPopup, mHome);
-        'I':
-          if JobTest(UnFocus, jFarm, [eTreaty]) then
-            MenuClick(mFarm)
-          else if JobTest(UnFocus, jClear, [eTreaty]) then
-            MenuClick(mClear)
-          else
-            MenuClick_Check(TerrainPopup, mIrrigation);
-        'L':
-          MenuClick_Check(UnitPopup, mLoad);
-        'M':
-          if JobTest(UnFocus, jAfforest, [eTreaty]) then
-            MenuClick(mAfforest)
-          else
-            MenuClick_Check(TerrainPopup, mMine);
-        'N':
-          MenuClick_Check(TerrainPopup, mCanal);
-        'O':
-          MenuClick_Check(TerrainPopup, MTrans);
-        'P':
-          MenuClick_Check(TerrainPopup, mPollution);
-        'R':
-          if JobTest(UnFocus, jRR, [eTreaty]) then
-            MenuClick(mRR)
-          else
-            MenuClick_Check(TerrainPopup, mRoad);
-        'S':
-          MenuClick(mStay);
-        'U':
-          MenuClick_Check(UnitPopup, mUnload);
-        'V':
-          MenuClick_Check(UnitPopup, mRecover);
-        'Z':
-          MenuClick_Check(UnitPopup, mUtilize);
-        #33 .. #40, #97 .. #100, #102 .. #105:
-          begin { arrow keys }
-            DestinationMarkON := false;
-            PaintDestination;
-            MyUn[UnFocus].Status := MyUn[UnFocus].Status and
-              ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
-            case Key of
-              VK_NUMPAD1, VK_END:
-                begin
-                  dx := -1;
-                  dy := 1
-                end;
-              VK_NUMPAD2, VK_DOWN:
-                begin
-                  dx := 0;
-                  dy := 2
-                end;
-              VK_NUMPAD3, VK_NEXT:
-                begin
-                  dx := 1;
-                  dy := 1
-                end;
-              VK_NUMPAD4, VK_LEFT:
-                begin
-                  dx := -2;
-                  dy := 0
-                end;
-              VK_NUMPAD6, VK_RIGHT:
-                begin
-                  dx := 2;
-                  dy := 0
-                end;
-              VK_NUMPAD7, VK_HOME:
-                begin
-                  dx := -1;
-                  dy := -1
-                end;
-              VK_NUMPAD8, VK_UP:
-                begin
-                  dx := 0;
-                  dy := -2
-                end;
-              VK_NUMPAD9, VK_PRIOR:
-                begin
-                  dx := 1;
-                  dy := -1
-                end;
-            end;
-            MoveUnit(dx, dy, muAutoNext)
-          end;
-      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)
+        else MenuClick_Check(TerrainPopup, mMine);
+    end
+    else if BCanal.Test(ShortCut) then MenuClick_Check(TerrainPopup, mCanal)
+    else if BTrans.Test(ShortCut) then MenuClick_Check(TerrainPopup, MTrans)
+    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)
+        else MenuClick_Check(TerrainPopup, mRoad);
+    end
+    else if BUnload.Test(ShortCut) then MenuClick_Check(UnitPopup, mUnload)
+    else if BRecover.Test(ShortCut) then MenuClick_Check(UnitPopup, mRecover)
+    else if BUtilize.Test(ShortCut) then MenuClick_Check(UnitPopup, mUtilize)
+    else if BMoveLeftDown.Test(ShortCut) then DoMoveUnit(-1, 1)
+    else if BMoveDown.Test(ShortCut) then DoMoveUnit(0, 2)
+    else if BMoveRightDown.Test(ShortCut) then DoMoveUnit(1, 1)
+    else if BMoveLeft.Test(ShortCut) then DoMoveUnit(-2, 0)
+    else if BMoveRight.Test(ShortCut) then DoMoveUnit(2, 0)
+    else if BMoveLeftUp.Test(ShortCut) then DoMoveUnit(-1, -1)
+    else if BMoveUp.Test(ShortCut) then  DoMoveUnit(0, -2)
+    else if BMoveRightUp.Test(ShortCut) then DoMoveUnit(1, -1);
+  end;
 end;
 
@@ -7152 +7159 @@
             SetTroopLoc(Loc);
             PanelPaint
-          end
+          end;
         end
       else if Sender = mSelectTransport then
@@ -7171 +7178 @@
     begin
       HaveCities := true;
-      Break
+      Break;
     end;
   if Popup = GamePopup then
@@ -7271 +7278 @@
             m.Checked := true;
           mDebugMap.Add(m);
-        end
+        end;
     end;
     mSmallTiles.Checked := xxt = 33;
@@ -7455 +7462 @@
   begin
     SetTroopLoc(-1);
-    PanelPaint
+    PanelPaint;
   end
   else
@@ -7474 +7481 @@
       SetTroopLoc(-1);
       PanelPaint
-    end
-  end
+    end;
+  end;
 end;
 
@@ -7523 +7530 @@
         2 + G.ly);
       Update;
-    end
+    end;
   end
   else
@@ -7539 +7546 @@
     MiniPaint;
     PanelPaint;
-  end
+  end;
 end;
 
@@ -7591 +7598 @@
 begin
   result := (y >= TopBarHeight + MapHeight) or (y >= ClientHeight - PanelHeight)
-    and ((x < xMidPanel) or (x >= xRightPanel))
+    and ((x < xMidPanel) or (x >= xRightPanel));
 end;
 
@@ -7608 +7615 @@
           GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
             TopBarHeight - 1);
-      end
+      end;
     end
     else if IsPanelPixel(x, y) then
@@ -7771 +7778 @@
       CityRepMask := CityRepMask or (1 shl (Tag shr 8))
     else
-      CityRepMask := CityRepMask and not(1 shl (Tag shr 8))
-  end
+      CityRepMask := CityRepMask and not(1 shl (Tag shr 8));
+  end;
 end;
 
@@ -7782 +7789 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
-  if FullScreen then begin
-    WindowState := wsFullScreen;
-    BorderStyle := bsNone;
-    BorderIcons := [];
-  end else begin
-    WindowState := wsMaximized;
-    BorderStyle := bsSizeable;
-    BorderIcons := [biSystemMenu, biMinimize, biMaximize];
-  end;
+  SetFullScreen(FullScreen);
   Timer1.Enabled := True;
 end;
@@ -7827 +7826 @@
       else if Flag = tfAllTechs then
         TellNewModels
-    end
-  end
+    end;
+  end;
 end;
 
@@ -7898 +7897 @@
       GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
-    exit
-  end // windows menu button calls game menu
+    exit;
+  end; // windows menu button calls game menu
 end;
 

branches/highdpi/LocalPlayer/Tribes.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, LazFileUtils,
-  Classes, Graphics, SysUtils;
+  Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global;
 
 type
   TCityPicture = record
-    xShield, yShield: integer;
+    xShield: Integer;
+    yShield: Integer;
   end;
 
   TModelPicture = record
-    HGr, pix, xShield, yShield: integer;
+    HGr: Integer;
+    pix: Integer;
+    xShield: Integer;
+    yShield: Integer;
   end;
 
   TModelPictureInfo = record
-    trix, mix, pix, Hash: integer;
+    trix: Integer;
+    mix: Integer;
+    pix: Integer;
+    Hash: Integer;
     GrName: ShortString;
   end;
 
   TTribe = class
-    symHGr, sympix, faceHGr, facepix, cHGr, cpix,
+    symHGr: Integer;
+    sympix: Integer;
+    faceHGr: Integer;
+    facepix: Integer;
+    cHGr: Integer;
+    cpix: Integer;
     // symbol and city graphics
-    cAge, mixSlaves: integer;
+    cAge: Integer;
+    mixSlaves: Integer;
     Color: TColor;
-    NumberName: integer;
+    NumberName: Integer;
     CityPicture: array [0 .. 3] of TCityPicture;
     ModelPicture: array [-1 .. 256] of TModelPicture; // -1 is building site
@@ -33 +45 @@
     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}
-    procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: boolean);
+    procedure SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
     function ChooseModelPicture(var Picture: TModelPictureInfo;
-      code, Turn: integer; ForceNew: boolean): boolean;
-    procedure InitAge(Age: integer);
+      Code, Turn: Integer; ForceNew: Boolean): Boolean;
+    procedure InitAge(Age: Integer);
   protected
-    CityLine0, nCityLines: integer;
+    CityLine0: Integer;
+    nCityLines: Integer;
     Name: array ['a' .. 'z'] of string;
-    Script: tstringlist;
+    Script: TStringList;
   end;
 
 var
   Tribe: array [0 .. nPl - 1] of TTribe;
-  HGrStdUnits: integer;
+  HGrStdUnits: Integer;
 
 procedure Init;
 procedure Done;
-function CityName(Founder: integer): string;
-function ModelCode(const ModelInfo: TModelInfo): integer;
-procedure FindStdModelPicture(code: integer; var pix: integer;
-  var Name: string);
-function GetTribeInfo(FileName: string; var Name: string;
-  var Color: TColor): boolean;
-procedure FindPosition(HGr, x, y, xmax, ymax: integer; Mark: TColor;
-  var xp, yp: integer);
+function CityName(Founder: Integer): string;
+function ModelCode(const ModelInfo: TModelInfo): Integer;
+procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
+function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): Boolean;
+procedure FindPosition(HGr, x, y, xmax, ymax: Integer; Mark: TColor;
+  var xp, yp: Integer);
+
 
 implementation
@@ -69 +81 @@
 type
   TChosenModelPictureInfo = record
-    Hash, HGr, pix: integer;
-    ModelName: ShortString end;
-
-    TPictureList = array [0 .. 99999] of TChosenModelPictureInfo;
-
-  var
-    StdUnitScript: tstringlist;
-    PictureList: ^TPictureList;
-    nPictureList: integer;
-
-    procedure Init;
-    begin
-      StdUnitScript := tstringlist.Create;
-      StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes' + DirectorySeparator + 'StdUnits.txt'));
-      nPictureList := 0;
-      PictureList := nil;
+    Hash: Integer;
+    HGr: Integer;
+    pix: Integer;
+    ModelName: ShortString;
+  end;
+
+  TPictureList = array [0 .. 99999] of TChosenModelPictureInfo;
+
+var
+  StdUnitScript: TStringList;
+  PictureList: ^TPictureList;
+  nPictureList: Integer;
+
+procedure Init;
+begin
+  StdUnitScript := TStringList.Create;
+  StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes' +
+    DirectorySeparator + 'StdUnits.txt'));
+  nPictureList := 0;
+  PictureList := nil;
+end;
+
+procedure Done;
+begin
+  ReallocMem(PictureList, 0);
+  FreeAndNil(StdUnitScript);
+end;
+
+function CityName(Founder: Integer): string;
+begin
+  if not GenerateNames then
+    Result := Format('%d.%d', [Founder shr 12, Founder and $FFF])
+  else
+    Result := Tribe[Founder shr 12].GetCityName(Founder and $FFF);
+end;
+
+function ModelCode(const ModelInfo: TModelInfo): Integer;
+begin
+  with ModelInfo do
+  begin
+    case Kind of
+      mkSelfDeveloped, mkEnemyDeveloped:
+        case Domain of { age determination }
+          dGround:
+            if (Attack >= Defense * 4) or (Attack > 0) and
+              (MaxUpgrade < 10) and
+              (Cap and (1 shl (mcArtillery - mcFirstNonCap)) <> 0) then
+            begin
+              Result := 170;
+              if MaxUpgrade >= 12 then
+                Inc(Result, 3)
+              else if (MaxUpgrade >= 10) or (Weight > 7) then
+                Inc(Result, 2)
+              else if MaxUpgrade >= 4 then
+                Inc(Result, 1);
+            end
+            else
+            begin
+              Result := 100;
+              if MaxUpgrade >= 12 then
+                Inc(Result, 6)
+              else if (MaxUpgrade >= 10) or (Weight > 7) then
+                Inc(Result, 5)
+              else if MaxUpgrade >= 6 then
+                Inc(Result, 4)
+              else if MaxUpgrade >= 4 then
+                Inc(Result, 3)
+              else if MaxUpgrade >= 2 then
+                Inc(Result, 2)
+              else if MaxUpgrade >= 1 then
+                Inc(Result, 1);
+              if Speed >= 250 then
+                if (Result >= 105) and (Attack <= Defense) then
+                  Result := 110
+                else
+                  Inc(Result, 30);
+            end;
+          dSea:
+          begin
+            Result := 200;
+            if MaxUpgrade >= 8 then
+              Inc(Result, 3)
+            else if MaxUpgrade >= 6 then
+              Inc(Result, 2)
+            else if MaxUpgrade >= 3 then
+              Inc(Result, 1);
+            if Cap and (1 shl (mcSub - mcFirstNonCap)) <> 0 then
+              Result := 240
+            else if ATrans_Fuel > 0 then
+              Result := 220
+            else if (Result >= 202) and (Attack = 0) and (TTrans > 0) then
+              Result := 210;
+          end;
+          dAir:
+          begin
+            Result := 300;
+            if (Bombs > 0) or (TTrans > 0) then
+              Inc(Result, 10);
+            if Speed > 850 then
+              Inc(Result, 1);
+          end;
+        end;
+      mkSpecial_TownGuard:
+        Result := 41;
+      mkSpecial_Boat:
+        Result := 64;
+      mkSpecial_SubCabin:
+        Result := 71;
+      mkSpecial_Glider:
+        Result := 73;
+      mkSlaves:
+        Result := 74;
+      mkSettler:
+        if Speed > 150 then
+          Result := 11
+        else
+          Result := 10;
+      mkDiplomat:
+        Result := 21;
+      mkCaravan:
+        Result := 30;
     end;
-
-    procedure Done;
-    begin
-      ReallocMem(PictureList, 0);
-      StdUnitScript.Free;
+  end;
+end;
+
+var
+  Input: string;
+
+function Get: string;
+var
+  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);
+end;
+
+function GetNum: Integer;
+var
+  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
+  begin // look through StdUnits
+    Input := StdUnitScript[i];
+    pix := GetNum;
+    if Code = GetNum then
+    begin
+      Name := Get;
+      Exit;
     end;
-
-    function CityName(Founder: integer): string;
-    begin
-      if not GenerateNames then
-        result := Format('%d.%d', [Founder shr 12, Founder and $FFF])
+  end;
+  pix := -1;
+end;
+
+function GetTribeInfo(FileName: string; var Name: string;
+  var Color: TColor): Boolean;
+var
+  Found: Integer;
+  TribeScript: TextFile;
+begin
+  Name := '';
+  Color := $FFFFFF;
+  Found := 0;
+  AssignFile(TribeScript, LocalizedFilePath('Tribes' + DirectorySeparator +
+    FileName + CevoTribeExt));
+  Reset(TribeScript);
+  while not EOF(TribeScript) do
+  begin
+    ReadLn(TribeScript, Input);
+    if Copy(Input, 1, 7) = '#CHOOSE' then
+    begin
+      Name := Copy(Input, 9, 255);
+      Found := Found or 1;
+      if Found = 3 then
+        Break;
+    end
+    else if Copy(Input, 1, 6) = '#COLOR' then
+    begin
+      Color := HexStringToColor(Copy(Input, 7, 255));
+      Found := Found or 2;
+      if Found = 3 then
+        Break;
+    end;
+  end;
+  CloseFile(TribeScript);
+  Result := Found = 3;
+end;
+
+constructor TTribe.Create(FileName: string);
+var
+  Line: Integer;
+  Variant: Char;
+  Item: string;
+begin
+  inherited Create;
+  for Variant := 'a' to 'z' do
+    Name[Variant] := '';
+  Script := TStringList.Create;
+  Script.LoadFromFile(FileName);
+  CityLine0 := 0;
+  nCityLines := 0;
+  for Line := 0 to Script.Count - 1 do
+  begin
+    Input := Script[Line];
+    if (CityLine0 > 0) and (nCityLines = 0) and
+      ((Input = '') or (Input[1] = '#')) then
+      nCityLines := Line - CityLine0;
+    if (Length(Input) >= 3) and (Input[1] = '#') and
+      (Input[2] in ['a' .. 'z']) and (Input[3] = ' ') then
+      Name[Input[2]] := Copy(Input, 4, 255)
+    else if Copy(Input, 1, 6) = '#COLOR' then
+      Color := HexStringToColor(Copy(Input, 7, 255))
+    else if Copy(Input, 1, 7) = '#CITIES' then
+      CityLine0 := Line + 1
+    else if Copy(Input, 1, 8) = '#SYMBOLS' then
+    begin
+      Delete(Input, 1, 9);
+      Item := Get;
+      sympix := GetNum;
+      symHGr := LoadGraphicSet(Item + '.png');
+    end;
+  end;
+  FillChar(ModelPicture, SizeOf(ModelPicture), 0);
+  NumberName := -1;
+  cAge := -1;
+  mixSlaves := -1;
+end;
+
+destructor TTribe.Destroy;
+begin
+  FreeAndNil(Script);
+  inherited;
+end;
+
+procedure FindPosition(HGr, x, y, xmax, ymax: Integer; Mark: TColor;
+  var xp, yp: Integer);
+begin
+  xp := 0;
+  while (xp < xmax) and (GrExt[HGr].Data.Canvas.Pixels[x + 1 + xp, y] <> Mark) do
+    Inc(xp);
+  yp := 0;
+  while (yp < ymax) and (GrExt[HGr].Data.Canvas.Pixels[x, y + 1 + yp] <> Mark) do
+    Inc(yp);
+end;
+
+function TTribe.GetCityName(i: Integer): string;
+begin
+  Result := '';
+  if nCityLines > i then
+  begin
+    Result := Script[CityLine0 + i];
+    while (Result <> '') and ((Result[1] = ' ') or (Result[1] = #9)) do
+      Delete(Result, 1, 1);
+  end
+{$IFNDEF SCR}
+  else
+    Result := Format(TPhrase('GENCITY'), [i + 1]);
+{$ENDIF}
+end;
+
+{$IFNDEF SCR}
+procedure TTribe.SetCityName(i: Integer; NewName: string);
+begin
+  while nCityLines <= i do
+  begin
+    Script.Insert(CityLine0 + nCityLines, Format(TPhrase('GENCITY'),
+      [nCityLines + 1]));
+    Inc(nCityLines);
+  end;
+  Script[CityLine0 + i] := NewName;
+end;
+
+function TTribe.TString(Template: string): string;
+var
+  p: Integer;
+  Variant: Char;
+  CaseUp: Boolean;
+begin
+  repeat
+    p := pos('#', Template);
+    if (p = 0) or (p = Length(Template)) then
+      Break;
+    Variant := Template[p + 1];
+    CaseUp := Variant in ['A' .. 'Z'];
+    if CaseUp then
+      Inc(Variant, 32);
+    Delete(Template, p, 2);
+    if Variant in ['a' .. 'z'] then
+    begin
+      if NumberName < 0 then
+        Insert(Name[Variant], Template, p)
       else
-        result := Tribe[Founder shr 12].GetCityName(Founder and $FFF);
-    end;
-
-    function ModelCode(const ModelInfo: TModelInfo): integer;
-    begin
-      with ModelInfo do
-      begin
-        case Kind of
-          mkSelfDeveloped, mkEnemyDeveloped:
-            case Domain of { age determination }
-              dGround:
-                if (Attack >= Defense * 4) or (Attack > 0) and (MaxUpgrade < 10)
-                  and (Cap and (1 shl (mcArtillery - mcFirstNonCap)) <> 0) then
-                begin
-                  result := 170;
-                  if MaxUpgrade >= 12 then
-                    inc(result, 3)
-                  else if (MaxUpgrade >= 10) or (Weight > 7) then
-                    inc(result, 2)
-                  else if MaxUpgrade >= 4 then
-                    inc(result, 1)
-                end
-                else
-                begin
-                  result := 100;
-                  if MaxUpgrade >= 12 then
-                    inc(result, 6)
-                  else if (MaxUpgrade >= 10) or (Weight > 7) then
-                    inc(result, 5)
-                  else if MaxUpgrade >= 6 then
-                    inc(result, 4)
-                  else if MaxUpgrade >= 4 then
-                    inc(result, 3)
-                  else if MaxUpgrade >= 2 then
-                    inc(result, 2)
-                  else if MaxUpgrade >= 1 then
-                    inc(result, 1);
-                  if Speed >= 250 then
-                    if (result >= 105) and (Attack <= Defense) then
-                      result := 110
-                    else
-                      inc(result, 30)
-                end;
-              dSea:
-                begin
-                  result := 200;
-                  if MaxUpgrade >= 8 then
-                    inc(result, 3)
-                  else if MaxUpgrade >= 6 then
-                    inc(result, 2)
-                  else if MaxUpgrade >= 3 then
-                    inc(result, 1);
-                  if Cap and (1 shl (mcSub - mcFirstNonCap)) <> 0 then
-                    result := 240
-                  else if ATrans_Fuel > 0 then
-                    result := 220
-                  else if (result >= 202) and (Attack = 0) and (TTrans > 0) then
-                    result := 210;
-                end;
-              dAir:
-                begin
-                  result := 300;
-                  if (Bombs > 0) or (TTrans > 0) then
-                    inc(result, 10);
-                  if Speed > 850 then
-                    inc(result, 1)
-                end;
-            end;
-          mkSpecial_TownGuard:
-            result := 41;
-          mkSpecial_Boat:
-            result := 64;
-          mkSpecial_SubCabin:
-            result := 71;
-          mkSpecial_Glider:
-            result := 73;
-          mkSlaves:
-            result := 74;
-          mkSettler:
-            if Speed > 150 then
-              result := 11
-            else
-              result := 10;
-          mkDiplomat:
-            result := 21;
-          mkCaravan:
-            result := 30;
-        end;
-      end;
-    end;
-
-  var
-    Input: string;
-
-    function Get: string;
-
-  var
-    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)
-  end;
-
-  function GetNum: integer;
-
-  var
-    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
-    begin // look through StdUnits
-      Input := StdUnitScript[i];
-      pix := GetNum;
-      if code = GetNum then
-      begin
-        Name := Get;
-        exit;
-      end
-    end;
-    pix := -1
-  end;
-
-  function GetTribeInfo(FileName: string; var Name: string;
-    var Color: TColor): boolean;
-
-  var
-    found: integer;
-    TribeScript: TextFile;
-  begin
-    Name := '';
-    Color := $FFFFFF;
-    found := 0;
-    AssignFile(TribeScript, LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
-      '.tribe.txt'));
-    Reset(TribeScript);
-    while not EOF(TribeScript) do
-    begin
-      ReadLn(TribeScript, Input);
-      if Copy(Input, 1, 7) = '#CHOOSE' then
-      begin
-        Name := Copy(Input, 9, 255);
-        found := found or 1;
-        if found = 3 then
-          break
-      end
-      else if Copy(Input, 1, 6) = '#COLOR' then
-      begin
-        Color := HexStringToColor(Copy(Input, 7, 255));
-        found := found or 2;
-        if found = 3 then
-          break
-      end
-    end;
-    CloseFile(TribeScript);
-    result := found = 3;
-  end;
-
-  constructor TTribe.Create(FileName: string);
-
-  var
-    line: integer;
-    variant: char;
-    Item: string;
-  begin
-    inherited Create;
-    for variant := 'a' to 'z' do
-      Name[variant] := '';
-    Script := tstringlist.Create;
-    Script.LoadFromFile(LocalizedFilePath('Tribes' + DirectorySeparator + FileName + '.tribe.txt'));
-    CityLine0 := 0;
-    nCityLines := 0;
-    for line := 0 to Script.Count - 1 do
-    begin
-      Input := Script[line];
-      if (CityLine0 > 0) and (nCityLines = 0) and
-        ((Input = '') or (Input[1] = '#')) then
-        nCityLines := line - CityLine0;
-      if (Length(Input) >= 3) and (Input[1] = '#') and (Input[2] in ['a' .. 'z']
-        ) and (Input[3] = ' ') then
-        Name[Input[2]] := Copy(Input, 4, 255)
-      else if Copy(Input, 1, 6) = '#COLOR' then
-        Color := HexStringToColor(Copy(Input, 7, 255))
-      else if Copy(Input, 1, 7) = '#CITIES' then
-        CityLine0 := line + 1
-      else if Copy(Input, 1, 8) = '#SYMBOLS' then
-      begin
-        Delete(Input, 1, 9);
-        Item := Get;
-        sympix := GetNum;
-        symHGr := LoadGraphicSet(Item + '.png');
-      end
-    end;
-    FillChar(ModelPicture, SizeOf(ModelPicture), 0);
-    NumberName := -1;
-    cAge := -1;
-    mixSlaves := -1;
-  end;
-
-  destructor TTribe.Destroy;
-  begin
-    Script.Free;
-    inherited Destroy;
-  end;
-
-  procedure FindPosition(HGr, x, y, xmax, ymax: integer; Mark: TColor;
-    var xp, yp: integer);
-  begin
-    xp := 0;
-    while (xp < xmax) and (GrExt[HGr].Data.Canvas.Pixels[x + 1 + xp, y]
-      <> Mark) do
-      inc(xp);
-    yp := 0;
-    while (yp < ymax) and (GrExt[HGr].Data.Canvas.Pixels[x, y + 1 + yp]
-      <> Mark) do
-      inc(yp);
-  end;
-
-  function TTribe.GetCityName(i: integer): string;
-  begin
-    result := '';
-    if nCityLines > i then
-    begin
-      result := Script[CityLine0 + i];
-      while (result <> '') and ((result[1] = ' ') or (result[1] = #9)) do
-        Delete(result, 1, 1);
+        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
-{$IFNDEF SCR} else
-      result := Format(TPhrase('GENCITY'), [i + 1]){$ENDIF}
-  end;
-
-{$IFNDEF SCR}
-  procedure TTribe.SetCityName(i: integer; NewName: string);
-  begin
-    while nCityLines <= i do
-    begin
-      Script.Insert(CityLine0 + nCityLines, Format(TPhrase('GENCITY'),
-        [nCityLines + 1]));
-      inc(nCityLines);
-    end;
-    Script[CityLine0 + i] := NewName;
-  end;
-
-  function TTribe.TString(Template: string): string;
-
-  var
-    p: integer;
-    variant: char;
-    CaseUp: boolean;
-  begin
-    repeat
-      p := pos('#', Template);
-      if (p = 0) or (p = Length(Template)) then
-        break;
-      variant := Template[p + 1];
-      CaseUp := variant in ['A' .. 'Z'];
-      if CaseUp then
-        inc(variant, 32);
-      Delete(Template, p, 2);
-      if variant in ['a' .. 'z'] then
-      begin
-        if NumberName < 0 then
-          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);
-      end
-      until false;
-      result := Template;
-    end;
-
-    function TTribe.TPhrase(Item: string): string;
-    begin
-      result := TString(Phrases.Lookup(Item));
-    end;
+  until False;
+  Result := Template;
+end;
+
+function TTribe.TPhrase(Item: string): string;
+begin
+  Result := TString(Phrases.Lookup(Item));
+end;
+
 {$ENDIF}
 
-    procedure TTribe.InitAge(Age: integer);
-    type
-      TLine = array [0 .. 649, 0 .. 2] of Byte;
-    var
-      i, x, gray: integer;
-      Item: string;
-    begin
-      if Age = cAge then
-        exit;
-      cAge := Age;
-      with Script do
-      begin
-        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];
-          system.Delete(Input, 1, 6);
-          Item := Get;
-          cpix := GetNum;
-          // init city graphics
-          if Age < 2 then
-          begin
-            if CompareText(Item, 'stdcities') = 0 then
-              case cpix of
-                3:
-                  cpix := 0;
-                6:
-                  begin
-                    cpix := 0;
-                    Item := 'Nation2';
-                  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,
-                  xShield, yShield);
-                // FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
-              end
-          end
-          else
-            cHGr := -1;
-
-{$IFNDEF SCR}
-          Get;
-          GetNum;
-          Item := Get;
-          if Item = '' then
-            faceHGr := -1
-          else
-          begin
-            faceHGr := LoadGraphicSet(Item + '.png');
-            facepix := GetNum;
-            if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
-              facepix div 10 * 49 + 48] = $00FFFF then
-            begin // generate shield picture
-              GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
-                facepix div 10 * 49 + 48] := $000000;
-              gray := $B8B8B8;
-              ImageOp_BCC(GrExt[faceHGr].Data, Templates,
-                facepix mod 10 * 65 + 1, facepix div 10 * 49 + 1, 1, 25, 64, 48,
-                gray, Color);
+procedure TTribe.InitAge(Age: Integer);
+type
+  TLine = array [0 .. 649, 0 .. 2] of Byte;
+var
+  i, x, Gray: Integer;
+  Item: string;
+begin
+  if Age = cAge then
+    Exit;
+  cAge := Age;
+  with Script do
+  begin
+    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];
+      system.Delete(Input, 1, 6);
+      Item := Get;
+      cpix := GetNum;
+      // init city graphics
+      if Age < 2 then
+      begin
+        if CompareText(Item, 'stdcities') = 0 then
+          case cpix of
+            3:
+              cpix := 0;
+            6:
+            begin
+              cpix := 0;
+              Item := 'Nation2';
             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,
+              xShield, yShield);
+            // FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
+          end;
+      end
+      else
+        cHGr := -1;
+
+{$IFNDEF SCR}
+      Get;
+      GetNum;
+      Item := Get;
+      if Item = '' then
+        faceHGr := -1
+      else
+      begin
+        faceHGr := LoadGraphicSet(Item + '.png');
+        facepix := GetNum;
+        if GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+          facepix div 10 * 49 + 48] = $00FFFF then
+        begin // generate shield picture
+          GrExt[faceHGr].Data.Canvas.Pixels[facepix mod 10 * 65,
+            facepix div 10 * 49 + 48] := $000000;
+          Gray := $B8B8B8;
+          ImageOp_BCC(GrExt[faceHGr].Data, Templates,
+            facepix mod 10 * 65 + 1, facepix div 10 * 49 + 1, 1, 25, 64, 48,
+            Gray, Color);
+        end;
+      end;
 {$ENDIF}
-        end
-      end
     end;
-
-    procedure TTribe.SetModelPicture(const Info: TModelPictureInfo;
-      IsNew: boolean);
-    var
-      i: integer;
-      ok: boolean;
-    begin
-      with Info do
-      begin
-        if not IsNew then
+  end;
+end;
+
+procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
+var
+  i: Integer;
+  ok: Boolean;
+begin
+  with Info do
+  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;
+    end
+    else
+    begin
+      with ModelPicture[mix] do
+      begin
+        HGr := LoadGraphicSet(GrName);
+        pix := Info.pix;
+        Inc(GrExt[HGr].pixUsed[pix]);
+      end;
+      ModelName[mix] := '';
+
+      // read model name from tribe script
+      ok := False;
+      for i := 0 to Script.Count - 1 do
+      begin
+        Input := Script[i];
+        if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
+          ok := True
+        else if (Input <> '') and (Input[1] = '#') then
+          ok := False
+        else if ok and (GetNum = pix) 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;
-        end
-        else
+          Get;
+          ModelName[mix] := Get;
+        end;
+      end;
+
+      if ModelName[mix] = '' then
+      begin // read model name from StdUnits.txt
+        for i := 0 to StdUnitScript.Count - 1 do
         begin
-          with ModelPicture[mix] do
+          Input := StdUnitScript[i];
+          if GetNum = pix then
           begin
-            HGr := LoadGraphicSet(GrName);
-            pix := Info.pix;
-            inc(GrExt[HGr].pixUsed[pix]);
+            Get;
+            ModelName[mix] := Get;
           end;
-          ModelName[mix] := '';
-
-          // read model name from tribe script
-          ok := false;
-          for i := 0 to Script.Count - 1 do
-          begin
-            Input := Script[i];
-            if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
-              ok := true
-            else if (Input <> '') and (Input[1] = '#') then
-              ok := false
-            else if ok and (GetNum = pix) then
-            begin
-              Get;
-              ModelName[mix] := Get
-            end
-          end;
-
-          if ModelName[mix] = '' then
-          begin // read model name from StdUnits.txt
-            for i := 0 to StdUnitScript.Count - 1 do
-            begin
-              Input := StdUnitScript[i];
-              if GetNum = pix then
-              begin
-                Get;
-                ModelName[mix] := Get
-              end
-            end
-          end;
-
-          if Hash <> 0 then
-          begin
-            if nPictureList = 0 then
-              ReallocMem(PictureList, 64 * SizeOf(TChosenModelPictureInfo))
-            else if (nPictureList >= 64) and
-              (nPictureList and (nPictureList - 1) = 0) then
-              ReallocMem(PictureList,
-                nPictureList * (2 * SizeOf(TChosenModelPictureInfo)));
-            PictureList[nPictureList].Hash := Info.Hash;
-            PictureList[nPictureList].HGr := ModelPicture[mix].HGr;
-            PictureList[nPictureList].pix := Info.pix;
-            PictureList[nPictureList].ModelName := ModelName[mix];
-            inc(nPictureList);
-          end
         end;
-
-        with ModelPicture[mix] do
-          FindPosition(HGr, pix mod 10 * 65, pix div 10 * 49, 63, 47, $FFFFFF,
-            xShield, yShield);
+      end;
+
+      if Hash <> 0 then
+      begin
+        if nPictureList = 0 then
+          ReallocMem(PictureList, 64 * SizeOf(TChosenModelPictureInfo))
+        else if (nPictureList >= 64) and (nPictureList and
+          (nPictureList - 1) = 0) then
+          ReallocMem(PictureList,
+            nPictureList * (2 * SizeOf(TChosenModelPictureInfo)));
+        PictureList[nPictureList].Hash := Info.Hash;
+        PictureList[nPictureList].HGr := ModelPicture[mix].HGr;
+        PictureList[nPictureList].pix := Info.pix;
+        PictureList[nPictureList].ModelName := ModelName[mix];
+        Inc(nPictureList);
       end;
     end;
 
-    function TTribe.ChooseModelPicture(var Picture: TModelPictureInfo;
-      code, Turn: integer; ForceNew: boolean): boolean;
-    var
-      i, Cnt, HGr, used, LeastUsed: integer;
-      TestPic: TModelPictureInfo;
-      ok: boolean;
-
-      procedure check;
-      begin
-        TestPic.pix := GetNum;
-        if code = GetNum then
-        begin
-          if ForceNew or (HGr < 0) then
-            used := 0
-          else
-          begin
-            used := 4 * GrExt[HGr].pixUsed[TestPic.pix];
-            if HGr = HGrStdUnits then
-              inc(used, 2); // prefer units not from StdUnits
-          end;
-          if used < LeastUsed then
-          begin
-            Cnt := 0;
-            LeastUsed := used
-          end;
-          if used = LeastUsed then
-          begin
-            inc(Cnt);
-            if Turn mod Cnt = 0 then
-              Picture := TestPic
-          end;
-        end
-      end;
-
-    begin
-      // look for identical model to assign same picture again
-      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 := GrExt[PictureList[i].HGr].Name;
-            Picture.pix := PictureList[i].pix;
-            result := false;
-            exit;
-          end
-      end;
-
-      Picture.pix := 0;
-      TestPic := Picture;
-      LeastUsed := MaxInt;
-
-      TestPic.GrName := 'StdUnits.png';
-      HGr := HGrStdUnits;
-      for i := 0 to StdUnitScript.Count - 1 do
-      begin // look through StdUnits
-        Input := StdUnitScript[i];
-        check;
-      end;
-
-      ok := false;
-      for i := 0 to Script.Count - 1 do
-      begin // look through units defined in tribe script
-        Input := Script[i];
-        if Copy(Input, 1, 6) = '#UNITS' then
-        begin
-          ok := true;
-          TestPic.GrName := Copy(Input, 8, 255) + '.png';
-          HGr := nGrExt - 1;
-          while (HGr >= 0) and (GrExt[HGr].Name <> TestPic.GrName) do
-            dec(HGr);
-        end
-        else if (Input <> '') and (Input[1] = '#') then
-          ok := false
-        else if ok then
-          check;
-      end;
-      result := true;
+    with ModelPicture[mix] do
+      FindPosition(HGr, pix mod 10 * 65, pix div 10 * 49, 63, 47, $FFFFFF,
+        xShield, yShield);
+  end;
+end;
+
+function TTribe.ChooseModelPicture(var Picture: TModelPictureInfo;
+  Code, Turn: Integer; ForceNew: Boolean): Boolean;
+var
+  i, Cnt, HGr, Used, LeastUsed: Integer;
+  TestPic: TModelPictureInfo;
+  ok: Boolean;
+
+  procedure Check;
+  begin
+    TestPic.pix := GetNum;
+    if Code = GetNum then
+    begin
+      if ForceNew or (HGr < 0) then
+        Used := 0
+      else
+      begin
+        Used := 4 * GrExt[HGr].pixUsed[TestPic.pix];
+        if HGr = HGrStdUnits then
+          Inc(Used, 2); // prefer units not from StdUnits
+      end;
+      if Used < LeastUsed then
+      begin
+        Cnt := 0;
+        LeastUsed := Used;
+      end;
+      if Used = LeastUsed then
+      begin
+        Inc(Cnt);
+        if Turn mod Cnt = 0 then
+          Picture := TestPic;
+      end;
     end;
+  end;
+
+begin
+  // look for identical model to assign same picture again
+  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 := GrExt[PictureList[i].HGr].Name;
+        Picture.pix := PictureList[i].pix;
+        Result := False;
+        Exit;
+      end;
+  end;
+
+  Picture.pix := 0;
+  TestPic := Picture;
+  LeastUsed := MaxInt;
+
+  TestPic.GrName := 'StdUnits.png';
+  HGr := HGrStdUnits;
+  for i := 0 to StdUnitScript.Count - 1 do
+  begin // look through StdUnits
+    Input := StdUnitScript[i];
+    Check;
+  end;
+
+  ok := False;
+  for i := 0 to Script.Count - 1 do
+  begin // look through units defined in tribe script
+    Input := Script[i];
+    if Copy(Input, 1, 6) = '#UNITS' then
+    begin
+      ok := True;
+      TestPic.GrName := Copy(Input, 8, 255) + '.png';
+      HGr := nGrExt - 1;
+      while (HGr >= 0) and (GrExt[HGr].Name <> TestPic.GrName) do
+        Dec(HGr);
+    end
+    else if (Input <> '') and (Input[1] = '#') then
+      ok := False
+    else if ok then
+      Check;
+  end;
+  Result := True;
+end;
 
 end.

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -83 +83 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png',
+    [gfNoGamma]);
 end;
 
 procedure TUnitStatDlg.FormDestroy(Sender: TObject);
 begin
-  Template.Free;
-  Back.Free;
+  FreeAndNil(Template);
+  FreeAndNil(Back);
 end;
 
@@ -276 +277 @@
 procedure TUnitStatDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -363 +364 @@
             inc(dx, 15)
           end;
-        end
-      end
+        end;
+      end;
   end; { featurebar }