Changeset 465 for branches/highdpi/LocalPlayer

Timestamp:

Nov 30, 2023, 10:16:14 PM (18 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

Location:

branches/highdpi/LocalPlayer

Files:

• Battle.pas (modified) (16 diffs)
• CityScreen.pas (modified) (71 diffs)
• CityType.pas (modified) (12 diffs)
• ClientTools.pas (modified) (40 diffs)
• Diagram.pas (modified) (16 diffs)
• Diplomacy.pas (modified) (9 diffs)
• Draft.pas (modified) (11 diffs)
• Enhance.pas (modified) (16 diffs)
• Help.pas (modified) (85 diffs)
• IsoEngine.pas (modified) (66 diffs)
• KeyBindings.pas (moved) (moved from branches/highdpi/LocalPlayer/UKeyBindings.pas ) (7 diffs)
• LocalPlayer.pas (modified) (1 diff)
• MessgEx.lfm (modified) (4 diffs)
• MessgEx.pas (modified) (27 diffs)
• NatStat.pas (modified) (25 diffs)
• Nego.pas (modified) (40 diffs)
• PVSB.pas (modified) (6 diffs)
• Rates.pas (modified) (11 diffs)
• Select.lfm (modified) (7 diffs)
• Select.pas (modified) (86 diffs)
• TechTree.pas (modified) (10 diffs)
• Term.lfm (modified) (23 diffs)
• Term.pas (modified) (350 diffs)
• Tribes.pas (modified) (20 diffs)
• UnitStat.pas (modified) (33 diffs)
• Wonders.pas (modified) (11 diffs)

branches/highdpi/LocalPlayer/Battle.pas ¶

@@ -32 +32 @@
     uix, ToLoc: Integer;
     Forecast: TBattleForecastEx;
-    IsSuicideQuery: boolean;
-  end;
-
-var
-  BattleDlg: TBattleDlg;
+    IsSuicideQuery: Boolean;
+  end;
+
 
 implementation
@@ -62 +60 @@
   TextSize: TSize;
   LabelText: string;
-  FirstStrike: boolean;
+  FirstStrike: Boolean;
 begin
   MaxBar := 65;
@@ -112 +110 @@
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
-  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Mask.Canvas, 26, 146, SRCAND);
-  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+  DpiBitBltCanvas(ca, xm - 12, ym - 12, 24, 24,
     HGrSystem.Data.Canvas, 26, 146, SRCPAINT);
 
@@ -137 +135 @@
   if Forecast.EndHealthDef <= 0 then
   begin
-    DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+    DpiBitBltCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
@@ -149 +147 @@
   begin
     if Forecast.EndHealthDef > 0 then
-      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText)
+      RisedTextOut(ca, xm + 10, ym - (TextSize.cy + 1) div 2, LabelText);
   end
   else
@@ -157 +155 @@
   if Forecast.EndHealthAtt <= 0 then
   begin
-    DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Mask.Canvas, 51, 153, SRCAND);
-    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+    DpiBitBltCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
       HGrSystem.Data.Canvas, 51, 153, SRCPAINT);
   end;
@@ -171 +169 @@
     if Forecast.EndHealthAtt > 0 then
       RisedTextOut(ca, xm - (TextSize.cx + 1) div 2, ym + 8 + LAAvoidedDamage,
-        LabelText)
+        LabelText);
   end
   else
@@ -178 +176 @@
 
   IsoMap.SetOutput(Buffer);
-  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
+  DpiBitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
     ym - 8 - 12 - 48);
   { if TerrType<fForest then
@@ -190 +188 @@
     end; }
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
+  DpiBitBltCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
     0, 0);
 
-  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
+  DpiBitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
     ym + 8 + 12);
-  MakeUnitInfo(me, MyUn[uix], UnitInfo);
+  MakeUnitInfo(Me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   IsoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
-end; { PaintBattleOutcome }
+  DpiBitBltCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
+end;
 
 procedure TBattleDlg.FormCreate(Sender: TObject);
@@ -215 +213 @@
     ClientWidth := 300;
     ClientHeight := 288;
-    OKBtn.Visible := true;
-    CancelBtn.Visible := true;
+    OKBtn.Visible := True;
+    CancelBtn.Visible := True;
     Left := (DpiScreen.Width - ClientWidth) div 2; // center on screen
     Top := (DpiScreen.Height - ClientHeight) div 2;
@@ -224 +222 @@
     ClientWidth := 178;
     ClientHeight := 178;
-    OKBtn.Visible := false;
-    CancelBtn.Visible := false;
+    OKBtn.Visible := False;
+    CancelBtn.Visible := False;
   end;
 end;
@@ -231 +229 @@
 procedure TBattleDlg.FormPaint(Sender: TObject);
 var
-  ym, cix, p: Integer;
-  s, s1: string;
+  ym, cix, P: Integer;
+  S, s1: string;
 begin
   with Canvas do
@@ -240 +238 @@
     Brush.Style := bsClear;
     PaintBackground(self, 3 + Border, 3 + Border,
-      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border))
+      ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border));
   end;
   Frame(Canvas, Border + 1, Border + 1, ClientWidth - (2 + Border),
@@ -252 +250 @@
   begin
     Canvas.Font.Assign(UniFont[ftCaption]);
-    s := Phrases.Lookup('TITLE_SUICIDE');
-    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-      7 + Border, s);
+    S := Phrases.Lookup('TITLE_SUICIDE');
+    RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+      7 + Border, S);
     Canvas.Font.Assign(UniFont[ftNormal]);
-    s := Phrases.Lookup('SUICIDE');
-    p := pos('\', s);
-    if p = 0 then
-      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-        div 2, 205, s)
+    S := Phrases.Lookup('SUICIDE');
+    P := Pos('\', S);
+    if P = 0 then
+      RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+        div 2, 205, S)
     else
     begin
-      s1 := copy(s, 1, p - 1);
+      s1 := Copy(S, 1, P - 1);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 - MessageLineSpacing div 2, s1);
-      s1 := copy(s, p + 1, 255);
+      s1 := Copy(S, P + 1, 255);
       RisedTextOut(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s1)) div 2,
         205 + (MessageLineSpacing - MessageLineSpacing div 2), s1);
     end;
-    ym := 110
+    ym := 110;
   end
   else
@@ -297 +295 @@
 begin
   if not IsSuicideQuery then
-    Close
+    Close;
 end;
 
@@ -309 +307 @@
     if Key <> VK_ESCAPE then
       MainScreen.FormKeyDown(Sender, Key, Shift);
-  end
+  end;
 end;
 

branches/highdpi/LocalPlayer/CityScreen.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, {$IFDEF LINUX}LMessages,{$ENDIF}
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA, ButtonC, Area, GraphType, UTexture;
+  UDpiControls, {$IFDEF UNIX}LMessages,{$ENDIF}
+  Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA,
+  ButtonC, Area, GraphType, Texture;
 
 const
@@ -39 +39 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure BuyClick(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
@@ -49 +49 @@
     procedure PrevCityBtnClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    // procedure AdviceBtnClick(Sender: TObject);
     procedure PageUpBtnClick(Sender: TObject);
     procedure PageDownBtnClick(Sender: TObject);
   private
-    c: TCity;
+    C: TCity;
     Report: TCityReportNew;
     cOwner: Integer;
@@ -70 +69 @@
     Optimize_cixTileChange: Integer;
     Optimize_TilesBeforeChange: Integer;
-    Happened: cardinal;
-    imix: array [0 .. 15] of integer;
+    Happened: Cardinal;
+    imix: array [0 .. 15] of Integer;
     CityAreaInfo: TCityAreaInfo;
     AreaMap: TIsoMap;
@@ -89 +88 @@
     procedure InitZoomCityMap;
     procedure ChooseProject;
-    procedure ChangeCity(d: integer);
-    procedure ChangeResourceWeights(iResourceWeights: integer);
+    procedure ChangeCity(D: Integer);
+    procedure ChangeResourceWeights(iResourceWeights: Integer);
     procedure OnPlaySound(var Msg: TMessage); message WM_PLAYSOUND;
   public
-    RestoreUnFocus: integer;
+    RestoreUnFocus: Integer;
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
     procedure Reset;
     procedure CheckAge;
   end;
 
-var
-  CityDlg: TCityDlg;
-
 
 implementation
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, Sound, Term;
 
 {$R *.lfm}
@@ -148 +144 @@
   wZoomEnvironment = 68;
 
-  ImpPosition: array [28 .. nImp - 1] of integer = (-1, // imTrGoods
+  ImpPosition: array [28 .. nImp - 1] of Integer = (
+    -1, // imTrGoods
     21, // imBarracks
     6, // imGranary
@@ -192 +189 @@
 
 var
-  ImpSorted: array [0 .. nImp - 1] of integer;
+  ImpSorted: array [0 .. nImp - 1] of Integer;
 
 procedure TCityDlg.FormCreate(Sender: TObject);
@@ -201 +198 @@
   NoMap := TIsoMap.Create;
   AreaMap := TIsoMap.Create;
-  AreaMap.SetOutput(offscreen);
+  AreaMap.SetOutput(Offscreen);
   AreaMap.SetPaintBounds(xmArea - 192, ymArea - 96 - 32, xmArea + 192,
     ymArea + 96);
-  SmallMapMode := smImprovements;
-  ZoomArea := 1;
-  ProdHint := false;
+  Reset;
+  ProdHint := False;
   RestoreUnFocus := -1;
   OpenSoundEvent := -1;
@@ -279 +275 @@
 
     UnshareBitmap(Back);
-    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
@@ -292 +288 @@
 procedure TCityDlg.InitSmallCityMap;
 var
-  i, iix, cli1, Color0, Color1, Color2: integer;
+  I, iix, cli1, Color0, Color1, Color2: Integer;
 begin
   if cix >= 0 then
-    c := MyCity[cix];
+    C := MyCity[cix];
   case MyMap[cLoc] and fTerrain of
     fPrairie: cli1 := cliPrairie;
@@ -307 +303 @@
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
-  DpiBitCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
+  DpiBitBltCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
     SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
   if IsPort then
   begin
-    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    DpiBitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
@@ -319 +315 @@
   else
   begin
-    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+    DpiBitBltCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
       SmallCityMapTemplate.Canvas, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
@@ -328 +324 @@
   begin
     Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
-    for i := 0 to 29 do
+    for I := 0 to 29 do
     begin
       for iix := nWonder to nImp - 1 do
-        if (ImpPosition[iix] = i) and (c.Built[iix] > 0) then
+        if (ImpPosition[iix] = I) and (C.Built[iix] > 0) then
         begin
-          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-            11 + 12 * (i mod 18 div 3)));
-          break;
+          FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+            3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+            11 + 12 * (I mod 18 div 3)));
+          Break;
         end;
     end;
-    i := 30;
+    I := 30;
     for iix := 0 to nImp do
-      if (c.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
+      if (C.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
       begin
-        FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-          3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-          11 + 12 * (i mod 18 div 3)));
-        inc(i);
-        if i = 36 then
-          break; // area is full
+        FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+          3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+          11 + 12 * (I mod 18 div 3)));
+        Inc(I);
+        if I = 36 then
+          Break; // area is full
       end;
-    if c.Project and cpImp <> 0 then
-    begin
-      iix := c.Project and cpIndex;
+    if C.Project and cpImp <> 0 then
+    begin
+      iix := C.Project and cpIndex;
       if iix <> imTrGoods then
       begin
         if (iix >= nWonder) and (ImpPosition[iix] >= 0) then
-          i := ImpPosition[iix];
-        if i < 36 then
+          I := ImpPosition[iix];
+        if I < 36 then
         begin
-          brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
-          FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
-            3 + 12 * (i mod 18 div 3), 13 + 16 * (i mod 3) + 48 * (i div 18),
-            11 + 12 * (i mod 18 div 3)));
+          Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImpProject];
+          FillRect(Rect(5 + 16 * (I mod 3) + 48 * (I div 18),
+            3 + 12 * (I mod 18 div 3), 13 + 16 * (I mod 3) + 48 * (I div 18),
+            11 + 12 * (I mod 18 div 3)));
         end;
       end;
     end;
-    brush.style := bsClear;
+    Brush.style := bsClear;
   end;
 end;
@@ -373 +369 @@
 begin
   UnshareBitmap(ZoomCityMap);
-  DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
+  DpiBitBltCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
     Back.Canvas, xZoomMap, yZoomMap);
   if SmallMapMode = smImprovements then begin
@@ -383 +379 @@
         112 * (ZoomArea - 3), wZoomMap - wZoomEnvironment, hZoomMap);
       ImageOp_B(ZoomCityMap, CityMapTemplate, wZoomMap - wZoomEnvironment, 0,
-        1504 + wZoomEnvironment * byte(IsPort), 112 * (ZoomArea - 3),
+        1504 + wZoomEnvironment * Byte(IsPort), 112 * (ZoomArea - 3),
         wZoomEnvironment, hZoomMap);
     end;
@@ -391 +387 @@
 procedure TCityDlg.OffscreenPaint;
 
-  procedure FillBar(x, y, pos, Growth, max, Kind: integer;
-    IndicateComplete: boolean);
+  procedure FillBar(X, Y, Pos, Growth, Max, Kind: Integer;
+    IndicateComplete: Boolean);
   begin
     BarTex.Assign(MainTexture);
@@ -399 +395 @@
       BarTex.ColorBevelShade := BarTex.ColorBevelLight;
     end;
-    PaintRelativeProgressBar(offscreen.Canvas, Kind, x - 3, y, wBar - 4, pos,
-      Growth, max, IndicateComplete, BarTex);
-  end;
-
-  procedure PaintResources(x, y, Loc: integer; Add4Happy: boolean);
+    PaintRelativeProgressBar(Offscreen.Canvas, Kind, X - 3, Y, wBar - 4, Pos,
+      Growth, Max, IndicateComplete, BarTex);
+  end;
+
+  procedure PaintResources(X, Y, Loc: Integer; Add4Happy: Boolean);
   var
-    d, i, Total, xGr, yGr: integer;
+    D, I, Total, xGr, yGr: Integer;
     TileInfo: TTileInfo;
-    rare: boolean;
+    rare: Boolean;
   begin
     with AreaMap do begin
-    if Server(sGetCityTileInfo, me, Loc, TileInfo) <> eOk then
-    begin
-      assert(cix < 0);
-      exit
+    if Server(sGetCityTileInfo, Me, Loc, TileInfo) <> eOk then
+    begin
+      Assert(cix < 0);
+      Exit
     end;
     Total := TileInfo.Food + TileInfo.Prod + TileInfo.Trade;
     rare := MyMap[Loc] and $06000000 > 0;
     if rare then
-      inc(Total);
+      Inc(Total);
     if Add4Happy then
-      inc(Total, 4);
+      Inc(Total, 4);
     if Total > 1 then
-      d := (xxt - 11) div (Total - 1);
-    if d < 1 then
-      d := 1;
-    if d > 4 then
-      d := 4;
-    for i := 0 to Total - 1 do
+      D := (xxt - 11) div (Total - 1);
+    if D < 1 then
+      D := 1;
+    if D > 4 then
+      D := 4;
+    for I := 0 to Total - 1 do
     begin
       yGr := 115;
-      if Add4Happy and (i >= Total - 4) then
+      if Add4Happy and (I >= Total - 4) then
       begin
         xGr := 132;
         yGr := 126
       end
-      else if rare and (i = Total - 1) then
+      else if rare and (I = Total - 1) then
         xGr := 66 + 110
-      else if i >= TileInfo.Food + TileInfo.Prod then
+      else if I >= TileInfo.Food + TileInfo.Prod then
         xGr := 66 + 44
-      else if i >= TileInfo.Prod then
+      else if I >= TileInfo.Prod then
         xGr := 66
       else
         xGr := 66 + 22;
-      Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
-        y + yyt - 5, 10, 10, xGr, yGr);
+      Sprite(Offscreen, HGrSystem, X + xxt - 5 + D * (2 * I + 1 - Total),
+        Y + yyt - 5, 10, 10, xGr, yGr);
     end;
     end;
   end;
 var
-  line, MessageCount: integer;
-
-  procedure CheckMessage(Flag: integer);
+  Line, MessageCount: Integer;
+
+  procedure CheckMessage(Flag: Integer);
   var
-    i, test: integer;
-    s: string;
+    I, Test: Integer;
+    S: string;
   begin
     if Happened and Flag <> 0 then
     begin
-      i := 0;
-      test := 1;
-      while test < Flag do
+      I := 0;
+      Test := 1;
+      while Test < Flag do
       begin
-        inc(i);
-        inc(test, test)
+        Inc(I);
+        Inc(Test, Test);
       end;
 
       if AllowChange and (Sounds <> nil) and (OpenSoundEvent = -1) then
       begin
-        s := CityEventSoundItem[i];
-        if s <> '' then
-          s := Sounds.Lookup(s);
-        if (Flag = chProduction) or (s <> '') and (s[1] <> '*') and (s[1] <> '[')
+        S := CityEventSoundItem[I];
+        if S <> '' then
+          S := Sounds.Lookup(S);
+        if (Flag = chProduction) or (S <> '') and (S[1] <> '*') and (S[1] <> '[')
         then
-          OpenSoundEvent := i
+          OpenSoundEvent := I;
       end;
 
-      s := CityEventName(i);
+      S := CityEventName(I);
       { if Flag=chNoGrowthWarning then
-        if c.Built[imAqueduct]=0 then
-        s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-        else s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
-      RisedTextOut(offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
-        16 * line, s);
-      inc(line)
+        if C.Built[imAqueduct]=0 then
+        S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
+        else S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); }
+      RisedTextOut(Offscreen.Canvas, xmOpt + 40, ymOpt - 1 - 8 * MessageCount +
+        16 * Line, S);
+      Inc(Line);
     end;
   end;
 
 var
-  x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
-    HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
-  av: integer;
-  PrName, s: string;
+  X, Y, xGr, I, J, iix, D, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+    HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: Integer;
+  av: Integer;
+  PrName, S: string;
   UnitInfo: TUnitInfo;
   UnitReport: TUnitReport;
-  IsCityAlive, CanGrow: boolean;
+  IsCityAlive, CanGrow: Boolean;
 begin
   inherited;
   if cix >= 0 then
-    c := MyCity[cix];
+    C := MyCity[cix];
   Report.HypoTiles := -1;
   Report.HypoTaxRate := -1;
   Report.HypoLuxuryRate := -1;
   if cix >= 0 then
-    Server(sGetCityReportNew, me, cix, Report) // own city
+    Server(sGetCityReportNew, Me, cix, Report) // own city
   else
-    Server(sGetEnemyCityReportNew, me, cLoc, Report); // enemy city
-  TrueFood := c.Food;
-  TrueProd := c.Prod;
-  TruePoll := c.Pollution;
-  if supervising or (cix < 0) then
+    Server(sGetEnemyCityReportNew, Me, cLoc, Report); // enemy city
+  TrueFood := C.Food;
+  TrueProd := C.Prod;
+  TruePoll := C.Pollution;
+  if Supervising or (cix < 0) then
   begin // normalize city from after-turn state
-    dec(TrueFood, Report.FoodSurplus);
+    Dec(TrueFood, Report.FoodSurplus);
     if TrueFood < 0 then
       TrueFood := 0; // shouldn't happen
-    dec(TrueProd, Report.Production);
+    Dec(TrueProd, Report.Production);
     if TrueProd < 0 then
       TrueProd := 0; // shouldn't happen
-    dec(TruePoll, Report.AddPollution);
+    Dec(TruePoll, Report.AddPollution);
     if TruePoll < 0 then
       TruePoll := 0; // shouldn't happen
   end;
-  IsCityAlive := (cGov <> gAnarchy) and (c.Flags and chCaptured = 0);
+  IsCityAlive := (cGov <> gAnarchy) and (C.Flags and chCaptured = 0);
   if not IsCityAlive then
-    Report.Working := c.Size;
+    Report.Working := C.Size;
 
   RedTex.Assign(MainTexture);
@@ -531 +527 @@
   RedTex.ColorTextShade := $0000FF;
 
-  DpiBitCanvas(offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
+  DpiBitBltCanvas(Offscreen.Canvas, 0, 0, 640, 480, Back.Canvas, 0, 0);
 
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextOut(offscreen.Canvas, 42, 7, Caption);
-  with offscreen.Canvas do
+  RisedTextOut(Offscreen.Canvas, 42, 7, Caption);
+  with Offscreen.Canvas do
   begin // city size
-    brush.Color := $000000;
+    Brush.Color := $000000;
     FillRect(Rect(8 + 1, 7 + 1, 36 + 1, 32 + 1));
-    brush.Color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     FillRect(Rect(8, 7, 36, 32));
-    brush.style := bsClear;
+    Brush.style := bsClear;
     Font.Color := $000000;
-    s := inttostr(c.Size);
-    TextOut(8 + 14 - textwidth(s) div 2, 7, s);
+    S := IntToStr(C.Size);
+    TextOut(8 + 14 - TextWidth(S) div 2, 7, S);
   end;
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
@@ -552 +548 @@
     MakeRed(Offscreen, 18, 280, 298, 40);
     if cGov = gAnarchy then
-      s := Phrases.Lookup('GOVERNMENT', gAnarchy)
+      S := Phrases.Lookup('GOVERNMENT', gAnarchy)
     else { if c.Flags and chCaptured<>0 then }
-      s := Phrases.Lookup('CITYEVENTS', 14);
-    RisedTextOut(offscreen.Canvas, 167 - BiColorTextWidth(offscreen.Canvas, s)
-      div 2, ymOpt - 9, s);
+      S := Phrases.Lookup('CITYEVENTS', 14);
+    RisedTextOut(Offscreen.Canvas, 167 - BiColorTextWidth(Offscreen.Canvas, S)
+      div 2, ymOpt - 9, S);
   end
   else if AllowChange then
   begin
-    OptiType := c.Status shr 4 and $0F;
-    Sprite(offscreen, HGrSystem2, xmOpt - 32, ymOpt - 32, 64, 64,
+    OptiType := C.Status shr 4 and $0F;
+    Sprite(Offscreen, HGrSystem2, xmOpt - 32, ymOpt - 32, 64, 64,
       1 + OptiType mod 3 * 64, 217 + OptiType div 3 * 64);
 
     { display messages now }
     MessageCount := 0;
-    for i := 0 to 31 do
-      if Happened and ($FFFFFFFF - chCaptured) and (1 shl i) <> 0 then
-        inc(MessageCount);
+    for I := 0 to 31 do
+      if Happened and ($FFFFFFFF - chCaptured) and (1 shl I) <> 0 then
+        Inc(MessageCount);
     if MessageCount > 3 then
       MessageCount := 3;
     if MessageCount > 0 then
     begin
-      MakeBlue(offscreen, 74, 280, 242, 40);
-      line := 0;
-      for i := 0 to nCityEventPriority - 1 do
-        if line < MessageCount then
-          CheckMessage(CityEventPriority[i]);
+      MakeBlue(Offscreen, 74, 280, 242, 40);
+      Line := 0;
+      for I := 0 to nCityEventPriority - 1 do
+        if Line < MessageCount then
+          CheckMessage(CityEventPriority[I]);
     end
     else
     begin
-      s := Phrases.Lookup('CITYMANAGETYPE', OptiType);
-      j := pos('\', s);
-      if j = 0 then
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
-          ymOpt - 9, s)
+      S := Phrases.Lookup('CITYMANAGETYPE', OptiType);
+      J := Pos('\', S);
+      if J = 0 then
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 9, S)
       else
       begin
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40,
-          ymOpt - 17, copy(s, 1, j - 1));
-        LoweredTextout(offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
-          copy(s, j + 1, 255));
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40,
+          ymOpt - 17, Copy(S, 1, J - 1));
+        LoweredTextout(Offscreen.Canvas, -1, MainTexture, xmOpt + 40, ymOpt - 1,
+          Copy(S, J + 1, 255));
       end;
     end;
@@ -601 +597 @@
     AreaMap.Paint(xmArea - xxt * 2 * rx, ymArea - yyt * 2 * ry - 3 * yyt,
       dLoc(cLoc, -2 * rx + 1, -2 * ry - 1), 4 * rx - 1, 4 * ry + 1, cLoc, cOwner,
-      false, AllowChange and IsCityAlive and
-      (c.Status and csResourceWeightsMask = 0));
-    DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+      False, AllowChange and IsCityAlive and
+      (C.Status and csResourceWeightsMask = 0));
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
       xmArea + 102, 42);
 
@@ -615 +611 @@
               ((Loc1 < 0) or (Loc1 >= G.lx * G.ly) or (MyMap[Loc1] and fCity = 0))
             then
-              Sprite(offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
+              Sprite(Offscreen, HGrTerrain, xmArea - xxt + xxt * dx,
                 ymArea - yyt + yyt * dy, xxt * 2, yyt * 2, 1 + 5 * (xxt * 2 + 1),
                 1 + yyt + 15 * (yyt * 3 + 1));
-            if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and c.Tiles <> 0) then
+            if (1 shl ((dy + 3) shl 2 + (dx + 3) shr 1) and C.Tiles <> 0) then
               PaintResources(xmArea - xxt + xxt * dx, ymArea - yyt + yyt * dy,
                 Loc1, (dx = 0) and (dy = 0));
@@ -625 +621 @@
 
   if Report.Working > 1 then
-    d := (xService - (xmArea - 192) - 8 - 32) div (Report.Working - 1);
-  if d > 28 then
-    d := 28;
-  for i := Report.Working - 1 downto 0 do
+    D := (xService - (xmArea - 192) - 8 - 32) div (Report.Working - 1);
+  if D > 28 then
+    D := 28;
+  for I := Report.Working - 1 downto 0 do
   begin
     if IsCityAlive then
@@ -634 +630 @@
     else
       xGr := 141;
-    DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea - 192 + 5 + I * D, ymArea - 96 - 29,
       27, 30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
-    Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
+    Sprite(Offscreen, HGrSystem, xmArea - 192 + 4 + I * D, ymArea - 96 - 30, 27,
       30, xGr, 171);
   end;
-  if c.Size - Report.Working > 1 then
-    d := (xmArea + 192 - xService - 32) div (c.Size - Report.Working - 1);
-  if d > 28 then
-    d := 28;
-  for i := 0 to c.Size - Report.Working - 1 do
+  if C.Size - Report.Working > 1 then
+    D := (xmArea + 192 - xService - 32) div (C.Size - Report.Working - 1);
+  if D > 28 then
+    D := 28;
+  for I := 0 to C.Size - Report.Working - 1 do
   begin
     xGr := 1 + 112;
-    DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+    DpiBitBltCanvas(Offscreen.Canvas, xmArea + 192 - 27 + 1 - I * D, 29 + 1, 27,
       30, HGrSystem.Mask.Canvas, xGr, 171, SRCAND); { shadow }
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 - I * D, 29, 27, 30,
       xGr, 171);
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 4 - i * d, 29 + 32, 10,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 + 4 - I * D, 29 + 32, 10,
       10, 121, 126);
-    Sprite(offscreen, HGrSystem, xmArea + 192 - 27 + 13 - i * d, 29 + 32, 10,
+    Sprite(Offscreen, HGrSystem, xmArea + 192 - 27 + 13 - I * D, 29 + 32, 10,
       10, 121, 126);
     // Sprite(offscreen,HGrSystem,xmArea+192-31+18-i*d,ymArea-96-80+32,10,10,88,115);
   end;
 
-  if c.Project and cpImp = 0 then
-    PrName := Tribe[cOwner].ModelName[c.Project and cpIndex]
+  if C.Project and cpImp = 0 then
+    PrName := Tribe[cOwner].ModelName[C.Project and cpIndex]
   else
-    PrName := Phrases.Lookup('IMPROVEMENTS', c.Project and cpIndex);
+    PrName := Phrases.Lookup('IMPROVEMENTS', C.Project and cpIndex);
   PrCost := Report.ProjectCost;
 
@@ -667 +663 @@
   begin
     if cGov = gFundamentalism then
-      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp, yHapp + dyBar, wBar, 17,
         Phrases.Lookup('FAITH'), Report.CollectedControl, MainTexture)
     else
     begin
-      CountBar(offscreen, xHapp, yHapp + dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp, yHapp + dyBar, wBar, 17,
         Phrases.Lookup('HAPPINESS'), Report.Morale, MainTexture);
-      CountBar(offscreen, xHapp, yHapp + 2 * dyBar, wBar, 16,
+      CountBar(Offscreen, xHapp, yHapp + 2 * dyBar, wBar, 16,
         Phrases.Lookup('CONTROL'), Report.CollectedControl, MainTexture);
     end;
-    CountBar(offscreen, xHapp, yHapp, wBar, 8, Phrases.Lookup('LUX'),
+    CountBar(Offscreen, xHapp, yHapp, wBar, 8, Phrases.Lookup('LUX'),
       Report.Luxury, MainTexture);
-    CountBar(offscreen, xHapp + dxBar, yHapp, wBar, 19,
+    CountBar(Offscreen, xHapp + dxBar, yHapp, wBar, 19,
       Phrases.Lookup('UNREST'), 2 * Report.Deployed, MainTexture);
-    CountBar(offscreen, xHapp + dxBar, yHapp + dyBar, wBar, 17,
-      Phrases.Lookup('HAPPINESSDEMAND'), c.Size, MainTexture);
+    CountBar(Offscreen, xHapp + dxBar, yHapp + dyBar, wBar, 17,
+      Phrases.Lookup('HAPPINESSDEMAND'), C.Size, MainTexture);
     if Report.HappinessBalance >= 0 then
-      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 17,
+      CountBar(Offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 17,
         Phrases.Lookup('HAPPINESSPLUS'), Report.HappinessBalance, MainTexture)
     else
     begin
       MakeRed(Offscreen, xHapp + dxBar - 6, yHapp + 2 * dyBar, wBar + 10, 38);
-      CountBar(offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
+      CountBar(Offscreen, xHapp + dxBar, yHapp + 2 * dyBar, wBar, 18,
         Phrases.Lookup('LACK'), -Report.HappinessBalance, RedTex);
     end;
@@ -696 +692 @@
   if IsCityAlive then
   begin
-    CountBar(offscreen, xFood, yFood + dyBar div 2, wBar, 0,
+    CountBar(Offscreen, xFood, yFood + dyBar div 2, wBar, 0,
       Phrases.Lookup('FOOD'), Report.CollectedFood, MainTexture);
-    CountBar(offscreen, xFood + dxBar, yFood + dyBar, wBar, 0,
-      Phrases.Lookup('DEMAND'), 2 * c.Size, MainTexture);
-    CountBar(offscreen, xFood + dxBar, yFood, wBar, 0,
+    CountBar(Offscreen, xFood + dxBar, yFood + dyBar, wBar, 0,
+      Phrases.Lookup('DEMAND'), 2 * C.Size, MainTexture);
+    CountBar(Offscreen, xFood + dxBar, yFood, wBar, 0,
       Phrases.Lookup('SUPPORT'), Report.FoodSupport, MainTexture);
     if Report.FoodSurplus >= 0 then
-      if (cGov = gFuture) or (c.Size >= NeedAqueductSize) and
+      if (cGov = gFuture) or (C.Size >= NeedAqueductSize) and
         (Report.FoodSurplus < 2) then
-        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 6,
+        CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 6,
           Phrases.Lookup('PROFIT'), Report.FoodSurplus, MainTexture)
       else
-        CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 0,
+        CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 0,
           Phrases.Lookup('SURPLUS'), Report.FoodSurplus, MainTexture)
     else
     begin
       MakeRed(Offscreen, xFood + dxBar - 6, yFood + 2 * dyBar, wBar + 10, 38);
-      CountBar(offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
+      CountBar(Offscreen, xFood + dxBar, yFood + 2 * dyBar, wBar, 1,
         Phrases.Lookup('LACK'), -Report.FoodSurplus, RedTex);
     end;
   end;
-  CanGrow := (c.Size < MaxCitySize) and (cGov <> gFuture) and
-    (Report.FoodSurplus > 0) and ((c.Size < NeedAqueductSize) or
-    (c.Built[imAqueduct] = 1) and (c.Size < NeedSewerSize) or
-    (c.Built[imSewer] = 1));
+  CanGrow := (C.Size < MaxCitySize) and (cGov <> gFuture) and
+    (Report.FoodSurplus > 0) and ((C.Size < NeedAqueductSize) or
+    (C.Built[imAqueduct] = 1) and (C.Size < NeedSewerSize) or
+    (C.Built[imSewer] = 1));
   FillBar(xFood + 3, yFood + 102, TrueFood,
-    CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, c.Size),
+    CutCityFoodSurplus(Report.FoodSurplus, IsCityAlive, cGov, C.Size),
     Report.Storage, 1, CanGrow);
-  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
+  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood + 3 - 5,
     yFood + 102 - 20, Format('%d/%d', [TrueFood, Report.Storage]));
-  LoweredTextout(offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
+  LoweredTextout(Offscreen.Canvas, -1, MainTexture, xFood - 2, yFood + 66,
     Phrases.Lookup('STORAGE'));
 
@@ -732 +728 @@
   if IsCityAlive then
   begin
-    CountBar(offscreen, xProd, yProd, wBar, 2, Phrases.Lookup('MATERIAL'),
+    CountBar(Offscreen, xProd, yProd, wBar, 2, Phrases.Lookup('MATERIAL'),
       Report.CollectedMaterial, MainTexture);
-    CountBar(offscreen, xProd + dxBar, yProd, wBar, 2,
+    CountBar(Offscreen, xProd + dxBar, yProd, wBar, 2,
       Phrases.Lookup('SUPPORT'), Report.MaterialSupport, MainTexture);
     if Report.Production >= 0 then
-      if c.Project and (cpImp + cpIndex) = cpImp + imTrGoods then
-        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 6,
+      if C.Project and (cpImp + cpIndex) = cpImp + imTrGoods then
+        CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 6,
           Phrases.Lookup('PROFIT'), Report.Production, MainTexture)
       else
-        CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 2,
+        CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 2,
           Phrases.Lookup('PROD'), Report.Production, MainTexture)
     else
     begin
       MakeRed(Offscreen, xProd + dxBar - 6, yProd + dyBar + 17, wBar + 10, 38);
-      CountBar(offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
+      CountBar(Offscreen, xProd + dxBar, yProd + dyBar + 16, wBar, 3,
         Phrases.Lookup('LACK'), -Report.Production, RedTex);
     end;
   end;
-  if c.Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
-    with offscreen.Canvas do
-    begin
-      i := Report.Production;
-      if (i < 0) or not IsCityAlive then
-        i := 0;
-      FillBar(xProd + 3, yProd + 16 + 63, TrueProd, i, PrCost, 4, true);
-      LoweredTextout(offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
+  if C.Project and (cpImp + cpIndex) <> cpImp + imTrGoods then
+    with Offscreen.Canvas do
+    begin
+      I := Report.Production;
+      if (I < 0) or not IsCityAlive then
+        I := 0;
+      FillBar(xProd + 3, yProd + 16 + 63, TrueProd, I, PrCost, 4, True);
+      LoweredTextout(Offscreen.Canvas, -1, MainTexture, xProd + 3 - 5,
         yProd + 16 + 43, Format('%d/%d', [TrueProd, PrCost]));
-      if BiColorTextWidth(offscreen.Canvas, PrName) > wBar + dxBar then
+      if BiColorTextWidth(Offscreen.Canvas, PrName) > wBar + dxBar then
       begin
         repeat
-          Delete(PrName, length(PrName), 1)
-        until BiColorTextWidth(offscreen.Canvas, PrName) <= wBar + dxBar;
+          Delete(PrName, Length(PrName), 1)
+        until BiColorTextWidth(Offscreen.Canvas, PrName) <= wBar + dxBar;
         PrName := PrName + '.'
       end;
     end;
-  RisedTextOut(offscreen.Canvas, xProd - 2, yProd + 36, PrName);
+  RisedTextOut(Offscreen.Canvas, xProd - 2, yProd + 36, PrName);
 
   // pollution section
@@ -773 +769 @@
   begin
     FillBar(xPoll + 3, yPoll + 20, TruePoll, Report.AddPollution,
-      MaxPollution, 3, true);
-    RisedTextOut(offscreen.Canvas, xPoll + 3 - 5, yPoll + 20 - 20,
+      MaxPollution, 3, True);
+    RisedTextOut(Offscreen.Canvas, xPoll + 3 - 5, yPoll + 20 - 20,
       Phrases.Lookup('POLL'));
   end;
@@ -781 +777 @@
   if IsCityAlive and (Report.CollectedTrade > 0) then
   begin
-    CountBar(offscreen, xTrade, yTrade + dyBar div 2, wBar, 4,
+    CountBar(Offscreen, xTrade, yTrade + dyBar div 2, wBar, 4,
       Phrases.Lookup('TRADE'), Report.CollectedTrade, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade + 2 * dyBar, wBar, 5,
+    CountBar(Offscreen, xTrade + dxBar, yTrade + 2 * dyBar, wBar, 5,
       Phrases.Lookup('CORR'), Report.Corruption, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade, wBar, 6, Phrases.Lookup('TAX'),
+    CountBar(Offscreen, xTrade + dxBar, yTrade, wBar, 6, Phrases.Lookup('TAX'),
       Report.Tax, MainTexture);
-    CountBar(offscreen, xTrade + dxBar, yTrade + dyBar, wBar, 12,
+    CountBar(Offscreen, xTrade + dxBar, yTrade + dyBar, wBar, 12,
       Phrases.Lookup('SCIENCE'), Report.Science, MainTexture);
   end;
 
   // small map
-  DpiBitCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+  DpiBitBltCanvas(Offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
     SmallCityMap.Canvas, 0, 0);
   if SmallMapMode = smImprovements then
-    Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
+    Frame(Offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
       ySmallMap + 24 * (ZoomArea mod 3), xSmallMap + 48 * (ZoomArea div 3) + 49,
       ySmallMap + 24 * (ZoomArea mod 3) + 25, MainTexture.ColorMark,
       MainTexture.ColorMark);
-  Frame(offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
+  Frame(Offscreen.Canvas, xSmallMap - 1, ySmallMap - 1, xSmallMap + wSmallMap,
     ySmallMap + hSmallMap, $B0B0B0, $FFFFFF);
-  RFrame(offscreen.Canvas, xSmallMap - 2, ySmallMap - 2, xSmallMap + wSmallMap +
+  RFrame(Offscreen.Canvas, xSmallMap - 2, ySmallMap - 2, xSmallMap + wSmallMap +
     1, ySmallMap + hSmallMap + 1, $FFFFFF, $B0B0B0);
 
-  Frame(offscreen.Canvas, xSupport - 1, ySupport - 1, xSupport + wSupport,
+  Frame(Offscreen.Canvas, xSupport - 1, ySupport - 1, xSupport + wSupport,
     ySupport + hSupport, $B0B0B0, $FFFFFF);
-  RFrame(offscreen.Canvas, xSupport - 2, ySupport - 2, xSupport + wSupport + 1,
+  RFrame(Offscreen.Canvas, xSupport - 2, ySupport - 2, xSupport + wSupport + 1,
     ySupport + hSupport + 1, $FFFFFF, $B0B0B0);
-  x := xSupport + wSupport div 2;
-  y := ySupport + hSupport div 2;
+  X := xSupport + wSupport div 2;
+  Y := ySupport + hSupport div 2;
   if SmallMapMode = smSupportedUnits then
   begin
-    offscreen.Canvas.brush.Color := MainTexture.ColorMark;
-    offscreen.Canvas.FillRect(Rect(x - 27, y - 6, x + 27, y + 6));
-    offscreen.Canvas.brush.style := bsClear;
-  end;
-  Sprite(offscreen, HGrSystem, x - 16, y - 5, 10, 10, 88, 115);
-  Sprite(offscreen, HGrSystem, x - 5, y - 5, 10, 10, 66, 115);
-  Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
-
-  DpiBitCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+    Offscreen.Canvas.Brush.Color := MainTexture.ColorMark;
+    Offscreen.Canvas.FillRect(Rect(X - 27, Y - 6, X + 27, Y + 6));
+    Offscreen.Canvas.Brush.style := bsClear;
+  end;
+  Sprite(Offscreen, HGrSystem, X - 16, Y - 5, 10, 10, 88, 115);
+  Sprite(Offscreen, HGrSystem, X - 5, Y - 5, 10, 10, 66, 115);
+  Sprite(Offscreen, HGrSystem, X + 6, Y - 5, 10, 10, 154, 126);
+
+  DpiBitBltCanvas(Offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
     ZoomCityMap.Canvas, 0, 0);
 
-  for i := 0 to 5 do
-    imix[i] := -1;
+  for I := 0 to 5 do
+    imix[I] := -1;
   if SmallMapMode = smImprovements then
   begin
@@ -831 +827 @@
       Cnt := 0;
       for iix := 0 to nImp - 1 do
-        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
+        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (C.Built[iix] > 0) then
         begin
-          i := Cnt - Page * 6;
-          if (i >= 0) and (i < 6) then
-            imix[i] := iix;
-          inc(Cnt);
+          I := Cnt - Page * 6;
+          if (I >= 0) and (I < 6) then
+            imix[I] := iix;
+          Inc(Cnt);
         end;
       PageCount := (Cnt + 5) div 6;
@@ -844 +840 @@
       for iix := nWonder to nImp - 1 do
       begin
-        i := ImpPosition[iix] - 6 * ZoomArea;
-        if (i >= 0) and (i < 6) and (c.Built[iix] > 0) then
-          imix[i] := iix;
+        I := ImpPosition[iix] - 6 * ZoomArea;
+        if (I >= 0) and (I < 6) and (C.Built[iix] > 0) then
+          imix[I] := iix;
       end;
       PageCount := 0;
     end;
-    for i := 0 to 5 do
-      if imix[i] >= 0 then
+    for I := 0 to 5 do
+      if imix[I] >= 0 then
       begin
-        iix := imix[i];
-        x := xZoomMap + 14 + 72 * (i mod 3);
-        y := yZoomMap + 14 + 56 * (i div 3);
-        ImpImage(offscreen.Canvas, x, y, iix, cGov, AllowChange and
+        iix := imix[I];
+        X := xZoomMap + 14 + 72 * (I mod 3);
+        Y := yZoomMap + 14 + 56 * (I div 3);
+        ImpImage(Offscreen.Canvas, X, Y, iix, cGov, AllowChange and
           (ClientMode < scContact));
         if IsCityAlive then
@@ -862 +858 @@
           if iix = imColosseum then
           begin
-            Sprite(offscreen, HGrSystem, x + 46, y, 14, 14, 82, 100);
+            Sprite(Offscreen, HGrSystem, X + 46, Y, 14, 14, 82, 100);
           end
           else
@@ -880 +876 @@
             if HappyGain > 1 then
             begin
-              d := 30 div (HappyGain - 1);
-              if d > 10 then
-                d := 10
+              D := 30 div (HappyGain - 1);
+              if D > 10 then
+                D := 10
             end;
-            for j := 0 to HappyGain - 1 do
-              Sprite(offscreen, HGrSystem, x + 50, y + d * j, 10, 10, 132, 126);
+            for J := 0 to HappyGain - 1 do
+              Sprite(Offscreen, HGrSystem, X + 50, Y + D * J, 10, 10, 132, 126);
           end;
-          for j := 0 to Imp[iix].Maint - 1 do
-            Sprite(offscreen, HGrSystem, x - 4, y + 29 - 3 * j, 10, 10,
+          for J := 0 to Imp[iix].Maint - 1 do
+            Sprite(Offscreen, HGrSystem, X - 4, Y + 29 - 3 * J, 10, 10,
               132, 115);
         end
@@ -919 +915 @@
   else { if SmallMapMode = smSupportedUnits then }
   begin
-    LoweredTextout(offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
+    LoweredTextout(Offscreen.Canvas, -1, MainTexture, xZoomMap + 6,
       yZoomMap + 2, Phrases.Lookup('SUPUNITS'));
-    FreeSupp := c.Size * SupportFree[cGov] shr 1;
+    FreeSupp := C.Size * SupportFree[cGov] shr 1;
     Cnt := 0;
-    for i := 0 to MyRO.nUn - 1 do
-      if (MyUn[i].Loc >= 0) and (MyUn[i].Home = cix) then
-        with MyModel[MyUn[i].mix] do
+    for I := 0 to MyRO.nUn - 1 do
+      if (MyUn[I].Loc >= 0) and (MyUn[I].Home = cix) then
+        with MyModel[MyUn[I].mix] do
         begin
-          Server(sGetUnitReport, me, i, UnitReport);
+          Server(sGetUnitReport, Me, I, UnitReport);
           if (Cnt >= 6 * Page) and (Cnt < 6 * (Page + 1)) then
           begin // unit visible in display
-            imix[Cnt - 6 * Page] := i;
-            x := ((Cnt - 6 * Page) mod 3) * 64 + xZoomMap;
-            y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
-            MakeUnitInfo(me, MyUn[i], UnitInfo);
-            NoMap.SetOutput(offscreen);
-            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
-
-            for j := 0 to UnitReport.FoodSupport - 1 do
-              Sprite(offscreen, HGrSystem, x + 38 + 11 * j, y + 40, 10,
+            imix[Cnt - 6 * Page] := I;
+            X := ((Cnt - 6 * Page) mod 3) * 64 + xZoomMap;
+            Y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
+            MakeUnitInfo(Me, MyUn[I], UnitInfo);
+            NoMap.SetOutput(Offscreen);
+            NoMap.PaintUnit(X, Y, UnitInfo, MyUn[I].Status);
+
+            for J := 0 to UnitReport.FoodSupport - 1 do
+              Sprite(Offscreen, HGrSystem, X + 38 + 11 * J, Y + 40, 10,
                 10, 66, 115);
-            for j := 0 to UnitReport.ProdSupport - 1 do
+            for J := 0 to UnitReport.ProdSupport - 1 do
             begin
               if (FreeSupp > 0) and
                 (UnitReport.ReportFlags and urfAlwaysSupport = 0) then
               begin
-                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                Sprite(Offscreen, HGrSystem, X + 16 - 11 * J, Y + 40, 10,
                   10, 143, 115);
-                dec(FreeSupp);
+                Dec(FreeSupp);
               end
               else
-                Sprite(offscreen, HGrSystem, x + 16 - 11 * j, y + 40, 10,
+                Sprite(Offscreen, HGrSystem, X + 16 - 11 * J, Y + 40, 10,
                   10, 88, 115);
             end;
             if UnitReport.ReportFlags and urfDeployed <> 0 then
-              for j := 0 to 1 do
-                Sprite(offscreen, HGrSystem, x + 27 + 11 * j, y + 40, 10,
+              for J := 0 to 1 do
+                Sprite(Offscreen, HGrSystem, X + 27 + 11 * J, Y + 40, 10,
                   10, 154, 126)
           end // unit visible in display
           else
-            dec(FreeSupp, UnitReport.ProdSupport);
-          inc(Cnt);
+            Dec(FreeSupp, UnitReport.ProdSupport);
+          Inc(Cnt);
         end;
     PageCount := (Cnt + 5) div 6;
@@ -973 +969 @@
   PageDownBtn.Visible := PageCount > 1;
 
-  with offscreen.Canvas do
+  with Offscreen.Canvas do
   begin
     { display project now }
-    DLine(offscreen.Canvas, xView + 9 + xSizeBig, xProd + 2 * wBar + 10,
+    DLine(Offscreen.Canvas, xView + 9 + xSizeBig, xProd + 2 * wBar + 10,
       yProd + dyBar + 16, $FFFFFF, $B0B0B0);
     if ProdHint then
     begin
-      ScreenTools.Frame(offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
+      ScreenTools.Frame(Offscreen.Canvas, xView + 9 - 1, yView + 5 - 1,
         xView + 9 + xSizeBig, yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
-      RFrame(offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
+      RFrame(Offscreen.Canvas, xView + 9 - 2, yView + 5 - 2,
         xView + 9 + xSizeBig + 1, yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
-      with offscreen.Canvas do
+      with Offscreen.Canvas do
       begin
-        brush.Color := $000000;
+        Brush.Color := $000000;
         FillRect(Rect(xView + 9, yView + 5, xView + 1 + 72 - 8,
           yView + 5 + 40));
-        brush.style := bsClear;
+        Brush.style := bsClear;
       end;
     end
-    else if AllowChange and (c.Status and 7 <> 0) then
+    else if AllowChange and (C.Status and 7 <> 0) then
     begin // city type autobuild
-      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
-        ySizeBig, (c.Status and 7 - 1 + 3) * xSizeBig, 0, (cix >= 0) and
+      FrameImage(Offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+        ySizeBig, (C.Status and 7 - 1 + 3) * xSizeBig, 0, (cix >= 0) and
         (ClientMode < scContact));
     end
-    else if c.Project and cpImp = 0 then
+    else if C.Project and cpImp = 0 then
     begin // project is unit
-      FrameImage(offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
+      FrameImage(Offscreen.Canvas, bigimp, xView + 9, yView + 5, xSizeBig,
         ySizeBig, 0, 0, AllowChange and (ClientMode < scContact));
-      with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
-        Sprite(offscreen, HGr, xView + 5, yView + 1, 64, 44,
+      with Tribe[cOwner].ModelPicture[C.Project and cpIndex] do
+        Sprite(Offscreen, HGr, xView + 5, yView + 1, 64, 44,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
     end
@@ -1009 +1005 @@
     begin // project is building
       if ProdHint then
-        Paintiix := c.Project0 and cpIndex
+        Paintiix := C.Project0 and cpIndex
       else
-        Paintiix := c.Project and cpIndex;
-      ImpImage(offscreen.Canvas, xView + 9, yView + 5, Paintiix, cGov,
+        Paintiix := C.Project and cpIndex;
+      ImpImage(Offscreen.Canvas, xView + 9, yView + 5, Paintiix, cGov,
         AllowChange and (ClientMode < scContact));
     end;
@@ -1019 +1015 @@
   if AllowChange and (ClientMode < scContact) then
   begin
-    i := Server(sBuyCityProject - sExecute, me, cix, nil^);
-    BuyBtn.Visible := (i = eOk) or (i = eViolation);
+    I := Server(sBuyCityProject - sExecute, Me, cix, nil^);
+    BuyBtn.Visible := (I = eOk) or (I = eViolation);
   end
   else
-    BuyBtn.Visible := false;
+    BuyBtn.Visible := False;
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TCityDlg.FormShow(Sender: TObject);
 var
-  dx, dy, Loc1: integer;
+  dx, dy, Loc1: Integer;
   GetCityData: TGetCityData;
 begin
@@ -1036 +1032 @@
   if cix >= 0 then
   begin { own city }
-    c := MyCity[cix];
-    cOwner := me;
+    C := MyCity[cix];
+    cOwner := Me;
     cGov := MyRO.Government;
     ProdHint := (cGov <> gAnarchy) and
       (Happened and (chProduction or chFounded or chCaptured or
       chAllImpsMade) <> 0);
-    Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+    Server(sGetCityAreaInfo, Me, cix, CityAreaInfo);
     NextCityBtn.Visible := WindowMode = wmPersistent;
     PrevCityBtn.Visible := WindowMode = wmPersistent;
@@ -1049 +1045 @@
   begin
     SmallMapMode := smImprovements;
-    Server(sGetCity, me, cLoc, GetCityData);
-    c := GetCityData.c;
+    Server(sGetCity, Me, cLoc, GetCityData);
+    C := GetCityData.C;
     cOwner := GetCityData.Owner;
     cGov := MyRO.EnemyReport[cOwner].Government;
-    Happened := c.Flags and $7FFFFFFF;
-    ProdHint := false;
-    Server(sGetEnemyCityAreaInfo, me, cLoc, CityAreaInfo);
-
-    if c.Project and cpImp = 0 then
+    Happened := C.Flags and $7FFFFFFF;
+    ProdHint := False;
+    Server(sGetEnemyCityAreaInfo, Me, cLoc, CityAreaInfo);
+
+    if C.Project and cpImp = 0 then
     begin
       emix := MyRO.nEnemyModel - 1;
       while (emix > 0) and ((MyRO.EnemyModel[emix].Owner <> cOwner) or
-        (integer(MyRO.EnemyModel[emix].mix) <> c.Project and cpIndex)) do
-        dec(emix);
-      if not Assigned(Tribe[cOwner].ModelPicture[c.Project and cpIndex].HGr) then
+        (Integer(MyRO.EnemyModel[emix].mix) <> C.Project and cpIndex)) do
+        Dec(emix);
+      if not Assigned(Tribe[cOwner].ModelPicture[C.Project and cpIndex].HGr) then
         InitEnemyModel(emix);
     end;
 
-    NextCityBtn.Visible := false;
-    PrevCityBtn.Visible := false;
+    NextCityBtn.Visible := False;
+    PrevCityBtn.Visible := False;
   end;
   Page := 0;
 
-  if c.Size < 5 then
+  if C.Size < 5 then
     SizeClass := 0
-  else if c.Size < 9 then
+  else if C.Size < 9 then
     SizeClass := 1
-  else if c.Size < 13 then
+  else if C.Size < 13 then
     SizeClass := 2
   else
@@ -1082 +1078 @@
 
   // check if port
-  IsPort := false;
+  IsPort := False;
   for dx := -2 to 2 do
     for dy := -2 to 2 do
-      if abs(dx) + abs(dy) = 2 then
+      if Abs(dx) + Abs(dy) = 2 then
       begin
         Loc1 := dLoc(cLoc, dx, dy);
         if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) and
           (MyMap[Loc1] and fTerrain < fGrass) then
-          IsPort := true;
+          IsPort := True;
       end;
 
@@ -1099 +1095 @@
   end;
 
-  Caption := CityName(c.ID);
+  Caption := CityName(C.ID);
 
   InitSmallCityMap;
@@ -1105 +1101 @@
   OpenSoundEvent := -1;
   OffscreenPaint;
-  Timer1.Enabled := true;
-end;
-
-procedure TCityDlg.ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+  Timer1.Enabled := True;
+end;
+
+procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: Integer; ShowEvent: Cardinal);
 begin
   if MyMap[Loc] and fOwned <> 0 then
@@ -1114 +1110 @@
     cix := MyRO.nCity - 1;
     while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-      dec(cix);
-    assert(cix >= 0);
+      Dec(cix);
+    Assert(cix >= 0);
     if (Optimize_cixTileChange >= 0) and
       (Optimize_TilesBeforeChange and not MyCity[Optimize_cixTileChange].Tiles
@@ -1131 +1127 @@
   else
     cix := -1;
-  AllowChange := not supervising and (cix >= 0);
+  AllowChange := not Supervising and (cix >= 0);
   cLoc := Loc;
   Happened := ShowEvent;
@@ -1138 +1134 @@
 
 procedure TCityDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, qx, qy, dx, dy, fix, NewTiles, Loc1, iix, SellResult: integer;
-  Rebuild: boolean;
-begin
-  if (ssLeft in Shift) and (x >= xSmallMap) and (x < xSmallMap + wSmallMap) and
-    (y >= ySmallMap) and (y < ySmallMap + hSmallMap) then
+  I, qx, qy, dx, dy, fix, NewTiles, Loc1, iix, SellResult: Integer;
+  Rebuild: Boolean;
+begin
+  if (ssLeft in Shift) and (X >= xSmallMap) and (X < xSmallMap + wSmallMap) and
+    (Y >= ySmallMap) and (Y < ySmallMap + hSmallMap) then
   begin
     SmallMapMode := smImprovements;
-    ZoomArea := (y - ySmallMap) * 3 div hSmallMap + 3 *
-      ((x - xSmallMap) * 2 div wSmallMap);
+    ZoomArea := (Y - ySmallMap) * 3 div hSmallMap + 3 *
+      ((X - xSmallMap) * 2 div wSmallMap);
     Page := 0;
     InitZoomCityMap;
     SmartUpdateContent;
-    exit;
-  end;
-  if (ssLeft in Shift) and (x >= xSupport) and (x < xSupport + wSupport) and
-    (y >= ySupport) and (y < ySupport + hSupport) then
+    Exit;
+  end;
+  if (ssLeft in Shift) and (X >= xSupport) and (X < xSupport + wSupport) and
+    (Y >= ySupport) and (Y < ySupport + hSupport) then
   begin
     SmallMapMode := smSupportedUnits;
@@ -1161 +1157 @@
     InitZoomCityMap;
     SmartUpdateContent;
-    exit;
+    Exit;
   end;
   if not AllowChange then
-    exit; // not an own city
+    Exit; // Not an own city
 
   if (ssLeft in Shift) then
-    if (ClientMode < scContact) and (x >= xView) and (y >= yView) and
-      (x < xView + 73) and (y < yView + 50) then
+    if (ClientMode < scContact) and (X >= xView) and (Y >= yView) and
+      (X < xView + 73) and (Y < yView + 50) then
       if cGov = gAnarchy then
-        with MessgExDlg do
+        with MainScreen.MessgExDlg do
         begin
           { MessgText:=Phrases.Lookup('OUTOFCONTROL');
-            if c.Project and cpImp=0 then
-            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[c.Project and cpIndex]])
-            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',c.Project and cpIndex)]); }
+            if C.Project and cpImp=0 then
+            MessgText:=Format(MessgText,[Tribe[cOwner].ModelName[C.Project and cpIndex]])
+            else MessgText:=Format(MessgText,[Phrases.Lookup('IMPROVEMENTS',C.Project and cpIndex)]); }
           MessgText := Phrases.Lookup('NOCHANGEINANARCHY');
           Kind := mkOk;
@@ -1184 +1180 @@
         if ProdHint then
         begin
-          ProdHint := false;
+          ProdHint := False;
           SmartUpdateContent
         end;
         ChooseProject;
       end
-    else if (SmallMapMode = smImprovements) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
-      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
-    begin
-      i := 5;
-      while (i >= 0) and not((x >= xZoomMap + 14 + 72 * (i mod 3)) and
-        (x < xZoomMap + 14 + 56 + 72 * (i mod 3)) and
-        (y >= yZoomMap + 14 + 56 * (i div 3)) and
-        (y < yZoomMap + 14 + 40 + 56 * (i div 3))) do
-        dec(i);
-      if i >= 0 then
+    else if (SmallMapMode = smImprovements) and (X >= xZoomMap) and (X < xZoomMap + wZoomMap) and
+      (Y >= yZoomMap) and (Y < yZoomMap + hZoomMap) then
+    begin
+      I := 5;
+      while (I >= 0) and not((X >= xZoomMap + 14 + 72 * (I mod 3)) and
+        (X < xZoomMap + 14 + 56 + 72 * (I mod 3)) and
+        (Y >= yZoomMap + 14 + 56 * (I div 3)) and
+        (Y < yZoomMap + 14 + 40 + 56 * (I div 3))) do
+        Dec(I);
+      if I >= 0 then
       begin
-        iix := imix[i];
+        iix := imix[I];
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
+            MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, iix)
           else if (ClientMode < scContact) then
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               IconKind := mikImp;
@@ -1220 +1216 @@
               else
               begin
-                SellResult := Server(sSellCityImprovement - sExecute, me,
+                SellResult := Server(sSellCityImprovement - sExecute, Me,
                   cix, iix);
                 if SellResult < rExecuted then
@@ -1235 +1231 @@
                 else
                 begin
-                  if Server(sRebuildCityImprovement - sExecute, me, cix, iix) < rExecuted
+                  if Server(sRebuildCityImprovement - sExecute, Me, cix, iix) < rExecuted
                   then
                   begin // no rebuild possible, ask for sell only
-                    Rebuild := false;
+                    Rebuild := False;
                     MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
                     if not Phrases2FallenBackToEnglish then
                       MessgText := Format(Phrases2.Lookup('SELL2'),
                         [MessgText, Imp[iix].Cost * BuildCostMod
-                        [G.Difficulty[me]] div 12])
+                        [G.Difficulty[Me]] div 12])
                     else
                       MessgText := Format(Phrases.Lookup('SELL'), [MessgText]);
                     if iix = imSpacePort then
-                      with MyRO.Ship[me] do
+                      with MyRO.Ship[Me] do
                         if Parts[0] + Parts[1] + Parts[2] > 0 then
                           MessgText := MessgText + ' ' +
@@ -1258 +1254 @@
                   else
                   begin
-                    Rebuild := true;
+                    Rebuild := True;
                     MessgText := Phrases.Lookup('IMPROVEMENTS', iix);
                     if not Phrases2FallenBackToEnglish then
                       MessgText := Format(Phrases2.Lookup('DISPOSE2'),
                         [MessgText, Imp[iix].Cost * BuildCostMod
-                        [G.Difficulty[me]] div 12 * 2 div 3])
+                        [G.Difficulty[Me]] div 12 * 2 div 3])
                     else
                       MessgText := Format(Phrases.Lookup('DISPOSE'),
                         [MessgText]);
                     if iix = imSpacePort then
-                      with MyRO.Ship[me] do
+                      with MyRO.Ship[Me] do
                         if Parts[0] + Parts[1] + Parts[2] > 0 then
                           MessgText := MessgText + ' ' +
@@ -1282 +1278 @@
                     begin
                       Play('CITY_REBUILDIMP');
-                      Server(sRebuildCityImprovement, me, cix, iix);
+                      Server(sRebuildCityImprovement, Me, cix, iix);
                     end
                     else
                     begin
                       Play('CITY_SELLIMP');
-                      Server(sSellCityImprovement, me, cix, iix);
+                      Server(sSellCityImprovement, Me, cix, iix);
                     end;
                     CityOptimizer_CityChange(cix);
@@ -1300 +1296 @@
       end;
     end
-    else if (SmallMapMode = smSupportedUnits) and (x >= xZoomMap) and (x < xZoomMap + wZoomMap) and
-      (y >= yZoomMap) and (y < yZoomMap + hZoomMap) then
-    begin
-      i := 5;
-      while (i >= 0) and not((x >= xZoomMap + 64 * (i mod 3)) and
-        (x < xZoomMap + 64 + 64 * (i mod 3)) and
-        (y >= yZoomMap + 20 + 48 * (i div 3)) and
-        (y < yZoomMap + 20 + 52 + 48 * (i div 3))) do
-        dec(i);
-      if (i >= 0) and (imix[i] >= 0) then
+    else if (SmallMapMode = smSupportedUnits) and (X >= xZoomMap) and (X < xZoomMap + wZoomMap) and
+      (Y >= yZoomMap) and (Y < yZoomMap + hZoomMap) then
+    begin
+      I := 5;
+      while (I >= 0) and not((X >= xZoomMap + 64 * (I mod 3)) and
+        (X < xZoomMap + 64 + 64 * (I mod 3)) and
+        (Y >= yZoomMap + 20 + 48 * (I div 3)) and
+        (Y < yZoomMap + 20 + 52 + 48 * (I div 3))) do
+        Dec(I);
+      if (I >= 0) and (imix[I] >= 0) then
         if ssShift in Shift then
         else if (cix >= 0) and (ClientMode < scContact) and
@@ -1316 +1312 @@
           CloseAction := None;
           Close;
-          MainScreen.CityClosed(imix[i], false, true);
+          MainScreen.CityClosed(imix[I], False, True);
         end;
     end
-    else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
-      and (y < ymArea + 96) then
+    else if (X >= xmArea - 192) and (X < xmArea + 192) and (Y >= ymArea - 96)
+      and (Y < ymArea + 96) then
     with AreaMap do begin
-      qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)
+      qx := ((4000 * xxt * yyt) + (X - xmArea) * (yyt * 2) + (Y - ymArea + yyt)
         * (xxt * 2)) div (xxt * yyt * 4) - 1000;
-      qy := ((4000 * xxt * yyt) + (y - ymArea + yyt) * (xxt * 2) - (x - xmArea)
+      qy := ((4000 * xxt * yyt) + (Y - ymArea + yyt) * (xxt * 2) - (X - xmArea)
         * (yyt * 2)) div (xxt * yyt * 4) - 1000;
       dx := qx - qy;
@@ -1334 +1330 @@
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
-            HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
+            HelpOnTerrain(Loc1, WindowModeMakePersistent(FWindowMode))
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and
-          (c.Flags and chCaptured = 0) then
+          (C.Flags and chCaptured = 0) then
         begin // toggle exploitation
-          assert(not supervising);
-          if c.Status and csResourceWeightsMask <> 0 then
+          Assert(not Supervising);
+          if C.Status and csResourceWeightsMask <> 0 then
           begin
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               MessgText := Phrases.Lookup('CITYMANAGEOFF');
@@ -1350 +1346 @@
               ShowModal;
             end;
-            if MessgExDlg.ModalResult = mrOK then
+            if MainScreen.MessgExDlg.ModalResult = mrOK then
             begin
               MyCity[cix].Status := MyCity[cix].Status and
                 not csResourceWeightsMask; // off
-              c.Status := MyCity[cix].Status;
+              C.Status := MyCity[cix].Status;
               SmartUpdateContent;
             end;
-            exit;
+            Exit;
           end;
           fix := (dy + 3) shl 2 + (dx + 3) shr 1;
           NewTiles := MyCity[cix].Tiles xor (1 shl fix);
-          if Server(sSetCityTiles, me, cix, NewTiles) >= rExecuted then
+          if Server(sSetCityTiles, Me, cix, NewTiles) >= rExecuted then
           begin
             SmartUpdateContent;
@@ -1370 +1366 @@
     end
     else if (ClientMode < scContact) and (cGov <> gAnarchy) and
-      (c.Flags and chCaptured = 0) and (x >= xmOpt - 32) and (x < xmOpt + 32)
-      and (y >= ymOpt - 32) and (y < ymOpt + 32) then
-    begin
-      i := sqr(x - xmOpt) + sqr(y - ymOpt); // click radius
-      if i <= 32 * 32 then
+      (C.Flags and chCaptured = 0) and (X >= xmOpt - 32) and (X < xmOpt + 32)
+      and (Y >= ymOpt - 32) and (Y < ymOpt + 32) then
+    begin
+      I := sqr(X - xmOpt) + sqr(Y - ymOpt); // click radius
+      if I <= 32 * 32 then
       begin
-        if i < 16 * 16 then // inner area clicked
-          if c.Status and csResourceWeightsMask <> 0 then
-            i := (c.Status shr 4 and $0F) mod 5 + 1 // rotate except off
+        if I < 16 * 16 then // inner area clicked
+          if C.Status and csResourceWeightsMask <> 0 then
+            I := (C.Status shr 4 and $0F) mod 5 + 1 // rotate except off
           else
-            i := 3 // rwGrowth
+            I := 3 // rwGrowth
         else
-          case trunc(arctan2(x - xmOpt, ymOpt - y) * 180 / pi) of
+          case trunc(arctan2(X - xmOpt, ymOpt - Y) * 180 / pi) of
             - 25 - 52 * 2 .. -26 - 52:
-              i := 1;
+              I := 1;
             -25 - 52 .. -26:
-              i := 2;
+              I := 2;
             -25 .. 25:
-              i := 3;
+              I := 3;
             26 .. 25 + 52:
-              i := 4;
+              I := 4;
             26 + 52 .. 25 + 52 * 2:
-              i := 5;
+              I := 5;
             180 - 26 .. 180, -180 .. -180 + 26:
-              i := 0;
+              I := 0;
           else
-            i := -1;
+            I := -1;
           end;
-        if i >= 0 then
+        if I >= 0 then
         begin
-          ChangeResourceWeights(i);
+          ChangeResourceWeights(I);
           SmartUpdateContent;
           if WindowMode <> wmModal then
@@ -1407 +1403 @@
       end;
     end;
-end; { FormMouseDown }
+end;
 
 procedure TCityDlg.ChooseProject;
@@ -1422 +1418 @@
   );
 
-  function ProjectType(Project: integer): TProjectType;
+  function ProjectType(Project: Integer): TProjectType;
   begin
     if Project and cpCompleted <> 0 then
@@ -1444 +1440 @@
 
 var
-  NewProject, OldMoney, cix1: integer;
+  NewProject, OldMoney, cix1: Integer;
   pt0, pt1: TProjectType;
-  QueryOk: boolean;
-begin
-  Assert(not supervising);
-  ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
-  if ModalSelectDlg.result <> -1 then
-  begin
-    if ModalSelectDlg.result and cpType <> 0 then
+  QueryOk: Boolean;
+begin
+  Assert(not Supervising);
+  MainScreen.ModalSelectDlg.ShowNewContent_CityProject(wmModal, cix);
+  if MainScreen.ModalSelectDlg.Result <> -1 then
+  begin
+    if MainScreen.ModalSelectDlg.Result and cpType <> 0 then
     begin
       MyCity[cix].Status := MyCity[cix].Status and not 7 or
-        (1 + ModalSelectDlg.result and cpIndex);
-      AutoBuild(cix, MyData.ImpOrder[ModalSelectDlg.result and cpIndex]);
+        (1 + MainScreen.ModalSelectDlg.Result and cpIndex);
+      AutoBuild(cix, MyData.ImpOrder[MainScreen.ModalSelectDlg.Result and cpIndex]);
     end
     else
     begin
-      NewProject := ModalSelectDlg.Result;
+      NewProject := MainScreen.ModalSelectDlg.Result;
       QueryOk := True;
       if (NewProject and cpImp <> 0) and (NewProject and cpIndex >= 28) and
         (MyRO.NatBuilt[NewProject and cpIndex] > 0) then
-        with MessgExDlg do
+        with MainScreen.MessgExDlg do
         begin
           cix1 := MyRO.nCity - 1;
@@ -1521 +1517 @@
         then
           NewProject := NewProject or cpDisbandCity;
-      Server(sSetCityProject, me, cix, NewProject);
-      c.Project := MyCity[cix].Project;
+      Server(sSetCityProject, Me, cix, NewProject);
+      C.Project := MyCity[cix].Project;
       if MyRO.Money > OldMoney then
         Play('CITY_SELLIMP');
@@ -1537 +1533 @@
 procedure TCityDlg.BuyClick(Sender: TObject);
 var
-  NextProd, Cost: integer;
+  NextProd, Cost: Integer;
 begin
   if (cix < 0) or (ClientMode >= scContact) then
-    exit;
-  with MyCity[cix], MessgExDlg do
+    Exit;
+  with MyCity[cix], MainScreen.MessgExDlg do
   begin
     Cost := Report.ProjectCost;
@@ -1548 +1544 @@
       NextProd := 0;
     Cost := Cost - Prod - NextProd;
-    if (MyRO.Wonder[woMich].EffectiveOwner = me) and (Project and cpImp <> 0)
+    if (MyRO.Wonder[woMich].EffectiveOwner = Me) and (Project and cpImp <> 0)
     then
       Cost := Cost * 2
@@ -1572 +1568 @@
     if (Kind = mkYesNo) and (ModalResult = mrOK) then
     begin
-      if Server(sBuyCityProject, me, cix, nil^) >= rExecuted then
+      if Server(sBuyCityProject, Me, cix, nil^) >= rExecuted then
       begin
         Play('CITY_BUYPROJECT');
@@ -1585 +1581 @@
 procedure TCityDlg.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Timer1.Enabled := false;
-  ProdHint := false;
+  Timer1.Enabled := False;
+  ProdHint := False;
   MarkCityLoc := -1;
   if Optimize_cixTileChange >= 0 then
@@ -1615 +1611 @@
       with Canvas do
       begin
-        DpiBitCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
+        DpiBitBltCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
           xView + 5, yView + 1);
-        DpiBitCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
+        DpiBitBltCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
           xView + 5, yView + 3);
-        DpiBitCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
+        DpiBitBltCanvas(Canvas, xView + 5 + 62, yView + 3, 2, 42,
           Back.Canvas, xView + 5 + 62, yView + 3);
         ScreenTools.Frame(Canvas, xView + 9 - 1, yView + 5 - 1, xView + 9 + xSizeBig,
@@ -1632 +1628 @@
     else if BlinkTime = 6 then
     begin
-      if AllowChange and (c.Status and 7 <> 0) then
+      if AllowChange and (C.Status and 7 <> 0) then
       begin // city type autobuild
         FrameImage(Canvas, bigimp, xView + 9, yView + 5, xSizeBig, ySizeBig,
-          (c.Status and 7 - 1 + 3) * xSizeBig, 0, true);
+          (C.Status and 7 - 1 + 3) * xSizeBig, 0, True);
       end
-      else if c.Project and cpImp = 0 then
+      else if C.Project and cpImp = 0 then
       begin // project is unit
-        DpiBitCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
+        DpiBitBltCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
           Bigimp.Canvas, 0, 0);
-        with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
+        with Tribe[cOwner].ModelPicture[C.Project and cpIndex] do
           Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
       end
       else
-        ImpImage(Canvas, xView + 9, yView + 5, c.Project0 and cpIndex,
-          cGov, true);
+        ImpImage(Canvas, xView + 9, yView + 5, C.Project0 and cpIndex,
+          cGov, True);
     end;
   end;
@@ -1663 +1659 @@
   if 1 shl OpenSoundEvent = chProduction then
   begin
-    if c.Project0 and cpImp <> 0 then
-    begin
-      if c.Project0 and cpIndex >= 28 then
+    if C.Project0 and cpImp <> 0 then
+    begin
+      if C.Project0 and cpIndex >= 28 then
       // wonders have already extra message with sound
-        if Imp[c.Project0 and cpIndex].Kind = ikShipPart then
+        if Imp[C.Project0 and cpIndex].Kind = ikShipPart then
           Play('SHIP_BUILT')
         else
@@ -1681 +1677 @@
 end;
 
-function Prio(iix: integer): integer;
+function Prio(iix: Integer): Integer;
 begin
   case Imp[iix].Kind of
     ikWonder:
-      result := iix + 10000;
+      Result := iix + 10000;
     ikNatLocal, ikNatGlobal:
       case iix of
         imPalace:
-          result := 0;
+          Result := 0;
       else
-        result := iix + 20000;
+        Result := iix + 20000;
       end;
   else
     case iix of
       imTownHall, imCourt:
-        result := iix + 30000;
+        Result := iix + 30000;
       imAqueduct, imSewer:
-        result := iix + 40000;
+        Result := iix + 40000;
       imTemple, imTheater, imCathedral:
-        result := iix + 50000;
-    else
-      result := iix + 90000;
+        Result := iix + 50000;
+    else
+      Result := iix + 90000;
     end;
   end;
@@ -1717 +1713 @@
 end;
 
-procedure TCityDlg.ChangeCity(d: integer);
+procedure TCityDlg.ChangeCity(D: Integer);
 var
-  cixNew: integer;
+  cixNew: Integer;
 begin
   cixNew := cix;
   repeat
-    cixNew := (cixNew + MyRO.nCity + d) mod MyRO.nCity;
+    cixNew := (cixNew + MyRO.nCity + D) mod MyRO.nCity;
   until (MyCity[cixNew].Loc >= 0) or (cixNew = cix);
   if cixNew <> cix then
@@ -1742 +1738 @@
 end;
 
-{ procedure TCityDlg.AdviceBtnClick(Sender: TObject);
-  begin
-  AdvisorDlg.GiveCityAdvice(cix);
-  end; }
-
 procedure TCityDlg.PageUpBtnClick(Sender: TObject);
 begin
   if Page > 0 then
   begin
-    dec(Page);
+    Dec(Page);
     SmartUpdateContent;
   end;
@@ -1760 +1751 @@
   if Page < PageCount - 1 then
   begin
-    inc(Page);
+    Inc(Page);
     SmartUpdateContent;
   end;
 end;
 
-procedure TCityDlg.ChangeResourceWeights(iResourceWeights: integer);
+procedure TCityDlg.ChangeResourceWeights(iResourceWeights: Integer);
 var
   Advice: TCityTileAdviceData;
 begin
-  assert(not supervising);
-  assert(cix >= 0);
+  Assert(not Supervising);
+  Assert(cix >= 0);
   MyCity[cix].Status := MyCity[cix].Status and not csResourceWeightsMask or
     (iResourceWeights shl 4);
-  c.Status := MyCity[cix].Status;
+  C.Status := MyCity[cix].Status;
   if iResourceWeights > 0 then
   begin
     Advice.ResourceWeights := OfferedResourceWeights[iResourceWeights];
-    Server(sGetCityTileAdvice, me, cix, Advice);
+    Server(sGetCityTileAdvice, Me, cix, Advice);
     if Advice.Tiles <> MyCity[cix].Tiles then
-      Server(sSetCityTiles, me, cix, Advice.Tiles);
+      Server(sSetCityTiles, Me, cix, Advice.Tiles);
   end;
 end;
@@ -1785 +1776 @@
 procedure SortImprovements;
 var
-  i, j, k: integer;
-begin
-  for i := 0 to nImp - 1 do
-    ImpSorted[i] := i;
-  for i := 0 to nImp - 2 do
-    for j := i + 1 to nImp - 1 do
-      if Prio(ImpSorted[i]) > Prio(ImpSorted[j]) then begin
-        k := ImpSorted[i];
-        ImpSorted[i] := ImpSorted[j];
-        ImpSorted[j] := k;
+  I, J, K: Integer;
+begin
+  for I := 0 to nImp - 1 do
+    ImpSorted[I] := I;
+  for I := 0 to nImp - 2 do
+    for J := I + 1 to nImp - 1 do
+      if Prio(ImpSorted[I]) > Prio(ImpSorted[J]) then begin
+        K := ImpSorted[I];
+        ImpSorted[I] := ImpSorted[J];
+        ImpSorted[J] := K;
       end;
 end;

branches/highdpi/LocalPlayer/CityType.pas ¶

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

branches/highdpi/LocalPlayer/ClientTools.pas ¶

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

branches/highdpi/LocalPlayer/Diagram.pas ¶

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

branches/highdpi/LocalPlayer/Diplomacy.pas ¶

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

branches/highdpi/LocalPlayer/Draft.pas ¶

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

branches/highdpi/LocalPlayer/Enhance.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
-
-  SysUtils, Classes, Graphics, Controls, Forms, IsoEngine,
-  ButtonB, ButtonC, Menus;
+  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, IsoEngine, ButtonB, ButtonC, Menus;
 
 type
@@ -39 +37 @@
     NoMap: TIsoMap;
   public
-    procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; TerrType: Integer = -1);
   protected
-    Page: integer;
+    Page: Integer;
     procedure OffscreenPaint; override;
   end;
 
-var
-  EnhanceDlg: TEnhanceDlg;
-
 
 implementation
 
 uses
-  Help, UKeyBindings;
+  Help, KeyBindings, Term;
 
 {$R *.lfm}
@@ -58 +53 @@
 procedure TEnhanceDlg.FormCreate(Sender: TObject);
 var
-  TerrType: integer;
-  m: TDpiMenuItem;
+  TerrType: Integer;
+  M: TDpiMenuItem;
 begin
   inherited;
@@ -73 +68 @@
     if TerrType <> fJungle then
     begin
-      m := TDpiMenuItem.Create(Popup);
-      m.RadioItem := true;
+      M := TDpiMenuItem.Create(Popup);
+      M.RadioItem := True;
       if TerrType = fGrass then
-        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+        M.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
           [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
           fGrass + 12)])
       else if TerrType = fForest then
-        m.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
+        M.Caption := Format(Phrases.Lookup('TWOTERRAINS'),
           [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
           fJungle)])
       else
-        m.Caption := Phrases.Lookup('TERRAIN', TerrType);
-      m.Tag := TerrType;
-      m.OnClick := TerrClick;
-      Popup.Items.Add(m);
+        M.Caption := Phrases.Lookup('TERRAIN', TerrType);
+      M.Tag := TerrType;
+      M.OnClick := TerrClick;
+      Popup.Items.Add(M);
     end;
 end;
@@ -98 +93 @@
 procedure TEnhanceDlg.FormPaint(Sender: TObject);
 var
-  i: integer;
+  I: Integer;
 begin
   inherited;
@@ -105 +100 @@
   BtnFrame(Canvas, Rect(job3.Left, job3.Top, job9.Left + job9.Width,
     job3.Top + job3.Height), MainTexture);
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonC then
-      DpiBitCanvas(Canvas, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
-        HGrSystem.Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
-        1 + Controls[i].Tag div 7 * 9);
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonC then
+      DpiBitBltCanvas(Canvas, Controls[I].Left + 2, Controls[I].Top - 11, 8, 8,
+        HGrSystem.Data.Canvas, 121 + Controls[I].Tag mod 7 * 9,
+        1 + Controls[I].Tag div 7 * 9);
 end;
 
@@ -117 +112 @@
 end;
 
-procedure TEnhanceDlg.ShowNewContent(NewMode, TerrType: integer);
+procedure TEnhanceDlg.ShowNewContent(NewMode: TWindowMode; TerrType: Integer);
 begin
   if (TerrType < fGrass) or (TerrType > fMountains) then
@@ -128 +123 @@
 procedure TEnhanceDlg.OffscreenPaint;
 var
-  i, stage, TerrType, TileImp, x, EndStage, Cost, LastJob: integer;
-  s: string;
-  Done: Set of jNone .. jTrans;
-  TypeChanged: boolean;
+  I, stage, TerrType, TileImp, X, EndStage, Cost, LastJob: Integer;
+  S: string;
+  Done: set of jNone .. jTrans;
+  TypeChanged: Boolean;
 begin
   OffscreenUser := self;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);
 
   EndStage := 0;
   while (EndStage < 5) and (MyData.EnhancementJobs[Page, EndStage] <> jNone) do
-    inc(EndStage);
+    Inc(EndStage);
   with NoMap do
-    x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
+    X := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
 
   TerrType := Page;
@@ -151 +146 @@
     if stage > 0 then
     begin
-      Sprite(offscreen, HGrSystem, x - 10, 66, 14, 14, 80, 1);
+      Sprite(Offscreen, HGrSystem, X - 10, 66, 14, 14, 80, 1);
       case MyData.EnhancementJobs[Page, stage - 1] of
         jRoad:
           begin
-            inc(Cost, Terrain[TerrType].MoveCost * RoadWork);
+            Inc(Cost, Terrain[TerrType].MoveCost * RoadWork);
             TileImp := TileImp or fRoad;
           end;
         jRR:
           begin
-            inc(Cost, Terrain[TerrType].MoveCost * RRWork);
+            Inc(Cost, Terrain[TerrType].MoveCost * RRWork);
             TileImp := TileImp or fRR;
           end;
         jIrr:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork);
             TileImp := TileImp and not fTerImp or tiIrrigation;
           end;
         jFarm:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork * FarmWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork * FarmWork);
             TileImp := TileImp and not fTerImp or tiFarm;
           end;
         jMine:
           begin
-            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            Inc(Cost, Terrain[TerrType].MineAfforestWork);
             TileImp := TileImp and not fTerImp or tiMine;
           end;
         jClear:
           begin
-            inc(Cost, Terrain[TerrType].IrrClearWork);
+            Inc(Cost, Terrain[TerrType].IrrClearWork);
             TerrType := Terrain[TerrType].ClearTerrain;
           end;
         jAfforest:
           begin
-            inc(Cost, Terrain[TerrType].MineAfforestWork);
+            Inc(Cost, Terrain[TerrType].MineAfforestWork);
             TerrType := Terrain[TerrType].AfforestTerrain;
           end;
         jTrans:
           begin
-            inc(Cost, Terrain[TerrType].TransWork);
+            Inc(Cost, Terrain[TerrType].TransWork);
             TerrType := Terrain[TerrType].TransTerrain;
           end;
       end;
-      include(Done, MyData.EnhancementJobs[Page, stage - 1]);
+      Include(Done, MyData.EnhancementJobs[Page, stage - 1]);
     end;
 
     with NoMap do begin
       if TerrType < fForest then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + TerrType * (xxt * 2 + 1), 1 + yyt)
       else
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
           (yyt * 3 + 1));
       end;
       if TileImp and fTerImp = tiFarm then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
       else if TileImp and fTerImp = tiIrrigation then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2, 1,
           1 + yyt + 12 * (yyt * 3 + 1));
       if TileImp and fRR <> 0 then
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
       end
       else if TileImp and fRoad <> 0 then
       begin
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
       end;
       if TileImp and fTerImp = tiMine then
-        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+        Sprite(Offscreen, HGrTerrain, X, 64 - yyt, xxt * 2, yyt * 2,
           1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
-      inc(x, xxt * 2 + 6);
-    end;
-  end;
-
-  for i := 0 to Popup.Items.Count - 1 do
-    if Popup.Items[i].Tag = Page then
-      s := Popup.Items[i].Caption;
+      Inc(X, xxt * 2 + 6);
+    end;
+  end;
+
+  for I := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[I].Tag = Page then
+      S := Popup.Items[I].Caption;
   if Cost > 0 then
-    s := Format(Phrases.Lookup('ENHANCE'), [s, MovementToString(Cost)]);
-  LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-    (InnerWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 12, s);
+    S := Format(Phrases.Lookup('ENHANCE'), [S, MovementToString(Cost)]);
+  LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+    (InnerWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2, 12, S);
 
   if EndStage > 0 then
@@ -291 +286 @@
     (Terrain[TerrType].MineEff > 0);
   job3.Visible := not TypeChanged and (Terrain[TerrType].ClearTerrain >= 0) and
-    ((TerrType <> fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner = me)) or
+    ((TerrType <> fDesert) or (MyRO.Wonder[woGardens].EffectiveOwner = Me)) or
     (LastJob = jClear);
   job6.Visible := not TypeChanged and (Terrain[TerrType].AfforestTerrain >= 0)
@@ -299 +294 @@
 
   MarkUsedOffscreen(InnerWidth, InnerHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TEnhanceDlg.CloseBtnClick(Sender: TObject);
@@ -308 +303 @@
 procedure TEnhanceDlg.ToggleBtnClick(Sender: TObject);
 var
-  i: integer;
-begin
-  for i := 0 to Popup.Items.Count - 1 do
-    Popup.Items[i].Checked := Popup.Items[i].Tag = Page;
+  I: Integer;
+begin
+  for I := 0 to Popup.Items.Count - 1 do
+    Popup.Items[I].Checked := Popup.Items[I].Tag = Page;
   Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top + ToggleBtn.Height);
 end;
@@ -323 +318 @@
 procedure TEnhanceDlg.JobClick(Sender: TObject);
 var
-  stage, NewJob: integer;
+  Stage, NewJob: Integer;
   Done: Set of jNone .. jTrans;
 
-  procedure RemoveJob(j: integer);
+  procedure RemoveJob(J: Integer);
   begin // remove job
-    stage := 0;
-    while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
-    begin
-      if (MyData.EnhancementJobs[Page, stage] = j) or (j = jRoad) and
-        (MyData.EnhancementJobs[Page, stage] = jRR) or (j = jIrr) and
-        (MyData.EnhancementJobs[Page, stage] = jFarm) then
+    Stage := 0;
+    while (Stage < 5) and (MyData.EnhancementJobs[Page, Stage] <> jNone) do
+    begin
+      if (MyData.EnhancementJobs[Page, Stage] = J) or (J = jRoad) and
+        (MyData.EnhancementJobs[Page, Stage] = jRR) or (J = jIrr) and
+        (MyData.EnhancementJobs[Page, Stage] = jFarm) then
       begin
-        if stage < 4 then
-          move(MyData.EnhancementJobs[Page, stage + 1],
-            MyData.EnhancementJobs[Page, stage], 4 - stage);
+        if Stage < 4 then
+          Move(MyData.EnhancementJobs[Page, Stage + 1],
+            MyData.EnhancementJobs[Page, Stage], 4 - Stage);
         MyData.EnhancementJobs[Page, 4] := jNone;
       end
       else
-        inc(stage);
+        Inc(Stage);
     end;
   end;
@@ -348 +343 @@
   NewJob := TButtonC(Sender).Tag;
   Done := [];
-  stage := 0;
-  while (stage < 5) and (MyData.EnhancementJobs[Page, stage] <> jNone) do
+  Stage := 0;
+  while (Stage < 5) and (MyData.EnhancementJobs[Page, Stage] <> jNone) do
   begin
-    include(Done, MyData.EnhancementJobs[Page, stage]);
-    inc(stage);
+    Include(Done, MyData.EnhancementJobs[Page, Stage]);
+    Inc(Stage);
   end;
   if NewJob in Done then
@@ -364 +359 @@
     if (NewJob = jRR) and not(jRoad in Done) then
     begin
-      MyData.EnhancementJobs[Page, stage] := jRoad;
-      inc(stage);
+      MyData.EnhancementJobs[Page, Stage] := jRoad;
+      Inc(Stage);
     end;
     if (NewJob = jFarm) and not(jIrr in Done) then
     begin
-      MyData.EnhancementJobs[Page, stage] := jIrr;
-      inc(stage);
-    end;
-    MyData.EnhancementJobs[Page, stage] := NewJob;
+      MyData.EnhancementJobs[Page, Stage] := jIrr;
+      Inc(Stage);
+    end;
+    MyData.EnhancementJobs[Page, Stage] := NewJob;
   end;
   SmartUpdateContent;
@@ -384 +379 @@
   ShortCut := KeyToShortCut(Key, Shift);
   if BHelp.Test(ShortCut) then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
-      HelpDlg.TextIndex('MACRO'))
+    MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkText,
+      MainScreen.HelpDlg.TextIndex('MACRO'))
 end;
 

branches/highdpi/LocalPlayer/Help.pas ¶

@@ -7 +7 @@
   UDpiControls, Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonB, PVSB, Types, fgl, IsoEngine;
+  ButtonB, PVSB, Types, Generics.Collections, IsoEngine;
 
 const
   MaxHist = 16;
 
-  { link categories }
-  hkNoLink = 0;
-  hkAdv = 1;
-  hkImp = 2;
-  hkTer = 3;
-  hkFeature = 4;
-  hkInternet = 5;
-  hkModel = 6;
-  hkMisc = 7;
-  hkCrossLink = $40;
-  hkText = $80;
-
-  liInvalid = $3FFF; // link index indicates invalid link
-
-  { link indices for category hkMisc }
-  miscMain = 0;
-  miscCredits = 1;
-  miscGovList = 2;
-  miscJobList = 3;
-  miscSearchResult = 7;
-
-  fJungle = 8; // pseudo terrain
+  fJungle = 8; // Pseudo terrain
 
 type
+  { Link categories }
+  TLinkCategory = (
+    hkNoLink,
+    hkAdv,
+    hkImp,
+    hkTer,
+    hkFeature ,
+    hkInternet,
+    hkModel,
+    hkMisc,
+    hkText);
+
+  { Link indices for category hkMisc }
+  TMiscLinkIndex = (
+    miscMain,
+    miscCredits,
+    miscGovList,
+    miscJobList,
+    miscSearchResult);
+
+  TTextFormat = (
+    pkNormal,
+    pkCaption,
+    pkSmallIcon,
+    pkBigIcon,
+    pkAdvIcon,
+    pkTer,
+    pkBigTer,
+    pkFeature,
+    pkDot,
+    pkNormal_Dot,
+    pkDomain,
+    pkSection,
+    pkBigFeature,
+    pkExp,
+    pkAITStat,
+    pkExternal,
+    pkModel,
+    pkNormal_64,
+    pkIllu,
+    pkLogo,
+    pkTerImp,
+    pkRightIcon,
+    pkAdvIcon_AsPreq,
+    pkSmallIcon_AsPreq,
+    pkSpecialIcon,
+    pkGov);
 
   { THyperText }
@@ -41 +67 @@
   THyperText = class(TStringList)
   public
-    procedure AddLine(s: String = ''; Format: integer = 0; Picpix: Integer = 0;
-      LinkCategory: integer = 0; LinkIndex: integer = 0);
+    procedure AddLine(S: String = ''; Format: TTextFormat = pkNormal; Picpix: Integer = 0;
+      LinkCategory: TLinkCategory = hkNoLink; LinkIndex: Integer = 0; CrossLink: Boolean = False);
     procedure LineFeed;
     procedure AppendList(Source: THyperText);
-    destructor Destroy; override;
   end;
 
@@ -51 +76 @@
 
   THistItem = class
-    Kind: Integer;
+    Kind: TLinkCategory;
     No: Integer;
     Pos: Integer;
@@ -60 +85 @@
   { THistItems }
 
-  THistItems = class(TFPGObjectList<THistItem>)
-    function AddNew(Kind, No, Pos: Integer; SearchContent: string): THistItem;
+  THistItems = class(TObjectList<THistItem>)
+    function AddNew(Kind: TLinkCategory; No, Pos: Integer; SearchContent: string): THistItem;
   end;
 
@@ -78 +103 @@
     procedure CloseBtnClick(Sender: TObject);
     procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure BackBtnClick(Sender: TObject);
     procedure TopBtnClick(Sender: TObject);
@@ -89 +114 @@
     procedure OffscreenPaint; override;
   private
-    Kind: Integer;
-    no: Integer;
+    Kind: TLinkCategory;
+    No: Integer;
     Sel: Integer;
     CaptionColor: Integer;
@@ -100 +125 @@
     SearchResult: THyperText;
     HelpText: TStringTable;
-    ExtPic, TerrIcon: TDpiBitmap;
+    ExtPic: TDpiBitmap;
+    TerrIcon: TDpiBitmap;
     ScrollBar: TPVScrollbar;
     NoMap: TIsoMap;
     x0: array [-2..180] of Integer;
-    procedure PaintTerrIcon(x, y, xSrc, ySrc: Integer);
+    procedure PaintTerrIcon(X, Y, xSrc, ySrc: Integer);
     procedure ScrollBarUpdate(Sender: TObject);
-    procedure Line(ca: TDpiCanvas; i: Integer; lit: Boolean);
+    procedure Line(ACanvas: TDpiCanvas; I: Integer; Lit: Boolean);
     procedure Prepare(sbPos: Integer = 0);
-    procedure ShowNewContentProcExecute(NewMode: Integer; HelpContext: string);
+    procedure ShowNewContentProcExecute(NewMode: TWindowMode; HelpContext: string);
     procedure WaterSign(x0, y0, iix: Integer);
     procedure Search(SearchString: string);
@@ -117 +143 @@
     Difficulty: Integer;
     procedure ClearHistory;
-    procedure ShowNewContent(NewMode, Category, Index: Integer);
+    procedure ShowNewContent(NewMode: TWindowMode; Category: TLinkCategory; Index: Integer);
     function TextIndex(Item: string): Integer;
   end;
 
-var
-  HelpDlg: THelpDlg;
-
 
 implementation
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
-  UKeyBindings;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global,
+  KeyBindings;
 
 {$R *.lfm}
@@ -138 +161 @@
 
   THelpLineInfo = class
-    Format: Byte;
+    Format: TTextFormat;
     Picpix: Byte;
-    Link: Word;
+    Category: TLinkCategory;
+    Index: Integer;
+    CrossLink: Boolean;
     procedure Assign(Source: THelpLineInfo);
   end;
 
-{ THelpLineInfo }
-
-procedure THelpLineInfo.Assign(Source: THelpLineInfo);
-begin
-  Format := Source.Format;
-  PicPix := Source.PicPix;
-  Link := Source.Link;
-end;
-
-{ THistItem }
-
-procedure THistItem.Assign(Source: THistItem);
-begin
-  Kind := Source.Kind;
-  No := Source.No;
-  Pos := Source.Pos;
-  SearchContent := Source.SearchContent;
-end;
-
-{ THistItems }
-
-function THistItems.AddNew(Kind, No, Pos: Integer; SearchContent: string
-  ): THistItem;
-begin
-  Result := THistItem.Create;
-  Result.Kind := Kind;
-  Result.No := No;
-  Result.Pos := Pos;
-  Result.SearchContent := SearchContent;
-  Add(Result);
-end;
-
-procedure THyperText.AddLine(s: String; Format: integer; Picpix: integer;
-  LinkCategory: integer; LinkIndex: integer);
-var
-  HelpLineInfo: THelpLineInfo;
-begin
-  HelpLineInfo := THelpLineInfo.Create;
-  if LinkIndex < 0 then
-    LinkIndex := liInvalid;
-  HelpLineInfo.Format := Format;
-  HelpLineInfo.Picpix := Picpix;
-  HelpLineInfo.Link := LinkCategory shl 8 + LinkIndex;
-  AddObject(s, TObject(HelpLineInfo));
-end;
-
-procedure THyperText.LineFeed;
-begin
-  AddLine;
-end;
-
-procedure THyperText.AppendList(Source: THyperText);
-var
-  I: Integer;
-  HelpLineInfo: THelpLineInfo;
-begin
-  for I := 0 to Source.Count - 1 do begin
-    HelpLineInfo := THelpLineInfo.Create;
-    HelpLineInfo.Assign(THelpLineInfo(Source.Objects[I]));
-    AddObject(Source.Strings[I], HelpLineInfo);
-  end;
-end;
-
-destructor THyperText.Destroy;
-begin
-  inherited;
-end;
+  TSeeAlso = record
+    Kind: TLinkCategory;
+    No: Integer;
+    SeeKind: TLinkCategory;
+    SeeNo: Integer;
+  end;
 
 const
-  { text formats }
-  pkNormal = 0;
-  pkCaption = 1;
-  pkSmallIcon = 2;
-  pkBigIcon = 3;
-  pkAdvIcon = 4;
-  pkTer = 5;
-  pkBigTer = 6;
-  pkFeature = 7;
-  pkDot = 8;
-  pkNormal_Dot = 9;
-  pkDomain = 10;
-  pkSection = 11;
-  pkBigFeature = 12;
-  pkExp = 13;
-  pkAITStat = 14;
-  pkExternal = 15;
-  pkModel = 16;
-  pkNormal_64 = 17;
-  pkIllu = 18;
-  pkLogo = 19;
-  pkTerImp = 20;
-  pkRightIcon = 21;
-  pkAdvIcon_AsPreq = 22;
-  pkSmallIcon_AsPreq = 23;
-  pkSpecialIcon = 24;
-  pkGov = 25;
-
-  nSeeAlso = 14;
-  SeeAlso: array [0 .. nSeeAlso - 1] of record
-    Kind: Integer;
-    no: Integer;
-    SeeKind: Integer;
-    SeeNo: Integer;
-  end = ((Kind: hkImp; no: imWalls; SeeKind: hkFeature;
+  SeeAlso: array[0..13] of TSeeAlso = ((Kind: hkImp; no: imWalls; SeeKind: hkFeature;
     SeeNo: mcArtillery), (Kind: hkImp; no: imHydro; SeeKind: hkImp;
     SeeNo: woHoover), (Kind: hkImp; no: imWalls; SeeKind: hkImp;
@@ -262 +192 @@
     SeeKind: hkFeature; SeeNo: mcDefense));
 
-  nTerrainHelp = 14;
-  TerrainHelp: array [0 .. nTerrainHelp - 1] of integer = (fGrass, fGrass + 12,
+  TerrainHelp: array[0..13] of Integer = (fGrass, fGrass + 12,
     fPrairie, fForest, fJungle, fHills, fMountains, fSwamp, fTundra, fArctic,
-    fDesert, 3 * 12 { DeadLands } , fShore, fOcean);
-
-  nJobHelp = 8;
-  JobHelp: array [0 .. nJobHelp - 1] of integer = (jRoad, jRR, jCanal, jIrr,
+    fDesert, 3 * 12 { DeadLands }, fShore, fOcean);
+
+  JobHelp: array[0..7] of Integer = (jRoad, jRR, jCanal, jIrr,
     jFarm, jMine, jFort, jBase);
 
+{ THelpLineInfo }
+
+procedure THelpLineInfo.Assign(Source: THelpLineInfo);
+begin
+  Format := Source.Format;
+  PicPix := Source.PicPix;
+  Category := Source.Category;
+  Index := Source.Index;
+end;
+
+{ THistItem }
+
+procedure THistItem.Assign(Source: THistItem);
+begin
+  Kind := Source.Kind;
+  No := Source.No;
+  Pos := Source.Pos;
+  SearchContent := Source.SearchContent;
+end;
+
+{ THistItems }
+
+function THistItems.AddNew(Kind: TLinkCategory; No, Pos: Integer; SearchContent: string
+  ): THistItem;
+begin
+  Result := THistItem.Create;
+  Result.Kind := Kind;
+  Result.No := No;
+  Result.Pos := Pos;
+  Result.SearchContent := SearchContent;
+  Add(Result);
+end;
+
+procedure THyperText.AddLine(S: String; Format: TTextFormat; Picpix: Integer;
+  LinkCategory: TLinkCategory = hkNoLink; LinkIndex: Integer = 0;
+  CrossLink: Boolean = False);
+var
+  HelpLineInfo: THelpLineInfo;
+begin
+  HelpLineInfo := THelpLineInfo.Create;
+  HelpLineInfo.Format := Format;
+  HelpLineInfo.Picpix := Picpix;
+  HelpLineInfo.Category := LinkCategory;
+  HelpLineInfo.Index := LinkIndex;
+  HelpLineInfo.CrossLink := CrossLink;
+  AddObject(S, HelpLineInfo);
+end;
+
+procedure THyperText.LineFeed;
+begin
+  AddLine;
+end;
+
+procedure THyperText.AppendList(Source: THyperText);
+var
+  I: Integer;
+  HelpLineInfo: THelpLineInfo;
+begin
+  for I := 0 to Source.Count - 1 do begin
+    HelpLineInfo := THelpLineInfo.Create;
+    HelpLineInfo.Assign(THelpLineInfo(Source.Objects[I]));
+    AddObject(Source.Strings[I], HelpLineInfo);
+  end;
+end;
+
 procedure THelpDlg.FormCreate(Sender: TObject);
 begin
-  inherited;
   NoMap := TIsoMap.Create;
 
@@ -280 +272 @@
   CaptionLeft := BackBtn.Left + BackBtn.Width;
   CaptionRight := SearchBtn.Left;
-  inc(ModalFrameIndent, 29);
+  Inc(ModalFrameIndent, 29);
   MainText := THyperText.Create;
   MainText.OwnsObjects := True;
@@ -290 +282 @@
 
   HelpText := TStringTable.Create;
-  HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'help.txt'));
+  HelpText.LoadFromFile(LocalizedFilePath('Help' + DirectorySeparator + 'Help.txt'));
   hADVHELP := HelpText.Gethandle('ADVHELP');
   hIMPHELP := HelpText.Gethandle('IMPHELP');
@@ -316 +308 @@
 end;
 
-procedure THelpDlg.ShowNewContentProcExecute(NewMode: Integer;
+procedure THelpDlg.ShowNewContentProcExecute(NewMode: TWindowMode;
   HelpContext: string);
 begin
-  HelpDlg.ShowNewContent(NewMode, hkText,
-    HelpDlg.TextIndex(HelpContext))
+  ShowNewContent(NewMode, hkText, TextIndex(HelpContext));
 end;
 
@@ -356 +347 @@
   if ScrollBar.Process(Msg) then begin
     Sel := -1;
-    SmartUpdateContent(true)
+    SmartUpdateContent(True)
   end;
   }
@@ -364 +355 @@
 begin
   if Sel <> -1 then begin
-    Line(Canvas, Sel, false);
-    Sel := -1
+    Line(Canvas, Sel, False);
+    Sel := -1;
   end;
 end;
@@ -380 +371 @@
 end;
 
-procedure THelpDlg.Line(ca: TDpiCanvas; i: Integer; lit: Boolean);
+procedure THelpDlg.Line(ACanvas: TDpiCanvas; I: Integer; Lit: Boolean);
 var
-  TextColor, x, y: Integer;
+  TextColor: TColor;
+  X, Y: Integer;
   TextSize: TSize;
-  s: string;
-begin
-  s := MainText[ScrollBar.Position + i];
-  if s = '' then
+  S: string;
+begin
+  S := MainText[ScrollBar.Position + I];
+  if S = '' then
     Exit;
-  x := x0[i];
-  y := 2 + i * 24;
-  if ca = Canvas then
-  begin
-    x := x + SideFrame;
-    y := y + WideFrame
-  end;
-  if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format
+  X := x0[I];
+  Y := 2 + I * 24;
+  if ACanvas = Canvas then
+  begin
+    X := X + SideFrame;
+    Y := Y + WideFrame;
+  end;
+  if THelpLineInfo(MainText.Objects[ScrollBar.Position + I]).Format
     in [pkCaption, pkBigTer, pkRightIcon, pkBigFeature] then
   begin
-    ca.Font.Assign(CaptionFont);
-    { ca.brush.color:=CaptionColor;
-      ca.FillRect(rect(x,i*24,x+24,i*24+24));
-      ca.brush.color:=$FFFFFF;
-      ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
-      ca.Brush.Style:=bsClear; }
-    DpiBitCanvas(ca, x, y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
+    ACanvas.Font.Assign(CaptionFont);
+    { ACanvas.brush.color:=CaptionColor;
+      ACanvas.FillRect(rect(X,I*24,X+24,I*24+24));
+      ACanvas.Brush.Color:=$FFFFFF;
+      ACanvas.FrameRect(rect(X+1,I*24+1,X+24-1,I*24+24-1));
+      ACanvas.Brush.Style:=bsClear; }
+    DpiBitBltCanvas(ACanvas, X, Y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
       146);
-    BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
-      y - 3, s[1]);
-    BiColorTextOut(ca, CaptionColor, $7F007F, x + 24, y - 3, copy(s, 2, 255));
-    ca.Font.Assign(UniFont[ftNormal]);
+    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.Textwidth(S[1]) div 2,
+      Y - 3, S[1]);
+    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X + 24, Y - 3, Copy(S, 2, 255));
+    ACanvas.Font.Assign(UniFont[ftNormal]);
   end
-  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format = pkSection
-  then
-  begin
-    ca.Font.Assign(CaptionFont);
-    BiColorTextOut(ca, CaptionColor, $7F007F, x, y - 3, s);
-    ca.Font.Assign(UniFont[ftNormal]);
+  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + I]).Format = pkSection then
+  begin
+    ACanvas.Font.Assign(CaptionFont);
+    BiColorTextOut(ACanvas, CaptionColor, $7F007F, X, Y - 3, S);
+    ACanvas.Font.Assign(UniFont[ftNormal]);
   end
   else
   begin
-    if (Kind = hkMisc) and (no = miscMain) then
-      ca.Font.Assign(CaptionFont);
+    if (Kind = hkMisc) and (No = Integer(miscMain)) then
+      ACanvas.Font.Assign(CaptionFont);
     TextColor := Colors.Canvas.Pixels[clkMisc, cliPaperText];
-    if ca = Canvas then
+    if ACanvas = Canvas then
     begin
-      TextSize.cx := BiColorTextWidth(ca, s);
-      TextSize.cy := ca.TextHeight(s);
-      if y + TextSize.cy >= WideFrame + InnerHeight then
-        TextSize.cy := WideFrame + InnerHeight - y;
-      FillSeamless(ca, x, y, TextSize.cx, TextSize.cy, -SideFrame,
+      TextSize.cx := BiColorTextWidth(ACanvas, S);
+      TextSize.cy := ACanvas.TextHeight(S);
+      if Y + TextSize.cy >= WideFrame + InnerHeight then
+        TextSize.cy := WideFrame + InnerHeight - Y;
+      FillSeamless(ACanvas, X, Y, TextSize.cx, TextSize.cy, -SideFrame,
         ScrollBar.Position * 24 - WideFrame, Paper);
     end;
-    BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
+    BiColorTextOut(ACanvas, TextColor, $7F007F, X, Y, S);
     if lit then
-      with ca do
+      with ACanvas do
       begin
-        Assert(ca = Canvas);
+        Assert(ACanvas = Canvas);
         Pen.Color := TextColor;
-        MoveTo(x + 1, y + TextSize.cy - 2);
-        LineTo(x + TextSize.cx, y + TextSize.cy - 2);
+        MoveTo(X + 1, Y + TextSize.cy - 2);
+        LineTo(X + TextSize.cx, Y + TextSize.cy - 2);
       end;
-    if (Kind = hkMisc) and (no = miscMain) then
-      ca.Font.Assign(UniFont[ftNormal]);
-  end;
-end;
-
-procedure THelpDlg.WaterSign(x0, y0, iix: integer);
+    if (Kind = hkMisc) and (No = Integer(miscMain)) then
+      ACanvas.Font.Assign(UniFont[ftNormal]);
+  end;
+end;
+
+procedure THelpDlg.WaterSign(x0, y0, iix: Integer);
 const
   nHeaven = 28;
   MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
-  Heaven: array [0..nHeaven] of integer;
+  X, Y, dx, dy, xSrc, ySrc, Sum, xx: Integer;
+  Heaven: array [0..nHeaven] of Integer;
   PaintPtr: TPixelPointer;
   CoalPtr: TPixelPointer;
@@ -467 +458 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  PaintPtr := PixelPointer(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
-  CoalPtr := PixelPointer(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
+  PaintPtr := TPixelPointer.Create(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
+  CoalPtr := TPixelPointer.Create(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
   for dy := -1 to 1 do
-    ImpPtr[dy] := PixelPointer(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
-  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
-    if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
+    ImpPtr[dy] := TPixelPointer.Create(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
+  for Y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
+    if ((ScaleToNative(y0) + Y) >= 0) and ((ScaleToNative(y0) + Y) < ScaleToNative(InnerHeight)) then begin
       for dy := -1 to 1 do
-        if ((Max(y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
-          ImpPtr[dy].SetXY(0, Max(y + ScaleToNative(dy), 0) shr 1);
-      for x := 0 to ScaleToNative(xSizeBig * 2) - 1 do begin
+        if ((Max(Y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(Y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
+          ImpPtr[dy].SetXY(0, Max(Y + ScaleToNative(dy), 0) shr 1);
+      for X := 0 to ScaleToNative(xSizeBig * 2) - 1 do begin
         Sum := 0;
         for dx := -1 to 1 do begin
-          xx := Max((x + ScaleToNative(dx)), 0) shr 1;
+          xx := Max((X + ScaleToNative(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((y + ScaleToNative(dy)) shr 1 < 0) or ((y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
-              ((x + ScaleToNative(dx)) shr 1 < 0) or ((x + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
-              ((y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
+            if ((Y + ScaleToNative(dy)) shr 1 < 0) or ((Y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
+              ((X + ScaleToNative(dx)) shr 1 < 0) or ((X + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
+              ((Y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y + ScaleToNative(dy))) shr 1]) then
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(Y + ScaleToNative(dy))) shr 1]) then
               Sum := Sum + 9 * 255
             else
@@ -493 +484 @@
           end;
         end;
-        if Sum < MaxSum then begin // no saturation
+        if Sum < MaxSum then begin // No saturation
           Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
           PaintPtr.Pixel^.B := Min(PaintPtr.Pixel^.B * Sum shr 22, 255);
@@ -510 +501 @@
 end;
 
-procedure THelpDlg.PaintTerrIcon(x, y, xSrc, ySrc: integer);
+procedure THelpDlg.PaintTerrIcon(X, Y, xSrc, ySrc: Integer);
 begin
   with NoMap do begin
-    Frame(OffScreen.Canvas, x - 1, y - 1, x + xSizeBig, y + ySizeBig,
+    Frame(OffScreen.Canvas, X - 1, Y - 1, X + xSizeBig, Y + ySizeBig,
       $000000, $000000);
     if 2 * yyt < 40 then begin
-      Sprite(OffScreen, HGrTerrain, x, y, 56, 2 * yyt, xSrc, ySrc);
-      Sprite(OffScreen, HGrTerrain, x, y + 2 * yyt, 56, 40 - 2 * yyt,
+      Sprite(OffScreen, HGrTerrain, X, Y, 56, 2 * yyt, xSrc, ySrc);
+      Sprite(OffScreen, HGrTerrain, X, Y + 2 * yyt, 56, 40 - 2 * yyt,
         xSrc, ySrc);
     end else
-      Sprite(OffScreen, HGrTerrain, x, y, 56, 40, xSrc, ySrc);
-    Sprite(OffScreen, HGrTerrain, x, y, xxt, yyt, xSrc + xxt, ySrc + yyt);
-    Sprite(OffScreen, HGrTerrain, x, y + yyt, xxt, 40 - yyt, xSrc + xxt, ySrc);
-    Sprite(OffScreen, HGrTerrain, x + xxt, y, 56 - xxt, yyt, xSrc, ySrc + yyt);
-    Sprite(OffScreen, HGrTerrain, x + xxt, y + yyt, 56 - xxt, 40 - yyt,
+      Sprite(OffScreen, HGrTerrain, X, Y, 56, 40, xSrc, ySrc);
+    Sprite(OffScreen, HGrTerrain, X, Y, xxt, yyt, xSrc + xxt, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, X, Y + yyt, xxt, 40 - yyt, xSrc + xxt, ySrc);
+    Sprite(OffScreen, HGrTerrain, X + xxt, Y, 56 - xxt, yyt, xSrc, ySrc + yyt);
+    Sprite(OffScreen, HGrTerrain, X + xxt, Y + yyt, 56 - xxt, 40 - yyt,
       xSrc, ySrc);
   end;
@@ -531 +522 @@
 procedure THelpDlg.OffscreenPaint;
 var
-  i, j, yl, srcno, ofs, cnt, y: Integer;
-  s: string;
+  I, J, yl, srcno, ofs, cnt, Y: Integer;
+  S: string;
   HelpLineInfo: THelpLineInfo;
 begin
@@ -542 +533 @@
   begin
     Font.Assign(UniFont[ftNormal]);
-    for i := -ScrollBar.Position to InnerHeight div 24 do
-      if ScrollBar.Position + i < MainText.Count then
+    for I := -ScrollBar.Position to InnerHeight div 24 do
+      if ScrollBar.Position + I < MainText.Count then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + I]);
         if HelpLineInfo.Format = pkExternal then
         begin
           yl := ExtPic.Height;
-          if 4 + i * 24 + yl > InnerHeight then
-            yl := InnerHeight - (4 + i * 24);
-          DpiBitCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+          if 4 + I * 24 + yl > InnerHeight then
+            yl := InnerHeight - (4 + I * 24);
+          DpiBitBltCanvas(OffScreen.Canvas, 8, 4 + I * 24, ExtPic.Width, yl, ExtPic.Canvas,
             0, 0);
         end;
       end;
-    for i := -2 to InnerHeight div 24 do
-      if (ScrollBar.Position + i >= 0) and (ScrollBar.Position + i < MainText.Count) then
+    for I := -2 to InnerHeight div 24 do
+      if (ScrollBar.Position + I >= 0) and (ScrollBar.Position + I < MainText.Count) then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
-        if HelpLineInfo.Link <> 0 then
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + I]);
+        if (HelpLineInfo.Category <> hkNoLink) or (HelpLineInfo.Index <> 0) then
         begin
-          if (Kind = hkMisc) and (no = miscSearchResult) then
-            Sprite(OffScreen, HGrSystem, 18, 9 + i * 24, 8, 8, 90, 16)
+          if (Kind = hkMisc) and (No = Integer(miscSearchResult)) then
+            Sprite(OffScreen, HGrSystem, 18, 9 + I * 24, 8, 8, 90, 16)
           else if HelpLineInfo.Format in [pkSmallIcon_AsPreq, pkAdvIcon_AsPreq]
           then
-            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 65, 20)
-          else if HelpLineInfo.Link and (hkCrossLink shl 8) <> 0 then
-            Sprite(OffScreen, HGrSystem, 12, i * 24 + 5, 14, 14, 80, 1)
-          else if not((Kind = hkMisc) and (no = miscMain)) then
-            Sprite(OffScreen, HGrSystem, 10, i * 24 + 6, 14, 14, 65, 1);
-          x0[i] := 24;
+            Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 65, 20)
+          else if HelpLineInfo.CrossLink then
+            Sprite(OffScreen, HGrSystem, 12, I * 24 + 5, 14, 14, 80, 1)
+          else if not((Kind = hkMisc) and (No = Integer(miscMain))) then
+            Sprite(OffScreen, HGrSystem, 10, I * 24 + 6, 14, 14, 65, 1);
+          x0[I] := 24;
         end
         else
-          x0[i] := 0;
+          x0[I] := 0;
         case HelpLineInfo.Format of
           pkLogo:
             begin
-              Server(sGetVersion, 0, 0, j);
-              s := Format('%d.%d.%d', [j shr 16 and $FF, j shr 8 and $FF,
-                j and $FF]);
-              PaintLogo(OffScreen.Canvas, (InnerWidth - 122) div 2, i * 24 + 1,
+              Server(sGetVersion, 0, 0, J);
+              S := Format('%d.%d.%d', [J shr 16 and $FF, J shr 8 and $FF,
+                J and $FF]);
+              PaintLogo(OffScreen.Canvas, (InnerWidth - 122) div 2, I * 24 + 1,
                 HGrSystem.Data.Canvas.Pixels[95, 1], $000000);
               Font.Assign(UniFont[ftSmall]);
               BiColorTextOut(OffScreen.Canvas, $000000, $7F007F,
-                (InnerWidth - Textwidth(s)) div 2, i * 24 + 26, s);
+                (InnerWidth - Textwidth(S)) div 2, I * 24 + 26, S);
               Font.Assign(UniFont[ftNormal]);
             end;
           pkSmallIcon, pkSmallIcon_AsPreq:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
               if HelpLineInfo.Picpix = imPalace then
-                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   0 * xSizeSmall, 1 * ySizeSmall)
               else
-                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   HelpLineInfo.Picpix mod 7 * xSizeSmall,
                   (HelpLineInfo.Picpix + SystemIconLines * 7) div 7 *
                   ySizeSmall);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkBigIcon:
             begin
-              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7, 56,
+              FrameImage(OffScreen.Canvas, BigImp, x0[I] + 12, I * 24 - 7, 56,
                 40, HelpLineInfo.Picpix mod 7 * xSizeBig,
                 HelpLineInfo.Picpix div 7 * ySizeBig);
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkSpecialIcon:
@@ -615 +606 @@
                 0:
                   FrameImage(OffScreen.Canvas, HGrSystem2.Data,
-                    12 + x0[i], -7 + i * 24, 56, 40, 137, 127);
+                    12 + x0[I], -7 + I * 24, 56, 40, 137, 127);
                 1:
                   with NoMap do begin
-                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
                       1 + 3 * (xxt * 2 + 1), 1 + yyt);
                     if 2 * yyt < 40 then
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 2 * yyt, 1 + 3 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 1 * (yyt * 3 + 1))
                     else
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i],
-                        -7 + 4 + i * 24 - 4, 56, 40, 1 + 3 * (xxt * 2 + 1) + xxt
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I],
+                        -7 + 4 + I * 24 - 4, 56, 40, 1 + 3 * (xxt * 2 + 1) + xxt
                         - 28, 1 + yyt + 1 * (yyt * 3 + 1) + yyt - 20);
                   end;
                 2:
                   with NoMap do begin
-                    PaintTerrIcon(12 + x0[i], -7 + i * 24,
+                    PaintTerrIcon(12 + x0[I], -7 + I * 24,
                       1 + 7 * (xxt * 2 + 1), 1 + yyt + 4 * (yyt * 3 + 1));
                     if 2 * yyt < 40 then
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
                     else
-                      Sprite(OffScreen, HGrTerrain, 12 + x0[i], -7 + 4 + i * 24,
+                      Sprite(OffScreen, HGrTerrain, 12 + x0[I], -7 + 4 + I * 24,
                         56, 32, 1 + 4 * (xxt * 2 + 1) + xxt - 28,
                         1 + yyt + 12 * (yyt * 3 + 1) + yyt - 16)
                   end;
               end;
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkDomain:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + 36 + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + 36 + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 8 + x0[I], 2 + I * 24, 36, 20,
                 75 + HelpLineInfo.Picpix * 37, 295);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkAdvIcon, pkAdvIcon_AsPreq:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + ySizeSmall + i * 24,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + ySizeSmall + I * 24,
                 $000000, $000000);
               if AdvIcon[HelpLineInfo.Picpix] < 84 then
-                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24,
                   xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 7 *
@@ -665 +656 @@
                   7) div 7 * ySizeSmall)
               else
-                Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
+                Dump(OffScreen, HGrSystem, 8 + x0[I], 2 + I * 24, 36, 20,
                   1 + (AdvIcon[HelpLineInfo.Picpix] - 84) mod 8 * 37,
                   295 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
-              j := AdvValue[HelpLineInfo.Picpix] div 1000;
-              DpiBitCanvas(OffScreen.Canvas, x0[i] + 4, 4 + i * 24, 14, 14,
-                HGrSystem.Mask.Canvas, 127 + j * 15, 85, SRCAND);
-              Sprite(OffScreen, HGrSystem, x0[i] + 3, 3 + i * 24, 14, 14,
-                127 + j * 15, 85);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              J := AdvValue[HelpLineInfo.Picpix] div 1000;
+              DpiBitBltCanvas(OffScreen.Canvas, x0[I] + 4, 4 + I * 24, 14, 14,
+                HGrSystem.Mask.Canvas, 127 + J * 15, 85, SRCAND);
+              Sprite(OffScreen, HGrSystem, x0[I] + 3, 3 + I * 24, 14, 14,
+                127 + J * 15, 85);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkRightIcon:
             begin
               if Imp[HelpLineInfo.Picpix].Kind <> ikWonder then
-                ImpImage(OffScreen.Canvas, InnerWidth - (40 + xSizeBig), i * 24,
+                ImpImage(OffScreen.Canvas, InnerWidth - (40 + xSizeBig), I * 24,
                   HelpLineInfo.Picpix, gDespotism)
               else
-                WaterSign(InnerWidth - (40 + 2 * xSizeBig), i * 24 - 8,
+                WaterSign(InnerWidth - (40 + 2 * xSizeBig), I * 24 - 8,
                   HelpLineInfo.Picpix + 7);
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkIllu:
-            WaterSign(8, i * 24 - 8, HelpLineInfo.Picpix);
+            WaterSign(8, I * 24 - 8, HelpLineInfo.Picpix);
           pkBigFeature:
             begin
               cnt := 0;
-              for j := nDomains - 1 downto 0 do
-                if 1 shl j and Feature[HelpLineInfo.Picpix].Domains <> 0 then
+              for J := nDomains - 1 downto 0 do
+                if 1 shl J and Feature[HelpLineInfo.Picpix].Domains <> 0 then
                 begin
-                  inc(cnt);
+                  Inc(cnt);
                   Dump(OffScreen, HGrSystem, InnerWidth - 38 - 38 * cnt,
-                    i * 24 + 1, 36, 20, 75 + j * 37, 295);
-                  ScreenTools.Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, i * 24,
-                    InnerWidth - 2 - 38 * cnt, i * 24 + 21, $000000, $000000);
+                    I * 24 + 1, 36, 20, 75 + J * 37, 295);
+                  ScreenTools.Frame(OffScreen.Canvas, InnerWidth - 39 - 38 * cnt, I * 24,
+                    InnerWidth - 2 - 38 * cnt, I * 24 + 21, $000000, $000000);
                 end;
               DarkGradient(OffScreen.Canvas, InnerWidth - 38 - 38 * cnt,
-                i * 24 + 23, cnt * 38 - 2, 1);
+                I * 24 + 23, cnt * 38 - 2, 1);
               ofs := InnerWidth - (39 + 7) - 19 * cnt;
               with OffScreen.Canvas do
               begin
-                Brush.color := $C0C0C0;
-                FrameRect(Rect(ofs, 1 + 23 + i * 24, ofs + 14,
-                  15 + 23 + i * 24));
+                Brush.Color := $C0C0C0;
+                FrameRect(Rect(ofs, 1 + 23 + I * 24, ofs + 14,
+                  15 + 23 + I * 24));
                 Brush.Style := bsClear;
-                Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + i * 24, 10, 10,
+                Sprite(OffScreen, HGrSystem, ofs + 2, 3 + 23 + I * 24, 10, 10,
                   66 + HelpLineInfo.Picpix mod 11 * 11,
                   137 + HelpLineInfo.Picpix div 11 * 11);
               end;
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkTer, pkBigTer:
             with NoMap do begin
               if HelpLineInfo.Format = pkBigTer then
-                y := i * 24 - 3 + yyt
+                Y := I * 24 - 3 + yyt
               else
-                y := i * 24 + 13;
+                Y := I * 24 + 13;
               if HelpLineInfo.Picpix >= 3 * 12 then
                 srcno := 2 * 9 + 6
@@ -730 +721 @@
               if HelpLineInfo.Format = pkTer then
               begin
-                ofs := x0[i] + 8;
-                x0[i] := 2 * xxt + 8 + ofs;
+                ofs := x0[I] + 8;
+                x0[I] := 2 * xxt + 8 + ofs;
               end
               else
               begin
                 ofs := InnerWidth - (2 * xxt + 38);
-                x0[i] := x0[i] + 8;
+                x0[I] := x0[I] + 8;
               end;
               if srcno >= fJungle then
               begin
-                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, Y - yyt + 2, xxt * 2 - 8,
                   yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
                   3 + yyt + 2 * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3 - 2, 1 + srcno mod 9 * (xxt * 2 + 1),
                   1 + srcno div 9 * (yyt * 3 + 1));
               end
               else
-                Sprite(OffScreen, HGrTerrain, ofs + 4, y - yyt + 2, xxt * 2 - 8,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, Y - yyt + 2, xxt * 2 - 8,
                   yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
                   3 + yyt + srcno div 9 * (yyt * 3 + 1));
               if HelpLineInfo.Picpix >= 3 * 12 then { rare resource }
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3, 1 + 8 * (xxt * 2 + 1),
                   1 + (HelpLineInfo.Picpix - 2 * 12) * (yyt * 3 + 1))
@@ -764 +755 @@
                   srcno := 18 + 8 + (HelpLineInfo.Picpix mod 12 - 9) * 18;
                 srcno := srcno + HelpLineInfo.Picpix div 12 * 9;
-                Sprite(OffScreen, HGrTerrain, ofs, y - 2 * yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, Y - 2 * yyt, xxt * 2,
                   yyt * 3, 1 + srcno mod 9 * (xxt * 2 + 1),
                   1 + srcno div 9 * (yyt * 3 + 1));
@@ -774 +765 @@
               if HelpLineInfo.Picpix = 5 then
               begin // display mine on hills
-                Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+                Sprite(OffScreen, HGrTerrain, ofs + 4, I * 24 + 13 - yyt,
                   xxt * 2 - 8, yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
                   3 + yyt + 2 * (yyt * 3 + 1));
@@ -781 +772 @@
               else
                 srcno := fPrairie; // display on prairie
-              Sprite(OffScreen, HGrTerrain, ofs + 4, i * 24 + 13 - yyt,
+              Sprite(OffScreen, HGrTerrain, ofs + 4, I * 24 + 13 - yyt,
                 xxt * 2 - 8, yyt * 2 - 4, 5 + srcno mod 9 * (xxt * 2 + 1),
                 3 + yyt + srcno div 9 * (yyt * 3 + 1));
               if HelpLineInfo.Picpix = 12 then { river }
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - yyt, xxt * 2,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - yyt, xxt * 2,
                   yyt * 2, 1 + 5 * (xxt * 2 + 1), 1 + yyt + 13 * (yyt * 3 + 1))
               else if HelpLineInfo.Picpix >= 3 then { improvement 2 }
               begin
                 if HelpLineInfo.Picpix = 6 then
-                  Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                  Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                     xxt * 2, yyt * 3, 1 + 7 * (xxt * 2 + 1),
                     1 + 12 * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + (HelpLineInfo.Picpix - 3) *
                   (xxt * 2 + 1), 1 + 12 * (yyt * 3 + 1))
@@ -799 +790 @@
               else { improvement 1 }
               begin
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + 2 * (xxt * 2 + 1),
                   1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1));
-                Sprite(OffScreen, HGrTerrain, ofs, i * 24 + 11 - 2 * yyt,
+                Sprite(OffScreen, HGrTerrain, ofs, I * 24 + 11 - 2 * yyt,
                   xxt * 2, yyt * 3, 1 + 5 * (xxt * 2 + 1),
                   1 + (9 + HelpLineInfo.Picpix) * (yyt * 3 + 1))
               end;
-              x0[i] := x0[i] + 8;
+              x0[I] := x0[I] + 8;
             end;
           pkModel:
             begin
-              FrameImage(OffScreen.Canvas, BigImp, x0[i] + 12, i * 24 - 7,
+              FrameImage(OffScreen.Canvas, BigImp, x0[I] + 12, I * 24 - 7,
                 56, 40, 0, 0);
-              Sprite(OffScreen, HGrStdUnits, x0[i] + 8, i * 24 - 11, 64, 44,
+              Sprite(OffScreen, HGrStdUnits, x0[I] + 8, I * 24 - 11, 64, 44,
                 1 + HelpLineInfo.Picpix mod 10 * 65,
                 1 + HelpLineInfo.Picpix div 10 * 49);
-              x0[i] := 64 + 8 + 8 + x0[i];
+              x0[I] := 64 + 8 + 8 + x0[I];
             end;
           pkFeature:
             begin
-              DarkGradient(OffScreen.Canvas, x0[i] + 8 - 1,
-                7 + i * 24 - 3, 16, 1);
-              ScreenTools.Frame(OffScreen.Canvas, x0[i] + 8, 7 + i * 24 - 2, x0[i] + 8 + 13,
-                7 + i * 24 - 2 + 13, $C0C0C0, $C0C0C0);
-              Sprite(OffScreen, HGrSystem, x0[i] + 8 + 2, 7 + i * 24, 10, 10,
+              DarkGradient(OffScreen.Canvas, x0[I] + 8 - 1,
+                7 + I * 24 - 3, 16, 1);
+              ScreenTools.Frame(OffScreen.Canvas, x0[I] + 8, 7 + I * 24 - 2, x0[I] + 8 + 13,
+                7 + I * 24 - 2 + 13, $C0C0C0, $C0C0C0);
+              Sprite(OffScreen, HGrSystem, x0[I] + 8 + 2, 7 + I * 24, 10, 10,
                 66 + HelpLineInfo.Picpix mod 11 * 11,
                 137 + HelpLineInfo.Picpix div 11 * 11);
-              x0[i] := x0[i] + 8 + 8 + 2 + 13;
+              x0[I] := x0[I] + 8 + 8 + 2 + 13;
             end;
           pkExp:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + i * 24, 20 + 12,
-                8 + 11 + i * 24, $000000, $000000);
-              Dump(OffScreen, HGrSystem, 20, 8 - 3 + i * 24, 12, 14,
+              ScreenTools.Frame(OffScreen.Canvas, 20 - 1, 8 - 4 + I * 24, 20 + 12,
+                8 + 11 + I * 24, $000000, $000000);
+              Dump(OffScreen, HGrSystem, 20, 8 - 3 + I * 24, 12, 14,
                 121 + HelpLineInfo.Picpix * 13, 28);
-              x0[i] := 20 + 8 + 11;
+              x0[I] := 20 + 8 + 11;
             end;
           pkAITStat:
             begin
-              Sprite(OffScreen, HGrSystem, 20, 6 + i * 24, 14, 14,
+              Sprite(OffScreen, HGrSystem, 20, 6 + I * 24, 14, 14,
                 1 + HelpLineInfo.Picpix * 15, 316);
-              x0[i] := 20 + 8 + 11;
+              x0[I] := 20 + 8 + 11;
             end;
           pkGov:
             begin
-              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
-                8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24, xSizeSmall,
+              ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[I], 2 - 1 + I * 24,
+                8 + xSizeSmall + x0[I], 2 + 20 + I * 24, $000000, $000000);
+              DpiBitBltCanvas(OffScreen.Canvas, 8 + x0[I], 2 + I * 24, xSizeSmall,
                 ySizeSmall, SmallImp.Canvas, (HelpLineInfo.Picpix - 1) *
                 xSizeSmall, ySizeSmall);
-              x0[i] := x0[i] + (8 + 8 + 36);
+              x0[I] := x0[I] + (8 + 8 + 36);
             end;
           pkDot:
             begin
-              Sprite(OffScreen, HGrSystem, x0[i] + 18, 9 + i * 24, 8,
+              Sprite(OffScreen, HGrSystem, x0[I] + 18, 9 + I * 24, 8,
                 8, 81, 16);
-              x0[i] := 20 + 8 + 4;
+              x0[I] := 20 + 8 + 4;
             end;
           pkNormal_Dot:
-            x0[i] := 20 + 8 + 4;
+            x0[I] := 20 + 8 + 4;
           pkNormal_64:
-            x0[i] := 64 + 8 + 8;
+            x0[I] := 64 + 8 + 8;
         else
-          x0[i] := x0[i] + 8;
+          x0[I] := x0[I] + 8;
         end;
-        Self.Line(OffScreen.Canvas, i, False)
+        Self.Line(OffScreen.Canvas, I, False)
       end;
   end;
@@ -873 +864 @@
 begin
   Sel := -1;
-  SmartUpdateContent(true)
-end;
-
-procedure THelpDlg.Prepare(sbPos: integer = 0);
+  SmartUpdateContent(True);
+end;
+
+procedure THelpDlg.Prepare(sbPos: Integer = 0);
 var
-  i, j, Special, Domain, Headline, TerrType, TerrSubType: integer;
-  s: string;
-  ps: pchar;
+  I, J, Special, Domain, Headline, TerrType, TerrSubType: Integer;
+  S: string;
+  ps: PChar;
   List: THyperText;
   CheckSeeAlso: Boolean;
 
-  procedure AddAdvance(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
-      hkAdv + hkCrossLink, i);
-  end;
-
-  procedure AddPreqAdv(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon_AsPreq, i,
-      hkAdv + hkCrossLink, i);
-  end;
-
-  procedure AddImprovement(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-      hkImp + hkCrossLink, i);
-  end;
-
-  procedure AddPreqImp(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon_AsPreq, i,
-      hkImp + hkCrossLink, i);
-  end;
-
-  procedure AddTerrain(i: integer);
+  procedure AddAdvance(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon, I,
+      hkAdv, I, True);
+  end;
+
+  procedure AddPreqAdv(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon_AsPreq, I,
+      hkAdv, I, True);
+  end;
+
+  procedure AddImprovement(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+      hkImp, I, True);
+  end;
+
+  procedure AddPreqImp(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon_AsPreq, I,
+      hkImp, I, True);
+  end;
+
+  procedure AddTerrain(I: Integer);
   begin
     if MainText.Count > 1 then
@@ -914 +905 @@
       MainText.LineFeed;
     end;
-    MainText.AddLine(Phrases.Lookup('TERRAIN', i), pkTer, i, hkTer, i);
-  end;
-
-  procedure AddFeature(i: integer);
-  begin
-    MainText.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
-      hkFeature + hkCrossLink, i);
-  end;
-
-  procedure AddModel(i: integer);
+    MainText.AddLine(Phrases.Lookup('TERRAIN', I), pkTer, I, hkTer, I);
+  end;
+
+  procedure AddFeature(I: Integer);
+  begin
+    MainText.AddLine(Phrases.Lookup('FEATURES', I), pkFeature, I,
+      hkFeature, I, True);
+  end;
+
+  procedure AddModel(I: Integer);
   var
-    pix: integer;
+    pix: Integer;
     Name: string;
   begin
     if MainText.Count > 1 then
       MainText.LineFeed;
-    FindStdModelPicture(SpecialModelPictureCode[i], pix, Name);
-    MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, i)
+    FindStdModelPicture(SpecialModelPictureCode[I], pix, Name);
+    MainText.AddLine(Name, pkModel, pix, hkModel, I, True);
   end;
 
   procedure AddStandardBlock(Item: string);
   var
-    i: integer;
+    I: Integer;
   begin
     with MainText do
@@ -947 +938 @@
       else if Item = 'TECHFORMULA' then
       begin
-        i := Difficulty;
-        if i = 0 then
-          i := 2;
-        AddLine(Format(HelpText.Lookup('TECHFORMULA'), [TechFormula_M[i],
-          TechFormula_D[i]]))
+        I := Difficulty;
+        if I = 0 then
+          I := 2;
+        AddLine(Format(HelpText.Lookup('TECHFORMULA'), [TechFormula_M[I],
+          TechFormula_D[I]]));
       end
       else if Item = 'EXPERIENCE' then
-        for i := 0 to nExp - 1 do
-          AddLine(Phrases.Lookup('EXPERIENCE', i), pkExp, i)
+        for I := 0 to nExp - 1 do
+          AddLine(Phrases.Lookup('EXPERIENCE', I), pkExp, I)
       else if Item = 'MODERN' then
-        for i := 1 to 3 do
+        for I := 1 to 3 do
         begin
           LineFeed;
-          AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + i), pkTer, 3 * 12 + i);
+          AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + I), pkTer, 3 * 12 + I);
         end
       else if Item = 'SAVED' then
         AddLine(DataDir + 'Saved', pkNormal)
       else if Item = 'AITSTAT' then
-        for i := 0 to 3 do
-          AddLine(Phrases2.Lookup('AITSTAT', i), pkAITStat, i)
-    end
-  end;
-
-  procedure DecodeItem(s: string; var Category, Index: Integer);
+        for I := 0 to 3 do
+          AddLine(Phrases2.Lookup('AITSTAT', I), pkAITStat, I)
+    end;
+  end;
+
+  procedure DecodeItem(S: string; var Category: TLinkCategory; var Index: Integer);
   var
-    i: Integer;
-  begin
-    if (Length(s) > 0) and (s[1] = ':') then begin
+    I: Integer;
+  begin
+    if (Length(S) > 0) and (S[1] = ':') then begin
       Category := hkMisc;
       Index := 0;
-      for i := 3 to length(s) do
-        Index := Index * 10 + Ord(s[i]) - 48;
-      case s[2] of
+      for I := 3 to Length(S) do
+        Index := Index * 10 + Ord(S[I]) - 48;
+      case S[2] of
         'A': Category := hkAdv;
         'B': Category := hkImp;
@@ -986 +977 @@
         'E': Category := hkInternet;
         'S': Category := hkModel;
-        'C': Index := miscCredits;
-        'J': Index := miscJobList;
-        'G': Index := miscGovList;
+        'C': Index := Integer(miscCredits);
+        'J': Index := Integer(miscJobList);
+        'G': Index := Integer(miscGovList);
       end;
       if (Category <> hkMisc) and (Index = 0) then
@@ -994 +985 @@
     end else begin
       Category := hkText;
-      Index := HelpText.Gethandle(Copy(s, 1, 255));
+      Index := HelpText.GetHandle(Copy(S, 1, 255));
     end;
   end;
 
-  procedure AddTextual(s: string);
+  procedure AddTextual(S: string);
   var
-    i: Integer;
-    p: Integer;
-    l: Integer;
+    I: Integer;
+    P: Integer;
+    L: Integer;
     ofs: Integer;
-    CurrentFormat: Integer;
-    FollowFormat: Integer;
+    CurrentFormat: TTextFormat;
+    FollowFormat: TTextFormat;
     Picpix: Integer;
-    LinkCategory: Integer;
+    LinkCategory: TLinkCategory;
+    CrossLink: Boolean;
     LinkIndex: Integer;
     RightMargin: Integer;
@@ -1013 +1005 @@
     Text: string;
   begin
+    CrossLink := False;
     RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
     FollowFormat := pkNormal;
-    while s <> '' do
+    while S <> '' do
     begin
       Picpix := 0;
-      LinkCategory := 0;
+      LinkCategory := hkNoLink;
       LinkIndex := 0;
-      if s[1] = '$' then
-      begin // window caption
-        p := 1;
+      if S[1] = '$' then
+      begin // Window caption
+        P := 1;
         repeat
-          inc(p)
-        until (p > Length(s)) or (s[p] = '\');
-        Caption := Copy(s, 2, p - 2);
-        Delete(s, 1, p);
+          Inc(P);
+        until (P > Length(S)) or (S[P] = '\');
+        Caption := Copy(S, 2, P - 2);
+        Delete(S, 1, P);
       end
-      else if s[1] = '&' then
-      begin // standard block
-        p := 1;
+      else if S[1] = '&' then
+      begin // Standard block
+        P := 1;
         repeat
-          inc(p)
-        until (p > Length(s)) or (s[p] = '\');
-        AddStandardBlock(Copy(s, 2, p - 2));
-        Delete(s, 1, p);
+          Inc(P);
+        until (P > Length(S)) or (S[P] = '\');
+        AddStandardBlock(Copy(S, 2, P - 2));
+        Delete(S, 1, P);
       end
-      else if s[1] = '@' then
-      begin // image
-        if (Length(s) >= 2) and (s[2] = '@') then
-        begin // generate from icon
+      else if S[1] = '@' then
+      begin // Image
+        if (Length(S) >= 2) and (S[2] = '@') then
+        begin // Generate from icon
           Picpix := 0;
-          p := 3;
-          while (p <= Length(s)) and (s[p] <> '\') do
+          P := 3;
+          while (P <= Length(S)) and (S[P] <> '\') do
           begin
-            Picpix := Picpix * 10 + Ord(s[p]) - 48;
-            inc(p)
+            Picpix := Picpix * 10 + Ord(S[P]) - 48;
+            Inc(P);
           end;
           if (Picpix < 0) or (Picpix >= nImp) then
@@ -1057 +1050 @@
         else
         begin // external image
-          p := 1;
+          P := 1;
           repeat
-            Inc(p)
-          until (p > Length(s)) or (s[p] = '\');
+            Inc(P);
+          until (P > Length(S)) or (S[P] = '\');
           if LoadGraphicFile(ExtPic, LocalizedFilePath('Help' +
-            DirectorySeparator + Copy(s, 2, p - 2)) + '.png') then
+            DirectorySeparator + Copy(S, 2, P - 2)) + '.png') then
           begin
             MainText.AddLine('', pkExternal);
-            for i := 0 to (ExtPic.Height - 12) div 24 do
+            for I := 0 to (ExtPic.Height - 12) div 24 do
               MainText.LineFeed;
           end;
         end;
-        Delete(s, 1, p);
+        Delete(S, 1, P);
       end
       else
       begin
-        case s[1] of
+        case S[1] of
           ':', ';':
             begin // link
-              p := 1;
+              P := 1;
               repeat
-                inc(p)
-              until (p > Length(s)) or (s[p] = '\') or (s[p] = ' ');
-              DecodeItem(Copy(s, 2, p - 2), LinkCategory, LinkIndex);
-              CurrentFormat := 0;
+                Inc(P);
+              until (P > Length(S)) or (S[P] = '\') or (S[P] = ' ');
+              DecodeItem(Copy(S, 2, P - 2), LinkCategory, LinkIndex);
+              CurrentFormat := pkNormal;
               if (LinkCategory <> hkText) and (LinkIndex < 200) then
               // show icon
@@ -1088 +1081 @@
                     begin
                       CurrentFormat := pkAdvIcon;
-                      Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkImp:
                     begin
                       CurrentFormat := pkSmallIcon;
-                      Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkTer:
@@ -1103 +1096 @@
                     begin
                       CurrentFormat := pkFeature;
-                      Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkModel:
@@ -1112 +1105 @@
                     end;
                 end;
-              if s[1] = ':' then
-                LinkCategory := LinkCategory + hkCrossLink;
-              if (p > Length(s)) or (s[p] = ' ') then
-                Delete(s, 1, p)
+              if S[1] = ':' then
+                CrossLink := True;
+              if (P > Length(S)) or (S[P] = ' ') then
+                Delete(S, 1, P)
               else
-                Delete(s, 1, p - 1)
-            end;
-          '!': // highlited
-            if (Length(s) >= 2) and (s[2] = '!') then
+                Delete(S, 1, P - 1)
+            end;
+          '!': // highlighted
+            if (Length(S) >= 2) and (S[2] = '!') then
             begin
               if MainText.Count > 1 then
@@ -1126 +1119 @@
               FollowFormat := pkCaption;
               CurrentFormat := pkCaption;
-              Delete(s, 1, 2);
+              Delete(S, 1, 2);
             end
             else
@@ -1132 +1125 @@
               FollowFormat := pkSection;
               CurrentFormat := pkSection;
-              Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
           '-':
@@ -1138 +1131 @@
               FollowFormat := pkNormal_Dot;
               CurrentFormat := pkDot;
-              Delete(s, 1, 1);
+              Delete(S, 1, 1);
             end;
         else
@@ -1147 +1140 @@
         else
           ofs := 8;
-        p := 0;
+        P := 0;
         repeat
           repeat
-            Inc(p)
-          until (p > Length(s)) or (s[p] = ' ') or (s[p] = '\');
-          if (BiColorTextWidth(OffScreen.Canvas, Copy(s, 1, p - 1)) <=
+            Inc(P)
+          until (P > Length(S)) or (S[P] = ' ') or (S[P] = '\');
+          if (BiColorTextWidth(OffScreen.Canvas, Copy(S, 1, P - 1)) <=
             RightMargin - ofs) then
-            l := p - 1
+            L := P - 1
           else
             Break;
-        until (p >= Length(s)) or (s[l + 1] = '\');
-        Text := Copy(s, 1, l);
-        if LinkCategory and $3f = hkInternet then begin
+        until (P >= Length(S)) or (S[L + 1] = '\');
+        Text := Copy(S, 1, L);
+        if LinkCategory = hkInternet then begin
           if LinkIndex = 1 then Text := AITemplateManual
           else if LinkIndex = 2 then Text := CevoHomepageShort
@@ -1165 +1158 @@
         end;
         MainText.AddLine(Text, CurrentFormat, Picpix, LinkCategory,
-          LinkIndex);
-        if (l < Length(s)) and (s[l + 1] = '\') then
+          LinkIndex, CrossLink);
+        if (L < Length(S)) and (S[L + 1] = '\') then
           FollowFormat := pkNormal;
-        Delete(s, 1, l + 1);
-      end
-    end
+        Delete(S, 1, L + 1);
+      end;
+    end;
   end;
 
@@ -1178 +1171 @@
   end;
 
-  procedure AddModelText(i: Integer);
+  procedure AddModelText(I: Integer);
   var
     pix: Integer;
-    s: string;
+    S: string;
   begin
     with MainText do begin
@@ -1188 +1181 @@
         LineFeed;
       end;
-      FindStdModelPicture(SpecialModelPictureCode[i], pix, s);
-      AddLine(s, pkSection);
-      AddLine(Format(HelpText.Lookup('STRENGTH'), [SpecialModel[i].Attack,
-        SpecialModel[i].Defense]), pkNormal_64);
+      FindStdModelPicture(SpecialModelPictureCode[I], pix, S);
+      AddLine(S, pkSection);
+      AddLine(Format(HelpText.Lookup('STRENGTH'), [SpecialModel[I].Attack,
+        SpecialModel[I].Defense]), pkNormal_64);
       AddLine(Format(HelpText.Lookup('SPEED'),
-        [MovementToString(SpecialModel[i].Speed)]), pkModel, pix);
+        [MovementToString(SpecialModel[I].Speed)]), pkModel, pix);
       if Difficulty = 0 then
-        AddLine(Format(HelpText.Lookup('BUILDCOST'), [SpecialModel[i].Cost]),
+        AddLine(Format(HelpText.Lookup('BUILDCOST'), [SpecialModel[I].Cost]),
           pkNormal_64)
       else
         AddLine(Format(HelpText.Lookup('BUILDCOST'),
-          [SpecialModel[i].Cost * BuildCostMod[Difficulty] div 12]),
+          [SpecialModel[I].Cost * BuildCostMod[Difficulty] div 12]),
           pkNormal_64);
-      s := HelpText.LookupByHandle(hSPECIALMODEL, i);
-      if (s <> '') and (s <> '*') then
-        AddTextual(s);
-      if SpecialModelPreq[i] >= 0 then
-        AddPreqAdv(SpecialModelPreq[i])
-      else if SpecialModelPreq[i] = preLighthouse then
+      S := HelpText.LookupByHandle(hSPECIALMODEL, I);
+      if (S <> '') and (S <> '*') then
+        AddTextual(S);
+      if SpecialModelPreq[I] >= 0 then
+        AddPreqAdv(SpecialModelPreq[I])
+      else if SpecialModelPreq[I] = preLighthouse then
         AddPreqImp(woLighthouse)
-      else if SpecialModelPreq[i] = preBuilder then
+      else if SpecialModelPreq[I] = preBuilder then
         AddPreqImp(woPyramids)
-      else if SpecialModelPreq[i] = preLeo then
+      else if SpecialModelPreq[I] = preLeo then
         AddPreqImp(woLeo);
-      if SpecialModelPreq[i] <> preNone then
+      if SpecialModelPreq[I] <> preNone then
         MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
           [MainText[Count - 1]]);
@@ -1220 +1213 @@
   procedure AddJobList;
   var
-    i, JobCost: Integer;
+    I, JobCost: Integer;
   begin
     with MainText do begin
-      for i := 0 to nJobHelp - 1 do begin
-        if i > 0 then begin
+      for I := 0 to Length(JobHelp) - 1 do begin
+        if I > 0 then begin
           LineFeed;
           LineFeed;
         end;
-        AddLine(Phrases.Lookup('JOBRESULT', JobHelp[i]), pkSection);
+        AddLine(Phrases.Lookup('JOBRESULT', JobHelp[I]), pkSection);
         AddLine;
-        AddLine('', pkTerImp, i);
+        AddLine('', pkTerImp, I);
         AddLine;
-        AddTextual(HelpText.LookupByHandle(hJOBHELP, i));
+        AddTextual(HelpText.LookupByHandle(hJOBHELP, I));
         JobCost := -1;
-        case JobHelp[i] of
+        case JobHelp[I] of
           jCanal: JobCost := CanalWork;
           jFort: JobCost := FortWork;
@@ -1244 +1237 @@
         else
           AddTextual(HelpText.Lookup('JOBCOSTVAR'));
-        if JobPreq[JobHelp[i]] <> preNone then begin
-          AddPreqAdv(JobPreq[JobHelp[i]]);
+        if JobPreq[JobHelp[I]] <> preNone then begin
+          AddPreqAdv(JobPreq[JobHelp[I]]);
           MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
             [MainText[Count - 1]]);
@@ -1255 +1248 @@
   procedure AddGraphicCredits;
   var
-    i: Integer;
-    s: string;
+    I: Integer;
+    S: string;
     sr: TSearchRec;
     List, Plus: TStringList;
@@ -1271 +1264 @@
 
     List.Sort;
-    i := 1;
-    while i < List.Count do
-      if List[i] = List[i - 1] then
-        List.Delete(i)
+    I := 1;
+    while I < List.Count do
+      if List[I] = List[I - 1] then
+        List.Delete(I)
       else
-        Inc(i);
-
-    for i := 0 to List.Count - 1 do begin
-      s := List[i];
-      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+        Inc(I);
+
+    for I := 0 to List.Count - 1 do begin
+      S := List[I];
+      while BiColorTextWidth(OffScreen.Canvas, S) > InnerWidth - 16 -
         DpiGetSystemMetrics(SM_CXVSCROLL) do
-        Delete(s, length(s), 1);
-      MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
@@ -1290 +1283 @@
   procedure AddSoundCredits;
   var
-    i: Integer;
-    s: string;
+    I: Integer;
+    S: string;
     List: TStringList;
   begin
     List := TStringList.Create;
     List.LoadFromFile(GetSoundsDir + DirectorySeparator + 'sound.credits.txt');
-    for i := 0 to List.Count - 1 do begin
-      s := List[i];
-      while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
+    for I := 0 to List.Count - 1 do begin
+      S := List[I];
+      while BiColorTextWidth(OffScreen.Canvas, S) > InnerWidth - 16 -
         DpiGetSystemMetrics(SM_CXVSCROLL) do
-        Delete(s, length(s), 1);
-      MainText.AddLine(s);
+        Delete(S, Length(S), 1);
+      MainText.AddLine(S);
     end;
     FreeAndNil(List);
@@ -1323 +1316 @@
     Clear;
     Headline := -1;
-    if (no >= 200) or not(Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
+    if (No >= 200) or not (Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
       LineFeed;
     case Kind of
       hkText:
-        AddTextual(HelpText.LookupByHandle(no));
+        AddTextual(HelpText.LookupByHandle(No));
       hkMisc:
         begin
-          case no of
-            miscMain:
+          case No of
+            Integer(miscMain):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_MAIN');
                 AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'), pkSpecialIcon,
-                  0, { pkBigIcon,22, } hkText, HelpText.Gethandle('QUICK'));
+                  0, { pkBigIcon,22, } hkText, HelpText.GetHandle('QUICK'));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CONCEPTS'), pkBigIcon, 6,
@@ -1344 +1337 @@
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkSpecialIcon, 2,
-                  hkMisc, miscJobList);
+                  hkMisc, Integer(miscJobList));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_TECHLIST'), pkBigIcon, 39,
                   hkAdv, 200);
                 LineFeed;
-                FindStdModelPicture(SpecialModelPictureCode[6], i, s);
-                AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, i,
+                FindStdModelPicture(SpecialModelPictureCode[6], I, S);
+                AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, I,
                   hkModel, 0);
                 LineFeed;
@@ -1366 +1359 @@
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkBigIcon,
-                  gDemocracy + 6, hkMisc, miscGovList);
+                  gDemocracy + 6, hkMisc, Integer(miscGovList));
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_KEYS'), pkBigIcon, 2, hkText,
@@ -1375 +1368 @@
                 LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CREDITS'), pkBigIcon, 22,
-                  hkMisc, miscCredits);
+                  hkMisc, Integer(miscCredits));
               end;
-            miscCredits:
+            Integer(miscCredits):
               begin
                 AddItem('CREDITS');
@@ -1390 +1383 @@
                 AddItem('AUTHOR');
               end;
-            miscJobList:
+            Integer(miscJobList):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_JOBLIST');
@@ -1399 +1392 @@
                 AddItem('TERIMPCITY');
               end;
-            miscGovList:
+            Integer(miscGovList):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_GOVLIST');
-                for i := 1 to nGov do
+                for I := 1 to nGov do
                 begin
-                  AddLine(Phrases.Lookup('GOVERNMENT', i mod nGov), pkSection);
+                  AddLine(Phrases.Lookup('GOVERNMENT', I mod nGov), pkSection);
                   LineFeed;
-                  if i = nGov then
+                  if I = nGov then
                     AddLine('', pkBigIcon, 7 * SystemIconLines + imPalace)
                   else
-                    AddLine('', pkBigIcon, i + 6);
+                    AddLine('', pkBigIcon, I + 6);
                   LineFeed;
-                  AddTextual(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
-                  if i mod nGov >= 2 then
+                  AddTextual(HelpText.LookupByHandle(hGOVHELP, I mod nGov));
+                  if I mod nGov >= 2 then
                   begin
-                    AddPreqAdv(GovPreq[i mod nGov]);
+                    AddPreqAdv(GovPreq[I mod nGov]);
                     MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
                       [MainText[Count - 1]]);
                   end;
-                  if i < nGov then
+                  if I < nGov then
                   begin
                     LineFeed;
@@ -1425 +1418 @@
                 end;
               end;
-            miscSearchResult:
+            Integer(miscSearchResult):
               begin
                 Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
@@ -1431 +1424 @@
                 MainText.AppendList(SearchResult);
               end;
-          end; // case no
+          end; // case No
         end;
 
       hkAdv:
-        if no = 200 then
+        if No = 200 then
         begin // complete advance list
           Caption := HelpText.Lookup('HELPTITLE_TECHLIST');
           List := THyperText.Create;
           List.OwnsObjects := True;
-          for j := 0 to 3 do
+          for J := 0 to 3 do
           begin
-            if j > 0 then
+            if J > 0 then
             begin
               LineFeed;
               LineFeed;
             end;
-            AddLine(HelpText.Lookup('TECHAGE', j), pkSection);
-            if j = 1 then
+            AddLine(HelpText.Lookup('TECHAGE', J), pkSection);
+            if J = 1 then
               AddLine(Phrases.Lookup('ADVANCES', adScience) + ' ' +
                 HelpText.Lookup('BASETECH'), pkAdvIcon, adScience, hkAdv,
                 adScience);
-            if j = 2 then
+            if J = 2 then
               AddLine(Phrases.Lookup('ADVANCES', adMassProduction) + ' ' +
                 HelpText.Lookup('BASETECH'), pkAdvIcon, adMassProduction, hkAdv,
                 adMassProduction);
             List.Clear;
-            for i := 0 to nAdv - 1 do
-              if (i <> adScience) and (i <> adMassProduction) and
-                (AdvValue[i] div 1000 = j) then
-                List.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
-                  hkAdv, i);
+            for I := 0 to nAdv - 1 do
+              if (I <> adScience) and (I <> adMassProduction) and
+                (AdvValue[I] div 1000 = J) then
+                List.AddLine(Phrases.Lookup('ADVANCES', I), pkAdvIcon, I,
+                  hkAdv, I);
             List.Sort;
             AppendList(List);
@@ -1469 +1462 @@
         else // single advance
         begin
-          Caption := Phrases.Lookup('ADVANCES', no);
+          Caption := Phrases.Lookup('ADVANCES', No);
           LineFeed;
-          AddLine(Phrases.Lookup('ADVANCES', no), pkCaption);
-          if no in FutureTech then
+          AddLine(Phrases.Lookup('ADVANCES', No), pkCaption);
+          if No in FutureTech then
           begin
             AddLine(HelpText.Lookup('HELPSPEC_FUTURE'));
             LineFeed;
-            if no = futResearchTechnology then
+            if No = futResearchTechnology then
               AddItem('FUTURETECHHELP100')
             else
@@ -1483 +1476 @@
           else
             AddLine(HelpText.Lookup('HELPSPEC_ADV'));
-          if AdvPreq[no, 2] <> preNone then
+          if AdvPreq[No, 2] <> preNone then
             NextSection('PREREQALT')
           else
             NextSection('PREREQ');
-          for i := 0 to 2 do
-            if AdvPreq[no, i] <> preNone then
-              AddPreqAdv(AdvPreq[no, i]);
+          for I := 0 to 2 do
+            if AdvPreq[No, I] <> preNone then
+              AddPreqAdv(AdvPreq[No, I]);
           NextSection('GOVALLOW');
-          for i := 2 to nGov - 1 do
-            if GovPreq[i] = no then
-              AddLine(Phrases.Lookup('GOVERNMENT', i), pkGov, i,
-                hkMisc + hkCrossLink, miscGovList);
+          for I := 2 to nGov - 1 do
+            if GovPreq[I] = No then
+              AddLine(Phrases.Lookup('GOVERNMENT', I), pkGov, I,
+                hkMisc, Integer(miscGovList), True);
           NextSection('BUILDALLOW');
-          for i := 0 to nWonder - 1 do
-            if Imp[i].Preq = no then
-              AddImprovement(i);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq = no) and (Imp[i].Kind <> ikCommon) then
-              AddImprovement(i);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq = no) and (Imp[i].Kind = ikCommon) then
-              AddImprovement(i);
+          for I := 0 to nWonder - 1 do
+            if Imp[I].Preq = No then
+              AddImprovement(I);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq = No) and (Imp[I].Kind <> ikCommon) then
+              AddImprovement(I);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq = No) and (Imp[I].Kind = ikCommon) then
+              AddImprovement(I);
           NextSection('MODELALLOW');
-          for i := 0 to nSpecialModel - 1 do
-            if SpecialModelPreq[i] = no then
-              AddModel(i);
+          for I := 0 to nSpecialModel - 1 do
+            if SpecialModelPreq[I] = No then
+              AddModel(I);
           NextSection('FEATALLOW');
-          for i := 0 to nFeature - 1 do
-            if Feature[i].Preq = no then
-              AddFeature(i);
+          for I := 0 to nFeature - 1 do
+            if Feature[I].Preq = No then
+              AddFeature(I);
           NextSection('FOLLOWADV');
-          for i := 0 to nAdv - 1 do
-            if (AdvPreq[i, 0] = no) or (AdvPreq[i, 1] = no) or
-              (AdvPreq[i, 2] = no) then
-              AddAdvance(i);
+          for I := 0 to nAdv - 1 do
+            if (AdvPreq[I, 0] = No) or (AdvPreq[I, 1] = No) or
+              (AdvPreq[I, 2] = No) then
+              AddAdvance(I);
           NextSection('UPGRADEALLOW');
           for Domain := 0 to nDomains - 1 do
-            for i := 1 to nUpgrade - 1 do
-              if upgrade[Domain, i].Preq = no then
+            for I := 1 to nUpgrade - 1 do
+              if upgrade[Domain, I].Preq = No then
               begin
-                if upgrade[Domain, i].Strength > 0 then
+                if upgrade[Domain, I].Strength > 0 then
                   AddLine(Format(HelpText.Lookup('STRENGTHUP'),
                     [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain,
-                    i].Strength]), pkDomain, Domain);
-                if upgrade[Domain, i].Trans > 0 then
+                    I].Strength]), pkDomain, Domain);
+                if upgrade[Domain, I].Trans > 0 then
                   AddLine(Format(HelpText.Lookup('TRANSUP'),
-                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, i].Trans]
+                    [Phrases.Lookup('DOMAIN', Domain), upgrade[Domain, I].Trans]
                     ), pkDomain, Domain);
-                if no in FutureTech then
+                if No in FutureTech then
                   AddLine(Format(HelpText.Lookup('COSTUP'),
-                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
+                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
                 else
                   AddLine(Format(HelpText.Lookup('COSTMIN'),
-                    [upgrade[Domain, i].Cost]), pkNormal_Dot)
+                    [upgrade[Domain, I].Cost]), pkNormal_Dot)
               end;
           NextSection('EXPIRATION');
-          for i := 0 to nWonder - 1 do
-            if (Imp[i].Preq <> preNA) and (Imp[i].Expiration = no) then
-              AddImprovement(i);
+          for I := 0 to nWonder - 1 do
+            if (Imp[I].Preq <> preNA) and (Imp[I].Expiration = No) then
+              AddImprovement(I);
           NextSection('ADVEFFECT');
-          s := HelpText.LookupByHandle(hADVHELP, no);
-          if s <> '*' then
-            AddTextual(s);
+          S := HelpText.LookupByHandle(hADVHELP, No);
+          if S <> '*' then
+            AddTextual(S);
           NextSection('SEEALSO');
-          CheckSeeAlso := true
+          CheckSeeAlso := True;
         end;
 
       hkImp:
-        if no = 200 then
+        if No = 200 then
         begin // complete city improvement list
           Caption := HelpText.Lookup('HELPTITLE_IMPLIST');
@@ -1557 +1550 @@
           List := THyperText.Create;
           List.OwnsObjects := True;
-          for i := nWonder to nImp - 1 do
-            if (i <> imTrGoods) and (Imp[i].Preq <> preNA) and
-              (Imp[i].Kind = ikCommon) then
-              List.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon,
-                i, hkImp, i);
+          for I := nWonder to nImp - 1 do
+            if (I <> imTrGoods) and (Imp[I].Preq <> preNA) and
+              (Imp[I].Kind = ikCommon) then
+              List.AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon,
+                I, hkImp, I);
           List.Sort;
           AppendList(List);
           FreeAndNil(List);
         end
-        else if no = 201 then
+        else if No = 201 then
         begin // complete nat. project list
           Caption := HelpText.Lookup('HELPTITLE_UNIQUELIST');
           // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
-          for i := nWonder to nImp - 1 do
-            if (Imp[i].Preq <> preNA) and
-              ((Imp[i].Kind = ikNatLocal) or (Imp[i].Kind = ikNatGlobal)) then
-              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-                hkImp, i);
+          for I := nWonder to nImp - 1 do
+            if (Imp[I].Preq <> preNA) and
+              ((Imp[I].Kind = ikNatLocal) or (Imp[I].Kind = ikNatGlobal)) then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+                hkImp, I);
           { LineFeed;
             LineFeed;
             AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
-            for i:= nWonder to nImp-1 do
-            if (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikShipPart) then
-            AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i); }
+            for I:= nWonder to nImp-1 do
+            if (Imp[I].Preq<>preNA) and (Imp[I].Kind=ikShipPart) then
+            AddLine(Phrases.Lookup('IMPROVEMENTS',I),pkSmallIcon,I,hkImp,I); }
         end
-        else if no = 202 then
+        else if No = 202 then
         begin // complete wonder list
           Caption := HelpText.Lookup('HELPTITLE_WONDERLIST');
           // AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkSection);
-          for i := 0 to nWonder - 1 do
-            if Imp[i].Preq <> preNA then
-              AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
-                hkImp, i);
+          for I := 0 to nWonder - 1 do
+            if Imp[I].Preq <> preNA then
+              AddLine(Phrases.Lookup('IMPROVEMENTS', I), pkSmallIcon, I,
+                hkImp, I);
         end
         else
         begin // single building
-          Caption := Phrases.Lookup('IMPROVEMENTS', no);
+          Caption := Phrases.Lookup('IMPROVEMENTS', No);
           LineFeed;
-          AddLine(Phrases.Lookup('IMPROVEMENTS', no), pkRightIcon, no);
-          case Imp[no].Kind of
+          AddLine(Phrases.Lookup('IMPROVEMENTS', No), pkRightIcon, No);
+          case Imp[No].Kind of
             ikWonder: AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
             ikCommon: AddLine(HelpText.Lookup('HELPSPEC_IMP'));
@@ -1603 +1596 @@
             AddLine(HelpText.Lookup('HELPSPEC_NAT'))
           end;
-          if Imp[no].Kind <> ikShipPart then begin
+          if Imp[No].Kind <> ikShipPart then begin
             NextSection('EFFECT');
-            AddTextual(HelpText.LookupByHandle(hIMPHELP, no));
+            AddTextual(HelpText.LookupByHandle(hIMPHELP, No));
           end;
-          if no = woSun then begin
+          if No = woSun then begin
             AddFeature(mcFirst);
             AddFeature(mcWill);
             AddFeature(mcAcademy);
           end;
-          if (no < nWonder) and not Phrases2FallenBackToEnglish then
+          if (No < nWonder) and not Phrases2FallenBackToEnglish then
           begin
             LineFeed;
-            if Imp[no].Expiration >= 0 then
+            if Imp[No].Expiration >= 0 then
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE1'))
             else
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE2'));
           end;
-          if Imp[no].Preq <> preNone then
+          if Imp[No].Preq <> preNone then
           begin
             NextSection('PREREQ');
-            AddPreqAdv(Imp[no].Preq);
+            AddPreqAdv(Imp[No].Preq);
           end;
           NextSection('COSTS');
           if Difficulty = 0 then
-            s := Format(HelpText.Lookup('BUILDCOST'), [Imp[no].Cost])
+            S := Format(HelpText.Lookup('BUILDCOST'), [Imp[No].Cost])
           else
-            s := Format(HelpText.Lookup('BUILDCOST'),
-              [Imp[no].Cost * BuildCostMod[Difficulty] div 12]);
-          AddLine(s);
-          if Imp[no].Maint > 0 then
-            AddLine(Format(HelpText.Lookup('MAINTCOST'), [Imp[no].Maint]));
-          j := 0;
-          for i := 0 to nImpReplacement - 1 do
-            if ImpReplacement[i].NewImp = no then
-            begin
-              if j = 0 then
+            S := Format(HelpText.Lookup('BUILDCOST'),
+              [Imp[No].Cost * BuildCostMod[Difficulty] div 12]);
+          AddLine(S);
+          if Imp[No].Maint > 0 then
+            AddLine(Format(HelpText.Lookup('MAINTCOST'), [Imp[No].Maint]));
+          J := 0;
+          for I := 0 to nImpReplacement - 1 do
+            if ImpReplacement[I].NewImp = No then
+            begin
+              if J = 0 then
               begin
                 NextSection('REPLACE');
                 AddItem('REPLACETEXT');
-                j := 1;
+                J := 1;
               end;
-              AddImprovement(ImpReplacement[i].OldImp);
-            end;
-          if Imp[no].Kind = ikShipPart then
+              AddImprovement(ImpReplacement[I].OldImp);
+            end;
+          if Imp[No].Kind = ikShipPart then
           begin
             LineFeed;
-            if no = imShipComp then
-              i := 1
-            else if no = imShipPow then
-              i := 2
-            else { if no=imShipHab then }
-              i := 3;
+            if No = imShipComp then
+              I := 1
+            else if No = imShipPow then
+              I := 2
+            else { if No=imShipHab then }
+              I := 3;
             AddLine(Format(HelpText.Lookup('RAREREQUIRED'),
-              [Phrases.Lookup('TERRAIN', 3 * 12 + i)]), pkTer, 3 * 12 + i);
+              [Phrases.Lookup('TERRAIN', 3 * 12 + I)]), pkTer, 3 * 12 + I);
           end;
-          if (no < nWonder) and (Imp[no].Expiration >= 0) then
+          if (No < nWonder) and (Imp[No].Expiration >= 0) then
           begin
             NextSection('EXPIRATION');
-            s := Format(HelpText.Lookup('EXPWITH'),
-              [Phrases.Lookup('ADVANCES', Imp[no].Expiration)]);
-            if no = woPyramids then
-              s := s + ' ' + HelpText.Lookup('EXPSLAVE');
-            AddTextual(s);
+            S := Format(HelpText.Lookup('EXPWITH'),
+              [Phrases.Lookup('ADVANCES', Imp[No].Expiration)]);
+            if No = woPyramids then
+              S := S + ' ' + HelpText.Lookup('EXPSLAVE');
+            AddTextual(S);
           end;
           NextSection('SEEALSO');
-          if (no < nWonder) and (Imp[no].Expiration >= 0) then
+          if (No < nWonder) and (Imp[No].Expiration >= 0) then
             AddImprovement(woEiffel);
-          for i := 0 to nImpReplacement - 1 do
-            if ImpReplacement[i].OldImp = no then
-              AddImprovement(ImpReplacement[i].NewImp);
-          if no = imSupermarket then
+          for I := 0 to nImpReplacement - 1 do
+            if ImpReplacement[I].OldImp = No then
+              AddImprovement(ImpReplacement[I].NewImp);
+          if No = imSupermarket then
             AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
-              hkMisc + hkCrossLink, miscJobList);
-          CheckSeeAlso := true;
+              hkMisc, Integer(miscJobList), True);
+          CheckSeeAlso := True;
         end;
 
       hkTer:
-        if no = 200 then
+        if No = 200 then
         begin // complete terrain type list
           Caption := HelpText.Lookup('HELPTITLE_TERLIST');
           // AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
-          for i := 0 to nTerrainHelp - 1 do
-            AddTerrain(TerrainHelp[i]);
+          for I := 0 to Length(TerrainHelp) - 1 do
+            AddTerrain(TerrainHelp[I]);
         end
         else
         begin // sigle terrain type
-          TerrType := no mod 12;
+          TerrType := No mod 12;
           if TerrType = fJungle then
             TerrType := fForest;
-          TerrSubType := no div 12;
-          if no = 3 * 12 then
+          TerrSubType := No div 12;
+          if No = 3 * 12 then
           begin
             TerrType := fDesert;
@@ -1700 +1693 @@
           with Terrain[TerrType] do
           begin
-            Caption := Phrases.Lookup('TERRAIN', no);
+            Caption := Phrases.Lookup('TERRAIN', No);
             LineFeed;
-            AddLine(Phrases.Lookup('TERRAIN', no), pkBigTer, no);
+            AddLine(Phrases.Lookup('TERRAIN', No), pkBigTer, No);
             AddLine(HelpText.Lookup('HELPSPEC_TER'));
             LineFeed;
@@ -1708 +1701 @@
               AddLine(Format(HelpText.Lookup('RESPROD'),
                 [ProdRes[TerrSubType]]));
-            if (no < 3 * 12) and (MineEff > 0) then
+            if (No < 3 * 12) and (MineEff > 0) then
               MainText[Count - 1] := MainText[Count - 1] + ' ' +
                 Format(HelpText.Lookup('MOREMINE'), [MineEff]);
@@ -1714 +1707 @@
               AddLine(Format(HelpText.Lookup('RESFOOD'),
                 [FoodRes[TerrSubType]]));
-            if (no < 3 * 12) and (IrrEff > 0) then
+            if (No < 3 * 12) and (IrrEff > 0) then
               MainText[Count - 1] := MainText[Count - 1] + ' ' +
                 Format(HelpText.Lookup('MOREIRR'), [IrrEff]);
@@ -1728 +1721 @@
               else
                 AddLine(HelpText.Lookup('MOVEPLAIN'));
-            if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
               AddTextual(HelpText.Lookup('DEADLANDS'));
             end;
-            if (TerrType = fDesert) and (no <> fDesert + 12) then
+            if (TerrType = fDesert) and (No <> fDesert + 12) then
             begin
               LineFeed;
@@ -1743 +1736 @@
               AddTextual(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
             end;
-            if (no < 3 * 12) and (TransTerrain >= 0) then
+            if (No < 3 * 12) and (TransTerrain >= 0) then
             begin
               LineFeed;
-              i := TransTerrain;
-              if (TerrType <> fGrass) and (i <> fGrass) then
-                i := i + TerrSubType * 12;
+              I := TransTerrain;
+              if (TerrType <> fGrass) and (I <> fGrass) then
+                I := I + TerrSubType * 12;
               // trafo to same Special resource group
               AddLine(Format(HelpText.Lookup('TRAFO'),
-                [Phrases.Lookup('TERRAIN', i)]), pkTer, i,
-                hkTer + hkCrossLink, i);
-              if no = fSwamp + 12 then
+                [Phrases.Lookup('TERRAIN', I)]), pkTer, I,
+                hkTer, I, True);
+              if No = fSwamp + 12 then
               begin
                 LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', TransTerrain + 24)]), pkTer,
-                  TransTerrain + 24, hkTer + hkCrossLink, TransTerrain + 24);
+                  TransTerrain + 24, hkTer, TransTerrain + 24, True);
               end
-              else if i = fGrass then
+              else if I = fGrass then
               begin
                 LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
-                  hkTer + hkCrossLink, fGrass + 12);
+                  hkTer, fGrass + 12, True);
               end;
             end;
             NextSection('SPECIAL');
-            if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
@@ -1780 +1773 @@
               end;
             end
-            else if (no < 12) and (no <> fGrass) and (no <> fOcean) then
+            else if (No < 12) and (No <> fGrass) and (No <> fOcean) then
             begin
               LineFeed;
               for Special := 1 to 2 do
-                if (no <> fArctic) and (no <> fSwamp) or (Special < 2) then
+                if (No <> fArctic) and (No <> fSwamp) or (Special < 2) then
                 begin
                   if Special > 1 then
                     LineFeed;
-                  AddLine(Phrases.Lookup('TERRAIN', no + Special * 12), pkTer,
-                    no + Special * 12);
-                  i := FoodRes[Special] - FoodRes[0];
-                  if i <> 0 then
+                  AddLine(Phrases.Lookup('TERRAIN', No + Special * 12), pkTer,
+                    No + Special * 12);
+                  I := FoodRes[Special] - FoodRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALFOOD'), [i]);
-                  i := ProdRes[Special] - ProdRes[0];
-                  if i <> 0 then
+                      Format(HelpText.Lookup('SPECIALFOOD'), [I]);
+                  I := ProdRes[Special] - ProdRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALPROD'), [i]);
-                  i := TradeRes[Special] - TradeRes[0];
-                  if i <> 0 then
+                      Format(HelpText.Lookup('SPECIALPROD'), [I]);
+                  I := TradeRes[Special] - TradeRes[0];
+                  if I <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
-                      Format(HelpText.Lookup('SPECIALTRADE'), [i]);
+                      Format(HelpText.Lookup('SPECIALTRADE'), [I]);
                 end;
             end;
-            if no = 3 * 12 then
+            if No = 3 * 12 then
             begin
               LineFeed;
               AddTextual(HelpText.Lookup('RARE'));
             end;
-            if (no < 3 * 12) and (TerrType in [fDesert, fArctic]) then
+            if (No < 3 * 12) and (TerrType in [fDesert, fArctic]) then
             begin
               NextSection('SEEALSO');
               AddImprovement(woGardens);
-              CheckSeeAlso := true
+              CheckSeeAlso := True;
             end;
           end;
@@ -1819 +1812 @@
 
       hkFeature:
-        if no = 200 then
+        if No = 200 then
         begin // complete feature list
           Caption := HelpText.Lookup('HELPTITLE_FEATURELIST');
@@ -1837 +1830 @@
             end;
             List.Clear;
-            for i := 0 to nFeature - 1 do
-              if Feature[i].Preq <> preNA then
+            for I := 0 to nFeature - 1 do
+              if Feature[I].Preq <> preNA then
               begin
-                if i < mcFirstNonCap then
-                  j := 0
-                else if i in AutoFeature then
-                  j := 2
+                if I < mcFirstNonCap then
+                  J := 0
+                else if I in AutoFeature then
+                  J := 2
                 else
-                  j := 1;
-                if j = Special then
-                  List.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
-                    hkFeature, i);
+                  J := 1;
+                if J = Special then
+                  List.AddLine(Phrases.Lookup('FEATURES', I), pkFeature, I,
+                    hkFeature, I);
               end;
             List.Sort;
@@ -1857 +1850 @@
         else
         begin // single feature
-          Caption := Phrases.Lookup('FEATURES', no);
+          Caption := Phrases.Lookup('FEATURES', No);
           LineFeed;
-          AddLine(Phrases.Lookup('FEATURES', no), pkBigFeature, no);
-          if no < mcFirstNonCap then
+          AddLine(Phrases.Lookup('FEATURES', No), pkBigFeature, No);
+          if No < mcFirstNonCap then
             AddLine(HelpText.Lookup('HELPSPEC_CAP'))
-          else if no in AutoFeature then
+          else if No in AutoFeature then
             AddLine(HelpText.Lookup('HELPSPEC_STANDARD'))
           else
             AddLine(HelpText.Lookup('HELPSPEC_FEATURE'));
           NextSection('EFFECT');
-          AddTextual(HelpText.LookupByHandle(hFEATUREHELP, no));
-          if (Feature[no].Weight <> 0) or (Feature[no].Cost <> 0) then
+          AddTextual(HelpText.LookupByHandle(hFEATUREHELP, No));
+          if (Feature[No].Weight <> 0) or (Feature[No].Cost <> 0) then
           begin
             NextSection('COSTS');
-            s := IntToStr(Feature[no].Cost);
-            if Feature[no].Cost >= 0 then
-              s := '+' + s;
-            AddLine(Format(HelpText.Lookup('COSTBASE'), [s]));
-            if Feature[no].Weight > 0 then
+            S := IntToStr(Feature[No].Cost);
+            if Feature[No].Cost >= 0 then
+              S := '+' + S;
+            AddLine(Format(HelpText.Lookup('COSTBASE'), [S]));
+            if Feature[No].Weight > 0 then
             begin
               AddLine(Format(HelpText.Lookup('WEIGHT'),
-                ['+' + IntToStr(Feature[no].Weight)]));
-              if no = mcDefense then
+                ['+' + IntToStr(Feature[No].Weight)]));
+              if No = mcDefense then
                 AddLine(Format(HelpText.Lookup('WEIGHT'), ['+2']),
                   pkDomain, dGround);
             end;
           end;
-          if Feature[no].Preq <> preNone then
+          if Feature[No].Preq <> preNone then
           begin
             LineFeed;
-            if Feature[no].Preq = preSun then
+            if Feature[No].Preq = preSun then
               AddPreqImp(woSun) // sun tsu feature
             else
-              AddPreqAdv(Feature[no].Preq);
+              AddPreqAdv(Feature[No].Preq);
             MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
               [MainText[Count - 1]]);
@@ -1901 +1894 @@
         begin
           Caption := HelpText.Lookup('HELPTITLE_MODELLIST');
-          for i := 0 to nSpecialModel - 1 do
-            if i <> 2 then
-              AddModelText(i);
+          for I := 0 to nSpecialModel - 1 do
+            if I <> 2 then
+              AddModelText(I);
           LineFeed;
           AddItem('MODELNOTE');
@@ -1910 +1903 @@
     end;
     if CheckSeeAlso then
-      for i := 0 to nSeeAlso - 1 do
-        if (SeeAlso[i].Kind = Kind) and (SeeAlso[i].no = no) then
-          case SeeAlso[i].SeeKind of
-            hkImp: AddImprovement(SeeAlso[i].SeeNo);
-            hkAdv: AddAdvance(SeeAlso[i].SeeNo);
-            hkFeature: AddFeature(SeeAlso[i].SeeNo);
+      for I := 0 to Length(SeeAlso) - 1 do
+        if (SeeAlso[I].Kind = Kind) and (SeeAlso[I].No = No) then
+          case SeeAlso[I].SeeKind of
+            hkImp: AddImprovement(SeeAlso[I].SeeNo);
+            hkAdv: AddAdvance(SeeAlso[I].SeeNo);
+            hkFeature: AddFeature(SeeAlso[I].SeeNo);
           end;
     if (Headline >= 0) and (Count = Headline + 1) then
@@ -1926 +1919 @@
     ScrollBar.SetPos(sbPos);
     BackBtn.Visible := HistItems.Count > 1;
-    TopBtn.Visible := (HistItems.Count > 1) or (Kind <> hkMisc) or (no <> miscMain);
+    TopBtn.Visible := (HistItems.Count > 1) or (Kind <> hkMisc) or (No <> Integer(miscMain));
     Sel := -1;
   end; // with MainText
 end;
 
-procedure THelpDlg.ShowNewContent(NewMode, Category, Index: Integer);
-begin
-  if (Category <> Kind) or (Index <> no) or (Category = hkMisc) and
-    (Index = miscSearchResult) then begin
+procedure THelpDlg.ShowNewContent(NewMode: TWindowMode; Category: TLinkCategory;
+  Index: Integer);
+begin
+  if (Category <> Kind) or (Index <> No) or (Category = hkMisc) and
+    (Index = Integer(miscSearchResult)) then begin
     if HistItems.Count = MaxHist then HistItems.Delete(0);
     if HistItems.Count = 0 then
@@ -1941 +1935 @@
   end;
   Kind := Category;
-  no := Index;
+  No := Index;
   SearchContent := NewSearchContent;
   Prepare;
@@ -1949 +1943 @@
 
 procedure THelpDlg.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
   i0, Sel0: Integer;
 begin
-  y := y - WideFrame;
+  Y := Y - WideFrame;
   i0 := ScrollBar.Position;
   Sel0 := Sel;
-  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
-    (y < InnerHeight) and (y mod 24 >= 8) then
-    Sel := y div 24
+  if (X >= SideFrame) and (X < SideFrame + InnerWidth) and (Y >= 0) and
+    (Y < InnerHeight) and (Y mod 24 >= 8) then
+    Sel := Y div 24
   else
     Sel := -1;
   if (Sel + i0 >= MainText.Count) or (Sel >= 0) and
-    (THelpLineInfo(MainText.Objects[Sel + i0]).Link = 0) then
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Category = hkNoLink) and
+    (THelpLineInfo(MainText.Objects[Sel + i0]).Index = 0)then
     Sel := -1;
   if Sel <> Sel0 then
@@ -1974 +1969 @@
 
 procedure THelpDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if Sel >= 0 then
     with THelpLineInfo(MainText.Objects[Sel + ScrollBar.Position]) do
-      if Link shr 8 and $3F = hkInternet then
-        case Link and $FF of
+      if Category = hkInternet then
+        case Index of
           1: OpenDocument(HomeDir + AITemplateFileName);
           2: OpenURL(CevoHomepage);
@@ -1986 +1981 @@
       else
       begin
-        if (Link >= $8000) and (Link and $3FFF = liInvalid) then
-          exit; // invalid link;
-        if Link >= $8000 then
-          ShowNewContent(FWindowMode, hkText, Link and $3FFF)
-        else
-          ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
+        if Index < 0 then Exit; // invalid link;
+        ShowNewContent(FWindowMode, Category, Index);
       end;
 end;
@@ -2003 +1994 @@
     HistItem.Assign(HistItems.Last);
     HistItems.Delete(HistItems.Count - 1);
-    if (HistItem.Kind = hkMisc) and (HistItem.No = miscSearchResult) and
+    if (HistItem.Kind = hkMisc) and (HistItem.No = Integer(miscSearchResult)) and
       (HistItem.SearchContent <> SearchContent) then
     begin
@@ -2010 +2001 @@
     end;
     Kind := HistItem.Kind;
-    no := HistItem.No;
+    No := HistItem.No;
     Prepare(HistItem.Pos);
     OffscreenPaint;
@@ -2022 +2013 @@
   while HistItems.Count > 1 do HistItems.Delete(HistItems.Count - 1);
   Kind := hkMisc;
-  no := miscMain;
+  No := Integer(miscMain);
   Prepare;
   OffscreenPaint;
@@ -2036 +2027 @@
 function THelpDlg.TextIndex(Item: string): Integer;
 begin
-  Result := HelpText.Gethandle(Item);
+  Result := HelpText.GetHandle(Item);
 end;
 
@@ -2064 +2055 @@
       1:
         with THelpLineInfo(SearchResult.Objects[0]) do
-          if Link >= $8000 then
-            ShowNewContent(FWindowMode, hkText, Link and $3FFF)
-          else
-            ShowNewContent(FWindowMode, Link shr 8 and $3F, Link and $FF);
-    else
-      begin
+          ShowNewContent(FWindowMode, Category, Index);
+      else begin
         NewSearchContent := InputDlg.EInput.Text;
-        ShowNewContent(FWindowMode, hkMisc, miscSearchResult);
+        ShowNewContent(FWindowMode, hkMisc, Integer(miscSearchResult));
       end;
     end;
@@ -2079 +2066 @@
 procedure THelpDlg.Search(SearchString: string);
 var
-  h, i, PrevHandle, PrevIndex, p, RightMargin: Integer;
-  s: string;
-  mADVHELP, mIMPHELP, mFEATUREHELP: set of 0 .. 255;
+  H, I, PrevHandle, PrevIndex, P, RightMargin: Integer;
+  S: string;
+  mADVHELP, mIMPHELP, mFEATUREHELP: set of 0..255;
   bGOVHELP, bSPECIALMODEL, bJOBHELP: Boolean;
 begin
@@ -2092 +2079 @@
   bJOBHELP := False;
 
-  // search in generic reference
+  // Search in generic reference
   SearchString := UpperCase(SearchString);
-  for i := 0 to 35 + 4 do begin
-    s := Phrases.Lookup('TERRAIN', i);
-    if pos(SearchString, UpperCase(s)) > 0 then
-      if i < 36 then
-        SearchResult.AddLine(s + ' ' + HelpText.Lookup('HELPSPEC_TER'),
-          pkNormal, 0, hkTer + hkCrossLink, i)
+  for I := 0 to 35 + 4 do begin
+    S := Phrases.Lookup('TERRAIN', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
+      if I < 36 then
+        SearchResult.AddLine(S + ' ' + HelpText.Lookup('HELPSPEC_TER'),
+          pkNormal, 0, hkTer, I, True)
       else
       begin
         SearchResult.AddLine(Phrases.Lookup('TERRAIN', 36) + ' ' +
           HelpText.Lookup('HELPSPEC_TER'), pkNormal, 0,
-          hkTer + hkCrossLink, 36);
-        if i > 36 then
+          hkTer, 36, True);
+        if I > 36 then
           SearchResult.AddLine(Phrases.Lookup('IMPROVEMENTS',
-            imShipComp + i - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
-            pkNormal, 0, hkImp + hkCrossLink, imShipComp + i - 37);
+            imShipComp + I - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
+            pkNormal, 0, hkImp, imShipComp + I - 37, True);
         Break;
       end;
   end;
-  for i := 0 to nJobHelp - 1 do
-    if pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[i]))) > 0
+  for I := 0 to Length(JobHelp) - 1 do
+    if Pos(SearchString, UpperCase(Phrases.Lookup('JOBRESULT', JobHelp[I]))) > 0
     then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
-        hkMisc + hkCrossLink, miscJobList);
+        hkMisc, Integer(miscJobList), True);
       bJOBHELP := True;
       Break;
     end;
-  for i := 0 to nAdv - 1 do
-  begin
-    s := Phrases.Lookup('ADVANCES', i);
-    if pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nAdv - 1 do
+  begin
+    S := Phrases.Lookup('ADVANCES', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      if i in FutureTech then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+      if I in FutureTech then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
-      SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i);
-      include(mADVHELP, i);
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+      SearchResult.AddLine(S, pkNormal, 0, hkAdv, I, True);
+      Include(mADVHELP, I);
     end;
   end;
-  for i := 0 to nSpecialModel - 1 do
-  begin
-    FindStdModelPicture(SpecialModelPictureCode[i], h, s);
-    if pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nSpecialModel - 1 do
+  begin
+    FindStdModelPicture(SpecialModelPictureCode[I], H, S);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal, 0,
-        hkModel + hkCrossLink, 0);
+        hkModel, 0, True);
       bSPECIALMODEL := True;
       Break;
     end;
   end;
-  for i := 0 to nFeature - 1 do
-  begin
-    s := Phrases.Lookup('FEATURES', i);
-    if Pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nFeature - 1 do
+  begin
+    S := Phrases.Lookup('FEATURES', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      if i < mcFirstNonCap then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
-      else if i in AutoFeature then
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+      if I < mcFirstNonCap then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+      else if I in AutoFeature then
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
-      SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
-      Include(mFEATUREHELP, i);
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+      SearchResult.AddLine(S, pkNormal, 0, hkFeature, I, True);
+      Include(mFEATUREHELP, I);
     end;
   end;
-  for i := 0 to nImp - 1 do
-  begin
-    s := Phrases.Lookup('IMPROVEMENTS', i);
-    if Pos(SearchString, UpperCase(s)) > 0 then
+  for I := 0 to nImp - 1 do
+  begin
+    S := Phrases.Lookup('IMPROVEMENTS', I);
+    if Pos(SearchString, UpperCase(S)) > 0 then
     begin
-      case Imp[i].Kind of
+      case Imp[I].Kind of
         ikWonder:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
         ikCommon:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_IMP');
         ikShipPart:
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
       else
-        s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
+        S := S + ' ' + HelpText.Lookup('HELPSPEC_NAT')
       end;
-      SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i);
-      Include(mIMPHELP, i);
+      SearchResult.AddLine(S, pkNormal, 0, hkImp, I, True);
+      Include(mIMPHELP, I);
     end
   end;
-  for i := 0 to nGov - 1 do
-    if Pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', i))) > 0 then
+  for I := 0 to nGov - 1 do
+    if Pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', I))) > 0 then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
-        hkMisc + hkCrossLink, miscGovList);
+        hkMisc, Integer(miscGovList), True);
       bGOVHELP := True;
       Break;
     end;
 
-  // full text search
-  h := -1;
+  // Full text search
+  H := -1;
   repeat
-    PrevHandle := h;
-    PrevIndex := i;
-    if not HelpText.Search(SearchString, h, i) then
+    PrevHandle := H;
+    PrevIndex := I;
+    if not HelpText.Search(SearchString, H, I) then
       Break;
-    if h = hADVHELP then
+    if H = hADVHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mADVHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mADVHELP) then
       begin
-        s := Phrases.Lookup('ADVANCES', i);
-        if i in FutureTech then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
+        S := Phrases.Lookup('ADVANCES', I);
+        if I in FutureTech then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_FUTURE')
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
-        SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i)
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_ADV');
+        SearchResult.AddLine(S, pkNormal, 0, hkAdv, I, True);
       end;
     end
-    else if h = hIMPHELP then
+    else if H = hIMPHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mIMPHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mIMPHELP) then
       begin
-        s := Phrases.Lookup('IMPROVEMENTS', i);
-        case Imp[i].Kind of
+        S := Phrases.Lookup('IMPROVEMENTS', I);
+        case Imp[I].Kind of
           ikWonder:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_WONDER');
           ikCommon:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_IMP');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_IMP');
           ikShipPart:
-            s := s + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
+            S := S + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART');
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_NAT')
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_NAT')
         end;
-        SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i)
+        SearchResult.AddLine(S, pkNormal, 0, hkImp, I, True);
       end;
     end
-    else if h = hFEATUREHELP then
+    else if H = hFEATUREHELP then
     begin
-      if (i >= 0) and ((i <> PrevIndex) or (h <> PrevHandle)) and
-        not(i in mFEATUREHELP) then
+      if (I >= 0) and ((I <> PrevIndex) or (H <> PrevHandle)) and
+        not(I in mFEATUREHELP) then
       begin
-        s := Phrases.Lookup('FEATURES', i);
-        if i < mcFirstNonCap then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_CAP')
-        else if i in AutoFeature then
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
+        S := Phrases.Lookup('FEATURES', I);
+        if I < mcFirstNonCap then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_CAP')
+        else if I in AutoFeature then
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_STANDARD')
         else
-          s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
-        SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
+          S := S + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
+        SearchResult.AddLine(S, pkNormal, 0, hkFeature, I, True);
       end;
     end
-    else if h = hGOVHELP then
+    else if H = hGOVHELP then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bGOVHELP then
+      if (I >= 0) and (H <> PrevHandle) and not bGOVHELP then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
-          hkMisc + hkCrossLink, miscGovList)
+          hkMisc, Integer(miscGovList), True);
     end
-    else if h = hSPECIALMODEL then
+    else if H = hSPECIALMODEL then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bSPECIALMODEL then
+      if (I >= 0) and (H <> PrevHandle) and not bSPECIALMODEL then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal,
-          0, hkModel + hkCrossLink, 0)
+          0, hkModel, 0, True);
     end
-    else if h = hJOBHELP then
+    else if H = hJOBHELP then
     begin
-      if (i >= 0) and (h <> PrevHandle) and not bJOBHELP then
+      if (I >= 0) and (H <> PrevHandle) and not bJOBHELP then
         SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
-          hkMisc + hkCrossLink, miscJobList)
+          hkMisc, Integer(miscJobList), True);
     end
-    else if { (h<>hMAIN) and } (h <> PrevHandle) then
+    else if { (h<>hMAIN) and } (H <> PrevHandle) then
     begin
-      s := HelpText.LookupByHandle(h);
-      p := Pos('$', s);
-      if p > 0 then
+      S := HelpText.LookupByHandle(H);
+      P := Pos('$', S);
+      if P > 0 then
       begin
-        s := Copy(s, p + 1, maxint);
-        p := Pos('\', s);
-        if p > 0 then
-          s := Copy(s, 1, p - 1);
-        SearchResult.AddLine(s, pkNormal, 0, hkText + hkCrossLink, h);
+        S := Copy(S, P + 1, MaxInt);
+        P := Pos('\', S);
+        if P > 0 then
+          S := Copy(S, 1, P - 1);
+        SearchResult.AddLine(S, pkNormal, 0, hkText, H, True);
       end;
     end;
-    until False;
-
-    // cut lines to fit to window
-    RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
-    OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
-    for i := 0 to SearchResult.Count - 1 do
-    begin
-      while BiColorTextWidth(OffScreen.Canvas, SearchResult[i]) >
-        RightMargin - 32 do
-        SearchResult[i] := copy(SearchResult[i], 1, length(SearchResult[i]) - 1)
-    end;
-  end;
+  until False;
+
+  // Cut lines to fit to window
+  RightMargin := InnerWidth - 16 - DpiGetSystemMetrics(SM_CXVSCROLL);
+  OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  for I := 0 to SearchResult.Count - 1 do
+  begin
+    while BiColorTextWidth(OffScreen.Canvas, SearchResult[I]) >
+      RightMargin - 32 do
+      SearchResult[I] := Copy(SearchResult[I], 1, Length(SearchResult[I]) - 1)
+  end;
+end;
 
 end.

branches/highdpi/LocalPlayer/IsoEngine.pas ¶

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

branches/highdpi/LocalPlayer/KeyBindings.pas ¶

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

branches/highdpi/LocalPlayer/LocalPlayer.pas ¶

@@ -4 +4 @@
 interface
 
-procedure Client(Command, Player: integer; var Data); stdcall;
-procedure SetAIName(p: integer; Name: string);
+procedure Client(Command, Player: Integer; var Data); stdcall;
+procedure SetAIName(P: Integer; Name: string);
 
 implementation
 
 uses
-  UDpiControls, Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
-  NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree, Forms;
+  UDpiControls, Term, CityScreen, Nego, BaseWin, Forms;
 
 var
-  FormsCreated: boolean;
+  FormsCreated: Boolean;
 
-procedure Client(Command, Player: integer; var Data);
+procedure Client(Command, Player: Integer; var Data);
 begin
   if not FormsCreated then
   begin
-    FormsCreated := true;
+    FormsCreated := True;
     // TODO: Changing application name in runtime will cause change of Linux XML registry file path
-//    DpiApplication.MainForm := MainScreen;
+//    Application.MainForm := MainScreen;
     DpiApplication.CreateForm(TMainScreen, MainScreen);
-    DpiApplication.CreateForm(TCityDlg, CityDlg);
-    DpiApplication.CreateForm(TModalSelectDlg, ModalSelectDlg);
-    DpiApplication.CreateForm(TListDlg, ListDlg);
-    DpiApplication.CreateForm(TMessgExDlg, MessgExDlg);
-    DpiApplication.CreateForm(TDraftDlg, DraftDlg);
-    DpiApplication.CreateForm(TCityTypeDlg, CityTypeDlg);
-    DpiApplication.CreateForm(THelpDlg, HelpDlg);
-    DpiApplication.CreateForm(TUnitStatDlg, UnitStatDlg);
-    DpiApplication.CreateForm(TDiaDlg, DiaDlg);
-    DpiApplication.CreateForm(TNatStatDlg, NatStatDlg);
-    DpiApplication.CreateForm(TWondersDlg, WondersDlg);
-    DpiApplication.CreateForm(TNegoDlg, NegoDlg);
-    DpiApplication.CreateForm(TEnhanceDlg, EnhanceDlg);
-    DpiApplication.CreateForm(TBattleDlg, BattleDlg);
-    // DpiApplication.CreateForm(TAdvisorDlg, AdvisorDlg);
-    DpiApplication.CreateForm(TRatesDlg, RatesDlg);
-    DpiApplication.CreateForm(TTechTreeDlg, TechTreeDlg);
   end;
   MainScreen.Client(Command, Player, Data);
 end;
 
-procedure SetAIName(p: integer; Name: string);
+procedure SetAIName(P: Integer; Name: string);
 begin
-  MainScreen.SetAIName(p, Name);
+  MainScreen.SetAIName(P, Name);
 end;
 
 initialization
 
-FormsCreated := false;
+FormsCreated := False;
 
 end.

branches/highdpi/LocalPlayer/MessgEx.lfm ¶

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

branches/highdpi/LocalPlayer/MessgEx.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils,
-  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
-  ButtonB, StdCtrls, DrawDlg;
+  UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
+  SysUtils, Classes, Graphics, Controls, Forms, ButtonA, ButtonB, StdCtrls,
+  DrawDlg, Help;
 
 type
@@ -13 +13 @@
     mikPureIcon, mikMyArmy, mikEnemyArmy, mikFullControl, mikShip, mikBigIcon,
     mikEnemyShipComplete);
+
+  { TMessgExDlg }
 
   TMessgExDlg = class(TBaseMessgDlg)
@@ -32 +34 @@
     Kind: TMessageKind;
     IconIndex: Integer;
-    HelpKind: Integer;
+    HelpKind: TLinkCategory;
     HelpNo: Integer;
     CenterTo: Integer;
     IconKind: TMessageIconKind;
     OpenSound: string;
-    function ShowModal: integer; override;
+    function ShowModal: Integer; override;
     procedure CancelMovie;
   private
-    MovieCancelled: boolean;
-    procedure PaintBook(ca: TDpiCanvas; x, y, clPage, clCover: integer);
+    MovieCancelled: Boolean;
+    procedure PaintBook(ca: TDpiCanvas; X, Y, clPage, clCover: Integer);
     procedure PaintMyArmy;
     procedure PaintEnemyArmy;
@@ -47 +49 @@
   end;
 
-var
-  MessgExDlg: TMessgExDlg;
 
 procedure SoundMessageEx(SimpleText, SoundItem: string);
-procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
+procedure TribeMessage(P: Integer; SimpleText, SoundItem: string);
 function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
-  : integer;
+  : Integer;
 procedure ContextMessage(SimpleText, SoundItem: string;
-  ContextKind, ContextNo: integer);
+  ContextKind: TLinkCategory; ContextNo: Integer);
+
 
 implementation
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
-  IsoEngine, Diagram, Sound;
+  ClientTools, BaseWin, Term, UnitStat, Tribes, PixelPointer,
+  Diagram, Sound;
 
 {$R *.lfm}
@@ -78 +79 @@
 procedure TMessgExDlg.FormShow(Sender: TObject);
 var
-  i: integer;
+  I: Integer;
 begin
   if IconKind = mikEnemyArmy then
@@ -147 +148 @@
   end;
 
-  SplitText(true);
+  SplitText(True);
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
   if GameMode = cMovie then
@@ -178 +179 @@
       end;
   end;
-  for i := 0 to ControlCount - 1 do
-    Controls[i].Top := ClientHeight - (34 + Border);
+  for I := 0 to ControlCount - 1 do
+    Controls[I].Top := ClientHeight - (34 + Border);
   if Kind = mkModel then
     EInput.Top := ClientHeight - (76 + Border);
 end;
 
-function TMessgExDlg.ShowModal: integer;
+function TMessgExDlg.ShowModal: Integer;
 var
   Ticks0: TDateTime;
   Ticks: TDateTime;
 begin
+  Caption := Phrases.Lookup('TITLE_MESSAGE');
   if GameMode = cMovie then
   begin
     if not((GameMode = cMovie) and (MovieSpeed = 4)) then
     begin
-      MovieCancelled := false;
+      MovieCancelled := False;
       Show;
       Ticks0 := NowPrecise;
@@ -203 +205 @@
       Hide;
     end;
-    result := mrOk;
+    Result := mrOk;
   end
   else
-    result := inherited;
+    Result := inherited;
+  //Gtk2Fix;
 end;
 
 procedure TMessgExDlg.CancelMovie;
 begin
-  MovieCancelled := true;
-end;
-
-procedure TMessgExDlg.PaintBook(ca: TDpiCanvas; x, y, clPage, clCover: integer);
+  MovieCancelled := True;
+end;
+
+procedure TMessgExDlg.PaintBook(ca: TDpiCanvas; X, Y, clPage, clCover: Integer);
 const
   xScrewed = 77;
@@ -220 +223 @@
   wScrewed = 43;
   hScrewed = 27;
+type
+  TScrewed = array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of Single;
 var
-  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: integer;
+  ix, iy, xDst, yDst, dx, dy, xIcon, yIcon: Integer;
   BookRect: TRect;
-  x1, xR, yR, share: single;
-  Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
+  x1, xR, yR, share: Single;
+  Screwed: TScrewed;
   SrcPtr: TPixelPointer;
   Width: Integer;
@@ -235 +240 @@
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
-    FillChar(Screwed, sizeof(Screwed), 0);
+    Screwed := Default(TScrewed);
     BigImp.BeginUpdate;
-    SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    SrcPtr := TPixelPointer.Create(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
     for iy := 0 to ScaleToNative(Height) - 1 do begin
       for ix := 0 to ScaleToNative(Width) - 1 do begin
@@ -277 +282 @@
     BookRect := SmallBook.BoundsRect;
   end;
-  x := x - BookRect.Width div 2;
+  X := X - BookRect.Width div 2;
 
   // paint
   UnshareBitmap(LogoBuffer);
-  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, x, y);
+  DpiBitBltCanvas(LogoBuffer.Canvas, 0, 0, BookRect.Width, BookRect.Height, ca, X, Y);
 
   if IconIndex >= 0 then
@@ -294 +299 @@
   ImageOp_BCC(LogoBuffer, Templates.Data, Point(0, 0), BookRect, clCover, clPage);
 
-  DpiBitCanvas(ca, x, y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
+  DpiBitBltCanvas(ca, X, Y, BookRect.Width, BookRect.Height, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -303 +308 @@
 procedure TMessgExDlg.PaintEnemyArmy;
 var
-  emix, ix, iy, x, y, count, UnitsInLine: integer;
+  emix, ix, iy, X, Y, count, UnitsInLine: Integer;
 begin
   ix := 0;
@@ -314 +319 @@
     for count := 0 to LostArmy[emix] - 1 do
     begin
-      x := ClientWidth div 2 + ix * 64 - UnitsInLine * 32;
-      y := 26 + Border + TopSpace + Lines * MessageLineSpacing + iy * 48;
+      X := ClientWidth div 2 + ix * 64 - UnitsInLine * 32;
+      Y := 26 + Border + TopSpace + Lines * MessageLineSpacing + iy * 48;
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Mask.Canvas,
+        DpiBitBltCanvas(Canvas, X, Y, 64, 48, HGr.Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        DpiBitCanvas(Canvas, x, y, 64, 48, HGr.Data.Canvas,
+        DpiBitBltCanvas(Canvas, X, Y, 64, 48, HGr.Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
 
       // next position
-      inc(ix);
+      Inc(ix);
       if ix = LostUnitsPerLine then
       begin // next line
         ix := 0;
-        inc(iy);
+        Inc(iy);
         if iy = 6 then
-          exit;
+          Exit;
         UnitsInLine := nLostArmy - LostUnitsPerLine * iy;
         if UnitsInLine > LostUnitsPerLine then
@@ -341 +346 @@
 procedure TMessgExDlg.FormPaint(Sender: TObject);
 var
-  p1, clSaveTextLight, clSaveTextShade: integer;
+  p1, clSaveTextLight, clSaveTextShade: Integer;
 begin
   if (IconKind = mikImp) and (IconIndex = 27) then
@@ -362 +367 @@
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
         UnshareBitmap(Buffer);
-        DpiBitCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
+        DpiBitBltCanvas(Buffer.Canvas, 0, 0, xSizeBig + 2 * GlowRange,
           ySizeBig + 2 * GlowRange, Canvas,
           ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange);
-        DpiBitCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
+        DpiBitBltCanvas(Buffer.Canvas, GlowRange, GlowRange, xSizeBig, ySizeBig,
           BigImp.Canvas, IconIndex mod 7 * xSizeBig,
           (IconIndex + SystemIconLines * 7) div 7 * ySizeBig);
@@ -373 +378 @@
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
-        DpiBitCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
           24 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
           Buffer.Canvas, 0, 0);
@@ -387 +392 @@
       end;
     mikModel:
-      with Tribe[me].ModelPicture[IconIndex] do
+      with Tribe[Me].ModelPicture[IconIndex] do
       begin
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
-        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
           HGr.Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
-        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
           HGr.Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
@@ -406 +411 @@
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
-        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
+        DpiBitBltCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
           Tribe[IconIndex].faceHGr.Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
@@ -420 +425 @@
     mikEnemyShipComplete:
       begin
-        DpiBitCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
+        DpiBitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
           (ClientWidth - 140) div 2, 24);
         ImageOp_BCC(Buffer, Templates.Data, Point(0, 0), StarshipDeparted.BoundsRect, 0, $FFFFFF);
-        DpiBitCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
+        DpiBitBltCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
           Buffer.Canvas, 0, 0);
       end;
@@ -451 +456 @@
 begin
   if Kind = mkOkHelp then
-    HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
+    MainScreen.HelpDlg.ShowNewContent(wmSubmodal, HelpKind, HelpNo)
   else if Kind = mkModel then
-    UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
+    MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmSubmodal, IconIndex)
   else
     ModalResult := mrIgnore;
@@ -482 +487 @@
 // because Messg.SoundMessage not capable of movie mode
 begin
-  with MessgExDlg do
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
@@ -491 +496 @@
 end;
 
-procedure TribeMessage(p: integer; SimpleText, SoundItem: string);
-begin
-  with MessgExDlg do
+procedure TribeMessage(P: Integer; SimpleText, SoundItem: string);
+begin
+  with MainScreen.MessgExDlg do
   begin
     OpenSound := SoundItem;
@@ -499 +504 @@
     Kind := mkOk;
     IconKind := mikTribe;
-    IconIndex := p;
+    IconIndex := P;
     ShowModal;
   end;
@@ -505 +510 @@
 
 function SimpleQuery(QueryKind: TMessageKind; SimpleText, SoundItem: string)
-  : integer;
-begin
-  with MessgExDlg do
+  : Integer;
+begin
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
@@ -513 +518 @@
     Kind := QueryKind;
     ShowModal;
-    result := ModalResult;
+    Result := ModalResult;
   end;
 end;
 
 procedure ContextMessage(SimpleText, SoundItem: string;
-  ContextKind, ContextNo: integer);
-begin
-  with MessgExDlg do
+  ContextKind: TLinkCategory; ContextNo: Integer);
+begin
+  with MainScreen.MessgExDlg do
   begin
     MessgText := SimpleText;
@@ -543 +548 @@
 end;
 
-
-initialization
-
 end.

branches/highdpi/LocalPlayer/NatStat.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
-
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC, Menus, EOTButton;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, Menus, EOTButton;
 
 type
@@ -27 +25 @@
     procedure ToggleBtnClick(Sender: TObject);
     procedure PlayerClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormDestroy(Sender: TObject);
     procedure ScrollUpBtnClick(Sender: TObject);
     procedure ScrollDownBtnClick(Sender: TObject);
     procedure TellAIBtnClick(Sender: TObject);
-
   public
     procedure CheckAge;
-    procedure ShowNewContent(NewMode: integer; p: integer = -1);
+    procedure ShowNewContent(NewMode: TWindowMode; P: Integer = -1);
     procedure EcoChange;
-
   protected
     procedure OffscreenPaint; override;
-
   private
-    pView, AgePrepared, LinesDown: integer;
-    SelfReport, CurrentReport: PEnemyReport;
-    ShowContact, ContactEnabled: boolean;
-    Back, Template: TDpiBitmap;
+    pView: Integer;
+    AgePrepared: Integer;
+    LinesDown: Integer;
+    SelfReport: PEnemyReport;
+    CurrentReport: PEnemyReport;
+    ShowContact: Boolean;
+    ContactEnabled: Boolean;
+    Back: TDpiBitmap;
+    Template: TDpiBitmap;
     ReportText: TStringList;
     procedure GenerateReportText;
   end;
 
-var
-  NatStatDlg: TNatStatDlg;
 
 implementation
@@ -58 +56 @@
 
 uses
-  Messg, Tribes, Directories;
+  Term, Messg, Tribes, Directories;
 
 const
@@ -109 +107 @@
   if MainTexture.Age <> AgePrepared then begin
     AgePrepared := MainTexture.Age;
-    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
       MainTexture.Image.Canvas, (MainTexture.Width - ClientWidth) div 2,
       (MainTexture.Height - ClientHeight) div 2);
@@ -118 +116 @@
 procedure TNatStatDlg.FormShow(Sender: TObject);
 begin
-  if pView = me then
+  if pView = Me then
   begin
     SelfReport.TurnOfCivilReport := MyRO.Turn;
     SelfReport.TurnOfMilReport := MyRO.Turn;
-    move(MyRO.Treaty, SelfReport.Treaty, SizeOf(SelfReport.Treaty));
+    Move(MyRO.Treaty, SelfReport.Treaty, SizeOf(SelfReport.Treaty));
     SelfReport.Government := MyRO.Government;
     SelfReport.Money := MyRO.Money;
-    CurrentReport := pointer(SelfReport);
+    CurrentReport := Pointer(SelfReport);
   end
   else
-    CurrentReport := pointer(MyRO.EnemyReport[pView]);
+    CurrentReport := Pointer(MyRO.EnemyReport[pView]);
   if CurrentReport.TurnOfCivilReport >= 0 then
     GenerateReportText;
-  ShowContact := (pView <> me) and (not supervising or (me <> 0));
-  ContactEnabled := ShowContact and not supervising and
+  ShowContact := (pView <> Me) and (not Supervising or (Me <> 0));
+  ContactEnabled := ShowContact and not Supervising and
     (1 shl pView and MyRO.Alive <> 0);
   ContactBtn.Visible := ContactEnabled and (MyRO.Happened and phGameEnd = 0) and
@@ -150 +148 @@
 end;
 
-procedure TNatStatDlg.ShowNewContent(NewMode, p: integer);
-begin
-  if p < 0 then
+procedure TNatStatDlg.ShowNewContent(NewMode: TWindowMode; P: Integer);
+begin
+  if P < 0 then
     if ClientMode >= scContact then
-      pView := DipMem[me].pContact
+      pView := DipMem[Me].pContact
     else
     begin
@@ -160 +158 @@
       while (pView < nPl) and ((MyRO.Treaty[pView] < trNone) or
         (1 shl pView and MyRO.Alive = 0)) do
-        inc(pView);
+        Inc(pView);
       if pView >= nPl then
-        pView := me;
+        pView := Me;
     end
   else
-    pView := p;
+    pView := P;
   inherited ShowNewContent(NewMode);
 end;
@@ -178 +176 @@
   List: ^TChart;
 
-  function StatText(no: integer): string;
+  function StatText(no: Integer): string;
   var
-    i: integer;
+    I: Integer;
   begin
     if (CurrentReport.TurnOfCivilReport >= 0) and
-      (Server(sGetChart + no shl 4, me, pView, List^) >= rExecuted) then
+      (Server(sGetChart + no shl 4, Me, pView, List^) >= rExecuted) then
     begin
-      i := List[CurrentReport.TurnOfCivilReport];
+      I := List[CurrentReport.TurnOfCivilReport];
       case no of
         stPop:
-          result := Format(Phrases.Lookup('FRSTATPOP'), [i]);
+          Result := Format(Phrases.Lookup('FRSTATPOP'), [I]);
         stTerritory:
-          result := Format(Phrases.Lookup('FRSTATTER'), [i]);
+          Result := Format(Phrases.Lookup('FRSTATTER'), [I]);
         stScience:
-          result := Format(Phrases.Lookup('FRSTATTECH'), [i div nAdv]);
+          Result := Format(Phrases.Lookup('FRSTATTECH'), [I div nAdv]);
         stExplore:
-          result := Format(Phrases.Lookup('FRSTATEXP'),
-            [i * 100 div (G.lx * G.ly)]);
+          Result := Format(Phrases.Lookup('FRSTATEXP'),
+            [I * 100 div (G.lx * G.ly)]);
       end;
-    end
+    end;
   end;
 
 var
-  p1, Treaty: integer;
-  s: string;
-  HasContact, ExtinctPart: boolean;
+  p1, Treaty: Integer;
+  S: string;
+  HasContact, ExtinctPart: Boolean;
 begin
   GetMem(List, 4 * (MyRO.Turn + 2));
@@ -212 +210 @@
     (1 shl pView and MyRO.Alive <> 0) then
   begin
-    s := Format(Phrases.Lookup('FROLDCIVILREP'),
+    S := Format(Phrases.Lookup('FROLDCIVILREP'),
       [TurnToString(CurrentReport.TurnOfCivilReport)]);
-    ReportText.Add('C' + s);
+    ReportText.Add('C' + S);
     ReportText.Add('');
   end;
@@ -227 +225 @@
   ReportText.Add('S' + StatText(stScience));
   ReportText.Add('E' + StatText(stExplore));
-  HasContact := false;
+  HasContact := False;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (CurrentReport.Treaty[p1] > trNoContact) then
-      HasContact := true;
+    if (p1 <> Me) and (CurrentReport.Treaty[p1] > trNoContact) then
+      HasContact := True;
   if HasContact then
   begin
     ReportText.Add('');
     ReportText.Add(' ' + Phrases.Lookup('FRRELATIONS'));
-    for ExtinctPart := false to true do
+    for ExtinctPart := False to True do
       for Treaty := trAlliance downto trNone do
         for p1 := 0 to nPl - 1 do
-          if (p1 <> me) and (CurrentReport.Treaty[p1] = Treaty) and
+          if (p1 <> Me) and (CurrentReport.Treaty[p1] = Treaty) and
             ((1 shl p1 and MyRO.Alive = 0) = ExtinctPart) then
           begin
-            s := Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
+            S := Tribe[p1].TString(Phrases.Lookup('HAVETREATY', Treaty));
             if ExtinctPart then
-              s := '(' + s + ')';
-            ReportText.Add(char(48 + Treaty) + s);
+              S := '(' + S + ')';
+            ReportText.Add(char(48 + Treaty) + S);
           end;
   end;
@@ -254 +252 @@
 procedure TNatStatDlg.OffscreenPaint;
 var
-  i, y: integer;
-  s: string;
-  ps: pchar;
-  Extinct: boolean;
-
+  I, Y: Integer;
+  S: string;
+  ps: PChar;
+  Extinct: Boolean;
 begin
   inherited;
@@ -264 +261 @@
   Extinct := 1 shl pView and MyRO.Alive = 0;
 
-  DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+  DpiBitBltCanvas(Offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
     Back.Canvas, 0, 0);
 
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  RisedTextout(offscreen.Canvas,
+  Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  RisedTextout(Offscreen.Canvas,
     40 { (ClientWidth-BiColorTextWidth(offscreen.canvas,caption)) div 2 } ,
     7, Caption);
 
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-
-  with offscreen do
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+
+  with Offscreen do
   begin
     // show leader picture
@@ -280 +277 @@
     if Assigned(Tribe[pView].faceHGr) then
     begin
-      Dump(offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
+      Dump(Offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
         1 + Tribe[pView].facepix mod 10 * 65,
         1 + Tribe[pView].facepix div 10 * 49);
-      frame(offscreen.Canvas, 18 - 1, yIcon - 4 - 1, 18 + 64, yIcon - 4 + 48,
+      Frame(Offscreen.Canvas, 18 - 1, yIcon - 4 - 1, 18 + 64, yIcon - 4 + 48,
         $000000, $000000);
     end;
 
-    if (pView = me) or not Extinct then
+    if (pView = Me) or not Extinct then
       LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib,
         Phrases.Lookup('GOVERNMENT', CurrentReport.Government) +
         Phrases.Lookup('FRAND'));
-    if pView = me then
+    if pView = Me then
     begin
       LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 19,
@@ -305 +302 @@
           Phrases.Lookup('FREXTINCT'));
         LoweredTextOut(Canvas, -1, MainTexture, xAttrib, yAttrib + 28,
-          TurnToString(CurrentReport.TurnOfCivilReport))
+          TurnToString(CurrentReport.TurnOfCivilReport));
       end
       else
@@ -318 +315 @@
       if MyRO.Treaty[pView] = trNoContact then
       begin
-        s := Phrases.Lookup('FRNOCONTACT');
+        S := Phrases.Lookup('FRNOCONTACT');
         LoweredTextOut(Canvas, -1, MainTexture,
-          (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, yRelation + 9, s)
+          (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, yRelation + 9, S);
       end
       else if ShowContact then
@@ -344 +341 @@
         FrameImage(Canvas, BigImp, xIcon, yIcon, xSizeBig, ySizeBig, 0, 200)
         { else if CurrentReport.Government=gAnarchy then
-          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
+          FrameImage(Canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,112,400,
           ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact))
           else
-          FrameImage(canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
+          FrameImage(Canvas,BigImp,xIcon,yIcon,xSizeBig,ySizeBig,
           56*(CurrentReport.Government-1),40,
           ContactEnabled and (MyRO.Happened and phGameEnd=0) and (ClientMode<scContact)) };
@@ -365 +362 @@
       end;
 
-      y := 0;
-      for i := 0 to ReportText.Count - 1 do
-      begin
-        if (i >= LinesDown) and (i < LinesDown + ReportLines) then
+      Y := 0;
+      for I := 0 to ReportText.Count - 1 do
+      begin
+        if (I >= LinesDown) and (I < LinesDown + ReportLines) then
         begin
-          s := ReportText[i];
-          if s <> '' then
+          S := ReportText[I];
+          if S <> '' then
           begin
             // LineType:=s[1];
-            delete(s, 1, 1);
+            Delete(S, 1, 1);
             BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkMisc, cliPaperText],
-              $7F007F, xReport + 8, yReport + LineSpacing * y, s);
+              $7F007F, xReport + 8, yReport + LineSpacing * Y, S);
           end;
-          inc(y);
-        end
+          Inc(Y);
+        end;
       end;
     end
     else
     begin
-      s := Phrases.Lookup('FRNOCIVILREP');
-      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, s)) div 2,
-        yReport + hReport div 2 - 10, s);
+      S := Phrases.Lookup('FRNOCIVILREP');
+      RisedTextout(Canvas, (ClientWidth - BiColorTextWidth(Canvas, S)) div 2,
+        yReport + hReport div 2 - 10, S);
     end;
 
     if soTellAI in OptionChecked then begin
-      Server(sGetAIInfo, me, pView, ps);
+      Server(sGetAIInfo, Me, pView, ps);
       LoweredTextOut(Canvas, -1, MainTexture, 42, 445, ps);
     end else
@@ -396 +393 @@
         Phrases2.Lookup('MENU_TELLAI'));
   end;
-  ContactBtn.SetBack(offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
+
+  ContactBtn.SetBack(Offscreen.Canvas, ContactBtn.Left, ContactBtn.Top);
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TNatStatDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
 procedure TNatStatDlg.DialogBtnClick(Sender: TObject);
 var
-  ContactResult: integer;
+  ContactResult: Integer;
 begin
   ContactResult := MainScreen.DipCall(scContact + pView shl 4);
@@ -416 +414 @@
       SoundMessage(Phrases.Lookup('FRCOLDWAR'), 'MSG_DEFAULT')
     else if MyRO.Government = gAnarchy then
-      SoundMessage(Tribe[me].TPhrase('FRMYANARCHY'), 'MSG_DEFAULT')
+      SoundMessage(Tribe[Me].TPhrase('FRMYANARCHY'), 'MSG_DEFAULT')
     else if ContactResult = eAnarchy then
       if MyRO.Treaty[pView] >= trPeace then
       begin
         if MainScreen.ContactRefused(pView, 'FRANARCHY') then
-          SmartUpdateContent
+          SmartUpdateContent;
       end
       else
@@ -427 +425 @@
   end
   else
-    Close
+    Close;
 end;
 
 procedure TNatStatDlg.ToggleBtnClick(Sender: TObject);
 var
-  p1, StartCount: integer;
-  m: TDpiMenuItem;
-  ExtinctPart: boolean;
+  p1, StartCount: Integer;
+  M: TDpiMenuItem;
+  ExtinctPart: Boolean;
 begin
   EmptyMenu(Popup.Items);
 
   // own nation
-  if G.Difficulty[me] <> 0 then
-  begin
-    m := TDpiMenuItem.Create(Popup);
-    m.RadioItem := true;
-    m.Caption := Tribe[me].TPhrase('TITLE_NATION');
-    m.Tag := me;
-    m.OnClick := PlayerClick;
-    if me = pView then
-      m.Checked := true;
-    Popup.Items.Add(m);
+  if G.Difficulty[Me] <> 0 then
+  begin
+    M := TDpiMenuItem.Create(Popup);
+    M.RadioItem := True;
+    M.Caption := Tribe[Me].TPhrase('TITLE_NATION');
+    M.Tag := Me;
+    M.OnClick := PlayerClick;
+    if Me = pView then
+      M.Checked := True;
+    Popup.Items.Add(M);
   end;
 
   // foreign nations
-  for ExtinctPart := false to true do
+  for ExtinctPart := False to True do
   begin
     StartCount := Popup.Items.Count;
@@ -460 +458 @@
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] >= trNone) then
       begin
-        m := TDpiMenuItem.Create(Popup);
-        m.RadioItem := true;
-        m.Caption := Tribe[p1].TPhrase('TITLE_NATION');
+        M := TDpiMenuItem.Create(Popup);
+        M.RadioItem := True;
+        M.Caption := Tribe[p1].TPhrase('TITLE_NATION');
         if ExtinctPart then
-          m.Caption := '(' + m.Caption + ')';
-        m.Tag := p1;
-        m.OnClick := PlayerClick;
+          M.Caption := '(' + M.Caption + ')';
+        M.Tag := p1;
+        M.OnClick := PlayerClick;
         if p1 = pView then
-          m.Checked := true;
-        Popup.Items.Add(m);
+          M.Checked := True;
+        Popup.Items.Add(M);
       end;
     if (StartCount > 0) and (Popup.Items.Count > StartCount) then
     begin // seperator
-      m := TDpiMenuItem.Create(Popup);
-      m.Caption := '-';
-      Popup.Items.Insert(StartCount, m);
+      M := TDpiMenuItem.Create(Popup);
+      M.Caption := '-';
+      Popup.Items.Insert(StartCount, M);
     end;
   end;
@@ -482 +480 @@
 end;
 
-procedure TNatStatDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TNatStatDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 var
-  i: integer;
+  I: Integer;
 begin
   if Key = VK_F9 then // my key
   begin // toggle nation
-    i := 0;
+    I := 0;
     repeat
       pView := (pView + 1) mod nPl;
-      inc(i);
-    until (i >= nPl) or (1 shl pView and MyRO.Alive <> 0) and
+      Inc(I);
+    until (I >= nPl) or (1 shl pView and MyRO.Alive <> 0) and
       (MyRO.Treaty[pView] >= trNone);
-    if i >= nPl then
-      pView := me;
+    if I >= nPl then
+      pView := Me;
     Tag := pView;
     PlayerClick(self); // no, this is not nice
   end
   else
-    inherited
+    inherited;
 end;
 
 procedure TNatStatDlg.EcoChange;
 begin
-  if Visible and (pView = me) then
+  if Visible and (pView = Me) then
   begin
     SelfReport.Government := MyRO.Government;
     SelfReport.Money := MyRO.Money;
-    SmartUpdateContent
-  end
+    SmartUpdateContent;
+  end;
 end;
 
@@ -518 +516 @@
   if LinesDown > 0 then
   begin
-    dec(LinesDown);
+    Dec(LinesDown);
     SmartUpdateContent;
-  end
+  end;
 end;
 
@@ -527 +525 @@
   if LinesDown + ReportLines < ReportText.Count then
   begin
-    inc(LinesDown);
+    Inc(LinesDown);
     SmartUpdateContent;
-  end
+  end;
 end;
 
@@ -540 +538 @@
   else
     TellAIBtn.ButtonIndex := 2;
-  SmartUpdateContent
+  SmartUpdateContent;
 end;
 

branches/highdpi/LocalPlayer/Nego.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, ScreenTools, BaseWin, Protocol, Term, LCLType, SysUtils, Classes, Graphics,
+  UDpiControls, ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonA, ButtonB, ButtonN;
 
@@ -15 +15 @@
 type
   THistory = record
-    n: Integer;
+    N: Integer;
     Text: array[0 .. MaxHistory - 1] of ansistring;
   end;
 
   TCommandAllowedEnum = scDipNoticeStart..scDipBreakStart;
+  TPriceSet = set of $00..$FF;
 
   { TNegoDlg }
@@ -59 +60 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure OkBtnClick(Sender: TObject);
     procedure BwdBtnClick(Sender: TObject);
@@ -69 +70 @@
     procedure OfferClick(Sender: TObject);
     procedure FastBtnClick(Sender: TObject);
-
   public
     procedure Initiate; // first turn of negotiation, initiate
@@ -75 +75 @@
     procedure Start; // next turn of negotiation
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer);
-
+    procedure ShowNewContent(NewMode: TWindowMode);
   private
-    Page, DipCommand: integer;
+    Page, DipCommand: Integer;
     CurrentOffer: TOffer;
     MyAllowed, OppoAllowed: TPriceSet;
@@ -84 +83 @@
     History: array [0 .. nPl - 1] of THistory;
     RomanFont: TDpiFont;
-    Costs, Delivers: array [0 .. 11] of cardinal;
+    Costs, Delivers: array [0 .. 11] of Cardinal;
     procedure ResetCurrentOffer;
     procedure BuildCurrentOffer;
     procedure FindAllowed;
     procedure SplitText(Text: string; Bounds: TRect);
-    procedure PaintNationPicture(X, Y, p: integer);
+    procedure PaintNationPicture(X, Y, P: Integer);
     procedure SetButtonStates;
   end;
 
-var
-  NegoDlg: TNegoDlg;
 
 implementation
 
 uses
-  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx;
+  Messg, ClientTools, Diplomacy, Inp, Select, NatStat, Tribes, MessgEx, Term;
 
 {$R *.lfm}
@@ -136 +133 @@
     'VII', 'VIII', 'IX', 'X', 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI');
 
-  ButtonPrice: array [0 .. 11] of cardinal = (opChoose, opCivilReport,
+  ButtonPrice: array [0 .. 11] of Cardinal = (opChoose, opCivilReport,
     opMilReport, opMap, opAllTech, opAllTech, opAllModel, opMoney, opTreaty,
     opLowTreaty, opShipParts, opShipParts);
@@ -142 +139 @@
 procedure TNegoDlg.FormCreate(Sender: TObject);
 var
-  cix: integer;
+  cix: Integer;
 begin
   InitButtons;
@@ -153 +150 @@
         BackGraphic := HGrSystem2.Data;
         case Tag shr 8 of
-          1:
-            SmartHint := Phrases.Lookup('WANT', ButtonIndex - 6);
-          2:
-            SmartHint := Phrases.Lookup('OFFER', ButtonIndex - 6);
+          1: SmartHint := Phrases.Lookup('WANT', ButtonIndex - 6);
+          2: SmartHint := Phrases.Lookup('OFFER', ButtonIndex - 6);
         end;
       end;
 
-  fillchar(History, sizeof(History), 0);
+  FillChar(History, SizeOf(History), 0);
   RomanFont := TDpiFont.Create;
   RomanFont.Name := 'Times New Roman';
@@ -184 +179 @@
 procedure TNegoDlg.ResetCurrentOffer;
 var
-  i: integer;
+  I: Integer;
 begin
   CurrentOffer.nDeliver := 0;
   CurrentOffer.nCost := 0;
-  for i := 0 to 11 do
-    Costs[i] := $FFFFFFFF;
-  for i := 0 to 11 do
-    Delivers[i] := $FFFFFFFF;
-end;
-
-procedure TNegoDlg.ShowNewContent(NewMode: integer);
+  for I := 0 to 11 do
+    Costs[I] := $FFFFFFFF;
+  for I := 0 to 11 do
+    Delivers[I] := $FFFFFFFF;
+end;
+
+procedure TNegoDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -202 +197 @@
   else
     PassBtn.SmartHint := Phrases.Lookup('BTN_PASS');
-  case MyRO.Treaty[DipMem[me].pContact] of
+  case MyRO.Treaty[DipMem[Me].pContact] of
     trNone:
       begin
@@ -238 +233 @@
 begin
   if ClientMode <> scDipStart then
-    with History[me] do
-    begin
-      if n = MaxHistory then
-      begin
-        move(Text[2], Text[0], (MaxHistory - 2) * sizeof(integer));
-        dec(n, 2);
+    with History[Me] do
+    begin
+      if N = MaxHistory then
+      begin
+        Move(Text[2], Text[0], (MaxHistory - 2) * SizeOf(Integer));
+        Dec(N, 2);
       end;
-      Text[n] := copy(DipCommandToString(DipMem[me].pContact, me,
-        DipMem[me].FormerTreaty, DipMem[me].SentCommand, ClientMode,
-        DipMem[me].SentOffer, ReceivedOffer), 1, 255);
-      inc(n);
+      Text[N] := Copy(DipCommandToString(DipMem[Me].pContact, Me,
+        DipMem[Me].FormerTreaty, DipMem[Me].SentCommand, ClientMode,
+        DipMem[Me].SentOffer, ReceivedOffer), 1, 255);
+      Inc(N);
     end;
-  assert(History[me].n mod 2 = 1);
-
-  Page := History[me].n;
+  Assert(History[Me].N mod 2 = 1);
+
+  Page := History[Me].N;
   FindAllowed;
   ResetCurrentOffer;
@@ -284 +279 @@
 procedure TNegoDlg.SplitText(Text: string; Bounds: TRect);
 var
-  nLines, Line, Start, Stop, OrdinaryStop, Indent, Y: integer;
-  s: string;
-  preview, Dot: boolean;
+  nLines, Line, Start, Stop, OrdinaryStop, Indent, Y: Integer;
+  S: string;
+  preview, Dot: Boolean;
 begin
   nLines := 0;
-  for preview := true downto false do
+  for preview := True downto False do
   begin
     Start := 1;
@@ -296 +291 @@
     while Start < Length(Text) do
     begin
-      Dot := false;
+      Dot := False;
       if (Start = 1) or (Text[Start - 1] = '\') then
         if Text[Start] = '-' then
         begin
           Indent := ListIndent;
-          inc(Start);
+          Inc(Start);
           if Start = Length(Text) then
-            break;
-          Dot := true;
+            Break;
+          Dot := True;
         end
         else
@@ -311 +306 @@
       while (Stop < Length(Text)) and (Text[Stop] <> '\') do
       begin
-        inc(Stop);
+        Inc(Stop);
         if BiColorTextWidth(Offscreen.Canvas,
-          copy(Text, Start, Stop - Start + 1)) > Bounds.Right - Bounds.Left -
+          Copy(Text, Start, Stop - Start + 1)) > Bounds.Right - Bounds.Left -
           PaperBorder_Left - PaperBorder_Right - Indent then
         begin
-          dec(Stop);
-          break
+          Dec(Stop);
+          Break
         end;
       end;
@@ -325 +320 @@
         while (Text[OrdinaryStop + 1] <> ' ') and
           (Text[OrdinaryStop + 1] <> '\') do
-          dec(OrdinaryStop);
+          Dec(OrdinaryStop);
         if (OrdinaryStop + 1 - Start) * 2 >= Stop - Start then
           Stop := OrdinaryStop
@@ -335 +330 @@
           Sprite(Offscreen, HGrSystem, Bounds.Left + PaperBorder_Left +
             (ListIndent - 14), Y + 7, 8, 8, 90, 16);
-        s := copy(Text, Start, Stop - Start + 1);
+        S := Copy(Text, Start, Stop - Start + 1);
         BiColorTextOut(Offscreen.Canvas, Colors.Canvas.Pixels[clkMisc,
           cliPaperText], $7F007F, Bounds.Left + PaperBorder_Left +
-          Indent, Y, s);
+          Indent, Y, S);
       end;
-      inc(Line);
+      Inc(Line);
       Start := Stop + 2;
     end;
@@ -349 +344 @@
 procedure TNegoDlg.FindAllowed;
 var
-  i: integer;
+  I: Integer;
 begin
   CommandAllowed := [scDipOffer - scDipStart];
   if ClientMode <> scDipBreak then
-    include(CommandAllowed, scDipBreak - scDipStart);
-  if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
-    include(CommandAllowed, scDipCancelTreaty - scDipStart);
-  if (ClientMode = scDipOffer) and (Server(scDipAccept - sExecute, me, 0, nil^)
+    Include(CommandAllowed, scDipBreak - scDipStart);
+  if MyRO.Treaty[DipMem[Me].pContact] >= trPeace then
+    Include(CommandAllowed, scDipCancelTreaty - scDipStart);
+  if (ClientMode = scDipOffer) and (Server(scDipAccept - sExecute, Me, 0, nil^)
     >= rExecuted) then
-    include(CommandAllowed, scDipAccept - scDipStart);
+    Include(CommandAllowed, scDipAccept - scDipStart);
 
   MyAllowed := [opChoose shr 24, opMoney shr 24];
   OppoAllowed := [opChoose shr 24, opMoney shr 24];
-  if not IsCivilReportNew(DipMem[me].pContact) then
+  if not IsCivilReportNew(DipMem[Me].pContact) then
   begin // no up-to-date civil report
     MyAllowed := MyAllowed + [opCivilReport shr 24];
-    for i := 0 to nAdv - 1 do
-      if MyRO.Tech[i] >= tsApplicable then
+    for I := 0 to nAdv - 1 do
+      if MyRO.Tech[I] >= tsApplicable then
       begin
         MyAllowed := MyAllowed + [opAllTech shr 24];
-        break
+        Break
       end;
     OppoAllowed := OppoAllowed + [opCivilReport shr 24, opAllTech shr 24];
@@ -375 +370 @@
   else
   begin // check techs
-    for i := 0 to nAdv - 1 do
-      if not(i in FutureTech) then
-        if (MyRO.Tech[i] < tsSeen) and
-          (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
+    for I := 0 to nAdv - 1 do
+      if not(I in FutureTech) then
+        if (MyRO.Tech[I] < tsSeen) and
+          (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
           OppoAllowed := OppoAllowed + [opAllTech shr 24]
-        else if (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) and
-          (MyRO.Tech[i] >= tsApplicable) then
+        else if (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) and
+          (MyRO.Tech[I] >= tsApplicable) then
           MyAllowed := MyAllowed + [opAllTech shr 24];
   end;
-  if not IsMilReportNew(DipMem[me].pContact) then
+  if not IsMilReportNew(DipMem[Me].pContact) then
   begin // no up-to-date military report
     MyAllowed := MyAllowed + [opMilReport shr 24];
@@ -393 +388 @@
   else
   begin
-    if ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseModel) <> mixAll then
       MyAllowed := MyAllowed + [opAllModel shr 24];
-    if ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
+    if MainScreen.ModalSelectDlg.OnlyChoice(kChooseEModel) <> mixAll then
       OppoAllowed := OppoAllowed + [opAllModel shr 24];
   end;
-  if MyRO.Treaty[DipMem[me].pContact] < trAlliance then
+  if MyRO.Treaty[DipMem[Me].pContact] < trAlliance then
   begin
     MyAllowed := MyAllowed + [opTreaty shr 24, opMap shr 24];
@@ -408 +403 @@
     OppoAllowed:=OppoAllowed+[opLowTreaty shr 24];
     end; }
-  for i := 0 to nShipPart - 1 do
-  begin
-    if MyRO.Ship[me].Parts[i] > 0 then
-      include(MyAllowed, opShipParts shr 24);
-    if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
-      include(OppoAllowed, opShipParts shr 24);
-  end;
-  MyAllowed := MyAllowed - DipMem[me].DeliveredPrices *
+  for I := 0 to nShipPart - 1 do
+  begin
+    if MyRO.Ship[Me].Parts[I] > 0 then
+      Include(MyAllowed, opShipParts shr 24);
+    if MyRO.Ship[DipMem[Me].pContact].Parts[I] > 0 then
+      Include(OppoAllowed, opShipParts shr 24);
+  end;
+  MyAllowed := MyAllowed - DipMem[Me].DeliveredPrices *
     [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
     opMilReport shr 24, opMap shr 24];
-  OppoAllowed := OppoAllowed - DipMem[me].ReceivedPrices *
+  OppoAllowed := OppoAllowed - DipMem[Me].ReceivedPrices *
     [opAllTech shr 24, opAllModel shr 24, opCivilReport shr 24,
     opMilReport shr 24, opMap shr 24];
 end;
 
-procedure TNegoDlg.PaintNationPicture(X, Y, p: integer);
+procedure TNegoDlg.PaintNationPicture(X, Y, P: Integer);
 begin
   with Offscreen.Canvas do
   begin
     Pen.Color := $000000;
-    Brush.Color := Tribe[p].Color;
+    Brush.Color := Tribe[P].Color;
     Rectangle(X - 6, Y - 1, X + 70, Y + 49);
     Brush.Color := $000000;
-    Tribe[p].InitAge(GetAge(p));
-    if Assigned(Tribe[p].faceHGr) then
-      Dump(Offscreen, Tribe[p].faceHGr, X, Y, 64, 48,
-        1 + Tribe[p].facepix mod 10 * 65, 1 + Tribe[p].facepix div 10 * 49)
+    Tribe[P].InitAge(GetAge(P));
+    if Assigned(Tribe[P].faceHGr) then
+      Dump(Offscreen, Tribe[P].faceHGr, X, Y, 64, 48,
+        1 + Tribe[P].facepix mod 10 * 65, 1 + Tribe[P].facepix div 10 * 49)
     else
       FillRect(Rect(X, Y, X + 64, Y + 48));
@@ -444 +439 @@
 procedure TNegoDlg.SetButtonStates;
 var
-  cix: integer;
-  IsActionPage: boolean;
-begin
-  IsActionPage := Page = History[me].n;
+  cix: Integer;
+  IsActionPage: Boolean;
+begin
+  IsActionPage := Page = History[Me].N;
 
   AcceptBtn.Possible := IsActionPage and
@@ -478 +473 @@
                 (ButtonPrice[Tag and $FF] shr 24 in MyAllowed);
               Lit := Delivers[Tag and $FF] <> $FFFFFFFF;
-            end
+            end;
         end;
 end;
@@ -484 +479 @@
 procedure TNegoDlg.OffscreenPaint;
 var
-  i, cred: integer;
-  s: string;
-  OkEnabled: boolean;
+  I, cred: Integer;
+  S: string;
+  OkEnabled: Boolean;
 begin
   if (OffscreenUser <> nil) and (OffscreenUser <> self) then
@@ -493 +488 @@
   OffscreenUser := self;
 
-  if (DipCommand >= 0) and (Page = History[me].n) then
-    History[me].Text[History[me].n] :=
-      copy(DipCommandToString(me, DipMem[me].pContact,
-      MyRO.Treaty[DipMem[me].pContact], ClientMode, DipCommand, ReceivedOffer,
+  if (DipCommand >= 0) and (Page = History[Me].N) then
+    History[Me].Text[History[Me].N] :=
+      Copy(DipCommandToString(Me, DipMem[Me].pContact,
+      MyRO.Treaty[DipMem[Me].pContact], ClientMode, DipCommand, ReceivedOffer,
       CurrentOffer), 1, 255);
 
-  FwdBtn.Visible := Page < History[me].n;
+  FwdBtn.Visible := Page < History[Me].N;
   BwdBtn.Visible := Page >= 2;
-  if Page < History[me].n then
-    OkEnabled := false
+  if Page < History[Me].N then
+    OkEnabled := False
   else if DipCommand = scDipOffer then
-    OkEnabled := Server(scDipOffer - sExecute, me, 0, CurrentOffer) >= rExecuted
+    OkEnabled := Server(scDipOffer - sExecute, Me, 0, CurrentOffer) >= rExecuted
   else
     OkEnabled := DipCommand >= 0;
@@ -533 +528 @@
     yPad1 + 41 + 42 * 2, $FFFFFF, $B0B0B0);
 
-  PaintNationPicture(xNationPicture0, yNationPicture, DipMem[me].pContact);
-  PaintNationPicture(xNationPicture1, yNationPicture, me);
-
-  if History[me].Text[Page - 1] <> '' then
+  PaintNationPicture(xNationPicture0, yNationPicture, DipMem[Me].pContact);
+  PaintNationPicture(xNationPicture1, yNationPicture, Me);
+
+  if History[Me].Text[Page - 1] <> '' then
   begin
     FillSeamless(Offscreen.Canvas, xText0, yText0, wText, hText, 0, 0, Paper);
-    i := Page - 1;
-    if History[me].Text[0] = '' then
-      dec(i);
-    if i < 16 then
+    I := Page - 1;
+    if History[Me].Text[0] = '' then
+      Dec(I);
+    if I < 16 then
     begin
       Offscreen.Canvas.Font.Assign(RomanFont);
       Offscreen.Canvas.TextOut
-        (xText0 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-        yText0 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
-        RomanNo[i]);
+        (xText0 + (wText - Offscreen.Canvas.TextWidth(RomanNo[I])) div 2,
+        yText0 + (hText - Offscreen.Canvas.TextHeight(RomanNo[I])) div 2,
+        RomanNo[I]);
     end
   end;
   FillSeamless(Offscreen.Canvas, xText1, yText1, wText, hText, 0, 0, Paper);
-  i := Page;
-  if History[me].Text[0] = '' then
-    dec(i);
-  if i < 16 then
+  I := Page;
+  if History[Me].Text[0] = '' then
+    Dec(I);
+  if I < 16 then
   begin
     Offscreen.Canvas.Font.Assign(RomanFont);
     Offscreen.Canvas.TextOut
-      (xText1 + (wText - Offscreen.Canvas.TextWidth(RomanNo[i])) div 2,
-      yText1 + (hText - Offscreen.Canvas.TextHeight(RomanNo[i])) div 2,
-      RomanNo[i]);
+      (xText1 + (wText - Offscreen.Canvas.TextWidth(RomanNo[I])) div 2,
+      yText1 + (hText - Offscreen.Canvas.TextHeight(RomanNo[I])) div 2,
+      RomanNo[I]);
   end;
   with Offscreen.Canvas do
   begin
     Brush.Color := MainTexture.ColorBevelShade;
-    if History[me].Text[Page - 1] <> '' then
+    if History[Me].Text[Page - 1] <> '' then
     begin
       FillRect(Rect(xText0 + wText, yText0 + PaperShade,
@@ -584 +579 @@
   { if Page=History[me].n then
     begin // show attitude
-    s:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[me].pContact].Attitude);
+    S:=Phrases.Lookup('ATTITUDE',MyRO.EnemyReport[DipMem[Me].pContact].Attitude);
     //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
     RisedTextOut(Offscreen.Canvas,xText0+wText div 2-
-    BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
-    s:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[me].pContact]);
+    BiColorTextWidth(Offscreen.Canvas,S) div 2,yAttitude,S);
+    S:=Phrases.Lookup('ATTITUDE',MyRO.Attitude[DipMem[Me].pContact]);
     //LoweredTextOut(Offscreen.Canvas,-1,MainTexture,
     RisedTextOut(Offscreen.Canvas,xText1+wText div 2-
-    BiColorTextWidth(Offscreen.Canvas,s) div 2,yAttitude,s);
+    BiColorTextWidth(Offscreen.Canvas,S) div 2,yAttitude,S);
     end; }
 
-  if History[me].Text[Page - 1] <> '' then
-    SplitText(History[me].Text[Page - 1], Rect(xText0, yText0, xText0 + wText,
+  if History[Me].Text[Page - 1] <> '' then
+    SplitText(History[Me].Text[Page - 1], Rect(xText0, yText0, xText0 + wText,
       yText0 + hText));
-  if (Page < History[me].n) or OkEnabled then
-    SplitText(History[me].Text[Page], Rect(xText1, yText1, xText1 + wText,
+  if (Page < History[Me].N) or OkEnabled then
+    SplitText(History[Me].Text[Page], Rect(xText1, yText1, xText1 + wText,
       yText1 + hText));
 
   // show credibility
   Offscreen.Canvas.Font.Assign(UniFont[ftTiny]);
-  cred := MyRO.EnemyReport[DipMem[me].pContact].Credibility;
+  cred := MyRO.EnemyReport[DipMem[Me].pContact].Credibility;
   case cred of
     0 .. 49:
-      i := 3;
+      I := 3;
     50 .. 90:
-      i := 0;
+      I := 0;
     91 .. 100:
-      i := 1;
-  end;
-  PaintProgressBar(Offscreen.Canvas, i, xCred0, yCred0 + 17, (cred + 2) div 5,
+      I := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, I, xCred0, yCred0 + 17, (cred + 2) div 5,
     0, 20, MainTexture);
-  s := IntToStr(cred);
+  S := IntToStr(cred);
   RisedTextOut(Offscreen.Canvas, xCred0 + 10 -
-    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred0, s);
+    (BiColorTextWidth(Offscreen.Canvas, S) + 1) div 2, yCred0, S);
   case MyRO.Credibility of
     0 .. 49:
-      i := 3;
+      I := 3;
     50 .. 90:
-      i := 0;
+      I := 0;
     91 .. 100:
-      i := 1;
-  end;
-  PaintProgressBar(Offscreen.Canvas, i, xCred1, yCred1 + 17,
+      I := 1;
+  end;
+  PaintProgressBar(Offscreen.Canvas, I, xCred1, yCred1 + 17,
     (MyRO.Credibility + 2) div 5, 0, 20, MainTexture);
-  s := IntToStr(MyRO.Credibility);
+  S := IntToStr(MyRO.Credibility);
   RisedTextOut(Offscreen.Canvas, xCred1 + 10 -
-    (BiColorTextWidth(Offscreen.Canvas, s) + 1) div 2, yCred1, s);
+    (BiColorTextWidth(Offscreen.Canvas, S) + 1) div 2, yCred1, S);
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TNegoDlg.Initiate;
 begin
-  History[me].n := 1;
-  History[me].Text[0] := '';
+  History[Me].N := 1;
+  History[Me].Text[0] := '';
 end;
 
 procedure TNegoDlg.Respond;
 begin
-  History[me].n := 0;
+  History[Me].N := 0;
 end;
 
 procedure TNegoDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, DipMem[me].pContact)
+    MainScreen.NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[Me].pContact)
   else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(FWindowMode or wmPersistent, me)
+    MainScreen.NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), Me)
 end;
 
 procedure TNegoDlg.BwdBtnClick(Sender: TObject);
 begin
-  dec(Page, 2);
+  Dec(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
@@ -665 +660 @@
 procedure TNegoDlg.FwdBtnClick(Sender: TObject);
 begin
-  inc(Page, 2);
+  Inc(Page, 2);
   SetButtonStates;
   SmartUpdateContent;
@@ -672 +667 @@
 procedure TNegoDlg.OkBtnClick(Sender: TObject);
 begin
-  inc(History[me].n);
+  Inc(History[Me].N);
   if DipCommand = scDipOffer then
     MainScreen.OfferCall(CurrentOffer)
@@ -698 +693 @@
 procedure TNegoDlg.BuildCurrentOffer;
 var
-  i: integer;
+  I: Integer;
 begin
   CurrentOffer.nDeliver := 0;
   CurrentOffer.nCost := 0;
-  for i := 0 to 11 do
-    if Delivers[i] <> $FFFFFFFF then
-    begin
-      CurrentOffer.Price[CurrentOffer.nDeliver] := Delivers[i];
-      inc(CurrentOffer.nDeliver);
+  for I := 0 to 11 do
+    if Delivers[I] <> $FFFFFFFF then
+    begin
+      CurrentOffer.Price[CurrentOffer.nDeliver] := Delivers[I];
+      Inc(CurrentOffer.nDeliver);
     end;
-  for i := 0 to 11 do
-    if Costs[i] <> $FFFFFFFF then
+  for I := 0 to 11 do
+    if Costs[I] <> $FFFFFFFF then
     begin
       CurrentOffer.Price[CurrentOffer.nDeliver + CurrentOffer.nCost] :=
-        Costs[i];
-      inc(CurrentOffer.nCost);
+        Costs[I];
+      Inc(CurrentOffer.nCost);
     end;
 end;
@@ -719 +714 @@
 procedure TNegoDlg.WantClick(Sender: TObject);
 var
-  a, i, max: integer;
-  Price: cardinal;
-begin
-  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+  A, I, Max: Integer;
+  Price: Cardinal;
+begin
+  if (Page <> History[Me].N) or (ClientMode = scDipCancelTreaty) or
     (ClientMode = scDipBreak) then
-    exit;
+    Exit;
   if Costs[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
     Price := $FFFFFFFF // toggle off
@@ -732 +727 @@
     begin
       SimpleMessage(Phrases.Lookup('MAX2WANTS'));
-      exit
+      Exit;
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
     if not(Price shr 24 in OppoAllowed) then
-      exit;
+      Exit;
     case Price of
       opCivilReport, opMilReport:
-        inc(Price, DipMem[me].pContact shl 16 + MyRO.Turn);
+        Inc(Price, DipMem[Me].pContact shl 16 + MyRO.Turn);
         // !!! choose player and year!
       opMoney:
@@ -748 +743 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
-            exit;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
+            Exit;
+          Inc(Price, A);
         end;
       opShipParts:
         begin // choose type and number
           if MyRO.NatBuilt[imSpacePort] = 0 then
-            with MessgExDlg do
+            with MainScreen.MessgExDlg do
             begin
               OpenSound := 'WARNING_LOWSUPPORT';
@@ -766 +761 @@
               ShowModal;
               if ModalResult <> mrOK then
-                exit
+                Exit;
             end;
-          ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          inc(Price, ModalSelectDlg.result shl 16);
-          max := MyRO.Ship[DipMem[me].pContact].Parts[ModalSelectDlg.result];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kEShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[DipMem[Me].pContact].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -778 +773 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) then
-            exit;
-          if a > max then
-            a := max;
-          if a > MaxShipPartPrice then
-            a := MaxShipPartPrice;
-          inc(Price, a)
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) then
+            Exit;
+          if A > Max then
+            A := Max;
+          if A > MaxShipPartPrice then
+            A := MaxShipPartPrice;
+          Inc(Price, A);
         end;
       opAllTech:
         begin // choose technology
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = adAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseETech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseEModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + MyRO.EnemyModel[ModalSelectDlg.result].mix;
+            Price := OpModel + MyRO.EnemyModel[MainScreen.ModalSelectDlg.Result].mix;
         end;
       opTreaty:
         begin
-          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+          if MyRO.Treaty[DipMem[Me].pContact] < trPeace then
             Price := opTreaty + trPeace
           else
-            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+            Price := opTreaty + MyRO.Treaty[DipMem[Me].pContact] + 1;
         end;
       { opLowTreaty:
         begin
-        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        if MyRO.Treaty[DipMem[Me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
         end }
     end;
@@ -832 +827 @@
 procedure TNegoDlg.OfferClick(Sender: TObject);
 var
-  a, i, max: integer;
-  Price: cardinal;
-begin
-  if (Page <> History[me].n) or (ClientMode = scDipCancelTreaty) or
+  A, I, Max: Integer;
+  Price: Cardinal;
+begin
+  if (Page <> History[Me].N) or (ClientMode = scDipCancelTreaty) or
     (ClientMode = scDipBreak) then
-    exit;
+    Exit;
   if Delivers[TButtonN(Sender).Tag and $FF] <> $FFFFFFFF then
     Price := $FFFFFFFF // toggle off
@@ -845 +840 @@
     begin
       SimpleMessage(Phrases.Lookup('MAX2OFFERS'));
-      exit
+      Exit;
     end;
     Price := ButtonPrice[TButtonN(Sender).Tag and $FF];
     if not(Price shr 24 in MyAllowed) then
-      exit;
+      Exit;
     case Price of
       opCivilReport, opMilReport:
-        inc(Price, me shl 16 + MyRO.Turn); // !!! choose player and year!
+        Inc(Price, Me shl 16 + MyRO.Turn); // !!! choose player and year!
       opMoney:
         begin // choose amount
@@ -860 +855 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) or (a >= MaxMoneyPrice) then
-            exit;
-          if (Price = opMoney) and (a > MyRO.Money) then
-            a := MyRO.Money;
-          inc(Price, a);
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) or (A >= MaxMoneyPrice) then
+            Exit;
+          if (Price = opMoney) and (A > MyRO.Money) then
+            A := MyRO.Money;
+          Inc(Price, A);
         end;
       opShipParts:
         begin // choose type and number
-          ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          inc(Price, ModalSelectDlg.result shl 16);
-          max := MyRO.Ship[me].Parts[ModalSelectDlg.result];
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kShipPart);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          Inc(Price, MainScreen.ModalSelectDlg.Result shl 16);
+          Max := MyRO.Ship[Me].Parts[MainScreen.ModalSelectDlg.Result];
           InputDlg.Caption := Phrases.Lookup('TITLE_NUMBER');
           InputDlg.EInput.Text := '';
@@ -880 +875 @@
           InputDlg.ShowModal;
           if InputDlg.ModalResult <> mrOK then
-            exit;
-          val(InputDlg.EInput.Text, a, i);
-          if (i <> 0) or (a <= 0) then
-            exit;
-          if a > max then
-            a := max;
-          if a > MaxShipPartPrice then
-            a := MaxShipPartPrice;
-          inc(Price, a)
+            Exit;
+          val(InputDlg.EInput.Text, A, I);
+          if (I <> 0) or (A <= 0) then
+            Exit;
+          if A > Max then
+            A := Max;
+          if A > MaxShipPartPrice then
+            A := MaxShipPartPrice;
+          Inc(Price, A);
         end;
       opAllTech:
         begin // choose technology
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = adAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseTech);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = adAll then
             Price := opAllTech
           else
-            Price := OpTech + ModalSelectDlg.result;
+            Price := OpTech + MainScreen.ModalSelectDlg.Result;
         end;
       opAllModel:
         begin // choose model
-          ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
-          if ModalSelectDlg.result < 0 then
-            exit;
-          if ModalSelectDlg.result = mixAll then
+          MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kChooseModel);
+          if MainScreen.ModalSelectDlg.Result < 0 then
+            Exit;
+          if MainScreen.ModalSelectDlg.Result = mixAll then
             Price := opAllModel
           else
-            Price := OpModel + ModalSelectDlg.result
+            Price := OpModel + MainScreen.ModalSelectDlg.Result;
         end;
       opTreaty:
         begin
-          if MyRO.Treaty[DipMem[me].pContact] < trPeace then
+          if MyRO.Treaty[DipMem[Me].pContact] < trPeace then
             Price := opTreaty + trPeace
           else
-            Price := opTreaty + MyRO.Treaty[DipMem[me].pContact] + 1;
+            Price := opTreaty + MyRO.Treaty[DipMem[Me].pContact] + 1;
         end;
       { opLowTreaty:
         begin
-        if MyRO.Treaty[DipMem[me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-        else Price:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
+        if MyRO.Treaty[DipMem[Me].pContact]=trNone then Price:=opTreaty+trCeaseFire
+        else Price:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
         end }
     end;
@@ -934 +929 @@
 procedure TNegoDlg.FastBtnClick(Sender: TObject);
 var
-  NewCommand: cardinal;
-begin
-  if Page <> History[me].n then
-    exit;
+  NewCommand: Cardinal;
+begin
+  if Page <> History[Me].N then
+    Exit;
   NewCommand := TButtonN(Sender).Tag and $FF + scDipStart;
   if not(NewCommand - scDipStart in CommandAllowed) then
-    exit;
+    Exit;
   if (NewCommand = scDipCancelTreaty) and
-    (MyRO.Turn < MyRO.LastCancelTreaty[DipMem[me].pContact] + CancelTreatyTurns)
+    (MyRO.Turn < MyRO.LastCancelTreaty[DipMem[Me].pContact] + CancelTreatyTurns)
   then
   begin
     SimpleMessage(Phrases.Lookup('CANCELTREATYRUSH'));
-    exit;
+    Exit;
   end;
   if (NewCommand = scDipOffer) and ((ClientMode = scDipCancelTreaty) or

branches/highdpi/LocalPlayer/PVSB.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, {$IFDEF WINDOWS}
-  Windows,
-  {$ENDIF}
+  UDpiControls, {$IFDEF WINDOWS}Windows,{$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
   StdCtrls, Math;
@@ -32 +30 @@
     procedure Init(Max, PageSize: Integer);
     procedure SetPos(Pos: Integer);
-    function Process(const Msg: TMessage): boolean;
+    function Process(const Msg: TMessage): Boolean;
     function ProcessMouseWheel(Delta: Integer): Boolean;
-    procedure Show(Visible: boolean);
+    procedure Show(Visible: Boolean);
     procedure EndSB;
     procedure SetBorderSpacing(Top, Right, Bottom: Integer);
@@ -65 +63 @@
 end;
 
-function TPVScrollBar.Process(const Msg: TMessage): boolean;
+function TPVScrollBar.Process(const Msg: TMessage): Boolean;
 var
-  NewPos: integer;
+  NewPos: Integer;
 begin
     if Max < ScrollBar.PageSize then
-      result := false
+      Result := False
     else
     begin
       if (Msg.wParam and $ffff) in [SB_THUMBPOSITION, SB_THUMBTRACK] then
       begin
-        result := ((Msg.wParam shr 16) and $ffff) <> ScrollBar.Position;
+        Result := ((Msg.wParam shr 16) and $ffff) <> ScrollBar.Position;
         ScrollBar.Position := (Msg.wParam shr 16) and $ffff;
       end else begin
@@ -94 +92 @@
         if NewPos > Max - ScrollBar.PageSize + 1 then
           NewPos := Max - ScrollBar.PageSize + 1;
-        result := NewPos <> ScrollBar.Position;
+        Result := NewPos <> ScrollBar.Position;
         if (NewPos <> ScrollBar.Position) or ((Msg.wParam and $ffff) = SB_ENDSCROLL) then
         begin
@@ -105 +103 @@
 function TPVScrollBar.ProcessMouseWheel(Delta: Integer): Boolean;
 var
-  NewPos: integer;
+  NewPos: Integer;
 begin
     if Max < ScrollBar.PageSize then Result := False
@@ -120 +118 @@
 end;
 
-procedure TPVScrollBar.Show(Visible: boolean);
+procedure TPVScrollBar.Show(Visible: Boolean);
 begin
   if not Visible or (Max < ScrollBar.PageSize) then

branches/highdpi/LocalPlayer/Rates.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
-
-  SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC;
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, ButtonC;
 
 type
@@ -23 +21 @@
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer);
-  end;
-
-var
-  RatesDlg: TRatesDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
+
 
 implementation
@@ -47 +43 @@
 procedure TRatesDlg.OffscreenPaint;
 var
-  p, x, y, current, max, i: integer;
-  s, s1: string;
+  P, X, Y, current, Max, I: Integer;
+  S, s1: string;
 begin
   if (OffscreenUser <> nil) and (OffscreenUser <> self) then
@@ -65 +61 @@
   BtnFrame(Offscreen.Canvas, CloseBtn.BoundsRect, MainTexture);
   Offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
-  s := Phrases.Lookup('TITLE_RATES');
+  S := Phrases.Lookup('TITLE_RATES');
   RisedTextOut(Offscreen.Canvas,
-    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s)) div 2 - 1, 7, s);
-
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-    s := Phrases.Lookup('NORATES')
-  else
-    s := Phrases.Lookup('RATES');
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2 - 1, 7, S);
+
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+    S := Phrases.Lookup('NORATES')
+  else
+    S := Phrases.Lookup('RATES');
   Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
-  p := pos('\', s);
-  if p = 0 then
-    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, s))
-      div 2, 114, s)
-  else
-  begin
-    s1 := copy(s, 1, p - 1);
+  P := Pos('\', S);
+  if P = 0 then
+    RisedTextOut(Offscreen.Canvas, (ClientWidth - BiColorTextWidth(Canvas, S))
+      div 2, 114, S)
+  else
+  begin
+    s1 := Copy(S, 1, P - 1);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
       114 - MessageLineSpacing div 2, s1);
-    s1 := copy(s, p + 1, 255);
+    s1 := Copy(S, P + 1, 255);
     RisedTextOut(Offscreen.Canvas,
       (ClientWidth - BiColorTextWidth(Offscreen.Canvas, s1)) div 2,
@@ -91 +87 @@
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
   begin
     GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2, 52, xSizeBig,
-      ySizeBig, Tribe[me].Color);
-    DpiBitCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
+      ySizeBig, Tribe[Me].Color);
+    DpiBitBltCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
       xSizeBig, ySizeBig, BigImp.Canvas, (woLiberty mod 7) * xSizeBig,
       (woLiberty div 7 + SystemIconLines) * ySizeBig);
@@ -103 +99 @@
     // ImageOp_CBC(Offscreen,Templates,260,40,145,112,36,36,$404000,$8B8BEB);
 
-    s := Phrases.Lookup('SCIENCE');
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 44, s);
-    s := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 120 - BiColorTextWidth(Offscreen.Canvas, s), 60, s);
+    S := Phrases.Lookup('SCIENCE');
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 44, S);
+    S := Format('%d%%', [100 - MyRO.TaxRate - MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 120 - BiColorTextWidth(Offscreen.Canvas, S), 60, S);
     // PaintProgressBar(Offscreen.Canvas,2,16,81,(100-MyRO.LuxRate-MyRO.TaxRate)*120 div 100,0,120,MainTexture);
 
     // reverse progress bar for science
-    x := 16;
-    y := 81;
+    X := 16;
+    Y := 81;
     current := (100 - MyRO.LuxRate - MyRO.TaxRate) * 120 div 100;
-    max := 120;
-    Frame(Offscreen.Canvas, x - 1, y - 1, x + max, y + 7, $000000, $000000);
-    RFrame(Offscreen.Canvas, x - 2, y - 2, x + max + 1, y + 8,
+    Max := 120;
+    Frame(Offscreen.Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
+    RFrame(Offscreen.Canvas, X - 2, Y - 2, X + Max + 1, Y + 8,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     with Offscreen.Canvas do
     begin
-      for i := 0 to current div 8 - 1 do
-        DpiBitCanvas(Offscreen.Canvas, x + max - 8 - i * 8, y, 8, 7,
+      for I := 0 to current div 8 - 1 do
+        DpiBitBltCanvas(Offscreen.Canvas, X + Max - 8 - I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
-      DpiBitCanvas(Offscreen.Canvas, x + max - current, y, current - 8 * (current div 8), 7,
+      DpiBitBltCanvas(Offscreen.Canvas, X + Max - current, Y, current - 8 * (current div 8), 7,
         HGrSystem.Data.Canvas, 104, 9 + 8 * 2);
       Brush.Color := $000000;
-      FillRect(Rect(x, y, x + max - current, y + 7));
+      FillRect(Rect(X, Y, X + Max - current, Y + 7));
       Brush.Style := bsClear;
     end;
 
     RisedTextOut(Offscreen.Canvas, 16 + 160, 44, Phrases.Lookup('LUX'));
-    s := Format('%d%%', [MyRO.LuxRate]);
-    RisedTextOut(Offscreen.Canvas,
-      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, s);
+    S := Format('%d%%', [MyRO.LuxRate]);
+    RisedTextOut(Offscreen.Canvas,
+      16 + 160 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 60, S);
     PaintProgressBar(Offscreen.Canvas, 5, 16 + 160, 81,
       MyRO.LuxRate * 120 div 100, 0, 120, MainTexture);
@@ -145 +141 @@
     MainTexture.ColorBevelLight);
   RisedTextOut(Offscreen.Canvas, 16 + 80, 164, Phrases.Lookup('TAXRATE'));
-  s := Format('%d%%', [MyRO.TaxRate]);
+  S := Format('%d%%', [MyRO.TaxRate]);
   RisedTextOut(Offscreen.Canvas,
-    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, s);
+    16 + 80 { +120-BiColorTextWidth(Offscreen.Canvas,s) } , 180, S);
   PaintProgressBar(Offscreen.Canvas, 0, 16 + 80, 201,
     MyRO.TaxRate * 120 div 100, 0, 120, MainTexture);
@@ -157 +153 @@
 end;
 
-procedure TRatesDlg.ShowNewContent(NewMode: integer);
+procedure TRatesDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -164 +160 @@
 procedure TRatesDlg.FormShow(Sender: TObject);
 begin
-  if MyRO.Wonder[woLiberty].EffectiveOwner = me then
-  begin
-    ScienceBtn.Visible := false;
-    LuxBtn.Visible := false;
+  Caption := Phrases.Lookup('TITLE_RATES');
+  if MyRO.Wonder[woLiberty].EffectiveOwner = Me then
+  begin
+    ScienceBtn.Visible := False;
+    LuxBtn.Visible := False;
   end
   else
   begin
-    ScienceBtn.Visible := true;
-    LuxBtn.Visible := true;
+    ScienceBtn.Visible := True;
+    LuxBtn.Visible := True;
   end;
   OffscreenPaint;
@@ -184 +181 @@
 procedure TRatesDlg.TaxLuxBtnClick(Sender: TObject);
 var
-  NewTax, NewLux: integer;
+  NewTax, NewLux: Integer;
 begin
   NewTax := MyRO.TaxRate div 10;
@@ -191 +188 @@
   begin
     if NewTax < 10 then
-      inc(NewTax);
+      Inc(NewTax);
     if NewTax + NewLux > 10 then
-      dec(NewLux);
+      Dec(NewLux);
   end
   else if (Sender = TaxDownBtn) and (NewTax > 0) then
-    dec(NewTax)
+    Dec(NewTax)
   else if (Sender = ScienceBtn) and (NewLux > 0) then
-    dec(NewLux)
+    Dec(NewLux)
   else if (Sender = LuxBtn) and (NewLux + NewTax < 100) then
-    inc(NewLux);
-  if Server(sSetRates, me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
+    Inc(NewLux);
+  if Server(sSetRates, Me, NewTax + NewLux shl 4, nil^) <> eNotChanged then
   begin
     CityOptimizer_BeginOfTurn;
     SmartUpdateContent;
-    MainScreen.UpdateViews(true);
+    MainScreen.UpdateViews(True);
   end;
 end;

branches/highdpi/LocalPlayer/Select.lfm ¶

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

branches/highdpi/LocalPlayer/Select.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+  UDpiControls, Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
@@ -27 +27 @@
     ToggleBtn: TButtonB;
     Popup: TDpiPopupMenu;
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
     procedure PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormPaint(Sender: TObject);
     procedure CloseBtnClick(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure FormShow(Sender: TObject);
     procedure ModeBtnClick(Sender: TObject);
     procedure ToggleBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure PlayerClick(Sender: TObject);
   private
@@ -49 +50 @@
     cixProject: Integer;
     pView: Integer;
-    Sel: Integer;
+    Selected: Integer;
     DispLines: Integer;
     Layer: Integer;
@@ -55 +56 @@
     TechNameSpace: Integer;
     ScienceNation: Integer;
-    sb: TPVScrollbar;
-    Lines, FirstShrinkedLine: array [0 .. MaxLayer - 1] of integer;
-    code: array [0 .. MaxLayer - 1, 0 .. 4095] of integer;
-    Column: array [0 .. nPl - 1] of integer;
+    ScrollBar: TPVScrollbar;
+    Lines: array [0 .. MaxLayer - 1] of Integer;
+    FirstShrinkedLine: array [0 .. MaxLayer - 1] of Integer;
+    Code: array [0 .. MaxLayer - 1, 0 .. 4095] of Integer;
+    Column: array [0 .. nPl - 1] of Integer;
     Closable: Boolean;
     MultiPage: Boolean;
@@ -64 +66 @@
     procedure ScrollBarUpdate(Sender: TObject);
     procedure InitLines;
-    procedure line(ca: TDpiCanvas; l: integer; NonText, lit: boolean);
-    function RenameCity(cix: integer): boolean;
-    function RenameModel(mix: integer): boolean;
+    procedure Line(ca: TDpiCanvas; L: Integer; NonText, lit: Boolean);
+    function RenameCity(cix: Integer): Boolean;
+    function RenameModel(mix: Integer): Boolean;
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
-    result: integer;
-    function OnlyChoice(TestKind: TListKind): integer;
+    Result: Integer;
+    function OnlyChoice(TestKind: TListKind): Integer;
     // -2=empty, -1=ambiguous, other=only choice
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer; ListKind: TListKind);
-    procedure ShowNewContent_CityProject(NewMode, cix: integer);
-    procedure ShowNewContent_MilReport(NewMode, p: integer);
+    procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
+    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
     procedure EcoChange;
     procedure TechChange;
@@ -90 +92 @@
   adAll = $10000;
 
-var
-  ListDlg: TListDlg;
-  ModalSelectDlg: TModalSelectDlg;
-
 
 implementation
 
 uses
-  CityScreen, Help, UnitStat, Tribes, Inp;
+  Term, CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
 
 {$R *.lfm}
@@ -111 +109 @@
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  sb := TPVScrollbar.Create(Self);
-  sb.SetBorderSpacing(36, 10, 36);
-  sb.OnUpdate := ScrollBarUpdate;
+  ScrollBar := TPVScrollbar.Create(Self);
+  ScrollBar.SetBorderSpacing(36, 10, 36);
+  ScrollBar.OnUpdate := ScrollBarUpdate;
   InitButtons;
   Kind := kMission;
@@ -127 +125 @@
 procedure TListDlg.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(sb);
+  FreeAndNil(ScrollBar);
   FreeAndNil(ScienceNationDotBuffer);
 end;
@@ -133 +131 @@
 procedure TListDlg.CloseBtnClick(Sender: TObject);
 begin
-  Closable := true;
+  Closable := True;
   Close;
 end;
 
-procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+procedure TListDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
   CanClose := Closable or not(Kind in MustChooseKind);
@@ -145 +143 @@
 begin
   { TODO: Handled by MouseWheel event
-  if sb.Process(Msg) then  begin
-    Sel := -2;
-    SmartUpdateContent(true);
+  if ScrollBar.Process(Msg) then  begin
+    Selected := -2;
+    SmartUpdateContent(True);
   end;
   }
@@ -154 +152 @@
 procedure TListDlg.OnMouseLeave(var Msg: TMessage);
 begin
-  if not Closable and (Sel <> -2) then
-  begin
-    line(Canvas, Sel, false, false);
-    Sel := -2;
+  if not Closable and (Selected <> -2) then
+  begin
+    Line(Canvas, Selected, False, False);
+    Selected := -2;
   end;
 end;
@@ -163 +161 @@
 procedure TListDlg.FormPaint(Sender: TObject);
 var
-  s: string;
+  S: string;
 begin
   inherited;
   Canvas.Font.Assign(UniFont[ftNormal]);
-  if Sel <> -2 then
-    line(Canvas, Sel, false, true);
-  s := '';
+  if Selected <> -2 then
+    Line(Canvas, Selected, False, True);
+  S := '';
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) then
-    s := Format(Phrases.Lookup('TECHFOCUS'),
+    S := Format(Phrases.Lookup('TECHFOCUS'),
       [Phrases.Lookup('ADVANCES', MyData.FarTech)])
   else if Kind = kModels then
-    s := Tribe[me].TPhrase('SHORTNAME')
+    S := Tribe[Me].TPhrase('SHORTNAME')
   else if Kind = kEModels then
-    s := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
+    S := Tribe[pView].TPhrase('SHORTNAME') + ' (' +
       TurnToString(MyRO.EnemyReport[pView].TurnOfMilReport) + ')';
-  if s <> '' then
+  if S <> '' then
     LoweredTextOut(Canvas, -1, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, 31, s);
+      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, 31, S);
   if not MultiPage and (Kind in [kProject, kAdvance, kFarAdvance]) and not Phrases2FallenBackToEnglish
   then
   begin
-    s := Phrases2.Lookup('SHIFTCLICK');
+    S := Phrases2.Lookup('SHIFTCLICK');
     LoweredTextOut(Canvas, -2, MainTexture,
-      (ClientWidth - BiColorTextWidth(Canvas, s)) div 2, ClientHeight - 29, s);
-  end;
-end;
-
-procedure TListDlg.line(ca: TDpiCanvas; l: integer; NonText, lit: boolean);
+      (ClientWidth - BiColorTextWidth(Canvas, S)) div 2, ClientHeight - 29, S);
+  end;
+end;
+
+procedure TListDlg.Line(ca: TDpiCanvas; L: Integer; NonText, lit: Boolean);
 // paint a line
 
-  procedure DisplayProject(x, y, pix: integer);
+  procedure DisplayProject(X, Y, pix: Integer);
   begin
     if pix and (cpType or cpImp) = 0 then
-      with Tribe[me].ModelPicture[pix and cpIndex] do
-        Sprite(offscreen, HGr, x, y, 64, 48, pix mod 10 * 65 + 1,
+      with Tribe[Me].ModelPicture[pix and cpIndex] do
+        Sprite(Offscreen, HGr, X, Y, 64, 48, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1)
     else
     begin
-      Frame(offscreen.Canvas, x + (16 - 1), y + (16 - 2), x + (16 + xSizeSmall),
-        y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
+      Frame(Offscreen.Canvas, X + (16 - 1), Y + (16 - 2), X + (16 + xSizeSmall),
+        Y + (16 - 1 + ySizeSmall), MainTexture.ColorBevelLight,
         MainTexture.ColorBevelShade);
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
-          DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          DpiBitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
             ySizeSmall, SmallImp.Canvas, (MyRO.Government - 1) *
             xSizeSmall, ySizeSmall)
         else
-          DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          DpiBitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
             ySizeSmall, SmallImp.Canvas, pix and cpIndex mod 7 *
             xSizeSmall, (pix and cpIndex + SystemIconLines * 7) div 7 *
             ySizeSmall)
       else
-        DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+        DpiBitBltCanvas(Offscreen.Canvas, X + 16, Y + (16 - 1), xSizeSmall,
           ySizeSmall, SmallImp.Canvas, (3 + pix and cpIndex) *
           xSizeSmall, 0);
@@ -221 +219 @@
   end;
 
-  procedure ReplaceText(x, y, Color: integer; s: string);
+  procedure ReplaceText(X, Y, Color: Integer; S: string);
   var
     TextSize: TSize;
@@ -227 +225 @@
     if ca = Canvas then
     begin
-      TextSize.cx := BiColorTextWidth(ca, s);
-      TextSize.cy := ca.TextHeight(s);
-      if y + TextSize.cy >= TitleHeight + InnerHeight then
-        TextSize.cy := TitleHeight + InnerHeight - y;
-      Fill(ca, x, y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
+      TextSize.cx := BiColorTextWidth(ca, S);
+      TextSize.cy := ca.TextHeight(S);
+      if Y + TextSize.cy >= TitleHeight + InnerHeight then
+        TextSize.cy := TitleHeight + InnerHeight - Y;
+      Fill(ca, X, Y, TextSize.cx, TextSize.cy, (Maintexture.Width - ClientWidth)
         div 2, (Maintexture.Height - ClientHeight) div 2);
     end;
-    LoweredTextOut(ca, Color, MainTexture, x, y, s);
+    LoweredTextOut(ca, Color, MainTexture, X, Y, S);
   end;
 
 var
-  icon, ofs, x, y, y0, lix, i, j, TextColor, Available, first, test,
-    FutureCount, growth, TrueFood, TrueProd: integer;
+  icon, ofs, X, Y, y0, lix, I, J, TextColor, Available, first, Test,
+    FutureCount, growth, TrueFood, TrueProd: Integer;
   CityReport: TCityReportNew;
   mox: ^TModelInfo;
-  s, number: string;
-  CanGrow: boolean;
-begin
-  lix := code[Layer, sb.Position + l];
-  y0 := 2 + (l + 1) * LineDistance;
-  if sb.Position + l >= FirstShrinkedLine[Layer] then
-    ofs := (sb.Position + l - FirstShrinkedLine[Layer]) and 1 * 33
+  S, number: string;
+  CanGrow: Boolean;
+begin
+  lix := Code[Layer, ScrollBar.Position + L];
+  y0 := 2 + (L + 1) * LineDistance;
+  if ScrollBar.Position + L >= FirstShrinkedLine[Layer] then
+    ofs := (ScrollBar.Position + L - FirstShrinkedLine[Layer]) and 1 * 33
   else { if FirstShrinkedLine[Layer]<Lines[Layer] then }
     ofs := 33;
@@ -255 +253 @@
     with MyCity[lix] do
     begin
-      x := 104 - 76;
-      y := y0;
+      X := 104 - 76;
+      Y := y0;
       if ca = Canvas then
       begin
-        x := x + SideFrame;
-        y := y + TitleHeight;
+        X := X + SideFrame;
+        Y := Y + TitleHeight;
       end;
       if lit then
@@ -266 +264 @@
       else
         TextColor := -1;
-      s := CityName(ID);
-      while BiColorTextWidth(ca, s) > CityNameSpace do
-        delete(s, length(s), 1);
-      ReplaceText(x + 15, y, TextColor, s);
+      S := CityName(ID);
+      while BiColorTextWidth(ca, S) > CityNameSpace do
+        Delete(S, Length(S), 1);
+      ReplaceText(X + 15, Y, TextColor, S);
 
       if NonText then
-        with offscreen.Canvas do
+        with Offscreen.Canvas do
         begin // city size
-          brush.Color := $000000;
-          fillrect(rect(x - 4 - 11, y + 1, x - 4 + 13, y + 21));
-          brush.Color := $FFFFFF;
-          fillrect(rect(x - 4 - 12, y, x - 4 + 12, y + 20));
-          brush.style := bsClear;
+          Brush.Color := $000000;
+          FillRect(rect(X - 4 - 11, Y + 1, X - 4 + 13, Y + 21));
+          Brush.Color := $FFFFFF;
+          FillRect(rect(X - 4 - 12, Y, X - 4 + 12, Y + 20));
+          Brush.style := bsClear;
           Font.Color := $000000;
-          s := inttostr(MyCity[lix].Size);
-          TextOut(x - 4 - textwidth(s) div 2, y, s);
+          S := IntToStr(MyCity[lix].Size);
+          TextOut(X - 4 - textwidth(S) div 2, Y, S);
         end;
 
@@ -287 +285 @@
       begin
         first := -1;
-        for j := 0 to nCityEventPriority - 1 do
-          if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
-          begin
-            first := j;
-            Break
+        for J := 0 to nCityEventPriority - 1 do
+          if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
+          begin
+            first := J;
+            Break;
           end;
         if first >= 0 then
         begin
-          i := 0;
-          test := 1;
-          while test < CityEventPriority[first] do
-          begin
-            inc(i);
-            inc(test, test)
-          end;
-          s := CityEventName(i);
+          I := 0;
+          Test := 1;
+          while Test < CityEventPriority[first] do
+          begin
+            Inc(I);
+            Inc(Test, Test);
+          end;
+          S := CityEventName(I);
           { if CityEventPriority[first]=chNoGrowthWarning then
             if Built[imAqueduct]=0 then
-            s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
-            else begin s:=Format(s,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); i:=17 end; }
-          ReplaceText(x + (CityNameSpace + 4 + 40 + 18 + 8), y, TextColor, s);
+            S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imAqueduct)])
+            else begin S:=Format(S,[Phrases.Lookup('IMPROVEMENTS',imSewer)]); I:=17 end; }
+          ReplaceText(X + (CityNameSpace + 4 + 40 + 18 + 8), Y, TextColor, S);
           if NonText then
           begin
-            Sprite(offscreen, HGrSystem, 105 - 76 + CityNameSpace + 4 + 40,
-              y0 + 1, 18, 18, 1 + i mod 3 * 19, 1 + i div 3 * 19);
-            x := InnerWidth - 26;
-            for j := nCityEventPriority - 1 downto first + 1 do
-              if (Flags and CityRepMask and CityEventPriority[j] <> 0) then
+            Sprite(Offscreen, HGrSystem, 105 - 76 + CityNameSpace + 4 + 40,
+              y0 + 1, 18, 18, 1 + I mod 3 * 19, 1 + I div 3 * 19);
+            X := InnerWidth - 26;
+            for J := nCityEventPriority - 1 downto first + 1 do
+              if (Flags and CityRepMask and CityEventPriority[J] <> 0) then
               begin
-                i := 0;
-                test := 1;
-                while test < CityEventPriority[j] do
+                I := 0;
+                Test := 1;
+                while Test < CityEventPriority[J] do
                 begin
-                  inc(i);
-                  inc(test, test)
+                  Inc(I);
+                  Inc(Test, Test);
                 end;
-                if (CityEventPriority[j] = chNoGrowthWarning) and
+                if (CityEventPriority[J] = chNoGrowthWarning) and
                   (Built[imAqueduct] > 0) then
-                  i := 17;
-                Sprite(offscreen, HGrSystem, x, y0 + 1, 18, 18,
-                  1 + i mod 3 * 19, 1 + i div 3 * 19);
-                dec(x, 20)
-              end
-          end
-        end
+                  I := 17;
+                Sprite(Offscreen, HGrSystem, X, y0 + 1, 18, 18,
+                  1 + I mod 3 * 19, 1 + I div 3 * 19);
+                Dec(X, 20);
+              end;
+          end;
+        end;
       end
       else
@@ -338 +336 @@
         CityReport.HypoTaxRate := -1;
         CityReport.HypoLuxuryRate := -1;
-        Server(sGetCityReportNew, me, lix, CityReport);
+        Server(sGetCityReportNew, Me, lix, CityReport);
         TrueFood := Food;
         TrueProd := Prod;
-        if supervising then
+        if Supervising then
         begin // normalize city from after-turn state
-          dec(TrueFood, CityReport.FoodSurplus);
+          Dec(TrueFood, CityReport.FoodSurplus);
           if TrueFood < 0 then
             TrueFood := 0; // shouldn't happen
-          dec(TrueProd, CityReport.Production);
+          Dec(TrueProd, CityReport.Production);
           if TrueProd < 0 then
             TrueProd := 0; // shouldn't happen
         end;
 
-        s := ''; // disorder info
+        S := ''; // disorder info
         if Flags and chCaptured <> 0 then
-          s := Phrases.Lookup('CITYEVENTS', 14)
+          S := Phrases.Lookup('CITYEVENTS', 14)
         else if CityReport.HappinessBalance < 0 then
-          s := Phrases.Lookup('CITYEVENTS', 0);
-        if s <> '' then
+          S := Phrases.Lookup('CITYEVENTS', 0);
+        if S <> '' then
         begin { disorder }
           if NonText then
           begin
-            DarkGradient(offscreen.Canvas, 99 + 31 + CityNameSpace + 4,
+            DarkGradient(Offscreen.Canvas, 99 + 31 + CityNameSpace + 4,
               y0 + 2, 131, 3);
             ca.Font.Assign(UniFont[ftSmall]);
-            RisedTextout(offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
-              y0 + 1, s);
+            RisedTextout(Offscreen.Canvas, 103 + CityNameSpace + 4 + 31,
+              y0 + 1, S);
             ca.Font.Assign(UniFont[ftNormal]);
-          end
+          end;
         end
         else
         begin
           { s:=IntToStr(CityReport.FoodSurplus);
-            ReplaceText(x+(CityNameSpace+4+48)-BiColorTextWidth(ca,s),y,TextColor,s); }
-          s := inttostr(CityReport.Science);
-          ReplaceText(x + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
-            s), y, TextColor, s);
-          s := inttostr(CityReport.Production);
-          ReplaceText(x + CityNameSpace + 4 + 132 - BiColorTextWidth(ca, s), y,
-            TextColor, s);
+            ReplaceText(X+(CityNameSpace+4+48)-BiColorTextWidth(ca,S),Y,TextColor,S); }
+          S := IntToStr(CityReport.Science);
+          ReplaceText(X + CityNameSpace + 4 + 370 + 48 - BiColorTextWidth(ca,
+            S), Y, TextColor, S);
+          S := IntToStr(CityReport.Production);
+          ReplaceText(X + CityNameSpace + 4 + 132 - BiColorTextWidth(ca, S), Y,
+            TextColor, S);
           if NonText then
           begin
             // Sprite(offscreen,HGrSystem,x+CityNameSpace+4+333+1,y+6,10,10,66,115);
-            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 48 + 1,
-              y + 6, 10, 10, 77, 126);
-            Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 132 + 1, y + 6,
+            Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 370 + 48 + 1,
+              Y + 6, 10, 10, 77, 126);
+            Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 132 + 1, Y + 6,
               10, 10, 88, 115);
-          end
-        end;
-        s := inttostr(CityTaxBalance(lix, CityReport));
-        ReplaceText(x + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, s), y,
-          TextColor, s);
+          end;
+        end;
+        S := IntToStr(CityTaxBalance(lix, CityReport));
+        ReplaceText(X + CityNameSpace + 4 + 370 - BiColorTextWidth(ca, S), Y,
+          TextColor, S);
         // if Project and (cpImp+cpIndex)<>cpImp+imTrGoods then
         // ReplaceText(x+CityNameSpace+4+333+1,y,TextColor,Format('%d/%d',[TrueProd,CityReport.ProjectCost]));
         if NonText then
         begin
-          Sprite(offscreen, HGrSystem, x + CityNameSpace + 4 + 370 + 1, y + 6,
+          Sprite(Offscreen, HGrSystem, X + CityNameSpace + 4 + 370 + 1, Y + 6,
             10, 10, 132, 115);
 
@@ -402 +400 @@
             ((Size < NeedAqueductSize) or (Built[imAqueduct] = 1) and
             (Size < NeedSewerSize) or (Built[imSewer] = 1));
-          PaintRelativeProgressBar(offscreen.Canvas, 1, x + 15 + CityNameSpace +
-            4, y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
+          PaintRelativeProgressBar(Offscreen.Canvas, 1, X + 15 + CityNameSpace +
+            4, Y + 7, 68, TrueFood, CutCityFoodSurplus(CityReport.FoodSurplus,
             (MyRO.Government <> gAnarchy) and (Flags and chCaptured = 0),
             MyRO.Government, Size), CityReport.Storage, CanGrow, MainTexture);
@@ -409 +407 @@
           if Project <> cpImp + imTrGoods then
           begin
-            DisplayProject(ofs + 104 - 76 + x - 28 + CityNameSpace + 4 + 206 -
+            DisplayProject(ofs + 104 - 76 + X - 28 + CityNameSpace + 4 + 206 -
               60, y0 - 15, Project);
 
@@ -417 +415 @@
               (Flags and chCaptured <> 0) then
               growth := 0;
-            PaintRelativeProgressBar(offscreen.Canvas, 4,
-              x + CityNameSpace + 4 + 304 - 60 + 9, y + 7, 68, TrueProd, growth,
-              CityReport.ProjectCost, true, MainTexture);
-          end;
-        end
+            PaintRelativeProgressBar(Offscreen.Canvas, 4,
+              X + CityNameSpace + 4 + 304 - 60 + 9, Y + 7, 68, TrueProd, growth,
+              CityReport.ProjectCost, True, MainTexture);
+          end;
+        end;
       end;
     end
   else if Kind in [kModels, kEModels] then
   begin
-    x := 104;
-    y := y0;
+    X := 104;
+    Y := y0;
     if ca = Canvas then
     begin
-      x := x + SideFrame;
-      y := y + TitleHeight
+      X := X + SideFrame;
+      Y := Y + TitleHeight;
     end;
     if lit then
@@ -440 +438 @@
     begin
       Available := 0;
-      for j := 0 to MyRO.nUn - 1 do
-        if (MyUn[j].Loc >= 0) and (MyUn[j].mix = lix) then
-          inc(Available);
+      for J := 0 to MyRO.nUn - 1 do
+        if (MyUn[J].Loc >= 0) and (MyUn[J].mix = lix) then
+          Inc(Available);
       if MainScreen.mNames.Checked then
-        s := Tribe[me].ModelName[lix]
+        S := Tribe[Me].ModelName[lix]
       else
-        s := Format(Tribe[me].TPhrase('GENMODEL'), [lix]);
+        S := Format(Tribe[Me].TPhrase('GENMODEL'), [lix]);
       if NonText then
         DisplayProject(8 + ofs, y0 - 15, lix);
@@ -454 +452 @@
       Available := MyRO.EnemyReport[pView].UnCount[lix];
       if MainScreen.mNames.Checked then
-        s := Tribe[pView].ModelName[lix]
+        S := Tribe[pView].ModelName[lix]
       else
-        s := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
+        S := Format(Tribe[pView].TPhrase('GENMODEL'), [lix]);
       if NonText then
         with Tribe[pView].ModelPicture[lix] do
-          Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
+          Sprite(Offscreen, HGr, 8 + ofs, y0 - 15, 64, 48, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
     end;
     if Available > 0 then
-      ReplaceText(x + 32 - BiColorTextWidth(ca, inttostr(Available)), y,
-        TextColor, inttostr(Available));
-    ReplaceText(x + 40, y, TextColor, s);
+      ReplaceText(X + 32 - BiColorTextWidth(ca, IntToStr(Available)), Y,
+        TextColor, IntToStr(Available));
+    ReplaceText(X + 40, Y, TextColor, S);
   end
   else
@@ -472 +470 @@
       kAllEModels, kChooseEModel:
         if lix = mixAll then
-          s := Phrases.Lookup('PRICECAT_ALLMODEL')
+          S := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
         begin
@@ -478 +476 @@
           if MainScreen.mNames.Checked then
           begin
-            s := Tribe[mox.Owner].ModelName[mox.mix];
-            if (Kind = kAllEModels) and (code[1, sb.Position + l] = 0) then
-              s := Format(Tribe[mox.Owner].TPhrase('OWNED'), [s]);
+            S := Tribe[mox.Owner].ModelName[mox.mix];
+            if (Kind = kAllEModels) and (Code[1, ScrollBar.Position + L] = 0) then
+              S := Format(Tribe[mox.Owner].TPhrase('OWNED'), [S]);
           end
           else
-            s := Format(Tribe[mox.Owner].TPhrase('GENMODEL'), [mox.mix]);
+            S := Format(Tribe[mox.Owner].TPhrase('GENMODEL'), [mox.mix]);
           if NonText then
             with Tribe[mox.Owner].ModelPicture[mox.mix] do
-              Sprite(offscreen, HGr, 8 + ofs, y0 - 15, 64, 48,
+              Sprite(Offscreen, HGr, 8 + ofs, y0 - 15, 64, 48,
                 pix mod 10 * 65 + 1, pix div 10 * 49 + 1);
         end;
       kChooseModel:
         if lix = mixAll then
-          s := Phrases.Lookup('PRICECAT_ALLMODEL')
+          S := Phrases.Lookup('PRICECAT_ALLMODEL')
         else
         begin
-          s := Tribe[me].ModelName[lix];
+          S := Tribe[Me].ModelName[lix];
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, lix);
@@ -501 +499 @@
         begin
           if lix and cpType <> 0 then
-            s := Phrases.Lookup('CITYTYPE', lix and cpIndex)
+            S := Phrases.Lookup('CITYTYPE', lix and cpIndex)
           else if lix and cpImp = 0 then
             with MyModel[lix and cpIndex] do
             begin
-              s := Tribe[me].ModelName[lix and cpIndex];
+              S := Tribe[Me].ModelName[lix and cpIndex];
               if lix and cpConscripts <> 0 then
-                s := Format(Phrases.Lookup('CONSCRIPTS'), [s]);
+                S := Format(Phrases.Lookup('CONSCRIPTS'), [S]);
             end
           else
           begin
-            s := Phrases.Lookup('IMPROVEMENTS', lix and cpIndex);
+            S := Phrases.Lookup('IMPROVEMENTS', lix and cpIndex);
             if (Imp[lix and cpIndex].Kind in [ikNatLocal, ikNatGlobal]) and
               (MyRO.NatBuilt[lix and cpIndex] > 0) or
@@ -517 +515 @@
               (MyCity[cixProject].Built[imPower] + MyCity[cixProject].Built
               [imHydro] + MyCity[cixProject].Built[imNuclear] > 0) then
-              s := Format(Phrases.Lookup('NATEXISTS'), [s]);
+              S := Format(Phrases.Lookup('NATEXISTS'), [S]);
           end;
           if NonText then
@@ -525 +523 @@
         begin
           if lix = adAll then
-            s := Phrases.Lookup('PRICECAT_ALLTECH')
+            S := Phrases.Lookup('PRICECAT_ALLTECH')
           else
           begin
             if lix = adNexus then
-              s := Phrases.Lookup('NEXUS')
+              S := Phrases.Lookup('NEXUS')
             else if lix = adNone then
-              s := Phrases.Lookup('NOFARTECH')
+              S := Phrases.Lookup('NOFARTECH')
             else if lix = adMilitary then
-              s := Phrases.Lookup('INITUNIT')
+              S := Phrases.Lookup('INITUNIT')
             else
             begin
-              s := Phrases.Lookup('ADVANCES', lix);
+              S := Phrases.Lookup('ADVANCES', lix);
               if (Kind = kAdvance) and (lix in FutureTech) then
                 if MyRO.Tech[lix] < tsApplicable then
-                  s := s + ' 1'
+                  S := S + ' 1'
                 else
-                  s := s + ' ' + inttostr(MyRO.Tech[lix] + 1);
+                  S := S + ' ' + IntToStr(MyRO.Tech[lix] + 1);
             end;
-            if BiColorTextWidth(ca, s) > TechNameSpace + 8 then
+            if BiColorTextWidth(ca, S) > TechNameSpace + 8 then
             begin
               repeat
-                delete(s, length(s), 1);
-              until BiColorTextWidth(ca, s) <= TechNameSpace + 5;
-              s := s + '.';
+                Delete(S, Length(S), 1);
+              until BiColorTextWidth(ca, S) <= TechNameSpace + 5;
+              S := S + '.';
             end;
 
@@ -555 +553 @@
               if lix = adNexus then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 223, 295)
               end
               else if lix = adNone then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 260, 295)
               end
               else if lix = adMilitary then
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1, (8 + 16 + 36),
                   y0 + 20, MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-                Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
+                Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20, 38, 295)
               end
               else
               begin
-                Frame(offscreen.Canvas, (8 + 16 - 1), y0 - 1,
+                Frame(Offscreen.Canvas, (8 + 16 - 1), y0 - 1,
                   (8 + 16 + xSizeSmall), y0 + ySizeSmall,
                   MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
                 if AdvIcon[lix] < 84 then
-                  DpiBitCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
+                  DpiBitBltCanvas(Offscreen.Canvas, (8 + 16), y0, xSizeSmall,
                     ySizeSmall, SmallImp.Canvas,
                     (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
@@ -583 +581 @@
                     ySizeSmall)
                 else
-                  Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
+                  Dump(Offscreen, HGrSystem, (8 + 16), y0, 36, 20,
                     1 + (AdvIcon[lix] - 84) mod 8 * 37,
                     295 + (AdvIcon[lix] - 84) div 8 * 21);
-                j := AdvValue[lix] div 1000;
-                DpiBitCanvas(offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
-                  HGrSystem.Mask.Canvas, 127 + j * 15,
+                J := AdvValue[lix] div 1000;
+                DpiBitBltCanvas(Offscreen.Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                  HGrSystem.Mask.Canvas, 127 + J * 15,
                   85, SRCAND);
-                Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
-                  127 + j * 15, 85);
+                Sprite(Offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
+                  127 + J * 15, 85);
               end;
             end;
@@ -598 +596 @@
           if NonText and (Kind in [kAdvance, kScience]) then
           begin // show research state
-            for j := 0 to nColumn - 1 do
+            for J := 0 to nColumn - 1 do
             begin
               FutureCount := 0;
-              if j = 0 then // own science
+              if J = 0 then // own science
                 if lix = MyRO.ResearchTech then
                 begin
-                  Server(sGetTechCost, me, 0, icon);
+                  Server(sGetTechCost, Me, 0, icon);
                   icon := 4 + MyRO.Research * 4 div icon;
                   if icon > 4 + 3 then
@@ -623 +621 @@
                   icon := -1
               else
-                with MyRO.EnemyReport[Column[j]]^ do // enemy science
-                  if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+                with MyRO.EnemyReport[Column[J]]^ do // enemy science
+                  if (MyRO.Alive and (1 shl Column[J]) <> 0) and
                     (TurnOfCivilReport >= 0) and (lix = ResearchTech) and
                     ((lix = adMilitary) or (lix in FutureTech) or
@@ -631 +629 @@
                     icon := 4 + ResearchDone div 25;
                     if icon > 4 + 3 then
-                      icon := 4 + 3
+                      icon := 4 + 3;
                   end
                   else if lix = adMilitary then
@@ -647 +645 @@
                     icon := -1;
               if icon >= 0 then
-                Sprite(offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
-                  24 * j, y0 + 3, 14, 14, 67 + icon * 15, 85)
+                Sprite(Offscreen, HGrSystem, 104 - 33 + 15 + 3 + TechNameSpace +
+                  24 * J, y0 + 3, 14, 14, 67 + icon * 15, 85)
               else if (Kind = kScience) and (FutureCount > 0) then
               begin
-                number := inttostr(FutureCount);
-                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * j -
+                number := IntToStr(FutureCount);
+                RisedTextout(ca, 104 - 33 + 15 + 10 + TechNameSpace + 24 * J -
                   BiColorTextWidth(ca, number) div 2, y0, number);
-              end
-            end
+              end;
+            end;
           end;
         end; // kAdvance, kScience
       kTribe:
-        s := TribeNames[lix];
+        S := TribeNames[lix];
       kShipPart:
         begin
-          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
-            inttostr(MyRO.Ship[me].Parts[lix]) + ')';
+          S := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            IntToStr(MyRO.Ship[Me].Parts[lix]) + ')';
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
@@ -669 +667 @@
       kEShipPart:
         begin
-          s := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
-            inttostr(MyRO.Ship[DipMem[me].pContact].Parts[lix]) + ')';
+          S := Phrases.Lookup('IMPROVEMENTS', imShipComp + lix) + ' (' +
+            IntToStr(MyRO.Ship[DipMem[Me].pContact].Parts[lix]) + ')';
           if NonText then
             DisplayProject(8 + ofs, y0 - 15, cpImp + imShipComp + lix);
@@ -676 +674 @@
       kGov:
         begin
-          s := Phrases.Lookup('GOVERNMENT', lix);
+          S := Phrases.Lookup('GOVERNMENT', lix);
           if NonText then
           begin
-            Frame(offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
+            Frame(Offscreen.Canvas, 8 + 16 - 1, y0 - 15 + (16 - 2),
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
               MainTexture.ColorBevelLight, MainTexture.ColorBevelShade);
-            DpiBitCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
+            DpiBitBltCanvas(Offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
               xSizeSmall, ySizeSmall, SmallImp.Canvas,
               (lix - 1) * xSizeSmall, ySizeSmall);
-          end
+          end;
         end;
       kMission:
-        s := Phrases.Lookup('SPYMISSION', lix);
+        S := Phrases.Lookup('SPYMISSION', lix);
     end;
     case Kind of
       kTribe, kMission: // center text
         if Lines[0] > MaxLines then
-          x := (InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL)) div 2 -
-            BiColorTextWidth(ca, s) div 2
+          X := (InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL)) div 2 -
+            BiColorTextWidth(ca, S) div 2
         else
-          x := InnerWidth div 2 - BiColorTextWidth(ca, s) div 2;
+          X := InnerWidth div 2 - BiColorTextWidth(ca, S) div 2;
       kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech,
         kStealTech, kGov:
-        x := 104 - 33;
+        X := 104 - 33;
       kAllEModels:
-        x := 104;
+        X := 104;
     else
-      x := 104 + 15;
+      X := 104 + 15;
     end;
-    y := y0;
+    Y := y0;
     if ca = Canvas then
     begin
-      x := x + SideFrame;
-      y := y + TitleHeight
+      X := X + SideFrame;
+      Y := Y + TitleHeight;
     end;
     if lit then
@@ -716 +714 @@
       TextColor := -1;
     { if Kind=kTribe then ReplaceText_Tribe(x,y,TextColor,
-      integer(TribeNames.Objects[lix]),s)
-      else } ReplaceText(x, y, TextColor, s);
-  end
+      Integer(TribeNames.Objects[lix]),S)
+      else } ReplaceText(X, Y, TextColor, S);
+  end;
 end;
 
 procedure TListDlg.OffscreenPaint;
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   case Kind of
     kCities:
-      Caption := Tribe[me].TPhrase('TITLE_CITIES');
+      Caption := Tribe[Me].TPhrase('TITLE_CITIES');
     kCityEvents:
       Caption := Format(Phrases.Lookup('TITLE_EVENTS'),
@@ -734 +732 @@
 
   inherited;
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);
-  with offscreen.Canvas do
+  with Offscreen.Canvas do
   begin
     if Kind = kScience then
-      for i := 1 to nColumn - 1 do
+      for I := 1 to nColumn - 1 do
       begin
         Pen.Color := $000000;
-        MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i, 0);
-        LineTo(104 - 33 + 15 + TechNameSpace + 24 * i, InnerHeight);
-        MoveTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, 0);
-        LineTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * i, InnerHeight);
-        if MyRO.EnemyReport[Column[i]].TurnOfCivilReport >= MyRO.Turn - 1 then
-        begin
-          brush.Color := Tribe[Column[i]].Color;
-          fillrect(rect(104 - 33 + 14 + TechNameSpace + 24 * i + 1 * 2, 0,
-            104 - 33 + 17 + TechNameSpace + 24 * i + 8 * 2, InnerHeight));
-          brush.style := bsClear;
+        MoveTo(104 - 33 + 15 + TechNameSpace + 24 * I, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 24 * I, InnerHeight);
+        MoveTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * I, 0);
+        LineTo(104 - 33 + 15 + TechNameSpace + 9 * 2 + 24 * I, InnerHeight);
+        if MyRO.EnemyReport[Column[I]].TurnOfCivilReport >= MyRO.Turn - 1 then
+        begin
+          Brush.Color := Tribe[Column[I]].Color;
+          FillRect(rect(104 - 33 + 14 + TechNameSpace + 24 * I + 1 * 2, 0,
+            104 - 33 + 17 + TechNameSpace + 24 * I + 8 * 2, InnerHeight));
+          Brush.style := bsClear;
         end
         else
         begin // colored player columns
-          Pen.Color := Tribe[Column[i]].Color;
-          for j := 1 to 8 do
-          begin
-            MoveTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, 0);
-            LineTo(104 - 33 + 15 + TechNameSpace + 24 * i + j * 2, InnerHeight);
-          end
-        end;
-      end;
-
-    for i := -1 to DispLines do
-      if (i + sb.Position >= 0) and (i + sb.Position < Lines[Layer]) then
-        Self.line(offscreen.Canvas, i, true, false)
+          Pen.Color := Tribe[Column[I]].Color;
+          for J := 1 to 8 do
+          begin
+            MoveTo(104 - 33 + 15 + TechNameSpace + 24 * I + J * 2, 0);
+            LineTo(104 - 33 + 15 + TechNameSpace + 24 * I + J * 2, InnerHeight);
+          end;
+        end;
+      end;
+
+    for I := -1 to DispLines do
+      if (I + ScrollBar.Position >= 0) and (I + ScrollBar.Position < Lines[Layer]) then
+        Self.Line(Offscreen.Canvas, I, True, False);
   end;
   MarkUsedOffscreen(InnerWidth, 8 + 48 + DispLines * LineDistance);
@@ -772 +770 @@
 
 procedure TListDlg.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  i0, Sel0, iColumn, OldScienceNation, xScreen: integer;
-  s: string;
-begin
-  y := y - TitleHeight;
-  i0 := sb.Position;
-  Sel0 := Sel;
-  if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
-    (y < InnerHeight) and (y mod LineDistance >= 4) and (y mod LineDistance < 20)
+  i0, Sel0, iColumn, OldScienceNation, xScreen: Integer;
+  S: string;
+begin
+  Y := Y - TitleHeight;
+  i0 := ScrollBar.Position;
+  Sel0 := Selected;
+  if (X >= SideFrame) and (X < SideFrame + InnerWidth) and (Y >= 0) and
+    (Y < InnerHeight) and (Y mod LineDistance >= 4) and (Y mod LineDistance < 20)
   then
-    Sel := y div LineDistance - 1
+    Selected := Y div LineDistance - 1
   else
-    Sel := -2;
-  if (Sel < -1) or (Sel > DispLines) or (Sel + i0 < 0) or
-    (Sel + i0 >= Lines[Layer]) then
-    Sel := -2;
-  if Sel <> Sel0 then
+    Selected := -2;
+  if (Selected < -1) or (Selected > DispLines) or (Selected + i0 < 0) or
+    (Selected + i0 >= Lines[Layer]) then
+    Selected := -2;
+  if Selected <> Sel0 then
   begin
     if Sel0 <> -2 then
-      line(Canvas, Sel0, false, false);
-    if Sel <> -2 then
-      line(Canvas, Sel, false, true)
+      Line(Canvas, Sel0, False, False);
+    if Selected <> -2 then
+      Line(Canvas, Selected, False, True);
   end;
 
@@ -801 +799 @@
     OldScienceNation := ScienceNation;
     ScienceNation := -1;
-    if (x >= SideFrame + (104 - 33 + 15 + TechNameSpace)) and
-      ((x - SideFrame - (104 - 33 + 15 + TechNameSpace)) mod 24 <= 18) and
-      (y >= 0) and (y < InnerHeight) then
+    if (X >= SideFrame + (104 - 33 + 15 + TechNameSpace)) and
+      ((X - SideFrame - (104 - 33 + 15 + TechNameSpace)) mod 24 <= 18) and
+      (Y >= 0) and (Y < InnerHeight) then
     begin
-      iColumn := (x - SideFrame - (104 - 33 + 15 + TechNameSpace)) div 24;
+      iColumn := (X - SideFrame - (104 - 33 + 15 + TechNameSpace)) div 24;
       if (iColumn >= 1) and (iColumn < nColumn) then
         ScienceNation := Column[iColumn];
@@ -816 +814 @@
       if ScienceNation >= 0 then
       begin
-        s := Tribe[ScienceNation].TPhrase('SHORTNAME');
+        S := Tribe[ScienceNation].TPhrase('SHORTNAME');
         if MyRO.Alive and (1 shl ScienceNation) = 0 then
-          s := Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'), [s]) // extinct
+          S := Format(Phrases.Lookup('SCIENCEREPORT_EXTINCT'), [S]) // extinct
         else if MyRO.EnemyReport[ScienceNation].TurnOfCivilReport < MyRO.Turn - 1
         then
-          s := s + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
+          S := S + ' (' + TurnToString(MyRO.EnemyReport[ScienceNation]
             .TurnOfCivilReport) + ')'; // old report
-        xScreen := (ClientWidth - BiColorTextWidth(Canvas, s)) div 2;
+        xScreen := (ClientWidth - BiColorTextWidth(Canvas, S)) div 2;
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
-          ClientHeight - 29, s);
-        DpiBitCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
+          ClientHeight - 29, S);
+        DpiBitBltCanvas(ScienceNationDotBuffer.Canvas, 0, 0, ScienceNationDot.Width,
           ScienceNationDot.Height, Canvas, xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDotBuffer, Templates.Data, Point(0, 0),
           ScienceNationDot.BoundsRect, MainTexture.ColorBevelShade, Tribe[ScienceNation].Color);
-        DpiBitCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
+        DpiBitBltCanvas(Canvas, xScreen - 10, ClientHeight - 27, ScienceNationDot.Width,
           ScienceNationDot.Height, ScienceNationDotBuffer.Canvas, 0, 0);
       end;
@@ -840 +838 @@
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
-  if sb.ProcessMouseWheel(WheelDelta) then begin
+  if ScrollBar.ProcessMouseWheel(WheelDelta) then begin
     PaintBox1MouseMove(nil, [], MousePos.X - Left,
       MousePos.Y - Top);
@@ -846 +844 @@
 end;
 
-function TListDlg.RenameCity(cix: integer): boolean;
+procedure TListDlg.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  //Gtk2Fix;
+end;
+
+function TListDlg.RenameCity(cix: Integer): Boolean;
 var
   CityNameInfo: TCityNameInfo;
@@ -859 +862 @@
     CityNameInfo.ID := MyCity[cix].ID;
     CityNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetCityName + (length(CityNameInfo.NewName) + 8) div 4, me, 0,
-      CityNameInfo);
-    if CityDlg.Visible then
+    if CityNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(CityNameInfo.NewName, Length(CityNameInfo.NewName) -
+        (CityNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
+      Me, 0, CityNameInfo);
+    if MainScreen.CityDlg.Visible then
     begin
-      CityDlg.FormShow(nil);
-      CityDlg.Invalidate;
+      MainScreen.CityDlg.FormShow(nil);
+      MainScreen.CityDlg.Invalidate;
     end;
-    result := true;
+    Result := True;
   end
   else
-    result := false;
-end;
-
-function TListDlg.RenameModel(mix: integer): boolean;
+    Result := False;
+end;
+
+function TListDlg.RenameModel(mix: Integer): Boolean;
 var
   ModelNameInfo: TModelNameInfo;
 begin
   InputDlg.Caption := Phrases.Lookup('TITLE_MODELNAME');
-  InputDlg.EInput.Text := Tribe[me].ModelName[mix];
+  InputDlg.EInput.Text := Tribe[Me].ModelName[mix];
   InputDlg.CenterToRect(BoundsRect);
   InputDlg.ShowModal;
   if (InputDlg.ModalResult = mrOK) and (InputDlg.EInput.Text <> '') and
-    (InputDlg.EInput.Text <> Tribe[me].ModelName[mix]) then
+    (InputDlg.EInput.Text <> Tribe[Me].ModelName[mix]) then
   begin
     ModelNameInfo.mix := mix;
     ModelNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetModelName + (length(ModelNameInfo.NewName) + 1 + 4 + 3) div 4,
-      me, 0, ModelNameInfo);
-    if UnitStatDlg.Visible then
+    if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+        (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+      Me, 0, ModelNameInfo);
+    if MainScreen.UnitStatDlg.Visible then
     begin
-      UnitStatDlg.FormShow(nil);
-      UnitStatDlg.Invalidate;
+      MainScreen.UnitStatDlg.FormShow(nil);
+      MainScreen.UnitStatDlg.Invalidate;
     end;
-    result := true;
+    Result := True;
   end
   else
-    result := false;
+    Result := False;
 end;
 
 procedure TListDlg.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  lix: integer;
-begin
-  if sb.Position + Sel >= 0 then
-    lix := code[Layer, sb.Position + Sel];
+  lix: Integer;
+begin
+  if ScrollBar.Position + Selected >= 0 then
+    lix := Code[Layer, ScrollBar.Position + Selected];
   if Kind in [kScience, kCities, kCityEvents, kModels, kEModels, kAllEModels]
   then
-    include(Shift, ssShift); // don't close list window
+    Include(Shift, ssShift); // don't close list window
   if (ssLeft in Shift) and not(ssShift in Shift) then
   begin
-    if Sel <> -2 then
+    if Selected <> -2 then
     begin
-      result := lix;
-      Closable := true;
+      Result := lix;
+      Closable := True;
       Close;
     end;
@@ -919 +928 @@
   else if (ssLeft in Shift) and (ssShift in Shift) then
   begin // show help/info popup
-    if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities:
           MainScreen.ZoomToCity(MyCity[lix].Loc);
         kCityEvents:
-          MainScreen.ZoomToCity(MyCity[lix].Loc, false, MyCity[lix].Flags and
+          MainScreen.ZoomToCity(MyCity[lix].Loc, False, MyCity[lix].Flags and
             CityRepMask);
         kModels, kChooseModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or
-              wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
         kEModels:
-          UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
-            code[1, sb.Position + Sel]);
+          MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
+            Code[1, ScrollBar.Position + Selected]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or
-              wmPersistent, lix);
+            MainScreen.UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
         kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
           if lix = adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
-              HelpDlg.TextIndex('MILRES'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('MILRES'))
           else if lix < adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
         kProject:
           if lix = cpImp + imTrGoods then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
-              HelpDlg.TextIndex('TRADINGGOODS'))
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkText,
+              MainScreen.HelpDlg.TextIndex('TRADINGGOODS'))
           else if lix and (cpImp + cpType) = 0 then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent,
+            MainScreen.UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
               lix and cpIndex)
           else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+            MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
         kGov:
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc,
-            miscGovList);
+          MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkMisc,
+            Integer(miscGovList));
         kShipPart, kEShipPart:
           ;
@@ -962 +969 @@
   else if ssRight in Shift then
   begin
-    if Sel <> -2 then
+    if Selected <> -2 then
       case Kind of
         kCities, kCityEvents:
@@ -976 +983 @@
 procedure TListDlg.InitLines;
 var
-  required: array [0 .. nAdv - 1] of integer;
-
-  procedure TryAddImpLine(Layer, Project: integer);
-  begin
-    if Server(sSetCityProject - sExecute, me, cixProject, Project) >= rExecuted
+  required: array [0 .. nAdv - 1] of Integer;
+
+  procedure TryAddImpLine(Layer, Project: Integer);
+  begin
+    if Server(sSetCityProject - sExecute, Me, cixProject, Project) >= rExecuted
     then
     begin
-      code[Layer, Lines[Layer]] := Project;
-      inc(Lines[Layer]);
+      Code[Layer, Lines[Layer]] := Project;
+      Inc(Lines[Layer]);
     end;
   end;
@@ -990 +997 @@
   procedure SortTechs;
   var
-    i, j, swap: integer;
+    I, J, swap: Integer;
   begin // sort by advancedness
-    for i := 0 to Lines[0] - 2 do
-      if code[0, i] < adMilitary then
-        for j := i + 1 to Lines[0] - 1 do
-          if AdvValue[code[0, i]] * nAdv + code[0, i] < AdvValue[code[0, j]] *
-            nAdv + code[0, j] then
-          begin
-            swap := code[0, i];
-            code[0, i] := code[0, j];
-            code[0, j] := swap;
+    for I := 0 to Lines[0] - 2 do
+      if Code[0, I] < adMilitary then
+        for J := I + 1 to Lines[0] - 1 do
+          if AdvValue[Code[0, I]] * nAdv + Code[0, I] < AdvValue[Code[0, J]] *
+            nAdv + Code[0, J] then
+          begin
+            swap := Code[0, I];
+            Code[0, I] := Code[0, J];
+            Code[0, J] := swap;
           end;
   end;
@@ -1006 +1013 @@
   procedure SortCities;
   var
-    i, j, swap: integer;
-  begin
-    for i := 0 to Lines[0] - 2 do
-      for j := i + 1 to Lines[0] - 1 do
-        if CityName(MyCity[code[0, i]].ID) > CityName(MyCity[code[0, j]].ID)
+    I, J, swap: Integer;
+  begin
+    for I := 0 to Lines[0] - 2 do
+      for J := I + 1 to Lines[0] - 1 do
+        if CityName(MyCity[Code[0, I]].ID) > CityName(MyCity[Code[0, J]].ID)
         then
         begin
-          swap := code[0, i];
-          code[0, i] := code[0, j];
-          code[0, j] := swap;
+          swap := Code[0, I];
+          Code[0, I] := Code[0, J];
+          Code[0, J] := swap;
         end;
   end;
 
   function ModelSortValue(const mi: TModelInfo;
-    MixPlayers: boolean = false): integer;
-  begin
-    result := (mi.Domain + 1) shl 28 - mi.mix;
+    MixPlayers: Boolean = False): Integer;
+  begin
+    Result := (mi.Domain + 1) shl 28 - mi.mix;
     if MixPlayers then
-      dec(result, ModelCode(mi) shl 16);
+      Dec(Result, ModelCode(mi) shl 16);
   end;
 
   procedure SortModels;
   var
-    i, j, swap: integer;
+    I, J, swap: Integer;
   begin // sort by code[2]
-    for i := 0 to Lines[0] - 2 do
-      for j := i + 1 to Lines[0] - 1 do
-        if code[2, i] > code[2, j] then
-        begin
-          swap := code[0, i];
-          code[0, i] := code[0, j];
-          code[0, j] := swap;
-          swap := code[1, i];
-          code[1, i] := code[1, j];
-          code[1, j] := swap;
-          swap := code[2, i];
-          code[2, i] := code[2, j];
-          code[2, j] := swap;
-        end;
-  end;
-
-  procedure MarkPreqs(i: integer);
-  begin
-    required[i] := 1;
-    if MyRO.Tech[i] < tsSeen then
+    for I := 0 to Lines[0] - 2 do
+      for J := I + 1 to Lines[0] - 1 do
+        if Code[2, I] > Code[2, J] then
+        begin
+          swap := Code[0, I];
+          Code[0, I] := Code[0, J];
+          Code[0, J] := swap;
+          swap := Code[1, I];
+          Code[1, I] := Code[1, J];
+          Code[1, J] := swap;
+          swap := Code[2, I];
+          Code[2, I] := Code[2, J];
+          Code[2, J] := swap;
+        end;
+  end;
+
+  procedure MarkPreqs(I: Integer);
+  begin
+    required[I] := 1;
+    if MyRO.Tech[I] < tsSeen then
     begin
-      if (AdvPreq[i, 0] >= 0) then
-        MarkPreqs(AdvPreq[i, 0]);
-      if (AdvPreq[i, 1] >= 0) then
-        MarkPreqs(AdvPreq[i, 1]);
+      if (AdvPreq[I, 0] >= 0) then
+        MarkPreqs(AdvPreq[I, 0]);
+      if (AdvPreq[I, 1] >= 0) then
+        MarkPreqs(AdvPreq[I, 1]);
     end;
   end;
 
 var
-  Loc1, i, j, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: integer;
+  Loc1, I, J, p1, dx, dy, mix, emix, EnemyType, TestEnemyType: Integer;
   mi: TModelInfo;
   PPicture, PTestPicture: ^TModelPicture;
-  ModelOk: array [0 .. 4095] of boolean;
-  ok: boolean;
-begin
-  for i := 0 to MaxLayer - 1 do
-  begin
-    Lines[i] := 0;
-    FirstShrinkedLine[i] := MaxInt;
+  ModelOk: array [0 .. 4095] of Boolean;
+  ok: Boolean;
+begin
+  for I := 0 to MaxLayer - 1 do
+  begin
+    Lines[I] := 0;
+    FirstShrinkedLine[I] := MaxInt;
   end;
   case Kind of
@@ -1075 +1082 @@
       begin
         // improvements
-        code[0, 0] := cpImp + imTrGoods;
+        Code[0, 0] := cpImp + imTrGoods;
         Lines[0] := 1;
-        for i := nWonder to nImp - 1 do
-          if Imp[i].Kind = ikCommon then
-            TryAddImpLine(0, i + cpImp);
-        for i := nWonder to nImp - 1 do
-          if not(Imp[i].Kind in [ikCommon, ikTrGoods]) and
-            ((MyRO.NatBuilt[i] = 0) or (Imp[i].Kind = ikNatLocal)) then
-            TryAddImpLine(0, i + cpImp);
-        for i := 0 to nCityType - 1 do
-          if MyData.ImpOrder[i, 0] >= 0 then
-          begin
-            code[0, Lines[0]] := cpType + i;
-            inc(Lines[0]);
+        for I := nWonder to nImp - 1 do
+          if Imp[I].Kind = ikCommon then
+            TryAddImpLine(0, I + cpImp);
+        for I := nWonder to nImp - 1 do
+          if not(Imp[I].Kind in [ikCommon, ikTrGoods]) and
+            ((MyRO.NatBuilt[I] = 0) or (Imp[I].Kind = ikNatLocal)) then
+            TryAddImpLine(0, I + cpImp);
+        for I := 0 to nCityType - 1 do
+          if MyData.ImpOrder[I, 0] >= 0 then
+          begin
+            Code[0, Lines[0]] := cpType + I;
+            Inc(Lines[0]);
           end;
 
         // wonders
-        for i := 0 to nWonder - 1 do
-          TryAddImpLine(1, i + cpImp);
+        for I := 0 to nWonder - 1 do
+          TryAddImpLine(1, I + cpImp);
 
         // units
-        for i := 0 to MyRO.nModel - 1 do
+        for I := 0 to MyRO.nModel - 1 do
         begin
           { if MyModel[i].Kind=mkSlaves then
-            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=me
-            else } if MyModel[i].Domain = dSea then
-          begin
-            ok := false;
+            ok:= MyRO.Wonder[woPyramids].EffectiveOwner=Me
+            else } if MyModel[I].Domain = dSea then
+          begin
+            ok := False;
             for dx := -2 to 2 do
               for dy := -2 to 2 do
@@ -1111 +1118 @@
                     ((MyMap[Loc1] and fTerrain = fShore) or
                     (MyMap[Loc1] and fCanal > 0)) then
-                    ok := true;
+                    ok := True;
                 end;
           end
           else
-            ok := true;
+            ok := True;
           if ok then
           begin
-            if MyModel[i].Status and msObsolete = 0 then
+            if MyModel[I].Status and msObsolete = 0 then
             begin
-              code[2, Lines[2]] := i;
-              inc(Lines[2]);
+              Code[2, Lines[2]] := I;
+              Inc(Lines[2]);
             end;
-            if MyModel[i].Status and msAllowConscripts <> 0 then
+            if MyModel[I].Status and msAllowConscripts <> 0 then
             begin
-              code[2, Lines[2]] := i + cpConscripts;
-              inc(Lines[2]);
+              Code[2, Lines[2]] := I + cpConscripts;
+              Inc(Lines[2]);
             end;
           end;
@@ -1140 +1147 @@
           MarkPreqs(MyData.FarTech);
         end;
-        for i := 0 to nAdv - 1 do
-          if ((i in FutureTech) or (MyRO.Tech[i] < tsApplicable)) and
-            (Server(sSetResearch - sExecute, me, i, nil^) >= rExecuted) and
-            ((MyData.FarTech = adNone) or (required[i] > 0)) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if ((I in FutureTech) or (MyRO.Tech[I] < tsApplicable)) and
+            (Server(sSetResearch - sExecute, Me, I, nil^) >= rExecuted) and
+            ((MyData.FarTech = adNone) or (required[I] > 0)) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         if Lines[0] = 0 then // no more techs -- offer nexus
         begin
-          code[0, Lines[0]] := adNexus;
-          inc(Lines[0]);
-        end;
-        ok := false;
-        for i := 0 to nDomains - 1 do
-          if (upgrade[i, 0].Preq = preNone) or
-            (MyRO.Tech[upgrade[i, 0].Preq] >= tsApplicable) then
-            ok := true;
+          Code[0, Lines[0]] := adNexus;
+          Inc(Lines[0]);
+        end;
+        ok := False;
+        for I := 0 to nDomains - 1 do
+          if (upgrade[I, 0].Preq = preNone) or
+            (MyRO.Tech[upgrade[I, 0].Preq] >= tsApplicable) then
+            ok := True;
         if ok then { new unit class }
         begin
-          code[0, Lines[0]] := adMilitary;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adMilitary;
+          Inc(Lines[0]);
         end;
       end;
     kFarAdvance:
       begin
-        code[0, Lines[0]] := adNone;
-        inc(Lines[0]);
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
-            ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
-            ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        Code[0, Lines[0]] := adNone;
+        Inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+            ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+            ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
@@ -1181 +1188 @@
     kChooseTech:
       begin
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] >= tsApplicable) and
-            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] < tsSeen) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] >= tsApplicable) and
+            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] < tsSeen) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := adAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adAll;
+          Inc(Lines[0]);
         end;
       end;
     kChooseETech:
       begin
-        for i := 0 to nAdv - 1 do
-          if not(i in FutureTech) and (MyRO.Tech[i] < tsSeen) and
-            (MyRO.EnemyReport[DipMem[me].pContact].Tech[i] >= tsApplicable) then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if not(I in FutureTech) and (MyRO.Tech[I] < tsSeen) and
+            (MyRO.EnemyReport[DipMem[Me].pContact].Tech[I] >= tsApplicable) then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := adAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adAll;
+          Inc(Lines[0]);
         end;
       end;
     kStealTech:
       begin
-        for i := 0 to nAdv - 1 do
-          if Server(sStealTech - sExecute, me, i, nil^) >= rExecuted then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nAdv - 1 do
+          if Server(sStealTech - sExecute, Me, I, nil^) >= rExecuted then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortTechs;
@@ -1223 +1230 @@
     kScience:
       begin
-        Column[0] := me;
+        Column[0] := Me;
         nColumn := 1;
         for EnemyType := 0 to 2 do
@@ -1241 +1248 @@
               begin
                 Column[nColumn] := p1;
-                inc(nColumn);
+                Inc(nColumn);
               end;
             end;
-        for i := 0 to nAdv - 1 do
-        begin
-          ok := (MyRO.Tech[i] <> tsNA) or (MyRO.ResearchTech = i);
-          for j := 1 to nColumn - 1 do
-            with MyRO.EnemyReport[Column[j]]^ do
-              if (Tech[i] <> tsNA) or (TurnOfCivilReport >= 0) and
-                (ResearchTech = i) then
-                ok := true;
+        for I := 0 to nAdv - 1 do
+        begin
+          ok := (MyRO.Tech[I] <> tsNA) or (MyRO.ResearchTech = I);
+          for J := 1 to nColumn - 1 do
+            with MyRO.EnemyReport[Column[J]]^ do
+              if (Tech[I] <> tsNA) or (TurnOfCivilReport >= 0) and
+                (ResearchTech = I) then
+                ok := True;
           if ok then
           begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         end;
@@ -1261 +1268 @@
 
         ok := MyRO.ResearchTech = adMilitary;
-        for j := 1 to nColumn - 1 do
-          with MyRO.EnemyReport[Column[j]]^ do
-            if (MyRO.Alive and (1 shl Column[j]) <> 0) and
+        for J := 1 to nColumn - 1 do
+          with MyRO.EnemyReport[Column[J]]^ do
+            if (MyRO.Alive and (1 shl Column[J]) <> 0) and
               (TurnOfCivilReport >= 0) and (ResearchTech = adMilitary) then
-              ok := true;
+              ok := True;
         if ok then
         begin
-          code[0, Lines[0]] := adMilitary;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := adMilitary;
+          Inc(Lines[0]);
         end
       end;
@@ -1275 +1282 @@
       begin
         if ClientMode < scContact then
-          for i := 0 to MyRO.nCity - 1 do
-            if MyCity[i].Loc >= 0 then
+          for I := 0 to MyRO.nCity - 1 do
+            if MyCity[I].Loc >= 0 then
             begin
-              code[0, Lines[0]] := i;
-              inc(Lines[0]);
+              Code[0, Lines[0]] := I;
+              Inc(Lines[0]);
             end;
         SortCities;
@@ -1286 +1293 @@
     kCityEvents:
       begin
-        for i := 0 to MyRO.nCity - 1 do
-          if (MyCity[i].Loc >= 0) and (MyCity[i].Flags and CityRepMask <> 0)
+        for I := 0 to MyRO.nCity - 1 do
+          if (MyCity[I].Loc >= 0) and (MyCity[I].Flags and CityRepMask <> 0)
           then
           begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
         SortCities;
@@ -1298 +1305 @@
     { kChooseECity:
       begin
-      for i:=0 to MyRO.nEnemyCity-1 do
-      if (MyRO.EnemyCity[i].Loc>=0)
-      and (MyRO.EnemyCity[i].owner=DipMem[me].pContact) then
-      begin code[0,Lines[0]]:=i; inc(Lines[0]); end;
+      for I:=0 to MyRO.nEnemyCity-1 do
+      if (MyRO.EnemyCity[I].Loc>=0)
+      and (MyRO.EnemyCity[I].owner=DipMem[Me].pContact) then
+      begin Code[0,Lines[0]]:=I; Inc(Lines[0]); end;
       FirstShrinkedLine:=0
       end; }
@@ -1308 +1315 @@
         for mix := 0 to MyRO.nModel - 1 do
         begin
-          code[0, mix] := mix;
-          MakeModelInfo(me, mix, MyModel[mix], mi);
-          code[2, mix] := ModelSortValue(mi);
+          Code[0, mix] := mix;
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          Code[2, mix] := ModelSortValue(mi);
         end;
         Lines[0] := MyRO.nModel;
@@ -1320 +1327 @@
         for mix := 3 to MyRO.nModel - 1 do
         begin // check if opponent already has this model
-          MakeModelInfo(me, mix, MyModel[mix], mi);
-          ok := true;
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
+          ok := True;
           for emix := 0 to MyRO.nEnemyModel - 1 do
-            if (MyRO.EnemyModel[emix].Owner = DipMem[me].pContact) and
+            if (MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact) and
               IsSameModel(MyRO.EnemyModel[emix], mi) then
-              ok := false;
+              ok := False;
           if ok then
           begin
-            code[0, Lines[0]] := mix;
-            MakeModelInfo(me, mix, MyModel[mix], mi);
-            code[2, Lines[0]] := ModelSortValue(mi);
-            inc(Lines[0]);
+            Code[0, Lines[0]] := mix;
+            MakeModelInfo(Me, mix, MyModel[mix], mi);
+            Code[2, Lines[0]] := ModelSortValue(mi);
+            Inc(Lines[0]);
           end;
         end;
@@ -1337 +1344 @@
         // if Lines[0]>1 then
         begin
-          code[0, Lines[0]] := mixAll;
-          inc(Lines[0]);;
+          Code[0, Lines[0]] := mixAll;
+          Inc(Lines[0]);;
         end;
         FirstShrinkedLine[0] := 0;
@@ -1345 +1352 @@
       begin
         if MyRO.TestFlags and tfUncover <> 0 then
-          Server(sGetModels, me, 0, nil^);
+          Server(sGetModels, Me, 0, nil^);
         for emix := 0 to MyRO.nEnemyModel - 1 do
-          ModelOk[emix] := MyRO.EnemyModel[emix].Owner = DipMem[me].pContact;
+          ModelOk[emix] := MyRO.EnemyModel[emix].Owner = DipMem[Me].pContact;
         for mix := 0 to MyRO.nModel - 1 do
         begin // don't list models I already have
-          MakeModelInfo(me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
           for emix := 0 to MyRO.nEnemyModel - 1 do
             ModelOk[emix] := ModelOk[emix] and
@@ -1358 +1365 @@
           if ModelOk[emix] then
           begin
-            if not Assigned(Tribe[DipMem[me].pContact].ModelPicture
+            if not Assigned(Tribe[DipMem[Me].pContact].ModelPicture
               [MyRO.EnemyModel[emix].mix].HGr) then
               InitEnemyModel(emix);
-            code[0, Lines[0]] := emix;
-            code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix]);
-            inc(Lines[0]);
+            Code[0, Lines[0]] := emix;
+            Code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix]);
+            Inc(Lines[0]);
           end;
         SortModels;
         // if not IsMilReportNew(DipMem[me].pContact) or (Lines[0]>1) then
         begin
-          code[0, Lines[0]] := mixAll;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := mixAll;
+          Inc(Lines[0]);
         end;
         FirstShrinkedLine[0] := 0;
@@ -1375 +1382 @@
     kEModels:
       begin
-        for i := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
-        begin
-          code[1, Lines[0]] := MyRO.nEnemyModel - 1;
-          while (code[1, Lines[0]] >= 0) and
-            not((MyRO.EnemyModel[code[1, Lines[0]]].Owner = pView) and
-            (MyRO.EnemyModel[code[1, Lines[0]]].mix = i)) do
-            dec(code[1, Lines[0]]);
-          if not Assigned(Tribe[pView].ModelPicture[i].HGr) then
-            InitEnemyModel(code[1, Lines[0]]);
-          code[0, Lines[0]] := i;
-          code[2, Lines[0]] :=
-            ModelSortValue(MyRO.EnemyModel[code[1, Lines[0]]]);
-          inc(Lines[0]);
+        for I := 0 to MyRO.EnemyReport[pView].nModelCounted - 1 do
+        begin
+          Code[1, Lines[0]] := MyRO.nEnemyModel - 1;
+          while (Code[1, Lines[0]] >= 0) and
+            not((MyRO.EnemyModel[Code[1, Lines[0]]].Owner = pView) and
+            (MyRO.EnemyModel[Code[1, Lines[0]]].mix = I)) do
+            Dec(Code[1, Lines[0]]);
+          if not Assigned(Tribe[pView].ModelPicture[I].HGr) then
+            InitEnemyModel(Code[1, Lines[0]]);
+          Code[0, Lines[0]] := I;
+          Code[2, Lines[0]] :=
+            ModelSortValue(MyRO.EnemyModel[Code[1, Lines[0]]]);
+          Inc(Lines[0]);
         end;
         SortModels;
@@ -1394 +1401 @@
     kAllEModels:
       begin
-        if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[me] = 0) then
-          Server(sGetModels, me, 0, nil^);
+        if (MyRO.TestFlags and tfUncover <> 0) or (G.Difficulty[Me] = 0) then
+          Server(sGetModels, Me, 0, nil^);
         for emix := 0 to MyRO.nEnemyModel - 1 do
           if (MyRO.EnemyModel[emix].mix >= 3) and
@@ -1405 +1412 @@
             if not Assigned(PPicture.HGr) then
               InitEnemyModel(emix);
-            ok := true;
+            ok := True;
             if MainScreen.mNames.Checked then
-              for j := 0 to Lines[0] - 1 do
+              for J := 0 to Lines[0] - 1 do
               begin
-                PTestPicture := @Tribe[MyRO.EnemyModel[code[0, j]].Owner]
-                  .ModelPicture[MyRO.EnemyModel[code[0, j]].mix];
+                PTestPicture := @Tribe[MyRO.EnemyModel[Code[0, J]].Owner]
+                  .ModelPicture[MyRO.EnemyModel[Code[0, J]].mix];
                 if (PPicture.HGr = PTestPicture.HGr) and
                   (PPicture.pix = PTestPicture.pix) and
                   (ModelHash(MyRO.EnemyModel[emix])
-                  = ModelHash(MyRO.EnemyModel[code[0, j]])) then
+                  = ModelHash(MyRO.EnemyModel[Code[0, J]])) then
                 begin
-                  code[1, j] := 1;
-                  ok := false;
+                  Code[1, J] := 1;
+                  ok := False;
                   Break;
                 end;
@@ -1423 +1430 @@
             if ok then
             begin
-              code[0, Lines[0]] := emix;
-              code[1, Lines[0]] := 0;
-              code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], true);
-              inc(Lines[0]);
+              Code[0, Lines[0]] := emix;
+              Code[1, Lines[0]] := 0;
+              Code[2, Lines[0]] := ModelSortValue(MyRO.EnemyModel[emix], True);
+              Inc(Lines[0]);
             end;
           end;
@@ -1433 +1440 @@
       end;
     kTribe:
-      for i := 0 to TribeNames.Count - 1 do
-      begin
-        code[0, Lines[0]] := i;
-        inc(Lines[0]);
+      for I := 0 to TribeNames.Count - 1 do
+      begin
+        Code[0, Lines[0]] := I;
+        Inc(Lines[0]);
       end;
     (* kDeliver:
-      if MyRO.Treaty[DipMem[me].pContact]<trAlliance then
+      if MyRO.Treaty[DipMem[Me].pContact]<trAlliance then
       begin // suggest next treaty level
-      code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]+1;
-      inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[me].pContact]=trNone then
+      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]+1;
+      Inc(Lines[0]);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact]=trNone then
       begin // suggest peace
-      code[0,Lines[0]]:=opTreaty+trPeace;
-      inc(Lines[0]);
-      end;
-      if MyRO.Treaty[DipMem[me].pContact]>trNone then
+      Code[0,Lines[0]]:=opTreaty+trPeace;
+      Inc(Lines[0]);
+      end;
+      if MyRO.Treaty[DipMem[Me].pContact]>trNone then
       begin // suggest next treaty level
-      code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[me].pContact]-1;
-      inc(Lines[0]);
+      Code[0,Lines[0]]:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
+      Inc(Lines[0]);
       end; *)
     kShipPart:
       begin
         Lines[0] := 0;
-        for i := 0 to nShipPart - 1 do
-          if MyRO.Ship[me].Parts[i] > 0 then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nShipPart - 1 do
+          if MyRO.Ship[Me].Parts[I] > 0 then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
       end;
@@ -1467 +1474 @@
       begin
         Lines[0] := 0;
-        for i := 0 to nShipPart - 1 do
-          if MyRO.Ship[DipMem[me].pContact].Parts[i] > 0 then
-          begin
-            code[0, Lines[0]] := i;
-            inc(Lines[0]);
+        for I := 0 to nShipPart - 1 do
+          if MyRO.Ship[DipMem[Me].pContact].Parts[I] > 0 then
+          begin
+            Code[0, Lines[0]] := I;
+            Inc(Lines[0]);
           end;
       end;
     kGov:
-      for i := 1 to nGov - 1 do
-        if (GovPreq[i] <> preNA) and
-          ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable))
+      for I := 1 to nGov - 1 do
+        if (GovPreq[I] <> preNA) and
+          ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable))
         then
         begin
-          code[0, Lines[0]] := i;
-          inc(Lines[0]);
+          Code[0, Lines[0]] := I;
+          Inc(Lines[0]);
         end;
     kMission:
-      for i := 0 to nSpyMission - 1 do
-      begin
-        code[0, Lines[0]] := i;
-        inc(Lines[0]);
+      for I := 0 to nSpyMission - 1 do
+      begin
+        Code[0, Lines[0]] := I;
+        Inc(Lines[0]);
       end;
   end;
@@ -1494 +1501 @@
     if Lines[0] + Lines[1] + Lines[2] <= MaxLines then
     begin
-      for i := 0 to Lines[1] - 1 do // add wonders to first page
-      begin
-        code[0, Lines[0]] := code[1, i];
-        inc(Lines[0]);
+      for I := 0 to Lines[1] - 1 do // add wonders to first page
+      begin
+        Code[0, Lines[0]] := Code[1, I];
+        Inc(Lines[0]);
       end;
       Lines[1] := 0;
       FirstShrinkedLine[0] := Lines[0];
-      for i := 0 to Lines[2] - 1 do // add models to first page
-      begin
-        code[0, Lines[0]] := code[2, i];
-        inc(Lines[0]);
+      for I := 0 to Lines[2] - 1 do // add models to first page
+      begin
+        Code[0, Lines[0]] := Code[2, I];
+        Inc(Lines[0]);
       end;
       Lines[2] := 0;
     end;
-end; // InitLines
-
-function TListDlg.OnlyChoice(TestKind: TListKind): integer;
+end;
+
+function TListDlg.OnlyChoice(TestKind: TListKind): Integer;
 begin
   Kind := TestKind;
   InitLines;
   if Lines[0] = 0 then
-    result := -2
+    Result := -2
   else if Lines[0] > 1 then
-    result := -1
+    Result := -1
   else
-    result := code[0, 0];
+    Result := Code[0, 0];
 end;
 
 procedure TListDlg.FormShow(Sender: TObject);
 var
-  i: integer;
-begin
-  result := -1;
-  Closable := false;
+  I: Integer;
+begin
+  Result := -1;
+  Closable := False;
 
   if Kind = kTribe then
@@ -1543 +1550 @@
   InitLines;
 
-  MultiPage := false;
-  for i := 1 to MaxLayer - 1 do
-    if Lines[i] > 0 then
-      MultiPage := true;
+  MultiPage := False;
+  for I := 1 to MaxLayer - 1 do
+    if Lines[I] > 0 then
+      MultiPage := True;
   WideBottom := MultiPage or (Kind = kScience) or
     not Phrases2FallenBackToEnglish and
@@ -1552 +1559 @@
   if (Kind = kAdvance) and (MyData.FarTech <> adNone) or (Kind = kModels) or
     (Kind = kEModels) then begin
-    sb.SetBorderSpacing(56, 10, 10);
+    ScrollBar.SetBorderSpacing(56, 10, 10);
     TitleHeight := WideFrame + 20;
   end else begin
-    sb.SetBorderSpacing(36, 10, 34);
+    ScrollBar.SetBorderSpacing(36, 10, 34);
     TitleHeight := WideFrame;
   end;
 
   DispLines := Lines[0];
-  for i := 0 to MaxLayer - 1 do
-    if Lines[i] > DispLines then
-      DispLines := Lines[i];
+  for I := 0 to MaxLayer - 1 do
+    if Lines[I] > DispLines then
+      DispLines := Lines[I];
   if WideBottom then
   begin
@@ -1577 +1584 @@
     ClientHeight := InnerHeight + TitleHeight + NarrowFrame;
   end;
-  assert(ClientHeight <= Maintexture.Height);
+  Assert(ClientHeight <= Maintexture.Height);
 
   TechNameSpace := 224;
@@ -1615 +1622 @@
   CaptionRight := CloseBtn.Left;
   { TODO:
-  SetWindowPos(sb.ScrollBar.Handle, 0, SideFrame + InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL),
+  SetWindowPos(ScrollBar.ScrollBar.Handle, 0, SideFrame + InnerWidth - DpiGetSystemMetrics(SM_CXVSCROLL),
     TitleHeight, DpiGetSystemMetrics(SM_CXVSCROLL), LineDistance * DispLines + 48,
     SWP_NOZORDER or SWP_NOREDRAW);
@@ -1638 +1645 @@
     Layer0Btn.Top := ClientHeight - 31;
     Layer0Btn.Left := ClientWidth div 2 - (12 + 29);
-    Layer0Btn.Down := true;
+    Layer0Btn.Down := True;
     Layer1Btn.Top := ClientHeight - 31;
     Layer1Btn.Left := ClientWidth div 2 - (12 - 29);
-    Layer1Btn.Down := false;
+    Layer1Btn.Down := False;
     Layer2Btn.Top := ClientHeight - 31;
     Layer2Btn.Left := ClientWidth div 2 - 12;
-    Layer2Btn.Down := false;
+    Layer2Btn.Down := False;
   end;
 
   Layer := 0;
-  Sel := -2;
+  Selected := -2;
   ScienceNation := -1;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
 
   OffscreenPaint;
 end;
 
-procedure TListDlg.ShowNewContent(NewMode: integer; ListKind: TListKind);
+procedure TListDlg.ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
 var
-  i: integer;
-  ShowFocus, forceclose: boolean;
+  I: Integer;
+  ShowFocus, forceclose: Boolean;
 begin
   forceclose := (ListKind <> Kind) and
@@ -1722 +1729 @@
   if Kind = kAdvance then // show focus button?
     if MyData.FarTech <> adNone then
-      ShowFocus := true
+      ShowFocus := True
     else
     begin
-      ShowFocus := false;
-      for i := 0 to nAdv - 1 do
-        if not(i in FutureTech) and (MyRO.Tech[i] < tsApplicable) and
-          ((AdvValue[i] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
-          ((AdvValue[i] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
-          (Server(sSetResearch - sExecute, me, i, nil^) < rExecuted) then
-          ShowFocus := true;
+      ShowFocus := False;
+      for I := 0 to nAdv - 1 do
+        if not(I in FutureTech) and (MyRO.Tech[I] < tsApplicable) and
+          ((AdvValue[I] < 2000) or (MyRO.Tech[adMassProduction] > tsNA)) and
+          ((AdvValue[I] < 1000) or (MyRO.Tech[adScience] > tsNA)) and
+          (Server(sSetResearch - sExecute, Me, I, nil^) < rExecuted) then
+          ShowFocus := True;
     end;
-  ToggleBtn.Visible := (Kind = kCities) and not supervising or (Kind = kAdvance)
+  ToggleBtn.Visible := (Kind = kCities) and not Supervising or (Kind = kAdvance)
     and ShowFocus or (Kind = kModels) or (Kind = kEModels);
   CloseBtn.Visible := not(Kind in MustChooseKind);
 
   inherited ShowNewContent(NewMode, forceclose);
-end; // ShowNewContent
-
-procedure TListDlg.ShowNewContent_CityProject(NewMode, cix: integer);
+end;
+
+procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: Integer);
 begin
   cixProject := cix;
@@ -1746 +1753 @@
 end;
 
-procedure TListDlg.ShowNewContent_MilReport(NewMode, p: integer);
-begin
-  pView := p;
-  if p = me then
+procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; P: Integer);
+begin
+  pView := P;
+  if P = Me then
     ShowNewContent(NewMode, kModels)
   else
@@ -1757 +1764 @@
 procedure TListDlg.PlayerClick(Sender: TObject);
 begin
-  if TComponent(Sender).Tag = me then
+  if TComponent(Sender).Tag = Me then
     Kind := kModels
   else
@@ -1765 +1772 @@
   end;
   InitLines;
-  Sel := -2;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   OffscreenPaint;
   Invalidate;
@@ -1778 +1785 @@
   Layer := TComponent(Sender).Tag;
 
-  Sel := -2;
-  sb.Init(Lines[Layer] - 1, DispLines);
+  Selected := -2;
+  ScrollBar.Init(Lines[Layer] - 1, DispLines);
   SmartUpdateContent;
 end;
@@ -1785 +1792 @@
 procedure TListDlg.ToggleBtnClick(Sender: TObject);
 var
-  p1: integer;
-  m: TDpiMenuItem;
+  p1: Integer;
+  M: TDpiMenuItem;
 begin
   case Kind of
     kAdvance:
       begin
-        result := adFar;
-        Closable := true;
+        Result := adFar;
+        Closable := True;
         Close;
       end;
@@ -1807 +1814 @@
       begin
         EmptyMenu(Popup.Items);
-        if G.Difficulty[me] > 0 then
-        begin
-          m := TDpiMenuItem.Create(Popup);
-          m.RadioItem := true;
-          m.Caption := Tribe[me].TPhrase('SHORTNAME');
-          m.Tag := me;
-          m.OnClick := PlayerClick;
+        if G.Difficulty[Me] > 0 then
+        begin
+          M := TDpiMenuItem.Create(Popup);
+          M.RadioItem := True;
+          M.Caption := Tribe[Me].TPhrase('SHORTNAME');
+          M.Tag := Me;
+          M.OnClick := PlayerClick;
           if Kind = kModels then
-            m.Checked := true;
-          Popup.Items.Add(m);
+            M.Checked := True;
+          Popup.Items.Add(M);
         end;
         for p1 := 0 to nPl - 1 do
-          if (p1 <> me) and (MyRO.EnemyReport[p1] <> nil) and
+          if (p1 <> Me) and (MyRO.EnemyReport[p1] <> nil) and
             (MyRO.EnemyReport[p1].TurnOfMilReport >= 0) then
           begin
-            m := TDpiMenuItem.Create(Popup);
-            m.RadioItem := true;
-            m.Caption := Tribe[p1].TPhrase('SHORTNAME');
-            m.Tag := p1;
-            m.OnClick := PlayerClick;
+            M := TDpiMenuItem.Create(Popup);
+            M.RadioItem := True;
+            M.Caption := Tribe[p1].TPhrase('SHORTNAME');
+            M.Tag := p1;
+            M.OnClick := PlayerClick;
             if (Kind = kEModels) and (p1 = pView) then
-              m.Checked := true;
-            Popup.Items.Add(m);
+              M.Checked := True;
+            Popup.Items.Add(M);
           end;
         Popup.Popup(Left + ToggleBtn.Left, Top + ToggleBtn.Top +
@@ -1837 +1844 @@
 end;
 
-procedure TListDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TListDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -1876 +1883 @@
 procedure TListDlg.RemoveUnit;
 begin
-  if ListDlg.Visible and (Kind = kModels) then
+  if Visible and (Kind = kModels) then
     SmartUpdateContent;
 end;
@@ -1882 +1889 @@
 procedure TListDlg.ScrollBarUpdate(Sender: TObject);
 begin
-  Sel := -2;
-  SmartUpdateContent(true);
+  Selected := -2;
+  SmartUpdateContent(True);
 end;
 

branches/highdpi/LocalPlayer/TechTree.pas ¶

@@ -30 +30 @@
   end;
 
-var
-  TechTreeDlg: TTechTreeDlg;
-
 
 implementation
@@ -55 +52 @@
   yLegendPitch = 32;
 
-function min(a, b: Integer): Integer;
-begin
-  if a < b then
-    result := a
+function Min(A, B: Integer): Integer;
+begin
+  if A < B then
+    Result := A
   else
-    result := b;
-end;
-
-function max(a, b: Integer): Integer;
-begin
-  if a > b then
-    result := a
+    Result := B;
+end;
+
+function Max(A, B: Integer): Integer;
+begin
+  if A > B then
+    Result := A
   else
-    result := b;
+    Result := B;
 end;
 
@@ -84 +81 @@
 procedure TTechTreeDlg.FormPaint(Sender: TObject);
 var
-  X, w: Integer;
+  X, W: Integer;
 begin
   with Canvas do begin
     // black border
-    brush.color := $000000;
-    fillrect(rect(0, 0, BlackBorder, ClientHeight));
-    fillrect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
-    fillrect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
-    fillrect(rect(BlackBorder, ClientHeight - BlackBorder,
+    Brush.Color := $000000;
+    FillRect(rect(0, 0, BlackBorder, ClientHeight));
+    FillRect(rect(BlackBorder, 0, ClientWidth - BlackBorder, BlackBorder));
+    FillRect(rect(ClientWidth - BlackBorder, 0, ClientWidth, ClientHeight));
+    FillRect(rect(BlackBorder, ClientHeight - BlackBorder,
       ClientWidth - BlackBorder, ClientHeight));
 
     // texturize empty space
-    brush.color := $FFFFFF;
+    Brush.Color := $FFFFFF;
     if xOffset > 0 then
       FillRectSeamless(Canvas, BlackBorder, BlackBorder, BlackBorder + xOffset,
@@ -105 +102 @@
         ClientWidth - BlackBorder, ClientHeight - BlackBorder,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
-    X := max(BlackBorder, BlackBorder + xOffset);
-    w := min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
+    X := Max(BlackBorder, BlackBorder + xOffset);
+    W := Min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
     if yOffset > 0 then
-      FillRectSeamless(Canvas, X, BlackBorder, w, BlackBorder + yOffset,
+      FillRectSeamless(Canvas, X, BlackBorder, W, BlackBorder + yOffset,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
     if yOffset + Image.height < ClientHeight - 2 * BlackBorder then
-      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, w,
+      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, W,
         ClientHeight - BlackBorder, -BlackBorder - xOffset,
         -BlackBorder - yOffset, Paper);
   end;
-  DpiBitCanvas(Canvas, max(BlackBorder, BlackBorder + xOffset),
-    max(BlackBorder, BlackBorder + yOffset),
-    min(Image.width, min(Image.width + xOffset,
-    min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
-    ), min(Image.height, min(Image.height + yOffset,
-    min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
-    yOffset))), Image.Canvas, max(0, -xOffset),
-    max(0, -yOffset));
+  DpiBitBltCanvas(Canvas, Max(BlackBorder, BlackBorder + xOffset),
+    Max(BlackBorder, BlackBorder + yOffset),
+    Min(Image.width, Min(Image.width + xOffset,
+    Min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
+    ), Min(Image.height, Min(Image.height + yOffset,
+    Min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
+    yOffset))), Image.Canvas, Max(0, -xOffset),
+    Max(0, -yOffset));
 end;
 
@@ -128 +125 @@
 var
   X, Y, ad: Integer;
-  s: string;
+  S: string;
   NewWidth: Integer;
   NewHeight: Integer;
 begin
+  Caption := Phrases2.Lookup('MENU_ADVTREE');
   if Image = nil then begin
     Image := TDpiBitmap.Create;
@@ -139 +137 @@
 
     with Image.Canvas do begin
-      // write advance names
+      // Write advance names
       Font.Assign(UniFont[ftSmall]);
-      Font.color := clBlack;
-      brush.Style := bsClear;
-      for X := 0 to (Image.width - xStart) div xPitch do
-        for Y := 0 to (Image.height - yStart) div yPitch do
+      Font.Color := clBlack;
+      Brush.Style := bsClear;
+      for X := 0 to (Image.Width - xStart) div xPitch do
+        for Y := 0 to (Image.Height - yStart) div yPitch do
         begin
           ad := Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1];
           if ad and $FFFF00 = 0 then
           begin
-            s := Phrases.Lookup('ADVANCES', ad);
-            while TextWidth(s) > 112 do
-              Delete(s, Length(s), 1);
-            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
+            S := Phrases.Lookup('ADVANCES', ad);
+            while TextWidth(S) > 112 do
+              Delete(S, Length(S), 1);
+            TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, S);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
               := TransparentColor2;
-          end
+          end;
         end;
 
-      // write legend
+      // Write legend
       TextOut(xLegend, yLegend, Phrases2.Lookup('ADVTREE_UP0'));
       TextOut(xLegend, yLegend + yLegendPitch, Phrases2.Lookup('ADVTREE_UP1'));
@@ -172 +170 @@
   end;
 
-  // fit window to image, center image in window, center window to screen
+  // Fit window to image, center image in window, center window to screen
   NewWidth := Min(DpiScreen.Width - 40, Image.Width + LeftBorder + RightBorder + 2 * BlackBorder);
   NewHeight := Min(DpiScreen.Height - 40, Image.Height + TopBorder + BottomBorder + 2 * BlackBorder);
@@ -190 +188 @@
   if Button = mbLeft then
   begin
-    dragging := true;
+    Dragging := True;
     xDown := X;
     yDown := Y;
@@ -199 +197 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  dragging := false;
+  Dragging := False;
 end;
 
@@ -205 +203 @@
   X, Y: Integer);
 begin
-  if dragging then
+  if Dragging then
   begin
     xOffset := xOffset + X - xDown;

branches/highdpi/LocalPlayer/Term.lfm ¶

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

branches/highdpi/LocalPlayer/Term.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, {$IFDEF Windows}
+  UDpiControls, {$IFDEF WINDOWS}
   Windows,
 {$ENDIF}
-{$IFDEF Linux}
+{$IFDEF UNIX}
   LMessages, Messages,
 {$ENDIF}
@@ -14 +14 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  UGraphicSet, UMiniMap, IsoEngine;
+  GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
+  Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
+  Help;
 
 const
@@ -68 +70 @@
     mWonders: TDpiMenuItem;
     mScienceStat: TDpiMenuItem;
-    mRR: TDpiMenuItem;
+    mRailRoad: TDpiMenuItem;
     mClear: TDpiMenuItem;
     mFarm: TDpiMenuItem;
@@ -181 +183 @@
     procedure FormMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
+    procedure mAfforestClick(Sender: TObject);
+    procedure mAirBaseClick(Sender: TObject);
+    procedure mCanalClick(Sender: TObject);
+    procedure mCancelClick(Sender: TObject);
+    procedure mCentreClick(Sender: TObject);
+    procedure mcityClick(Sender: TObject);
+    procedure mCityStatClick(Sender: TObject);
+    procedure mCityTypesClick(Sender: TObject);
+    procedure mClearClick(Sender: TObject);
+    procedure mDiagramClick(Sender: TObject);
+    procedure mEmpireClick(Sender: TObject);
+    procedure mEnhanceClick(Sender: TObject);
+    procedure mEnhanceDefClick(Sender: TObject);
+    procedure mEUnitStatClick(Sender: TObject);
+    procedure mFarmClick(Sender: TObject);
+    procedure mfortClick(Sender: TObject);
+    procedure mGoOnClick(Sender: TObject);
+    procedure mHelpClick(Sender: TObject);
+    procedure mhomeClick(Sender: TObject);
+    procedure mirrigationClick(Sender: TObject);
+    procedure mirrigationDrawItem(Sender: TObject; ACanvas: TDpiCanvas;
+      ARect: TRect; AState: TOwnerDrawState);
+    procedure mJumpClick(Sender: TObject);
+    procedure mLoadClick(Sender: TObject);
+    procedure mmineClick(Sender: TObject);
+    procedure mNationsClick(Sender: TObject);
+    procedure mNextUnitClick(Sender: TObject);
+    procedure mnoordersClick(Sender: TObject);
+    procedure mPillageClick(Sender: TObject);
+    procedure mpollutionClick(Sender: TObject);
+    procedure mPrevUnitClick(Sender: TObject);
+    procedure mRandomMapClick(Sender: TObject);
+    procedure mRecoverClick(Sender: TObject);
+    procedure mResignClick(Sender: TObject);
+    procedure mRevolutionClick(Sender: TObject);
+    procedure mroadClick(Sender: TObject);
+    procedure mRailRoadClick(Sender: TObject);
+    procedure mRunClick(Sender: TObject);
+    procedure mScienceStatClick(Sender: TObject);
+    procedure mSelectTransportClick(Sender: TObject);
+    procedure mShipsClick(Sender: TObject);
+    procedure mstayClick(Sender: TObject);
+    procedure mTechTreeClick(Sender: TObject);
+    procedure mtransClick(Sender: TObject);
+    procedure mUnitStatClick(Sender: TObject);
+    procedure mUnloadClick(Sender: TObject);
+    procedure mwaitClick(Sender: TObject);
+    procedure mWebsiteClick(Sender: TObject);
+    procedure mWondersClick(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
     procedure MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure EOTClick(Sender: TObject);
     procedure PanelBoxMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
-    procedure MenuClick(Sender: TObject);
+      Shift: TShiftState; X, Y: Integer);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure mDisbandOrUtilizeClick(Sender: TObject);
     procedure FormResize(Sender: TObject);
     procedure PanelBtnClick(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure Toggle(Sender: TObject);
     procedure PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
-      x, y: integer);
+      X, Y: Integer);
     procedure mShowClick(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
+      Shift: TShiftState; X, Y: Integer);
     procedure FormPaint(Sender: TObject);
     procedure mRepClicked(Sender: TObject);
@@ -214 +265 @@
     procedure mNamesClick(Sender: TObject);
     procedure MapBtnClick(Sender: TObject);
-    procedure FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CreateUnitClick(Sender: TObject);
     procedure mSoundOffClick(Sender: TObject);
@@ -275 +326 @@
     NoMap: TIsoMap;
     NoMapPanel: TIsoMap;
-    function ChooseUnusedTribe: integer;
+    // Forms
+    FWondersDlg: TWondersDlg;
+    FTechTreeDlg: TTechTreeDlg;
+    FEnhanceDlg: TEnhanceDlg;
+    FNegoDlg: TNegoDlg;
+    FCityTypeDlg: TCityTypeDlg;
+    FDiaDlg: TDiaDlg;
+    FCityDlg: TCityDlg;
+    FRatesDlg: TRatesDlg;
+    FBattleDlg: TBattleDlg;
+    FNatStatDlg: TNatStatDlg;
+    FUnitStatDlg: TUnitStatDlg;
+    FDraftDlg: TDraftDlg;
+    FModalSelectDlg: TModalSelectDlg;
+    FListDlg: TListDlg;
+    FMessgExDlg: TMessgExDlg;
+    FHelpDlg: THelpDlg;
+    procedure ArrangeDialogs;
+    procedure ArrangeDialog(Form: TBufferedDrawDlg);
+    function ChooseUnusedTribe: Integer;
+    function DoJob(j0: Integer): Integer;
+    function GetBattleDlg: TBattleDlg;
+    function GetCityDlg: TCityDlg;
+    function GetCityTypeDlg: TCityTypeDlg;
+    function GetDiaDlg: TDiaDlg;
+    function GetDraftDlg: TDraftDlg;
+    function GetEnhanceDlg: TEnhanceDlg;
+    function GetHelpDlg: THelpDlg;
+    function GetListDlg: TListDlg;
+    function GetMessgExDlg: TMessgExDlg;
+    function GetModalSelectDlg: TModalSelectDlg;
+    function GetNatStatDlg: TNatStatDlg;
+    function GetNegoDlg: TNegoDlg;
+    function GetRatesDlg: TRatesDlg;
+    function GetTechTreeDlg: TTechTreeDlg;
     procedure GetTribeList;
+    function GetUnitStatDlg: TUnitStatDlg;
+    function GetWondersDlg: TWondersDlg;
     procedure InitModule;
     procedure DoneModule;
-    procedure InitTurn(NewPlayer: integer);
+    procedure InitTurn(NewPlayer: Integer);
     procedure SaveMenuItemsState;
     procedure ScrollBarUpdate(Sender: TObject);
@@ -291 +378 @@
     procedure FocusNextUnit(Dir: Integer = 1);
     procedure NextUnit(NearLoc: Integer; AutoTurn: Boolean);
-    procedure Scroll(dx, dy: integer);
-    procedure SetMapPos(Loc: integer; MapPos: TPoint);
-    procedure Centre(Loc: integer);
-    procedure SetTroopLoc(Loc: integer);
-    procedure ProcessRect(x0, y0, nx, ny, Options: integer);
-    procedure PaintLoc(Loc: integer; Radius: integer = 0);
-    procedure PaintLoc_BeforeMove(FromLoc: integer);
-    procedure PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle = pltsNormal);
-    procedure PaintBufferToScreen(xMap, yMap, width, height: integer);
+    procedure Scroll(dx, dy: Integer);
+    procedure SetMapPos(Loc: Integer; MapPos: TPoint);
+    procedure Centre(Loc: Integer);
+    procedure SetTroopLoc(Loc: Integer);
+    procedure ProcessRect(x0, y0, nx, ny, Options: Integer);
+    procedure PaintLoc(Loc: Integer; Radius: Integer = 0);
+    procedure PaintLoc_BeforeMove(FromLoc: Integer);
+    procedure PaintLocTemp(Loc: Integer; Style: TPaintLocTempStyle = pltsNormal);
+    procedure PaintBufferToScreen(xMap, yMap, width, height: Integer);
     procedure PaintDestination;
-    procedure SetUnFocus(uix: integer);
-    function MoveUnit(dx, dy: integer; Options: integer = 0): integer;
-    procedure MoveToLoc(Loc: integer; CheckSuicide: boolean);
-    procedure MoveOnScreen(ShowMove: TShowMove; Step0, Step1, nStep: integer;
-      Restore: boolean = true);
-    procedure FocusOnLoc(Loc: integer; Options: integer = 0);
-    function EndTurn(WasSkipped: boolean = false): boolean;
+    procedure SetUnFocus(uix: Integer);
+    function MoveUnit(dx, dy: Integer; Options: Integer = 0): Integer;
+    procedure MoveToLoc(Loc: Integer; CheckSuicide: Boolean);
+    procedure MoveOnScreen(ShowMove: TShowMove; Step0, Step1, nStep: Integer;
+      Restore: Boolean = True);
+    procedure FocusOnLoc(Loc: Integer; Options: Integer = 0);
+    function EndTurn(WasSkipped: Boolean = False): Boolean;
     procedure EndNego;
-    function IsPanelPixel(x, y: integer): boolean;
+    function IsPanelPixel(X, Y: Integer): Boolean;
     procedure InitPopup(Popup: TDpiPopupMenu);
     procedure SetMapOptions;
@@ -315 +402 @@
     procedure CheckTerrainBtnVisible;
     procedure RememberPeaceViolation;
-    procedure SetDebugMap(p: integer);
-    procedure SetViewpoint(p: integer);
-    function LocationOfScreenPixel(x, y: integer): Integer;
+    procedure SetDebugMap(P: Integer);
+    procedure SetViewpoint(P: Integer);
+    function LocationOfScreenPixel(X, Y: Integer): Integer;
     function GetCenterLoc: Integer;
     procedure SetTileSizeCenter(TileSize: TTileSize);
     procedure SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
-    procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure RectInvalidate(Left, Top, Rigth, Bottom: Integer);
     procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
-    procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: Integer);
     procedure LoadSettings;
     procedure SaveSettings;
@@ -331 +418 @@
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
-    procedure PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
+    procedure PaintZoomedTile(dst: TDpiBitmap; X, Y, Loc: Integer);
   public
-    UsedOffscreenWidth, UsedOffscreenHeight: integer;
+    UsedOffscreenWidth: Integer;
+    UsedOffscreenHeight: Integer;
     Offscreen: TDpiBitmap;
     OffscreenUser: TDpiForm;
-    procedure Client(Command, NewPlayer: integer; var Data);
-    procedure SetAIName(p: integer; Name: string);
-    function ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-      ShowEvent: integer = 0): boolean;
-    procedure CityClosed(Activateuix: integer; StepFocus: boolean = false;
-      SelectFocus: boolean = false);
-    function DipCall(Command: integer): integer;
-    function OfferCall(var Offer: TOffer): integer;
-    procedure UpdateViews(UpdateCityScreen: boolean = false);
-    function ContactRefused(p: integer; Item: String): boolean;
+    procedure Client(Command, NewPlayer: Integer; var Data);
+    procedure SetAIName(P: Integer; Name: string);
+    function ZoomToCity(Loc: Integer; NextUnitOnClose: Boolean = False;
+      ShowEvent: Integer = 0): Boolean;
+    procedure CityClosed(Activateuix: Integer; StepFocus: Boolean = False;
+      SelectFocus: Boolean = False);
+    function DipCall(Command: Integer): Integer;
+    function OfferCall(var Offer: TOffer): Integer;
+    procedure UpdateViews(UpdateCityScreen: Boolean = False);
+    function ContactRefused(P: Integer; Item: String): Boolean;
+    // Forms
+    property WondersDlg: TWondersDlg read GetWondersDlg;
+    property TechTreeDlg: TTechTreeDlg read GetTechTreeDlg;
+    property EnhanceDlg: TEnhanceDlg read GetEnhanceDlg;
+    property NegoDlg: TNegoDlg read GetNegoDlg;
+    property CityTypeDlg: TCityTypeDlg read GetCityTypeDlg;
+    property DiaDlg: TDiaDlg read GetDiaDlg;
+    property CityDlg: TCityDlg read GetCityDlg;
+    property RatesDlg: TRatesDlg read GetRatesDlg;
+    property BattleDlg: TBattleDlg read GetBattleDlg;
+    property NatStatDlg: TNatStatDlg read GetNatStatDlg;
+    property UnitStatDlg: TUnitStatDlg read GetUnitStatDlg;
+    property DraftDlg: TDraftDlg read GetDraftDlg;
+    property ModalSelectDlg: TModalSelectDlg read GetModalSelectDlg;
+    property ListDlg: TListDlg read GetListDlg;
+    property MessgExDlg: TMessgExDlg read GetMessgExDlg;
+    property HelpDlg: THelpDlg read GetHelpDlg;
   end;
 
@@ -352 +457 @@
 
 type
+
+  { TTribeInfo }
+
   TTribeInfo = record
-    trix: integer;
+    trix: Integer;
     FileName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TCityNameInfo }
 
   TCityNameInfo = record
-    ID: integer;
+    ID: Integer;
     NewName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TModelNameInfo }
 
   TModelNameInfo = record
-    mix: integer;
+    mix: Integer;
     NewName: ShortString;
-  end;
-
-  TPriceSet = set of $00 .. $FF;
+    function GetCommandDataSize: Byte;
+  end;
+
+  TFormAction = (faClose, faEnable, faDisable, faUpdate, faSmartUpdateContent);
 
 const
@@ -410 +525 @@
   usToldNoReturn = $100;
   usPersistent = usStay or usGoto or usEnhance or usRecover or
-    integer($FFFF0000);
+    Integer($FFFF0000);
 
   { model status flags }
@@ -424 +539 @@
   adNexus = $803;
 
-  SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of integer = (10,
+  SpecialModelPictureCode: array [0 .. nSpecialModel - 1] of Integer = (10,
     11, 40, 41, 21, 30, { 50,51, } 64, 74, { 71, } 73);
 
@@ -437 +552 @@
 
   nCityEventPriority = 16;
-  CityEventPriority: array [0 .. nCityEventPriority - 1] of integer =
+  CityEventPriority: array [0 .. nCityEventPriority - 1] of Integer =
     (chDisorder, chImprovementLost, chUnitLost, chAllImpsMade, chProduction,
     chOldWonder, chNoSettlerProd, chPopDecrease, chProductionSabotaged,
@@ -504 +619 @@
   DestinationMarkON: Boolean;
   StartRunning: Boolean;
-  StayOnTop_Ensured: Boolean;
   Supervising: Boolean;
   UnusedTribeFiles: TStringList;
@@ -512 +626 @@
   DipMem: array [0 .. nPl - 1] of TDipMem;
 
-function CityEventName(i: integer): string;
-function RoughCredibility(Credibility: integer): integer;
-
-function InitEnemyModel(emix: integer): boolean;
+function CityEventName(I: Integer): string;
+function RoughCredibility(Credibility: Integer): Integer;
+
+function InitEnemyModel(emix: Integer): Boolean;
 procedure InitAllEnemyModels;
-procedure InitMyModel(mix: integer; final: boolean);
-
-procedure ImpImage(ca: TDpiCanvas; x, y, iix: integer; Government: integer = -1;
-  IsControl: boolean = false);
-procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure InitMyModel(Mix: Integer; Final: Boolean);
+
+procedure ImpImage(ca: TDpiCanvas; X, Y, iix: Integer; Government: Integer = -1;
+  IsControl: Boolean = False);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
+function AlignUp(Value, Alignment: Integer): Integer;
 
 
@@ -527 +642 @@
 
 uses
-  Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
+  Directories, Log, PixelPointer, Sound, Registry, Global, KeyBindings, CmdList;
 
 {$R *.lfm}
@@ -536 +649 @@
   lxmax_xxx = 130;
   LeftPanelWidth = 70;
-  LeftPanelWidth_Editor = 46;
   overlap = PanelHeight - MidPanelHeight;
   yTroop = PanelHeight - 83;
   xPalace = 66;
   yPalace = 24; // 120;
-  xAdvisor = 108;
-  yAdvisor = 48;
+{  xAdvisor = 108;
+  yAdvisor = 48;}
   xUnitText = 80;
-  PaperShade = 3;
   BlinkOnTime = 12;
   BlinkOffTime = 6;
   MoveTime = 300; // {time for moving a unit in ms}
   WaitAfterShowMove = 32;
-  FastScrolling = false; // causes problems with overlapping windows
+  FastScrolling = False; // causes problems with overlapping windows
 
   nBrushTypes = 26;
@@ -587 +698 @@
   CurrentMoveInfo: TCurrentMoveInfo;
 
-function CityEventName(i: integer): string;
-begin
-  if i = 14 then // chAllImpsMade
+function CityEventName(I: Integer): string;
+begin
+  if I = 14 then // chAllImpsMade
     if not Phrases2FallenBackToEnglish then
-      result := Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
+      Result := Phrases2.Lookup('CITYEVENT_ALLIMPSMADE')
     else
-      result := Phrases.Lookup('CITYEVENTS', 1)
+      Result := Phrases.Lookup('CITYEVENTS', 1)
   else
-    result := Phrases.Lookup('CITYEVENTS', i);
+    Result := Phrases.Lookup('CITYEVENTS', I);
 end;
 
@@ -605 +716 @@
   TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
-  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch: Integer;
+  Sum: Int64;
+  Cnt, dx, dy, nx, ny, ix, iy, ir, X, Y, C, ch: Integer;
   xdivider, ydivider: Integer;
   Resampled: ^TBuffer;
@@ -611 +723 @@
 begin
   nx := BigImp.Width div xSizeBig * xSizeSmall;
-  ny := BigImp.Height div ySizeBig * ySizeSmall;
-  SmallImp.SetSize(nx, ny);
-  SmallImp.Canvas.StretchDraw(Rect(0, 0, SmallImp.Width, SmallImp.Height), BigImp);
-
-{  nx := BigImp.Width div xSizeBig * xSizeSmall;
   ny := BigImp.Height div ySizeBig * ySizeSmall;
 
@@ -624 +731 @@
   for ix := 0 to BigImp.Width div xSizeBig - 1 do
     for iy := 0 to BigImp.Height div ySizeBig - 1 do begin
-      PixelPtr := PixelPointer(BigImp, ScaleToNative(ix * xSizeBig),
-        ScaleToNative(cut + iy * ySizeBig));
-      for y := 0 to ScaleToNative(ySizeBig - 2 * cut) - 1 do begin
-        ydivider := (ScaleFromNative(y) * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
-          (ySizeBig - 2 * cut) - ScaleFromNative(y) * ySizeSmall;
+      PixelPtr := TPixelPointer.Create(BigImp, ScaleToNative(ix * xSizeBig),
+        ScaleToNative(Cut + iy * ySizeBig));
+      for Y := 0 to ScaleToNative(ySizeBig - 2 * Cut) - 1 do begin
+        ydivider := (ScaleFromNative(Y) * ySizeSmall div (ySizeBig - 2 * Cut) + 1) *
+          (ySizeBig - 2 * Cut) - ScaleFromNative(Y) * ySizeSmall;
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        for x := 0 to ScaleToNative(xSizeBig) - 1 do begin
-          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(x) *
-            xSizeSmall div xSizeBig + ScaleFromNative(y) *
-            ySizeSmall div (ySizeBig - 2 * cut) * nx;
-          xdivider := (ScaleFromNative(x) * xSizeSmall div xSizeBig + 1) *
-            xSizeBig - ScaleFromNative(x) * xSizeSmall;
+        for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
+          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(X) *
+            xSizeSmall div xSizeBig + ScaleFromNative(Y) *
+            ySizeSmall div (ySizeBig - 2 * Cut) * nx;
+          xdivider := (ScaleFromNative(X) * xSizeSmall div xSizeBig + 1) *
+            xSizeBig - ScaleFromNative(X) * xSizeSmall;
           if xdivider > xSizeSmall then
             xdivider := xSizeSmall;
           for ch := 0 to 2 do begin
-            c := PixelPtr.Pixel^.Planes[ch];
-            Inc(Resampled[ir, ch], c * xdivider * ydivider);
+            C := PixelPtr.Pixel^.Planes[ch];
+            Inc(Resampled[ir, ch], C * xdivider * ydivider);
             if xdivider < xSizeSmall then
-              Inc(Resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + 1, ch], C * (xSizeSmall - xdivider) *
                 ydivider);
             if ydivider < ySizeSmall then
               Inc(Resampled[ir + nx, ch],
-                c * xdivider * (ySizeSmall - ydivider));
+                C * xdivider * (ySizeSmall - ydivider));
             if (xdivider < xSizeSmall) and (ydivider < ySizeSmall) then
-              Inc(Resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + nx + 1, ch], C * (xSizeSmall - xdivider) *
                 (ySizeSmall - ydivider));
           end;
@@ -662 +769 @@
   SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
-  PixelPtr := PixelPointer(SmallImp);
-  for y := 0 to ScaleToNative(ny) - 1 do begin
-    for x := 0 to ScaleToNative(nx) - 1 do begin
+  PixelPtr := TPixelPointer.Create(SmallImp);
+  for Y := 0 to ScaleToNative(ny) - 1 do begin
+    for X := 0 to ScaleToNative(nx) - 1 do begin
       for ch := 0 to 2 do begin
         Sum := 0;
         Cnt := 0;
         for dy := -1 to 1 do
-          if ((dy >= 0) or (ScaleFromNative(y) mod ySizeSmall > 0)) and
-            ((dy <= 0) or (ScaleFromNative(y) mod ySizeSmall < ySizeSmall - 1)) then
+          if ((dy >= 0) or (ScaleFromNative(Y) mod ySizeSmall > 0)) and
+            ((dy <= 0) or (ScaleFromNative(Y) mod ySizeSmall < ySizeSmall - 1)) then
             for dx := -1 to 1 do
-              if ((dx >= 0) or (ScaleFromNative(x) mod xSizeSmall > 0)) and
-                ((dx <= 0) or (ScaleFromNative(x) mod xSizeSmall < xSizeSmall - 1)) then
+              if ((dx >= 0) or (ScaleFromNative(X) mod xSizeSmall > 0)) and
+                ((dx <= 0) or (ScaleFromNative(X) mod xSizeSmall < xSizeSmall - 1)) then
               begin
-                Inc(Sum, Resampled[ScaleFromNative(x) + dx + nx * (ScaleFromNative(y) + dy), ch]);
+                Inc(Sum, Resampled[ScaleFromNative(X) + dx + nx * (ScaleFromNative(Y) + dy), ch]);
                 Inc(Cnt);
               end;
-        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(x) + nx * ScaleFromNative(y), ch] - Sum *
-          Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
+        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(X) + nx * ScaleFromNative(Y), ch] - Sum *
+          Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * Cut));
         if Sum < 0 then Sum := 0;
         if Sum > 255 then Sum := 255;
@@ -690 +797 @@
   SmallImp.EndUpdate;
   FreeMem(Resampled);
-  }
-end;
-
-procedure ImpImage(ca: TDpiCanvas; x, y, iix: integer; Government: integer;
-  IsControl: boolean);
+end;
+
+procedure ImpImage(ca: TDpiCanvas; X, Y, iix: Integer; Government: Integer;
+  IsControl: Boolean);
 begin
   if Government < 0 then
@@ -700 +806 @@
   if (iix = imPalace) and (Government <> gAnarchy) then
     iix := Government - 8;
-  FrameImage(ca, BigImp, x, y, xSizeBig, ySizeBig, (iix + SystemIconLines * 7)
+  FrameImage(ca, BigImp, X, Y, xSizeBig, ySizeBig, (iix + SystemIconLines * 7)
     mod 7 * xSizeBig, (iix + SystemIconLines * 7) div 7 * ySizeBig, IsControl);
 end;
 
-procedure HelpOnTerrain(Loc, NewMode: integer);
+procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
 begin
   if MyMap[Loc] and fDeadLands <> 0 then
-    HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
   else if (MyMap[Loc] and fTerrain = fForest) and IsJungle(Loc div G.lx) then
-    HelpDlg.ShowNewContent(NewMode, hkTer,
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer,
       fJungle + (MyMap[Loc] shr 5 and 3) * 12)
   else
-    HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
       (MyMap[Loc] shr 5 and 3) * 12);
 end;
 
+function AlignUp(Value, Alignment: Integer): Integer;
+begin
+  Result := Value or (Alignment - 1);
+end;
+
 { *** tribe management procedures *** }
 
-function RoughCredibility(Credibility: integer): integer;
+function RoughCredibility(Credibility: Integer): Integer;
 begin
   case Credibility of
     0 .. 69:
-      result := 0;
+      Result := 0;
     70 .. 89:
-      result := 1;
+      Result := 1;
     90 .. 99:
-      result := 2;
+      Result := 2;
     100:
-      result := 3
-  end;
-end;
-
-procedure ChooseModelPicture(p, mix, code, Hash, Turn: integer;
-  ForceNew, final: boolean);
+      Result := 3;
+  end;
+end;
+
+procedure ChooseModelPicture(P, mix, Code, Hash, Turn: Integer;
+  ForceNew, final: Boolean);
 var
-  i: integer;
+  I: Integer;
   Picture: TModelPictureInfo;
-  IsNew: boolean;
-begin
-  Picture.trix := p;
+  IsNew: Boolean;
+begin
+  Picture.trix := P;
   Picture.mix := mix;
-  if code = 74 then
+  if Code = 74 then
   begin // use correct pictures for slaves
-    if Tribe[p].mixSlaves < 0 then
-      if not TribeOriginal[p] then
-        Tribe[p].mixSlaves := mix
+    if Tribe[P].mixSlaves < 0 then
+      if not TribeOriginal[P] then
+        Tribe[P].mixSlaves := mix
       else
       begin
-        i := mix + p shl 16;
-        Server(cSetSlaveIndex, 0, 0, i);
+        I := mix + P shl 16;
+        Server(cSetSlaveIndex, 0, 0, I);
       end;
     if ToldSlavery = 1 then
@@ -757 +868 @@
     Picture.Hash := 0;
     Picture.GrName := 'StdUnits.png';
-    IsNew := true;
+    IsNew := True;
   end
   else
   begin
     Picture.Hash := Hash;
-    IsNew := Tribe[p].ChooseModelPicture(Picture, code, Turn, ForceNew);
+    IsNew := Tribe[P].ChooseModelPicture(Picture, Code, Turn, ForceNew);
   end;
   if final then
-    if not TribeOriginal[p] then
-      Tribe[p].SetModelPicture(Picture, IsNew)
+    if not TribeOriginal[P] then
+      Tribe[P].SetModelPicture(Picture, IsNew)
     else if IsNew then
-      Server(cSetNewModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4,
+      Server(CommandWithData(cSetNewModelPicture, Picture.GetCommandDataSize),
         0, 0, Picture)
     else
-      Server(cSetModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4, 0,
-        0, Picture)
+      Server(CommandWithData(cSetModelPicture, Picture.GetCommandDataSize),
+        0, 0, Picture)
   else
-    with Tribe[p].ModelPicture[mix] do
+    with Tribe[P].ModelPicture[mix] do
     begin
       HGr := LoadGraphicSet(Picture.GrName);
@@ -781 +892 @@
 end;
 
-function InitEnemyModel(emix: integer): boolean;
+function InitEnemyModel(emix: Integer): Boolean;
 begin
   if GameMode = cMovie then
   begin
-    result := false;
-    exit
+    Result := False;
+    Exit;
   end;
   with MyRO.EnemyModel[emix] do
     ChooseModelPicture(Owner, mix, ModelCode(MyRO.EnemyModel[emix]),
-      ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, false, true);
-  result := true;
+      ModelHash(MyRO.EnemyModel[emix]), MyRO.Turn, False, True);
+  Result := True;
 end;
 
 procedure InitAllEnemyModels;
 var
-  emix: integer;
+  emix: Integer;
 begin
   for emix := 0 to MyRO.nEnemyModel - 1 do
@@ -804 +915 @@
 end;
 
-procedure InitMyModel(mix: integer; final: boolean);
+procedure InitMyModel(Mix: Integer; Final: Boolean);
 var
   mi: TModelInfo;
 begin
   if (GameMode = cMovie) and (MyModel[mix].Kind < $08) then
-    exit;
+    Exit;
   // don't exit for special units because cSetModelPicture comes after TellNewModels
-  MakeModelInfo(me, mix, MyModel[mix], mi);
-  ChooseModelPicture(me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
-    false, final);
-end;
-
-function AttackSound(code: integer): string;
-begin
-  result := 'ATTACK_' + char(48 + code div 100 mod 10) +
-    char(48 + code div 10 mod 10) + char(48 + code mod 10);
-end;
-
-procedure CheckToldNoReturn(uix: integer);
+  MakeModelInfo(Me, Mix, MyModel[mix], mi);
+  ChooseModelPicture(Me, Mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
+    False, Final);
+end;
+
+function AttackSound(Code: Integer): string;
+begin
+  Result := 'ATTACK_' + char(48 + Code div 100 mod 10) +
+    char(48 + Code div 10 mod 10) + char(48 + Code mod 10);
+end;
+
+procedure CheckToldNoReturn(uix: Integer);
 // check whether aircraft survived low-fuel warning
 begin
-  assert(not supervising);
+  Assert(not Supervising);
   with MyUn[uix] do
     if (Status and usToldNoReturn <> 0) and
@@ -833 +944 @@
 end;
 
-function CreateTribe(p: integer; FileName: string; Original: boolean): boolean;
+function CreateTribe(P: Integer; FileName: string; Original: Boolean): Boolean;
 begin
   FileName := LocalizedFilePath('Tribes' + DirectorySeparator + FileName +
@@ -843 +954 @@
   end;
 
-  TribeOriginal[p] := Original;
-  Tribe[p] := TTribe.Create(FileName);
-  with Tribe[p] do
+  TribeOriginal[P] := Original;
+  Tribe[P] := TTribe.Create(FileName);
+  with Tribe[P] do
   begin
     if (GameMode = cNewGame) or not Original then
     begin
-      Term.ChooseModelPicture(p, 0, 010, 1, 0, true, true);
-      Term.ChooseModelPicture(p, 1, 040, 1, 0, true, true);
-      Term.ChooseModelPicture(p, 2, 041, 1, 0, true, true);
-      Term.ChooseModelPicture(p, -1, 017, 1, 0, true, true);
-    end;
-    DipMem[p].pContact := -1;
-  end;
-  result := true;
+      Term.ChooseModelPicture(P, 0, 010, 1, 0, True, True);
+      Term.ChooseModelPicture(P, 1, 040, 1, 0, True, True);
+      Term.ChooseModelPicture(P, 2, 041, 1, 0, True, True);
+      Term.ChooseModelPicture(P, -1, 017, 1, 0, True, True);
+    end;
+    DipMem[P].pContact := -1;
+  end;
+  Result := True;
 end;
 
 procedure TellNewContacts;
 var
-  p1: integer;
-begin
-  if not supervising then
+  p1: Integer;
+begin
+  if not Supervising then
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and MyData.ToldContact = 0) and
+      if (p1 <> Me) and (1 shl p1 and MyData.ToldContact = 0) and
         (1 shl p1 and MyRO.Alive <> 0) and (MyRO.Treaty[p1] > trNoContact) then
       begin
         TribeMessage(p1, Tribe[p1].TPhrase('FRNEWNATION'), '');
         MyData.ToldContact := MyData.ToldContact or (1 shl p1);
-      end
+      end;
 end;
 
 procedure TellNewModels;
 var
-  mix: integer;
+  mix: Integer;
   ModelNameInfo: TModelNameInfo;
 begin
-  if supervising then
-    exit;
-  with Tribe[me] do
+  if Supervising then
+    Exit;
+  with Tribe[Me] do
     while MyData.ToldModels < MyRO.nModel do
     begin { new Unit class available }
@@ -891 +1002 @@
       end;
       if not Assigned(ModelPicture[MyData.ToldModels].HGr) then
-        InitMyModel(MyData.ToldModels, true);
+        InitMyModel(MyData.ToldModels, True);
       { only run if no researched model }
-      with MessgExDlg do
+      with MainScreen.MessgExDlg do
       begin
         { MakeModelInfo(me,MyData.ToldModels,MyModel[MyData.ToldModels],mi);
@@ -919 +1030 @@
           ModelNameInfo.mix := MyData.ToldModels;
           ModelNameInfo.NewName := EInput.Text;
-          Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
-            div 4, me, 0, ModelNameInfo);
+          if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+            Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+             (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+          Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+            Me, 0, ModelNameInfo);
         end;
       end;
@@ -929 +1043 @@
             MyModel[mix].Status := MyModel[mix].Status or msObsolete;
       end;
-      inc(MyData.ToldModels);
-    end;
-end;
-
-procedure TMainScreen.PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
-
-  procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
+      Inc(MyData.ToldModels);
+    end;
+end;
+
+{ TTribeInfo }
+
+function TTribeInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + 1 + Length(FileName)
+end;
+
+{ TModelNameInfo }
+
+function TModelNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(mix) + 1 + Length(NewName);
+end;
+
+{ TCityNameInfo }
+
+function TCityNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(ID) + 1 + Length(NewName);
+end;
+
+procedure TMainScreen.PaintZoomedTile(dst: TDpiBitmap; X, Y, Loc: Integer);
+
+  procedure TSprite(xDst, yDst, xSrc, ySrc: Integer);
   begin
     with NoMapPanel do
-      Sprite(dst, HGrTerrain, x + xDst, y + yDst, xxt * 2, yyt * 3,
+      Sprite(dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
         1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
   end;
 
-  procedure TSprite4(xSrc, ySrc: integer);
+  procedure TSprite4(xSrc, ySrc: Integer);
   begin
     with NoMapPanel do begin
-      Sprite(dst, HGrTerrain, x + xxt, y + yyt + 2, xxt * 2, yyt * 2 - 2,
+      Sprite(dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + 4, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + xxt * 2, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, x + xxt, y + yyt * 3, xxt * 2, yyt * 2 - 2,
+      Sprite(dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
     end;
@@ -957 +1092 @@
 
 var
-  cix, ySrc, Tile: integer;
+  cix, ySrc, Tile: Integer;
 begin
   with NoMapPanel do begin
@@ -971 +1106 @@
         cix := MyRO.nCity - 1;
         while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-          dec(cix);
-        assert(cix >= 0);
+          Dec(cix);
+        Assert(cix >= 0);
         if MyCity[cix].Built[imSupermarket] > 0 then
           Tile := Tile or tiFarm
@@ -1063 +1198 @@
 end;
 
-function ChooseResearch: boolean;
+function ChooseResearch: Boolean;
 var
-  ChosenResearch: integer;
+  ChosenResearch: Integer;
 begin
   if (MyData.FarTech <> adNone) and (MyRO.Tech[MyData.FarTech] >= tsApplicable)
@@ -1073 +1208 @@
     { research complete -- select new }
     repeat
-      ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
-      if ModalSelectDlg.result < 0 then
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
+      if MainScreen.ModalSelectDlg.Result < 0 then
       begin
-        result := false;
-        exit;
-      end;
-      ChosenResearch := ModalSelectDlg.result;
+        Result := False;
+        Exit;
+      end;
+      ChosenResearch := MainScreen.ModalSelectDlg.Result;
       if ChosenResearch = adMilitary then
       begin
-        DraftDlg.ShowNewContent(wmModal);
-        if DraftDlg.ModalResult <> mrOK then
-          Tribe[me].ModelPicture[MyRO.nModel].HGr := nil
-      end;
-    until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
+        MainScreen.DraftDlg.ShowNewContent(wmModal);
+        if MainScreen.DraftDlg.ModalResult <> mrOK then
+          Tribe[Me].ModelPicture[MyRO.nModel].HGr := nil;
+      end;
+    until (ChosenResearch <> adMilitary) or (MainScreen.DraftDlg.ModalResult = mrOK);
 
     if ChosenResearch = adMilitary then
-      InitMyModel(MyRO.nModel, true)
+      InitMyModel(MyRO.nModel, True)
     else if ChosenResearch = adFar then
     begin
-      ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
-      if ModalSelectDlg.result >= 0 then
-        if (ModalSelectDlg.result = adNone) or
-          (Server(sSetResearch - sExecute, me, ModalSelectDlg.result, nil^) <
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
+      if MainScreen.ModalSelectDlg.Result >= 0 then
+        if (MainScreen.ModalSelectDlg.Result = adNone) or
+          (Server(sSetResearch - sExecute, Me, MainScreen.ModalSelectDlg.Result, nil^) <
           rExecuted) then
-          MyData.FarTech := ModalSelectDlg.result
+          MyData.FarTech := MainScreen.ModalSelectDlg.Result
         else
         begin
-          ChosenResearch := ModalSelectDlg.result;
+          ChosenResearch := MainScreen.ModalSelectDlg.Result;
           // can be researched immediately
-          MyData.FarTech := adNone
+          MyData.FarTech := adNone;
         end;
     end;
@@ -1109 +1244 @@
     MyData.FarTech := adNexus
   else
-    Server(sSetResearch, me, ChosenResearch, nil^);
-  ListDlg.TechChange;
-  result := true;
+    Server(sSetResearch, Me, ChosenResearch, nil^);
+  MainScreen.ListDlg.TechChange;
+  Result := True;
+end;
+
+procedure ApplyToVisibleForms(FormAction: TFormAction);
+var
+  I: Integer;
+  Form: TDpiForm;
+begin
+  for I := 0 to DpiScreen.FormCount - 1 do begin
+    Form := DpiScreen.Forms[I];
+    if Form.Visible and (Form is TBufferedDrawDlg) then begin
+      case FormAction of
+        faClose: Form.Close;
+        faEnable: Form.Enabled := True;
+        faDisable: Form.Enabled := False;
+        faUpdate: begin
+          if @Form.OnShow <> nil then Form.OnShow(nil);
+            Form.Invalidate;
+            Form.Update;
+        end;
+        faSmartUpdateContent: TBufferedDrawDlg(Form).SmartUpdateContent(False);
+      end;
+    end;
+  end;
 end;
 
 (* ** client function handling ** *)
 
-function TMainScreen.DipCall(Command: integer): integer;
+function TMainScreen.DipCall(Command: Integer): Integer;
 var
-  i: integer;
-  IsTreatyDeal: boolean;
-begin
-  result := Server(Command, me, 0, nil^);
-  if result >= rExecuted then
+  I: Integer;
+  IsTreatyDeal: Boolean;
+begin
+  Result := Server(Command, Me, 0, nil^);
+  if Result >= rExecuted then
   begin
     if Command and $FF0F = scContact then
     begin
-      DipMem[me].pContact := Command shr 4 and $F;
+      DipMem[Me].pContact := Command shr 4 and $F;
       NegoDlg.Initiate;
-      DipMem[me].DeliveredPrices := [];
-      DipMem[me].ReceivedPrices := [];
-    end;
-
-    DipMem[me].SentCommand := Command;
-    DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
+      DipMem[Me].DeliveredPrices := [];
+      DipMem[Me].ReceivedPrices := [];
+    end;
+
+    DipMem[Me].SentCommand := Command;
+    DipMem[Me].FormerTreaty := MyRO.Treaty[DipMem[Me].pContact];
     if Command = scDipCancelTreaty then
       Play('CANCELTREATY')
     else if Command = scDipAccept then
     begin // remember delivered and received prices
-      for i := 0 to ReceivedOffer.nDeliver - 1 do
-        include(DipMem[me].ReceivedPrices, ReceivedOffer.Price[i] shr 24);
-      for i := 0 to ReceivedOffer.nCost - 1 do
-        include(DipMem[me].DeliveredPrices,
-          ReceivedOffer.Price[ReceivedOffer.nDeliver + i] shr 24);
-      IsTreatyDeal := false;
-      for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-        if ReceivedOffer.Price[i] and opMask = opTreaty then
-          IsTreatyDeal := true;
+      for I := 0 to ReceivedOffer.nDeliver - 1 do
+        Include(DipMem[Me].ReceivedPrices, ReceivedOffer.Price[I] shr 24);
+      for I := 0 to ReceivedOffer.nCost - 1 do
+        Include(DipMem[Me].DeliveredPrices,
+          ReceivedOffer.Price[ReceivedOffer.nDeliver + I] shr 24);
+      IsTreatyDeal := False;
+      for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+        if ReceivedOffer.Price[I] and opMask = opTreaty then
+          IsTreatyDeal := True;
       if IsTreatyDeal then
         Play('NEWTREATY')
@@ -1153 +1311 @@
     end;
     CityDlg.CloseAction := None;
-    if G.RO[DipMem[me].pContact] <> nil then
+    if G.RO[DipMem[Me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to DpiScreen.FormCount - 1 do
-        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
-        then
-          DpiScreen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
@@ -1170 +1325 @@
 end;
 
-function TMainScreen.OfferCall(var Offer: TOffer): integer;
-var
-  i: integer;
-begin
-  result := Server(scDipOffer, me, 0, Offer);
-  if result >= rExecuted then
-  begin
-    DipMem[me].SentCommand := scDipOffer;
-    DipMem[me].FormerTreaty := MyRO.Treaty[DipMem[me].pContact];
-    DipMem[me].SentOffer := Offer;
+function TMainScreen.OfferCall(var Offer: TOffer): Integer;
+begin
+  Result := Server(scDipOffer, Me, 0, Offer);
+  if Result >= rExecuted then
+  begin
+    DipMem[Me].SentCommand := scDipOffer;
+    DipMem[Me].FormerTreaty := MyRO.Treaty[DipMem[Me].pContact];
+    DipMem[Me].SentOffer := Offer;
     CityDlg.CloseAction := None;
-    if G.RO[DipMem[me].pContact] <> nil then
+    if G.RO[DipMem[Me].pContact] <> nil then
     begin // close windows for next player
-      for i := 0 to DpiScreen.FormCount - 1 do
-        if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
-        then
-          DpiScreen.Forms[i].Close;
+      ApplyToVisibleForms(faClose);
     end
     else
@@ -1198 +1348 @@
 end;
 
-procedure TMainScreen.SetUnFocus(uix: integer);
+procedure TMainScreen.SetUnFocus(uix: Integer);
 var
-  Loc0: integer;
-begin
-  assert(not((uix >= 0) and supervising));
+  Loc0: Integer;
+begin
+  Assert(not((uix >= 0) and Supervising));
   if uix <> UnFocus then
   begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     if uix >= 0 then
       UnStartLoc := MyUn[uix].Loc;
-    BlinkON := false;
+    BlinkON := False;
     BlinkTime := -1;
     if UnFocus >= 0 then
@@ -1229 +1379 @@
 procedure TMainScreen.CheckTerrainBtnVisible;
 var
-  Tile: integer;
+  Tile: Integer;
   mox: ^TModel;
 begin
@@ -1241 +1391 @@
   end
   else
-    TerrainBtn.Visible := false;
+    TerrainBtn.Visible := False;
 end;
 
@@ -1249 +1399 @@
   begin
     MovieSpeed1Btn.Down := MovieSpeed = 1;
-    MovieSpeed1Btn.Visible := true;
+    MovieSpeed1Btn.Visible := True;
     MovieSpeed2Btn.Down := MovieSpeed = 2;
-    MovieSpeed2Btn.Visible := true;
+    MovieSpeed2Btn.Visible := True;
     MovieSpeed3Btn.Down := MovieSpeed = 3;
-    MovieSpeed3Btn.Visible := true;
+    MovieSpeed3Btn.Visible := True;
     MovieSpeed4Btn.Down := MovieSpeed = 4;
-    MovieSpeed4Btn.Visible := true;
+    MovieSpeed4Btn.Visible := True;
   end
   else
   begin
-    MovieSpeed1Btn.Visible := false;
-    MovieSpeed2Btn.Visible := false;
-    MovieSpeed3Btn.Visible := false;
-    MovieSpeed4Btn.Visible := false;
+    MovieSpeed1Btn.Visible := False;
+    MovieSpeed2Btn.Visible := False;
+    MovieSpeed3Btn.Visible := False;
+    MovieSpeed4Btn.Visible := False;
   end;
 end;
@@ -1276 +1426 @@
 end;
 
-procedure TMainScreen.UpdateViews(UpdateCityScreen: boolean);
+procedure TMainScreen.UpdateViews(UpdateCityScreen: Boolean);
 begin
   SumCities(TaxSum, ScienceSum);
@@ -1286 +1436 @@
 end;
 
-procedure TMainScreen.SetAIName(p: integer; Name: string);
+procedure TMainScreen.SetAIName(P: Integer; Name: string);
 begin
   if Name = '' then
   begin
-    if AILogo[p] <> nil then
+    if AILogo[P] <> nil then
     begin
-      FreeAndNil(AILogo[p]);
+      FreeAndNil(AILogo[P]);
     end;
   end
   else
   begin
-    if AILogo[p] = nil then
-      AILogo[p] := TDpiBitmap.Create;
-    if not LoadGraphicFile(AILogo[p], HomeDir + Name + '.png', [gfNoError]) then
+    if AILogo[P] = nil then
+      AILogo[P] := TDpiBitmap.Create;
+    if not LoadGraphicFile(AILogo[P], HomeDir + Name + '.png', [gfNoError]) then
     begin
-      FreeAndNil(AILogo[p]);
-    end;
-  end;
-end;
-
-function TMainScreen.ContactRefused(p: integer; Item: String): boolean;
+      FreeAndNil(AILogo[P]);
+    end;
+  end;
+end;
+
+function TMainScreen.ContactRefused(P: Integer; Item: String): Boolean;
 // return whether treaty was cancelled
 var
-  s: string;
-begin
-  assert(MyRO.Treaty[p] >= trPeace);
-  s := Tribe[p].TPhrase(Item);
-  if MyRO.Turn < MyRO.LastCancelTreaty[p] + CancelTreatyTurns then
-  begin
-    SimpleMessage(s);
-    result := false;
+  S: string;
+begin
+  Assert(MyRO.Treaty[P] >= trPeace);
+  S := Tribe[P].TPhrase(Item);
+  if MyRO.Turn < MyRO.LastCancelTreaty[P] + CancelTreatyTurns then
+  begin
+    SimpleMessage(S);
+    Result := False;
   end
   else
   begin
-    case MyRO.Treaty[p] of
+    case MyRO.Treaty[P] of
       trPeace:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_PEACE');
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_PEACE');
       trFriendlyContact:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_FRIENDLY');
       trAlliance:
-        s := s + ' ' + Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
-    end;
-    result := SimpleQuery(mkYesNo, s, 'NEGO_REJECTED') = mrOK;
-    if result then
+        S := S + ' ' + Phrases.Lookup('FRCANCELQUERY_ALLIANCE');
+    end;
+    Result := SimpleQuery(mkYesNo, S, 'NEGO_REJECTED') = mrOK;
+    if Result then
     begin
       Play('CANCELTREATY');
-      Server(sCancelTreaty, me, 0, nil^);
-      if MyRO.Treaty[p] = trNone then
+      Server(sCancelTreaty, Me, 0, nil^);
+      if MyRO.Treaty[P] = trNone then
         CityOptimizer_BeginOfTurn;
       // peace treaty was cancelled -- use formerly forbidden tiles
-      MapValid := false;
+      MapValid := False;
       PaintAllMaps;
     end;
@@ -1344 +1494 @@
 procedure TMainScreen.RememberPeaceViolation;
 var
-  uix, p1: integer;
+  uix, p1: Integer;
 begin
   MyData.PeaceEvaHappened := 0;
@@ -1352 +1502 @@
       begin
         p1 := MyRO.Territory[Loc];
-        if (p1 <> me) and (p1 >= 0) and
+        if (p1 <> Me) and (p1 >= 0) and
           (MyRO.Turn = MyRO.EvaStart[p1] + (PeaceEvaTurns - 1)) then
           MyData.PeaceEvaHappened := MyData.PeaceEvaHappened or (1 shl p1);
@@ -1390 +1540 @@
 
 var
-  i, cix, mix: integer;
-  need: boolean;
+  I, cix, mix: Integer;
+  need: Boolean;
   mi: TModelInfo;
 begin
   if (sbStart in Check) and not (sbStart in SoundPreloadDone) then begin
-    for i := 0 to nStartBlock - 1 do
-      PreparePlay(StartBlock[i]);
+    for I := 0 to nStartBlock - 1 do
+      PreparePlay(StartBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbStart];
   end;
   if (sbWonder in Check) and not (sbWonder in SoundPreloadDone) then begin
-    need := false;
-    for i := 0 to nWonder - 1 do
-      if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
-        need := true;
+    need := False;
+    for I := 0 to nWonder - 1 do
+      if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
+        need := True;
     if need then begin
-      for i := 0 to nWonderBlock - 1 do
-        PreparePlay(WonderBlock[i]);
+      for I := 0 to nWonderBlock - 1 do
+        PreparePlay(WonderBlock[I]);
       SoundPreloadDone := SoundPreloadDone + [sbWonder];
     end;
@@ -1412 +1562 @@
   if ((sbScience in Check) and not (sbScience in SoundPreloadDone)) and
     (MyRO.Tech[adScience] >= tsApplicable) then begin
-    for i := 0 to nScienceBlock - 1 do
-      PreparePlay(ScienceBlock[i]);
+    for I := 0 to nScienceBlock - 1 do
+      PreparePlay(ScienceBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbScience];
   end;
   if ((sbContact in Check) and not (sbContact in SoundPreloadDone)) and
     (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then begin
-    for i := 0 to nContactBlock - 1 do
-      PreparePlay(ContactBlock[i]);
+    for I := 0 to nContactBlock - 1 do
+      PreparePlay(ContactBlock[I]);
     SoundPreloadDone := SoundPreloadDone + [sbContact];
   end;
@@ -1430 +1580 @@
       with MyCity[cix] do
         if (Loc >= 0) and (Flags and CityRepMask <> 0) then
-          for i := 0 to 12 do
-            if 1 shl i and Flags and CityRepMask <> 0 then
-              PreparePlay(CityEventSoundItem[i]);
+          for I := 0 to 12 do
+            if 1 shl I and Flags and CityRepMask <> 0 then
+              PreparePlay(CityEventSoundItem[I]);
     for mix := 0 to MyRO.nModel - 1 do
       with MyModel[mix] do
         if Attack > 0 then
         begin
-          MakeModelInfo(me, mix, MyModel[mix], mi);
+          MakeModelInfo(Me, mix, MyModel[mix], mi);
           PreparePlay(AttackSound(ModelCode(mi)));
         end;
@@ -1448 +1598 @@
   Color: TColor;
   Name: string;
-  ok: boolean;
+  ok: Boolean;
 begin
   UnusedTribeFiles.Clear;
@@ -1468 +1618 @@
 end;
 
-function TMainScreen.ChooseUnusedTribe: integer;
+function TMainScreen.GetUnitStatDlg: TUnitStatDlg;
+begin
+  if not Assigned(FUnitStatDlg) then begin
+    FUnitStatDlg := TUnitStatDlg.Create(nil);
+    ArrangeDialog(FUnitStatDlg);
+    FUnitStatDlg.CheckAge;
+  end;
+  Result := FUnitStatDlg;
+end;
+
+function TMainScreen.GetWondersDlg: TWondersDlg;
+begin
+  if not Assigned(FWondersDlg) then FWondersDlg := TWondersDlg.Create(nil);
+  Result := FWondersDlg;
+end;
+
+function TMainScreen.ChooseUnusedTribe: Integer;
 var
-  i: Integer;
-  j: Integer;
+  I: Integer;
+  J: Integer;
   ColorDistance: Integer;
   BestColorDistance: Integer;
@@ -1477 +1643 @@
   CountBest: Integer;
 begin
-  assert(UnusedTribeFiles.Count > 0);
-  result := -1;
+  Assert(UnusedTribeFiles.Count > 0);
+  Result := -1;
   BestColorDistance := -1;
-  for j := 0 to UnusedTribeFiles.Count - 1 do
+  for J := 0 to UnusedTribeFiles.Count - 1 do
   begin
     ColorDistance := 250; // consider differences more than this infinite
-    for i := 0 to nPl - 1 do
-      if Tribe[i] <> nil then
+    for I := 0 to nPl - 1 do
+      if Tribe[I] <> nil then
       begin
-        TestColorDistance := abs(integer(UnusedTribeFiles.Objects[j])
-          shr 16 and $FF - Tribe[i].Color shr 16 and $FF) +
-          abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and
-          $FF - Tribe[i].Color shr 8 and $FF) * 3 +
-          abs(integer(UnusedTribeFiles.Objects[j]) and
-          $FF - Tribe[i].Color and $FF) * 2;
+        TestColorDistance := abs(Integer(UnusedTribeFiles.Objects[J])
+          shr 16 and $FF - Tribe[I].Color shr 16 and $FF) +
+          abs(Integer(UnusedTribeFiles.Objects[J]) shr 8 and
+          $FF - Tribe[I].Color shr 8 and $FF) * 3 +
+          abs(Integer(UnusedTribeFiles.Objects[J]) and
+          $FF - Tribe[I].Color and $FF) * 2;
         if TestColorDistance < ColorDistance then
           ColorDistance := TestColorDistance;
@@ -1502 +1668 @@
     if ColorDistance = BestColorDistance then
     begin
-      inc(CountBest);
+      Inc(CountBest);
       if DelphiRandom(CountBest) = 0 then
-        result := j;
+        Result := J;
     end;
   end;
@@ -1511 +1677 @@
 procedure TMainScreen.ShowEnemyShipChange(ShowShipChange: TShowShipChange);
 var
-  i, TestCost, MostCost: integer;
-  Ship1Plus, Ship2Plus: boolean;
+  I, TestCost, MostCost: Integer;
+  Ship1Plus, Ship2Plus: Boolean;
 begin
   with ShowShipChange, MessgExDlg do
@@ -1535 +1701 @@
         begin
           OpenSound := 'SHIP_TRADED';
-          Ship1Plus := false;
-          Ship2Plus := false;
-          for i := 0 to nShipPart - 1 do
+          Ship1Plus := False;
+          Ship2Plus := False;
+          for I := 0 to nShipPart - 1 do
           begin
-            if Ship1Change[i] > 0 then
-              Ship1Plus := true;
-            if Ship2Change[i] > 0 then
-              Ship2Plus := true;
+            if Ship1Change[I] > 0 then
+              Ship1Plus := True;
+            if Ship2Change[I] > 0 then
+              Ship2Plus := True;
           end;
           if Ship1Plus and Ship2Plus then
@@ -1569 +1735 @@
     begin
       MostCost := 0;
-      for i := 0 to nShipPart - 1 do
+      for I := 0 to nShipPart - 1 do
       begin
-        TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
+        TestCost := abs(Ship1Change[I]) * Imp[imShipComp + I].Cost;
         if TestCost > MostCost then
         begin
           MostCost := TestCost;
-          IconIndex := imShipComp + i;
+          IconIndex := imShipComp + I;
         end;
       end;
@@ -1587 +1753 @@
 procedure TMainScreen.InitModule;
 var
-  i, j, Domain: integer;
+  I, J, Domain: Integer;
 begin
   { search icons for advances: }
-  for i := 0 to nAdv - 1 do
-    if i in FutureTech then
-      AdvIcon[i] := 96 + i - futResearchTechnology
+  for I := 0 to nAdv - 1 do
+    if I in FutureTech then
+      AdvIcon[I] := 96 + I - futResearchTechnology
     else
     begin
-      AdvIcon[i] := -1;
+      AdvIcon[I] := -1;
       for Domain := 0 to nDomains - 1 do
-        for j := 0 to nUpgrade - 1 do
-          if upgrade[Domain, j].Preq = i then
-            if AdvIcon[i] >= 0 then
-              AdvIcon[i] := 85
+        for J := 0 to nUpgrade - 1 do
+          if upgrade[Domain, J].Preq = I then
+            if AdvIcon[I] >= 0 then
+              AdvIcon[I] := 85
             else
-              AdvIcon[i] := 86 + Domain;
-      for j := 0 to nFeature - 1 do
-        if Feature[j].Preq = i then
+              AdvIcon[I] := 86 + Domain;
+      for J := 0 to nFeature - 1 do
+        if Feature[J].Preq = I then
           for Domain := 0 to nDomains - 1 do
-            if 1 shl Domain and Feature[j].Domains <> 0 then
-              if (AdvIcon[i] >= 0) and (AdvIcon[i] <> 86 + Domain) then
-                AdvIcon[i] := 85
+            if 1 shl Domain and Feature[J].Domains <> 0 then
+              if (AdvIcon[I] >= 0) and (AdvIcon[I] <> 86 + Domain) then
+                AdvIcon[I] := 85
               else
-                AdvIcon[i] := 86 + Domain;
-      for j := nWonder to nImp - 1 do
-        if Imp[j].Preq = i then
-          AdvIcon[i] := j;
-      for j := nWonder to nImp - 1 do
-        if (Imp[j].Preq = i) and (Imp[j].Kind <> ikCommon) then
-          AdvIcon[i] := j;
-      for j := 0 to nJob - 1 do
-        if i = JobPreq[j] then
-          AdvIcon[i] := 84;
-      for j := 0 to nWonder - 1 do
-        if Imp[j].Preq = i then
-          AdvIcon[i] := j;
-      if AdvIcon[i] < 0 then
-        if AdvValue[i] < 1000 then
-          AdvIcon[i] := -7
+                AdvIcon[I] := 86 + Domain;
+      for J := nWonder to nImp - 1 do
+        if Imp[J].Preq = I then
+          AdvIcon[I] := J;
+      for J := nWonder to nImp - 1 do
+        if (Imp[J].Preq = I) and (Imp[J].Kind <> ikCommon) then
+          AdvIcon[I] := J;
+      for J := 0 to nJob - 1 do
+        if I = JobPreq[J] then
+          AdvIcon[I] := 84;
+      for J := 0 to nWonder - 1 do
+        if Imp[J].Preq = I then
+          AdvIcon[I] := J;
+      if AdvIcon[I] < 0 then
+        if AdvValue[I] < 1000 then
+          AdvIcon[I] := -7
         else
-          AdvIcon[i] := 24 + AdvValue[i] div 1000;
-      for j := 2 to nGov - 1 do
-        if GovPreq[j] = i then
-          AdvIcon[i] := j - 8;
+          AdvIcon[I] := 24 + AdvValue[I] div 1000;
+      for J := 2 to nGov - 1 do
+        if GovPreq[J] = I then
+          AdvIcon[I] := J - 8;
     end;
   AdvIcon[adConscription] := 86 + dGround;
 
   UnusedTribeFiles := tstringlist.Create;
-  UnusedTribeFiles.Sorted := true;
+  UnusedTribeFiles.Sorted := True;
   TribeNames := tstringlist.Create;
 
   IsoEngine.Init(InitEnemyModel);
   // non-default tile size is missing a file, switch to default
-  MainMap.SetOutput(offscreen);
+  MainMap.SetOutput(Offscreen);
 
   HGrStdUnits := LoadGraphicSet('StdUnits.png');
@@ -1647 +1813 @@
   InitSmallImp;
   SoundPreloadDone := [];
-  StartRunning := false;
-  StayOnTop_Ensured := false;
+  StartRunning := False;
 
   sb := TPVScrollbar.Create(Self);
@@ -1659 +1824 @@
   FreeAndNil(UnusedTribeFiles);
   FreeAndNil(TribeNames);
-  // AdvisorDlg.DeInit;
-end;
-
-procedure TMainScreen.InitTurn(NewPlayer: integer);
+end;
+
+procedure TMainScreen.InitTurn(NewPlayer: Integer);
 const
   nAdvBookIcon = 16;
   AdvBookIcon: array [0 .. nAdvBookIcon - 1] of record Adv,
-    Icon: integer end = ((Adv: adPolyTheism; Icon: woZeus),
+    Icon: Integer end = ((Adv: adPolyTheism; Icon: woZeus),
     (Adv: adBronzeWorking; Icon: woColossus), (Adv: adMapMaking;
     Icon: woLighthouse), (Adv: adPoetry; Icon: imTheater), (Adv: adMonotheism;
@@ -1678 +1842 @@
   sbAll = [sbStart, sbWonder, sbScience, sbContact, sbTurn];
 var
-  p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
+  p1, I, ad, uix, cix, MoveOptions, MoveResult, Loc1,
     NewAgeCenterTo, Winners, NewGovAvailable, dx,
-    dy: integer;
+    dy: Integer;
   MoveAdviceData: TMoveAdviceData;
   Picture: TModelPictureInfo;
-  s, Item, Item2: string;
+  S, Item, Item2: string;
   UpdatePanel, OwnWonder, ok, Stop, ShowCityList, WondersOnly,
-    AllowCityScreen: boolean;
-begin
-  if IsMultiPlayerGame and (NewPlayer <> me) then
-  begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
-    EOT.Visible := false;
-  end;
-  if IsMultiPlayerGame and (NewPlayer <> me) and
+    AllowCityScreen: Boolean;
+begin
+  if IsMultiPlayerGame and (NewPlayer <> Me) then
+  begin
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
+    EOT.Visible := False;
+  end;
+  if IsMultiPlayerGame and (NewPlayer <> Me) and
     (G.RO[0].Happened and phShipComplete = 0) then
   begin // inter player screen
-    for i := 0 to ControlCount - 1 do
-      if Controls[i] is TButtonC then
-        Controls[i].Visible := false;
-    me := -1;
+    for I := 0 to ControlCount - 1 do
+      if Controls[I] is TButtonC then
+        Controls[I].Visible := False;
+    Me := -1;
     MainTexture.Age := -1;
     with Panel.Canvas do
@@ -1716 +1880 @@
     Invalidate;
 
-    s := TurnToString(G.RO[0].Turn);
-    if supervising then
-      SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [s]))
+    S := TurnToString(G.RO[0].Turn);
+    if Supervising then
+      SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [S]))
     else
-      SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [s]));
-  end;
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonC then
-      Controls[i].Visible := true;
+      SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [S]));
+  end;
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonC then
+      Controls[I].Visible := True;
 
   ItsMeAgain(NewPlayer);
   MyData := G.RO[NewPlayer].Data;
-  if not supervising then
+  if not Supervising then
     SoundPreload(sbAll);
-  if (me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
+  if (Me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
     Invalidate; // colorize empty space
 
-  if not supervising then
+  if not Supervising then
   begin
 
@@ -1743 +1907 @@
       else }
     begin
-      Age := GetAge(me);
+      Age := GetAge(Me);
       if MainTexture.Age <> Age then begin
         MainTexture.Age := Age;
@@ -1767 +1931 @@
   end;
   InitCityMark(MainTexture);
-  CityDlg.CheckAge;
-  NatStatDlg.CheckAge;
-  UnitStatDlg.CheckAge;
-  HelpDlg.Difficulty := G.Difficulty[me];
+  if Assigned(FCityDlg) then FCityDlg.CheckAge;
+  if Assigned(FNatStatDlg) then FNatStatDlg.CheckAge;
+  if Assigned(FUnitStatDlg) then FUnitStatDlg.CheckAge;
+  if Assigned(FHelpDlg) then FHelpDlg.Difficulty := G.Difficulty[Me];
 
   UnFocus := -1;
   MarkCityLoc := -1;
-  BlinkON := false;
+  BlinkON := False;
   BlinkTime := -1;
-  Tracking := false;
-  TurnComplete := false;
+  Tracking := False;
+  TurnComplete := False;
 
   if (ToldSlavery < 0) or
@@ -1797 +1961 @@
           Hash := 0;
           GrName := 'StdUnits.png';
-          Tribe[p1].SetModelPicture(Picture, true);
-        end
-  end;
-
-  if not supervising and (ClientMode = cTurn) then
+          Tribe[p1].SetModelPicture(Picture, True);
+        end;
+  end;
+
+  if not Supervising and (ClientMode = cTurn) then
   begin
     for cix := 0 to MyRO.nCity - 1 do
@@ -1816 +1980 @@
   if ClientMode = cMovieTurn then
   begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.Hint := Phrases.Lookup('BTN_STOP');
-    EOT.Visible := true;
+    EOT.Visible := True;
   end
   else if ClientMode < scContact then
@@ -1827 +1991 @@
     UnitBtn.Visible := UnFocus >= 0;
     CheckTerrainBtnVisible;
-    TurnComplete := supervising;
+    TurnComplete := Supervising;
     EOT.Hint := Phrases.Lookup('BTN_ENDTURN');
-    EOT.Visible := Server(sTurn - sExecute, me, 0, nil^) >= rExecuted;
+    EOT.Visible := Server(sTurn - sExecute, Me, 0, nil^) >= rExecuted;
   end
   else
   begin
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.Hint := Phrases.Lookup('BTN_NEGO');
-    EOT.Visible := true;
+    EOT.Visible := True;
   end;
   SetTroopLoc(-1);
-  MapValid := false;
+  MapValid := False;
   NewAgeCenterTo := 0;
-  if ((MyRO.Turn = 0) and not supervising or IsMultiPlayerGame or
+  if ((MyRO.Turn = 0) and not Supervising or IsMultiPlayerGame or
     (ClientMode = cResume)) and (MyRO.nCity > 0) then
   begin
@@ -1857 +2021 @@
       begin
         NewAgeCenterTo := -1;
-        Loc1 := dLoc(Loc1, -dx, -dy)
+        Loc1 := dLoc(Loc1, -dx, -dy);
       end
       else
@@ -1865 +2029 @@
       end
     end;
-    Centre(Loc1)
-  end;
-
-  for i := 0 to DpiScreen.FormCount - 1 do
-    if DpiScreen.Forms[i] is TBufferedDrawDlg then
-      DpiScreen.Forms[i].Enabled := true;
+    Centre(Loc1);
+  end;
+
+  ApplyToVisibleForms(faEnable);
 
   if ClientMode <> cResume then
@@ -1881 +2043 @@
     // first turn after anarchy -- don't show despotism palace!
     Update;
-    for i := 0 to DpiScreen.FormCount - 1 do
-      if (DpiScreen.Forms[i].Visible) and (DpiScreen.Forms[i] is TBufferedDrawDlg)
-      then
-      begin
-        if @DpiScreen.Forms[i].OnShow <> nil then
-          DpiScreen.Forms[i].OnShow(nil);
-        DpiScreen.Forms[i].Invalidate;
-        DpiScreen.Forms[i].Update;
-      end;
+    ApplyToVisibleForms(faUpdate);
 
     if MyRO.Happened and phGameEnd <> 0 then
@@ -1897 +2051 @@
         begin
           OpenSound := 'MSG_GAMEOVER';
-          MessgText := Tribe[me].TPhrase('GAMEOVER');
+          MessgText := Tribe[Me].TPhrase('GAMEOVER');
           IconKind := mikBigIcon;
           IconIndex := 8;
@@ -1908 +2062 @@
             begin
               Winners := Winners or 1 shl p1;
-              for i := 0 to nShipPart - 1 do
-                if MyRO.Ship[p1].Parts[i] < ShipNeed[i] then
+              for I := 0 to nShipPart - 1 do
+                if MyRO.Ship[p1].Parts[I] < ShipNeed[I] then
                   Winners := Winners and not(1 shl p1);
             end;
-          assert(Winners <> 0);
-          if Winners and (1 shl me) <> 0 then
+          Assert(Winners <> 0);
+          if Winners and (1 shl Me) <> 0 then
           begin
-            s := '';
+            S := '';
             for p1 := 0 to nPl - 1 do
-              if (p1 <> me) and (1 shl p1 and Winners <> 0) then
-                if s = '' then
-                  s := Tribe[p1].TPhrase('SHORTNAME')
+              if (p1 <> Me) and (1 shl p1 and Winners <> 0) then
+                if S = '' then
+                  S := Tribe[p1].TPhrase('SHORTNAME')
                 else
-                  s := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
-                    [s, Tribe[p1].TPhrase('SHORTNAME')]);
+                  S := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
+                    [S, Tribe[p1].TPhrase('SHORTNAME')]);
 
             OpenSound := 'MSG_YOUWIN';
-            MessgText := Tribe[me].TPhrase('MYSPACESHIP');
-            if s <> '' then
+            MessgText := Tribe[Me].TPhrase('MYSPACESHIP');
+            if S <> '' then
               MessgText := MessgText + '\' +
-                Format(Phrases.Lookup('SHAREDWIN'), [s]);
+                Format(Phrases.Lookup('SHAREDWIN'), [S]);
             IconKind := mikBigIcon;
             IconIndex := 9;
@@ -1934 +2088 @@
           else
           begin
-            assert(me = 0);
+            Assert(Me = 0);
             OpenSound := 'MSG_GAMEOVER';
             MessgText := '';
@@ -1946 +2100 @@
         else { if MyRO.Happened and fTimeUp<>0 then }
         begin
-          assert(me = 0);
+          Assert(Me = 0);
           OpenSound := 'MSG_GAMEOVER';
-          if not supervising then
-            MessgText := Tribe[me].TPhrase('TIMEUP')
+          if not Supervising then
+            MessgText := Tribe[Me].TPhrase('TIMEUP')
           else
             MessgText := Phrases.Lookup('TIMEUPSUPER');
@@ -1961 +2115 @@
           p1 := 0;
           while (p1 < nPl - 1) and (Winners and (1 shl p1) = 0) do
-            inc(p1);
+            Inc(p1);
           if MyRO.Happened and phShipComplete = 0 then
             DiaDlg.ShowNewContent_Charts(wmModal);
         end;
-        TurnComplete := true;
-        exit;
-      end;
-    if not supervising and (1 shl me and MyRO.Alive = 0) then
+        TurnComplete := True;
+        Exit;
+      end;
+    if not Supervising and (1 shl Me and MyRO.Alive = 0) then
     begin
-      TurnComplete := true;
-      exit;
+      TurnComplete := True;
+      Exit;
     end;
 
     if (ClientMode = cContinue) and
-      (DipMem[me].SentCommand and $FF0F = scContact) then
+      (DipMem[Me].SentCommand and $FF0F = scContact) then
       // contact was refused
-      if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
-        ContactRefused(DipMem[me].pContact, 'FRREJECTED')
+      if MyRO.Treaty[DipMem[Me].pContact] >= trPeace then
+        ContactRefused(DipMem[Me].pContact, 'FRREJECTED')
       else
-        SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),
+        SoundMessage(Tribe[DipMem[Me].pContact].TPhrase('FRREJECTED'),
           'NEGO_REJECTED');
 
-    if not supervising and (Age > MyData.ToldAge) and
+    if not Supervising and (Age > MyData.ToldAge) and
       ((Age > 0) or (ClientMode <> cMovieTurn)) then
       with MessgExDlg do
@@ -1991 +2145 @@
           if Phrases2FallenBackToEnglish then
           begin
-            s := Tribe[me].TPhrase('AGE0');
+            S := Tribe[Me].TPhrase('AGE0');
             MessgText :=
-              Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)])
+              Format(S, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)]);
           end
           else
           begin
-            s := Tribe[me].TString(Phrases2.Lookup('AGE0'));
-            MessgText := Format(s, [TurnToString(MyRO.Turn)]);
-          end
+            S := Tribe[Me].TString(Phrases2.Lookup('AGE0'));
+            MessgText := Format(S, [TurnToString(MyRO.Turn)]);
+          end;
         end
         else
         begin
-          s := Tribe[me].TPhrase('AGE' + char(48 + Age));
-          MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+          S := Tribe[Me].TPhrase('AGE' + char(48 + Age));
+          MessgText := Format(S, [TurnToString(MyRO.Turn)]);
         end;
         IconKind := mikAge;
@@ -2012 +2166 @@
         CenterTo := NewAgeCenterTo;
         OpenSound := 'AGE_' + char(48 + Age);
+        DpiApplication.ProcessMessages;
         ShowModal;
         MyData.ToldAge := Age;
@@ -2025 +2180 @@
           begin
             OpenSound := 'MSG_EXTINCT';
-            s := Tribe[p1].TPhrase('EXTINCT');
-            MessgText := Format(s, [TurnToString(MyRO.Turn)]);
-            if MyRO.Alive = 1 shl me then
+            S := Tribe[p1].TPhrase('EXTINCT');
+            MessgText := Format(S, [TurnToString(MyRO.Turn)]);
+            if MyRO.Alive = 1 shl Me then
               MessgText := MessgText + Phrases.Lookup('EXTINCTALL');
             Kind := mkOk;
@@ -2034 +2189 @@
             ShowModal;
           end;
-      if (ClientMode <> cMovieTurn) and not supervising then
+      if (ClientMode <> cMovieTurn) and not Supervising then
         DiaDlg.ShowNewContent_Charts(wmModal);
     end;
 
     // tell changes of own credibility
-    if not supervising then
+    if not Supervising then
     begin
       if RoughCredibility(MyRO.Credibility) <>
@@ -2046 +2201 @@
         if RoughCredibility(MyRO.Credibility) >
           RoughCredibility(MyData.ToldOwnCredibility) then
-          s := Phrases.Lookup('CREDUP')
+          S := Phrases.Lookup('CREDUP')
         else
-          s := Phrases.Lookup('CREDDOWN');
-        TribeMessage(me, Format(s, [Phrases.Lookup('CREDIBILITY',
+          S := Phrases.Lookup('CREDDOWN');
+        TribeMessage(Me, Format(S, [Phrases.Lookup('CREDIBILITY',
           RoughCredibility(MyRO.Credibility))]), '');
       end;
@@ -2055 +2210 @@
     end;
 
-    for i := 0 to nWonder - 1 do
+    for I := 0 to nWonder - 1 do
     begin
-      OwnWonder := false;
+      OwnWonder := False;
       for cix := 0 to MyRO.nCity - 1 do
-        if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[i].CityID)
+        if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[I].CityID)
         then
-          OwnWonder := true;
-      if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
+          OwnWonder := True;
+      if MyRO.Wonder[I].CityID <> MyData.ToldWonders[I].CityID then
       begin
-        if MyRO.Wonder[i].CityID = WonderDestroyed then
+        if MyRO.Wonder[I].CityID = WonderDestroyed then
           with MessgExDlg do
           begin { tell about destroyed wonders }
             OpenSound := 'WONDER_DESTROYED';
             MessgText := Format(Phrases.Lookup('WONDERDEST'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
           end
         else
         begin
-          if i = woManhattan then
-            if MyRO.Wonder[i].EffectiveOwner > me then
+          if I = woManhattan then
+            if MyRO.Wonder[I].EffectiveOwner > Me then
               MyData.ColdWarStart := MyRO.Turn - 1
             else
@@ -2087 +2242 @@
             with MessgExDlg do
             begin { tell about newly built wonders }
-              if i = woManhattan then
+              if I = woManhattan then
               begin
                 OpenSound := 'MSG_COLDWAR';
-                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
+                S := Tribe[MyRO.Wonder[I].EffectiveOwner].TPhrase('COLDWAR');
               end
-              else if MyRO.Wonder[i].EffectiveOwner >= 0 then
+              else if MyRO.Wonder[I].EffectiveOwner >= 0 then
               begin
                 OpenSound := 'WONDER_BUILT';
-                s := Tribe[MyRO.Wonder[i].EffectiveOwner]
-                  .TPhrase('WONDERBUILT')
+                S := Tribe[MyRO.Wonder[I].EffectiveOwner]
+                  .TPhrase('WONDERBUILT');
               end
               else
               begin
                 OpenSound := 'MSG_DEFAULT';
-                s := Phrases.Lookup('WONDERBUILTEXP');
+                S := Phrases.Lookup('WONDERBUILTEXP');
                 // already expired when built
               end;
-              MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
-                CityName(MyRO.Wonder[i].CityID)]);
+              MessgText := Format(S, [Phrases.Lookup('IMPROVEMENTS', I),
+                CityName(MyRO.Wonder[I].CityID)]);
               Kind := mkOkHelp;
               HelpKind := hkImp;
-              HelpNo := i;
+              HelpNo := I;
               IconKind := mikImp;
-              IconIndex := i;
+              IconIndex := I;
               ShowModal;
-            end
-        end
+            end;
+        end;
       end
-      else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
-        .EffectiveOwner) and (MyRO.Wonder[i].CityID > WonderDestroyed) then
-        if MyRO.Wonder[i].EffectiveOwner < 0 then
+      else if (MyRO.Wonder[I].EffectiveOwner <> MyData.ToldWonders[I]
+        .EffectiveOwner) and (MyRO.Wonder[I].CityID > WonderDestroyed) then
+        if MyRO.Wonder[I].EffectiveOwner < 0 then
         begin
-          if i <> woMIR then
+          if I <> woMIR then
             with MessgExDlg do
             begin { tell about expired wonders }
               OpenSound := 'WONDER_EXPIRED';
               MessgText := Format(Phrases.Lookup('WONDEREXP'),
-                [Phrases.Lookup('IMPROVEMENTS', i),
-                CityName(MyRO.Wonder[i].CityID)]);
+                [Phrases.Lookup('IMPROVEMENTS', I),
+                CityName(MyRO.Wonder[I].CityID)]);
               Kind := mkOkHelp;
               HelpKind := hkImp;
-              HelpNo := i;
+              HelpNo := I;
               IconKind := mikImp;
-              IconIndex := i;
+              IconIndex := I;
               ShowModal;
-            end
+            end;
         end
-        else if (MyData.ToldWonders[i].EffectiveOwner >= 0) and not OwnWonder
+        else if (MyData.ToldWonders[I].EffectiveOwner >= 0) and not OwnWonder
         then
           with MessgExDlg do
           begin { tell about capture of wonders }
             OpenSound := 'WONDER_CAPTURED';
-            s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('WONDERCAPT');
-            MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
-              CityName(MyRO.Wonder[i].CityID)]);
+            S := Tribe[MyRO.Wonder[I].EffectiveOwner].TPhrase('WONDERCAPT');
+            MessgText := Format(S, [Phrases.Lookup('IMPROVEMENTS', I),
+              CityName(MyRO.Wonder[I].CityID)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
           end;
@@ -2154 +2309 @@
     begin
       SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
-      MyData.ColdWarStart := -ColdWarTurns - 1
+      MyData.ColdWarStart := -ColdWarTurns - 1;
     end;
 
@@ -2160 +2315 @@
   end; // ClientMode<>cResume
   MyData.ToldAlive := MyRO.Alive;
-  move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
+  Move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
 
   NewGovAvailable := -1;
@@ -2184 +2339 @@
           IconKind := mikBook;
           IconIndex := -1;
-          for i := 0 to nAdvBookIcon - 1 do
-            if AdvBookIcon[i].Adv = ad then
-              IconIndex := AdvBookIcon[i].Icon;
+          for I := 0 to nAdvBookIcon - 1 do
+            if AdvBookIcon[I].Adv = ad then
+              IconIndex := AdvBookIcon[I].Icon;
           ShowModal;
           MyData.ToldTech[ad] := MyRO.Tech[ad];
-          for i := gMonarchy to nGov - 1 do
-            if GovPreq[i] = ad then
-              NewGovAvailable := i;
+          for I := gMonarchy to nGov - 1 do
+            if GovPreq[I] = ad then
+              NewGovAvailable := I;
         end;
   end;
 
-  ShowCityList := false;
+  ShowCityList := False;
   if ClientMode = cTurn then
   begin
@@ -2201 +2356 @@
       ChooseResearch;
 
-    UpdatePanel := false;
+    UpdatePanel := False;
     if MyRO.Happened and phChangeGov <> 0 then
     begin
       ModalSelectDlg.ShowNewContent(wmModal, kGov);
       Play('NEWGOV');
-      Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+      Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
       CityOptimizer_BeginOfTurn;
-      UpdatePanel := true;
+      UpdatePanel := True;
     end;
   end; // ClientMode=cTurn
 
-  if not supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
+  if not Supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
   then
     for cix := 0 to MyRO.nCity - 1 do
@@ -2222 +2377 @@
   begin
     // tell what happened in cities
-    for WondersOnly := true downto false do
+    for WondersOnly := True downto False do
       for cix := 0 to MyRO.nCity - 1 do
         with MyCity[cix] do
@@ -2233 +2388 @@
               begin { tell about newly built wonder }
                 OpenSound := 'WONDER_BUILT';
-                s := Tribe[me].TPhrase('WONDERBUILTOWN');
+                S := Tribe[Me].TPhrase('WONDERBUILTOWN');
                 MessgText :=
-                  Format(s, [Phrases.Lookup('IMPROVEMENTS',
+                  Format(S, [Phrases.Lookup('IMPROVEMENTS',
                   Project0 and cpIndex), CityName(ID)]);
                 Kind := mkOkHelp;
@@ -2244 +2399 @@
                 ShowModal;
               end;
-            if not supervising and (ClientMode = cTurn) then
+            if not Supervising and (ClientMode = cTurn) then
             begin
-              AllowCityScreen := true;
+              AllowCityScreen := True;
               if (Status and 7 <> 0) and
                 (Project and (cpImp + cpIndex) = cpImp + imTrGoods) then
@@ -2252 +2407 @@
                 begin
                   if AutoBuild(cix, MyData.ImpOrder[Status and 7 - 1]) then
-                    AllowCityScreen := false
+                    AllowCityScreen := False
                   else if Flags and chProduction <> 0 then
                     Flags := (Flags and not chProduction) or chAllImpsMade
@@ -2280 +2435 @@
                   CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
                     Flags and CityRepMask);
-                  UpdatePanel := true;
+                  UpdatePanel := True;
                 end;
               end
@@ -2286 +2441 @@
               begin
                 if Flags and CityRepMask <> 0 then
-                  ShowCityList := true
+                  ShowCityList := True;
               end;
             end;
@@ -2306 +2461 @@
         begin
           Play('REVOLUTION');
-          Server(sRevolution, me, 0, nil^);
+          Server(sRevolution, Me, 0, nil^);
         end;
       end;
@@ -2340 +2495 @@
     DpiApplication.ProcessMessages;
 
-    if not supervising then
+    if not Supervising then
       for uix := 0 to MyRO.nUn - 1 do
         with MyUn[uix] do
@@ -2368 +2523 @@
               begin // !!! Shinkansen
                 MoveResult := eOK;
-                ok := true;
-                for i := 0 to MoveAdviceData.nStep - 1 do
+                ok := True;
+                for I := 0 to MoveAdviceData.nStep - 1 do
                 begin
-                  Loc1 := dLoc(Loc, MoveAdviceData.dx[i],
-                    MoveAdviceData.dy[i]);
+                  Loc1 := dLoc(Loc, MoveAdviceData.dx[I],
+                    MoveAdviceData.dy[I]);
                   if (MyMap[Loc1] and (fCity or fOwned) = fCity)
                   // don't capture cities during auto move
@@ -2378 +2533 @@
                   // don't attack during auto move
                   begin
-                    ok := false;
+                    ok := False;
                     Break
                   end
@@ -2385 +2540 @@
                     if (Loc1 = MoveAdviceData.ToLoc) or
                       (MoveAdviceData.ToLoc = maNextCity) and
-                      (MyMap[dLoc(Loc, MoveAdviceData.dx[i],
-                      MoveAdviceData.dy[i])] and fCity <> 0) then
+                      (MyMap[dLoc(Loc, MoveAdviceData.dx[I],
+                      MoveAdviceData.dy[I])] and fCity <> 0) then
                       MoveOptions := muAutoNoWait
                     else
                       MoveOptions := 0;
-                    MoveResult := MoveUnit(MoveAdviceData.dx[i],
-                      MoveAdviceData.dy[i], MoveOptions);
+                    MoveResult := MoveUnit(MoveAdviceData.dx[I],
+                      MoveAdviceData.dy[I], MoveOptions);
                     if (MoveResult < rExecuted) or (MoveResult = eEnemySpotted)
                     then
                     begin
-                      ok := false;
+                      ok := False;
                       Break
                     end;
@@ -2407 +2562 @@
               begin
                 MoveResult := eOK;
-                Stop := true;
+                Stop := True;
               end;
 
@@ -2430 +2585 @@
   end; // ClientMode=cTurn
 
-  HaveStrategyAdvice := false;
-  // (GameMode<>cMovie) and not supervising
-  // and AdvisorDlg.HaveStrategyAdvice;
-  GoOnPhase := true;
-  if supervising or (GameMode = cMovie) then
+  HaveStrategyAdvice := False;
+  GoOnPhase := True;
+  if Supervising or (GameMode = cMovie) then
   begin
     SetTroopLoc(-1);
@@ -2449 +2602 @@
       SetUnFocus(-1)
     else
-      NextUnit(-1, false);
+      NextUnit(-1, False);
     if UnFocus < 0 then
     begin
@@ -2466 +2619 @@
 end;
 
-procedure TMainScreen.Client(Command, NewPlayer: integer; var Data);
+procedure TMainScreen.Client(Command, NewPlayer: Integer; var Data);
 var
-  i, j, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: integer;
+  I, J, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: Integer;
   Color: TColor;
-  Name, s: string;
+  Name, S: string;
   TribeInfo: TTribeInfo;
   mi: TModelInfo;
-  SkipTurn, IsAlpine, IsTreatyDeal: boolean;
+  SkipTurn, IsAlpine, IsTreatyDeal: Boolean;
 begin
   case Command of
     cTurn, cResume, cContinue, cMovieTurn, scContact, scDipStart .. scDipBreak:
       begin
-        supervising := G.Difficulty[NewPlayer] = 0;
+        Supervising := G.Difficulty[NewPlayer] = 0;
         ArrangeMidPanel;
       end
@@ -2484 +2637 @@
   case Command of
     cDebugMessage:
-      LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(@Data));
+      LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(@Data));
 
     cShowNego:
       with TShowNegoData(Data) do
       begin
-        s := Format('P%d to P%d: ', [pSender, pTarget]);
+        S := Format('P%d to P%d: ', [pSender, pTarget]);
         if (Action = scDipOffer) and (Offer.nDeliver + Offer.nCost > 0) then
         begin
-          s := s + 'Offer ';
-          for i := 0 to Offer.nDeliver + Offer.nCost - 1 do
+          S := S + 'Offer ';
+          for I := 0 to Offer.nDeliver + Offer.nCost - 1 do
           begin
-            if i = Offer.nDeliver then
-              s := s + ' for '
-            else if i > 0 then
-              s := s + '+';
-            case Offer.Price[i] and opMask of
+            if I = Offer.nDeliver then
+              S := S + ' for '
+            else if I > 0 then
+              S := S + '+';
+            case Offer.Price[I] and opMask of
               opChoose:
-                s := s + 'Price of choice';
+                S := S + 'Price of choice';
               opCivilReport:
-                s := s + 'State report';
+                S := S + 'State report';
               opMilReport:
-                s := s + 'Military report';
+                S := S + 'Military report';
               opMap:
-                s := s + 'Map';
+                S := S + 'Map';
               opTreaty:
-                s := s + 'Treaty';
+                S := S + 'Treaty';
               opShipParts:
-                s := s + 'Ship part';
+                S := S + 'Ship part';
               opMoney:
-                s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o';
+                S := S + IntToStr(Offer.Price[I] and $FFFFFF) + 'o';
               opTribute:
-                s := s + IntToStr(Offer.Price[i] and $FFFFFF) + 'o tribute';
+                S := S + IntToStr(Offer.Price[I] and $FFFFFF) + 'o tribute';
               opTech:
-                s := s + Phrases.Lookup('ADVANCES', Offer.Price[i] and $FFFFFF);
+                S := S + Phrases.Lookup('ADVANCES', Offer.Price[I] and $FFFFFF);
               opAllTech:
-                s := s + 'All advances';
+                S := S + 'All advances';
               opModel:
-                s := s + Tribe[pSender].ModelName[Offer.Price[i] and $FFFFFF];
+                S := S + Tribe[pSender].ModelName[Offer.Price[I] and $FFFFFF];
               opAllModel:
-                s := s + 'All models';
+                S := S + 'All models';
             end;
           end;
-          LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(S));
         end
         else if Action = scDipAccept then
         begin
-          s := s + '--- ACCEPTED! ---';
-          LogDlg.Add(NewPlayer, G.RO[0].Turn, pchar(s));
+          S := S + '--- ACCEPTED! ---';
+          LogDlg.Add(NewPlayer, G.RO[0].Turn, PChar(S));
         end;
       end;
@@ -2538 +2691 @@
       begin
         Server := TInitModuleData(Data).Server;
-        // AdvisorDlg.Init;
         InitModule;
         TInitModuleData(Data).DataSize := SizeOf(TPersistentData);
@@ -2552 +2704 @@
           MainTexture.Age := -1;
         Tribes.Init;
-        HelpDlg.UserLeft := (DpiScreen.width - HelpDlg.width) div 2;
-        HelpDlg.UserTop := (DpiScreen.height - HelpDlg.height) div 2;
+        HelpDlg.UserLeft := (DpiScreen.Width - HelpDlg.Width) div 2;
+        HelpDlg.UserTop := (DpiScreen.Height - HelpDlg.Height) div 2;
         HelpDlg.Difficulty := 0;
         if Command = cStartCredits then
-          HelpDlg.ShowNewContent(wmModal, hkMisc, miscCredits)
+          HelpDlg.ShowNewContent(wmModal, hkMisc, Integer(miscCredits))
         else
-          HelpDlg.ShowNewContent(wmModal, hkMisc, miscMain);
+          HelpDlg.ShowNewContent(wmModal, hkMisc, Integer(miscMain));
         Tribes.Done;
       end;
@@ -2564 +2716 @@
     cNewGame, cLoadGame, cMovie, cNewMap:
       begin
-        { if (Command=cNewGame) or (Command=cLoadGame) then
-          AdvisorDlg.NewGame(Data); }
         GenerateNames := mNames.Checked;
-        GameOK := true;
+        GameOK := True;
         G := TNewGameData(Data);
-        me := -1;
+        Me := -1;
         pLogo := -1;
         ClientMode := -1;
         SetMapOptions;
         MainMap.pDebugMap := -1;
-        idle := false;
+        Idle := False;
         FillChar(Jump, SizeOf(Jump), 0);
         if StartRunning then
@@ -2597 +2747 @@
               ToldContact := 0;
               ToldOwnCredibility := InitialCredibility;
-              for i := 0 to nPl - 1 do
-                if G.Difficulty[i] > 0 then
-                  inc(ToldAlive, 1 shl i);
+              for I := 0 to nPl - 1 do
+                if G.Difficulty[I] > 0 then
+                  Inc(ToldAlive, 1 shl I);
               PeaceEvaHappened := 0;
-              for i := 0 to nWonder - 1 do
-                with ToldWonders[i] do
+              for I := 0 to nWonder - 1 do
+                with ToldWonders[I] do
                 begin
                   CityID := -1;
-                  EffectiveOwner := -1
+                  EffectiveOwner := -1;
                 end;
               FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
@@ -2612 +2762 @@
             end;
 
-        // arrange dialogs
-        ListDlg.UserLeft := 8;
-        ListDlg.UserTop := TopBarHeight + 8;
-        HelpDlg.UserLeft := DpiScreen.width - HelpDlg.width - 8;
-        HelpDlg.UserTop := TopBarHeight + 8;
-        UnitStatDlg.UserLeft := 397;
-        UnitStatDlg.UserTop := TopBarHeight + 64;
-        DiaDlg.UserLeft := (DpiScreen.width - DiaDlg.width) div 2;
-        DiaDlg.UserTop := (DpiScreen.height - DiaDlg.height) div 2;
-        NatStatDlg.UserLeft := DpiScreen.width - NatStatDlg.width - 8;
-        NatStatDlg.UserTop := DpiScreen.height - PanelHeight -
-          NatStatDlg.height - 8;
-        if NatStatDlg.UserTop < 8 then
-          NatStatDlg.UserTop := 8;
+        ArrangeDialogs;
 
         Age := 0;
         MovieSpeed := 1;
-        LogDlg.mSlot.Visible := true;
-        LogDlg.Host := self;
-        HelpDlg.ClearHistory;
-        CityDlg.Reset;
+        LogDlg.mSlot.Visible := True;
+        LogDlg.Host := Self;
+        if Assigned(FHelpDlg) then FHelpDlg.ClearHistory;
+        if Assigned(FCityDlg) then FCityDlg.Reset;
 
         MiniMap.Size := Point(G.lx, G.ly);
-        for i := 0 to nPl - 1 do
+        for I := 0 to nPl - 1 do
         begin
-          Tribe[i] := nil;
-          TribeOriginal[i] := false;
+          Tribe[I] := nil;
+          TribeOriginal[I] := False;
         end;
         ToldSlavery := -1;
-        RepaintOnResize := false;
-        Closable := false;
-        FirstMovieTurn := true;
+        RepaintOnResize := False;
+        Closable := False;
+        FirstMovieTurn := True;
 
         MenuArea.Visible := GameMode <> cMovie;
@@ -2654 +2791 @@
       if NewPlayer = 0 then
       begin
-        i := 0;
+        I := 0;
         for p1 := 0 to nPl - 1 do
           if (G.Difficulty[p1] > 0) and (Tribe[p1] = nil) then
-            inc(i);
-        if i > UnusedTribeFiles.Count then
+            Inc(I);
+        if I > UnusedTribeFiles.Count then
         begin
-          GameOK := false;
+          GameOK := False;
           SimpleMessage(Phrases.Lookup('TOOFEWTRIBES'));
         end
@@ -2671 +2808 @@
               TribeInfo.trix := p1;
               TribeNames.Clear;
-              for j := 0 to UnusedTribeFiles.Count - 1 do
+              for J := 0 to UnusedTribeFiles.Count - 1 do
               begin
-                GetTribeInfo(UnusedTribeFiles[j], Name, Color);
+                GetTribeInfo(UnusedTribeFiles[J], Name, Color);
                 TribeNames.AddObject(Name, TObject(Color));
               end;
-              assert(TribeNames.Count > 0);
+              Assert(TribeNames.Count > 0);
               ModalSelectDlg.ShowNewContent(wmModal, kTribe);
               DpiApplication.ProcessMessages;
-              TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.result];
-              UnusedTribeFiles.Delete(ModalSelectDlg.result);
+              TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.Result];
+              UnusedTribeFiles.Delete(ModalSelectDlg.Result);
 
               if GameMode = cLoadGame then
-                CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                CreateTribe(TribeInfo.trix, TribeInfo.FileName, False)
               else
-                Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
                   0, 0, TribeInfo);
             end;
@@ -2693 +2830 @@
             then
             begin // autoselect enemy tribes
-              j := ChooseUnusedTribe;
-              TribeInfo.FileName := UnusedTribeFiles[j];
-              UnusedTribeFiles.Delete(j);
+              J := ChooseUnusedTribe;
+              TribeInfo.FileName := UnusedTribeFiles[J];
+              UnusedTribeFiles.Delete(J);
               TribeInfo.trix := p1;
               if GameMode = cLoadGame then
-                CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
+                CreateTribe(TribeInfo.trix, TribeInfo.FileName, False)
               else
-                Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
                   0, 0, TribeInfo);
             end;
@@ -2714 +2851 @@
         SaveSettings;
         CityDlg.CloseAction := None;
-        for i := 0 to DpiScreen.FormCount - 1 do
-          if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg)
-          then
-            DpiScreen.Forms[i].Close;
+        ApplyToVisibleForms(faClose);
         if LogDlg.Visible then
           LogDlg.Close;
         LogDlg.List.Clear;
-        StartRunning := not idle and (Jump[0] > 0); // AI called Reload
-        me := -1;
-        idle := false;
+        StartRunning := not Idle and (Jump[0] > 0); // AI called Reload
+        Me := -1;
+        Idle := False;
         ClientMode := -1;
-        UnitInfoBtn.Visible := false;
-        UnitBtn.Visible := false;
-        TerrainBtn.Visible := false;
-        MovieSpeed1Btn.Visible := false;
-        MovieSpeed2Btn.Visible := false;
-        MovieSpeed3Btn.Visible := false;
-        MovieSpeed4Btn.Visible := false;
-        EOT.Visible := false;
-        for i := 0 to ControlCount - 1 do
-          if Controls[i] is TButtonC then
-            Controls[i].Visible := false;
+        UnitInfoBtn.Visible := False;
+        UnitBtn.Visible := False;
+        TerrainBtn.Visible := False;
+        MovieSpeed1Btn.Visible := False;
+        MovieSpeed2Btn.Visible := False;
+        MovieSpeed3Btn.Visible := False;
+        MovieSpeed4Btn.Visible := False;
+        EOT.Visible := False;
+        for I := 0 to ControlCount - 1 do
+          if Controls[I] is TButtonC then
+            Controls[I].Visible := False;
         sb.Init(0, 1);
         for p1 := 0 to nPl - 1 do
@@ -2741 +2875 @@
             FreeAndNil(Tribe[p1]);
         Tribes.Done;
-        RepaintOnResize := false;
-        Closable := true;
+        RepaintOnResize := False;
+        Closable := True;
         Close;
-        { if (GameMode=cNewGame) or (GameMode=cLoadGame) then
-          AdvisorDlg.BreakGame; }
       end;
 
@@ -2765 +2897 @@
         Show;
         Update;
-        RepaintOnResize := true;
+        RepaintOnResize := True;
         xw := 0;
         yw := ywcenter;
-        if not StayOnTop_Ensured then
-        begin
-          StayOnTop_Ensured := true;
-          CityDlg.StayOnTop_Workaround;
-          CityTypeDlg.StayOnTop_Workaround;
-          DiaDlg.StayOnTop_Workaround;
-          DraftDlg.StayOnTop_Workaround;
-          EnhanceDlg.StayOnTop_Workaround;
-          HelpDlg.StayOnTop_Workaround;
-          NatStatDlg.StayOnTop_Workaround;
-          NegoDlg.StayOnTop_Workaround;
-          ModalSelectDlg.StayOnTop_Workaround;
-          ListDlg.StayOnTop_Workaround;
-          UnitStatDlg.StayOnTop_Workaround;
-          WondersDlg.StayOnTop_Workaround;
-          RatesDlg.StayOnTop_Workaround;
-        end;
       end;
 
     cShowTurnChange:
       begin
-        if integer(Data) >= 0 then
+        if Integer(Data) >= 0 then
         begin
-          pLogo := integer(Data);
+          pLogo := Integer(Data);
           if G.RO[pLogo] = nil then
           begin
             if AILogo[pLogo] <> nil then
-              DpiBitCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
+              DpiBitBltCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
                 ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas,
                 0, 0);
-          end
-        end
+          end;
+        end;
       end;
 
@@ -2818 +2933 @@
               ItsMeAgain(p1);
               for mix := 0 to MyRO.nModel - 1 do
-                if not Assigned(Tribe[me].ModelPicture[mix].HGr) then
-                  InitMyModel(mix, true);
+                if not Assigned(Tribe[Me].ModelPicture[mix].HGr) then
+                  InitMyModel(mix, True);
             end;
-          me := -1;
+          Me := -1;
         end;
 
@@ -2830 +2945 @@
             Jump[pTurn] := 0
           else
-            dec(Jump[pTurn]);
+            Dec(Jump[pTurn]);
         SkipTurn := Jump[pTurn] > 0;
         if SkipTurn then
@@ -2839 +2954 @@
           MiniMapPaint;
           InitAllEnemyModels; // necessary for correct replay
-          if not EndTurn(true) then
-            SkipTurn := false;
+          if not EndTurn(True) then
+            SkipTurn := False;
         end;
         if not SkipTurn then
@@ -2847 +2962 @@
             NegoDlg.Visible then
             NegoDlg.Close;
-          skipped := false; // always show my moves during my turn
-          idle := true;
+          Skipped := False; // always show my moves during my turn
+          Idle := True;
           InitTurn(NewPlayer);
-          DipMem[me].pContact := -1;
-          (* if (me=0) and (MyRO.Alive and (1 shl me)=0)} then
+          DipMem[Me].pContact := -1;
+          (* if (Me=0) and (MyRO.Alive and (1 shl Me)=0)} then
             begin
             if SimpleQuery(Phrases.Lookup('RESIGN'))=mrIgnore then
-            Server(sResign,me,0,nil^)
-            else Server(sBreak,me,0,nil^)
+            Server(sResign,Me,0,nil^)
+            else Server(sBreak,Me,0,nil^)
             end
             else Play('TURNSTART'); *)
@@ -2866 +2981 @@
         pTurn := NewPlayer;
         pLogo := -1;
-        skipped := false; // always show my moves during my turn
-        idle := true;
+        Skipped := False; // always show my moves during my turn
+        Idle := True;
         if FirstMovieTurn then
         begin
           CheckMovieSpeedBtnState;
-          FirstMovieTurn := false;
+          FirstMovieTurn := False;
         end;
         InitTurn(NewPlayer);
@@ -2888 +3003 @@
         pTurn := -1;
         pLogo := -1;
-        MapValid := false;
+        MapValid := False;
         ClientMode := -1;
-        idle := false;
-        skipped := false;
+        Idle := False;
+        Skipped := False;
       end;
 
@@ -2901 +3016 @@
         ItsMeAgain(0);
         MyData := nil;
-        UnitInfoBtn.Visible := false;
-        UnitBtn.Visible := false;
-        TerrainBtn.Visible := false;
-        MovieSpeed1Btn.Visible := false;
-        MovieSpeed2Btn.Visible := false;
-        MovieSpeed3Btn.Visible := false;
-        MovieSpeed4Btn.Visible := false;
-        EOT.Visible := false;
+        UnitInfoBtn.Visible := False;
+        UnitBtn.Visible := False;
+        TerrainBtn.Visible := False;
+        MovieSpeed1Btn.Visible := False;
+        MovieSpeed2Btn.Visible := False;
+        MovieSpeed3Btn.Visible := False;
+        MovieSpeed4Btn.Visible := False;
+        EOT.Visible := False;
         HelpDlg.Difficulty := 0;
         BrushType := fGrass;
         BrushLoc := -1;
-        Edited := false;
+        Edited := False;
         UnFocus := -1;
         MarkCityLoc := -1;
-        Tracking := false;
-        TurnComplete := false;
-        MapValid := false;
+        Tracking := False;
+        TurnComplete := False;
+        MapValid := False;
         FormResize(nil); // calculate geometrics and paint all
         SetTroopLoc(-1);
-        idle := true;
+        Idle := True;
       end;
 
@@ -2930 +3045 @@
     scContact:
       begin
-        DipMem[NewPlayer].pContact := integer(Data);
+        DipMem[NewPlayer].pContact := Integer(Data);
         if Jump[NewPlayer] > 0 then
           DipCall(scReject)
@@ -2937 +3052 @@
           ClientMode := Command;
           InitTurn(NewPlayer);
-          MyData.ToldContact := MyData.ToldContact or (1 shl integer(Data));
+          MyData.ToldContact := MyData.ToldContact or (1 shl Integer(Data));
           // don't tell about new nation when already contacted by them
           with MessgExDlg do
           begin
-            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[integer(Data)
+            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[Integer(Data)
               ].Attitude);
-            MessgText := Tribe[integer(Data)].TPhrase('FRCONTACT');
+            MessgText := Tribe[Integer(Data)].TPhrase('FRCONTACT');
             Kind := mkYesNo;
             IconKind := mikTribe;
-            IconIndex := integer(Data);
+            IconIndex := Integer(Data);
             ShowModal;
             if ModalResult = mrOK then
             begin
               NegoDlg.Respond;
-              DipMem[me].DeliveredPrices := [];
-              DipMem[me].ReceivedPrices := [];
+              DipMem[Me].DeliveredPrices := [];
+              DipMem[Me].ReceivedPrices := [];
               DipCall(scDipStart);
             end
@@ -2980 +3095 @@
         else if Command = scDipAccept then
         begin // remember delivered and received prices
-          for i := 0 to DipMem[me].SentOffer.nDeliver - 1 do
-            include(DipMem[me].DeliveredPrices,
-              DipMem[me].SentOffer.Price[i] shr 24);
-          for i := 0 to DipMem[me].SentOffer.nCost - 1 do
-            include(DipMem[me].ReceivedPrices,
-              DipMem[me].SentOffer.Price[DipMem[me].SentOffer.nDeliver +
-              i] shr 24);
-          IsTreatyDeal := false;
-          for i := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
-            if DipMem[me].SentOffer.Price[i] and opMask = opTreaty then
-              IsTreatyDeal := true;
+          for I := 0 to DipMem[Me].SentOffer.nDeliver - 1 do
+            Include(DipMem[Me].DeliveredPrices,
+              DipMem[Me].SentOffer.Price[I] shr 24);
+          for I := 0 to DipMem[Me].SentOffer.nCost - 1 do
+            Include(DipMem[Me].ReceivedPrices,
+              DipMem[Me].SentOffer.Price[DipMem[Me].SentOffer.nDeliver +
+              I] shr 24);
+          IsTreatyDeal := False;
+          for I := 0 to ReceivedOffer.nDeliver + ReceivedOffer.nCost - 1 do
+            if DipMem[Me].SentOffer.Price[I] and opMask = opTreaty then
+              IsTreatyDeal := True;
           if IsTreatyDeal then
             Play('NEWTREATY')
@@ -2997 +3112 @@
         end;
         NegoDlg.Start;
-        idle := true;
+        Idle := True;
       end;
 
@@ -3003 +3118 @@
       if not IsMultiPlayerGame then
       begin
-        case G.RO[NewPlayer].Treaty[integer(Data)] of
+        case G.RO[NewPlayer].Treaty[Integer(Data)] of
           trPeace:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_PEACE');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_PEACE');
           trFriendlyContact:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_FRIENDLY');
           trAlliance:
-            s := Tribe[integer(Data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
+            S := Tribe[Integer(Data)].TPhrase('FRCANCELBYREJECT_ALLIANCE');
         end;
-        TribeMessage(integer(Data), s, 'CANCELTREATY');
+        TribeMessage(Integer(Data), S, 'CANCELTREATY');
       end;
 
     cShowCancelTreatyByAlliance:
-      if idle and (NewPlayer = me) then
-        TribeMessage(integer(Data), Tribe[integer(Data)
+      if Idle and (NewPlayer = Me) then
+        TribeMessage(Integer(Data), Tribe[Integer(Data)
           ].TPhrase('FRENEMYALLIANCE'), 'CANCELTREATY');
 
     cShowSupportAllianceAgainst:
       if not IsMultiPlayerGame and (Jump[0] = 0) then
-        TribeMessage(integer(Data) and $F, Tribe[integer(Data) and $F]
-          .TPhrase('FRMYALLIANCE1') + ' ' + Tribe[integer(Data) shr 4]
+        TribeMessage(Integer(Data) and $F, Tribe[Integer(Data) and $F]
+          .TPhrase('FRMYALLIANCE1') + ' ' + Tribe[Integer(Data) shr 4]
           .TPhrase('FRMYALLIANCE2'), 'CANCELTREATY');
 
     cShowPeaceViolation:
       if not IsMultiPlayerGame and (Jump[0] = 0) then
-        TribeMessage(integer(Data),
-          Format(Tribe[integer(Data)].TPhrase('EVIOLATION'),
+        TribeMessage(Integer(Data),
+          Format(Tribe[Integer(Data)].TPhrase('EVIOLATION'),
           [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
 
@@ -3035 +3150 @@
 
     cShowUnitChanged, cShowCityChanged, cShowAfterMove, cShowAfterAttack:
-      if (idle and (NewPlayer = me) or not idle and not skipped) and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           DpiApplication.ProcessMessages;
         if Command = cShowCityChanged then
         begin
-          CurrentMoveInfo.DoShow := false;
-          if idle then
-            CurrentMoveInfo.DoShow := true
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
+            CurrentMoveInfo.DoShow := True
           else if CurrentMoveInfo.IsAlly then
             CurrentMoveInfo.DoShow := not mAlNoMoves.Checked
@@ -3053 +3168 @@
         else if Command = cShowUnitChanged then
         begin
-          CurrentMoveInfo.DoShow := false;
-          if idle then
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
             CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked
           else if CurrentMoveInfo.IsAlly then
@@ -3068 +3183 @@
         begin
           if Command = cShowCityChanged then
-            MapValid := false;
-          FocusOnLoc(integer(Data), flImmUpdate);
+            MapValid := False;
+          FocusOnLoc(Integer(Data), flImmUpdate);
           // OldUnFocus:=UnFocus;
           // UnFocus:=-1;
           if Command = cShowAfterMove then
-            PaintLoc(integer(Data), CurrentMoveInfo.AfterMovePaintRadius)
+            PaintLoc(Integer(Data), CurrentMoveInfo.AfterMovePaintRadius)
             // show discovered areas
           else
-            PaintLoc(integer(Data), 1);
+            PaintLoc(Integer(Data), 1);
           // UnFocus:=OldUnFocus;
           if (Command = cShowAfterAttack) and
@@ -3086 +3201 @@
             Update; // remove message box from screen
           end
-          else if not idle then
+          else if not Idle then
             if Command = cShowCityChanged then
               Sleep(MoveTime * WaitAfterShowMove div 16)
             else if (Command = cShowUnitChanged) and
-              (MyMap[integer(Data)] and fUnit <> 0) then
+              (MyMap[Integer(Data)] and fUnit <> 0) then
               Sleep(MoveTime * WaitAfterShowMove div 32)
         end // if CurrentMoveInfo.DoShow
         else
-          MapValid := false;
+          MapValid := False;
       end;
 
     cShowMoving, cShowCapturing:
-      if (idle and (NewPlayer = me) or not idle and not skipped and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
-          CurrentMoveInfo.DoShow := false;
-          if not idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
+          CurrentMoveInfo.DoShow := False;
+          if not Idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
             InitEnemyModel(emix);
 
           ToLoc := dLoc(FromLoc, dx, dy);
-          if idle then
+          if Idle then
           begin // own unit -- make discovered land visible
-            assert(Owner = me); // no foreign moves during my turn!
+            Assert(Owner = Me); // no foreign moves during my turn!
             CurrentMoveInfo.DoShow := not mEffectiveMovesOnly.Checked or
               (Command = cShowCapturing);
@@ -3147 +3262 @@
                 else
                   CurrentMoveInfo.AfterMovePaintRadius := 1;
-                if (MyRO.Wonder[woShinkansen].EffectiveOwner = me) and
+                if (MyRO.Wonder[woShinkansen].EffectiveOwner = Me) and
                   (Domain = dGround) and
                   (MyMap[FromLoc] and (fRR or fCity) <> 0) and
@@ -3162 +3277 @@
             CurrentMoveInfo.IsAlly := MyRO.Treaty[Owner] = trAlliance;
             if GameMode = cMovie then
-              CurrentMoveInfo.DoShow := true
+              CurrentMoveInfo.DoShow := True
             else if CurrentMoveInfo.IsAlly then
               CurrentMoveInfo.DoShow := not mAlNoMoves.Checked and
@@ -3178 +3293 @@
                   cix := MyRO.nCity - 1;
                   while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-                    dec(cix);
-                  s := CityName(MyCity[cix].ID);
+                    Dec(cix);
+                  S := CityName(MyCity[cix].ID);
                 end
                 else
@@ -3185 +3300 @@
                   ecix := MyRO.nEnemyCity - 1;
                   while (ecix >= 0) and (MyRO.EnemyCity[ecix].Loc <> ToLoc) do
-                    dec(ecix);
-                  s := CityName(MyRO.EnemyCity[ecix].ID);
+                    Dec(ecix);
+                  S := CityName(MyRO.EnemyCity[ecix].ID);
                 end;
                 TribeMessage(Owner, Format(Tribe[Owner].TPhrase('CAPTURE'),
-                  [s]), '');
+                  [S]), '');
                 Update; // remove message box from screen
               end;
@@ -3274 +3389 @@
           end // if CurrentMoveInfo.DoShow
           else
-            MapValid := false;
+            MapValid := False;
         end;
       end;
 
     cShowAttacking:
-      if (idle and (NewPlayer = me) or not idle and not skipped and
+      if (Idle and (NewPlayer = Me) or not Idle and not skipped and
         (TShowMove(Data).emix <> $FFFF)) and
         not((GameMode = cMovie) and (MovieSpeed = 4)) then
       begin
-        assert(NewPlayer = me);
-        if not idle or (GameMode = cMovie) then
+        Assert(NewPlayer = Me);
+        if not Idle or (GameMode = cMovie) then
           DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
           CurrentMoveInfo.AfterAttackExpeller := -1;
-          CurrentMoveInfo.DoShow := false;
-          if idle then
-            CurrentMoveInfo.DoShow := true // own unit -- always show attacks
+          CurrentMoveInfo.DoShow := False;
+          if Idle then
+            CurrentMoveInfo.DoShow := True // own unit -- always show attacks
           else
           begin
@@ -3311 +3426 @@
               cix := MyRO.nCity - 1;
               while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-                dec(cix);
+                Dec(cix);
               if MyCity[cix].Status and csToldBombard = 0 then
               begin
-                if not supervising then
+                if not Supervising then
                   MyCity[cix].Status := MyCity[cix].Status or csToldBombard;
-                s := CityName(MyCity[cix].ID);
+                S := CityName(MyCity[cix].ID);
                 SoundMessageEx(Format(Tribe[Owner].TPhrase('BOMBARD'),
-                  [s]), '');
+                  [S]), '');
                 Update; // remove message box from screen
               end;
@@ -3327 +3442 @@
             if Flags and umExpelling <> 0 then
               Play('MOVE_EXPEL')
-            else if Owner = me then
+            else if Owner = Me then
             begin
-              MakeModelInfo(me, mix, MyModel[mix], mi);
+              MakeModelInfo(Me, mix, MyModel[mix], mi);
               Play(AttackSound(ModelCode(mi)));
             end
@@ -3354 +3469 @@
               MoveOnScreen(TShowMove(Data), 10, 0, 16);
             end
-            else if not idle then
+            else if not Idle then
               Sleep(MoveTime div 2);
             MainMap.AttackEnd;
           end // if CurrentMoveInfo.DoShow
           else
-            MapValid := false;
+            MapValid := False;
         end;
       end;
@@ -3368 +3483 @@
       else
       begin
-        s := Phrases.Lookup('FOREIGNINFO');
+        S := Phrases.Lookup('FOREIGNINFO');
         for p1 := 0 to nPl - 1 do
           if 3 shl (p1 * 2) and Cardinal(Data) <> 0 then
-            s := s + '\' + Tribe[p1].TPhrase('SHORTNAME');
-        SoundMessageEx(s, '');
+            S := S + '\' + Tribe[p1].TPhrase('SHORTNAME');
+        SoundMessageEx(S, '');
       end;
 
@@ -3384 +3499 @@
         begin
           MessgText := Format(Phrases.Lookup('GRLIB_GENERAL'),
-            [Phrases.Lookup('ADVANCES', integer(Data))]);
+            [Phrases.Lookup('ADVANCES', Integer(Data))]);
           OpenSound := 'NEWADVANCE_GRLIB';
           Kind := mkOk;
@@ -3394 +3509 @@
     cRefreshDebugMap:
       begin
-        if integer(Data) = MainMap.pDebugMap then
+        if Integer(Data) = MainMap.pDebugMap then
         begin
-          MapValid := false;
+          MapValid := False;
           MainOffscreenPaint;
           Update;
-        end
+        end;
       end;
 
   else
     if Command >= cClientEx then
-      case Command and $FFF0 of
-
+      case Command and (not Integer(CommandDataElementCountMask)) of
         cSetTribe:
-          with TTribeInfo(Data) do
-          begin
-            i := UnusedTribeFiles.Count - 1;
-            while (i >= 0) and
-              (AnsiCompareFileName(UnusedTribeFiles[i], FileName) <> 0) do
-              dec(i);
-            if i >= 0 then
-              UnusedTribeFiles.Delete(i);
-            CreateTribe(trix, FileName, true);
+          with TTribeInfo(Data) do begin
+            I := UnusedTribeFiles.Count - 1;
+            while (I >= 0) and
+              (AnsiCompareFileName(UnusedTribeFiles[I], FileName) <> 0) do
+              Dec(I);
+            if I >= 0 then
+              UnusedTribeFiles.Delete(I);
+            CreateTribe(trix, FileName, True);
           end;
-
-        cSetNewModelPicture, cSetModelPicture:
+        cSetNewModelPicture:
           if TribeOriginal[TModelPictureInfo(Data).trix] then
             Tribe[TModelPictureInfo(Data).trix].SetModelPicture
-              (TModelPictureInfo(Data), Command and
-              $FFF0 = cSetNewModelPicture);
-
-        cSetSlaveIndex and $FFF0:
-          Tribe[integer(Data) shr 16].mixSlaves := integer(Data) and $FFFF;
-
+              (TModelPictureInfo(Data), True);
+        cSetModelPicture:
+          if TribeOriginal[TModelPictureInfo(Data).trix] then
+            Tribe[TModelPictureInfo(Data).trix].SetModelPicture
+              (TModelPictureInfo(Data), False);
+        cSetSlaveIndex:
+          Tribe[Integer(Data) shr 16].mixSlaves := Integer(Data) and $FFFF;
         cSetCityName:
           with TCityNameInfo(Data) do
             if TribeOriginal[ID shr 12] then
               Tribe[ID shr 12].SetCityName(ID and $FFF, NewName);
-
         cSetModelName:
           with TModelNameInfo(Data) do
@@ -3444 +3556 @@
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   NoMap := TIsoMap.Create;
@@ -3486 +3598 @@
 
   // tag-controlled language
-  for i := 0 to ComponentCount - 1 do
-    if Components[i].Tag and $FF <> 0 then
-      if Components[i] is TDpiMenuItem then begin
-        TDpiMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
-          -1 + Components[i].Tag and $FF);
-        for j := 0 to Length(SaveOption) - 1 do
-          if Components[i].Tag and $FF = SaveOption[j] then
-            TDpiMenuItem(Components[i]).Checked := TSaveOption(j) in OptionChecked;
+  for I := 0 to ComponentCount - 1 do
+    if Components[I].Tag and $FF <> 0 then
+      if Components[I] is TDpiMenuItem then begin
+        TDpiMenuItem(Components[I]).Caption := Phrases.Lookup('CONTROLS',
+          -1 + Components[I].Tag and $FF);
+        for J := 0 to Length(SaveOption) - 1 do
+          if Components[I].Tag and $FF = SaveOption[J] then
+            TDpiMenuItem(Components[I]).Checked := TSaveOption(J) in OptionChecked;
       end else
-      if Components[i] is TButtonBase then begin
-        TButtonBase(Components[i]).Hint := Phrases.Lookup('CONTROLS',
-          -1 + Components[i].Tag and $FF);
-        if (Components[i] is TButtonC) and
-          (TButtonC(Components[i]).ButtonIndex <> 1) then
-          TButtonC(Components[i]).ButtonIndex :=
-            Integer(MapOptionChecked) shr (Components[i].Tag shr 8) and 1 + 2
+      if Components[I] is TButtonBase then begin
+        TButtonBase(Components[I]).Hint := Phrases.Lookup('CONTROLS',
+          -1 + Components[I].Tag and $FF);
+        if (Components[I] is TButtonC) and
+          (TButtonC(Components[I]).ButtonIndex <> 1) then
+          TButtonC(Components[I]).ButtonIndex :=
+            Integer(MapOptionChecked) shr (Components[I].Tag shr 8) and 1 + 2
       end;
 
@@ -3514 +3626 @@
     ManagementArea.Hint := Phrases2.Lookup('BTN_MANAGE');
   end;
-  for i := 0 to mRep.Count - 1 do
-  begin
-    j := mRep[i].Tag shr 8;
-    mRep[i].Caption := CityEventName(j);
-    mRep[i].Checked := CityRepMask and (1 shl j) <> 0;
+  for I := 0 to mRep.Count - 1 do
+  begin
+    J := mRep[I].Tag shr 8;
+    mRep[I].Caption := CityEventName(J);
+    mRep[I].Checked := CityRepMask and (1 shl J) <> 0;
   end;
 
@@ -3537 +3649 @@
     else Buffer.height := 3 * ySizeBig;
   Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
-  for i := 0 to nPl - 1 do
-    AILogo[i] := nil;
+  for I := 0 to nPl - 1 do
+    AILogo[I] := nil;
   Canvas.Font.Assign(UniFont[ftSmall]);
   InitButtons;
@@ -3548 +3660 @@
   I: Integer;
 begin
+  if Assigned(FWondersDlg) then FreeAndNil(FWondersDlg);
+  if Assigned(FTechTreeDlg) then FreeAndNil(FTechTreeDlg);
+  if Assigned(FEnhanceDlg) then FreeAndNil(FEnhanceDlg);
+  if Assigned(FNegoDlg) then FreeAndNil(FNegoDlg);
+  if Assigned(FCityTypeDlg) then FreeAndNil(FCityTypeDlg);
+  if Assigned(FDiaDlg) then FreeAndNil(FDiaDlg);
+  if Assigned(FCityDlg) then FreeAndNil(FCityDlg);
+  if Assigned(FRatesDlg) then FreeAndNil(FRatesDlg);
+  if Assigned(FBattleDlg) then FreeAndNil(FBattleDlg);
+  if Assigned(FNatStatDlg) then FreeAndNil(FNatStatDlg);
+  if Assigned(FUnitStatDlg) then FreeAndNil(FUnitStatDlg);
+  if Assigned(FDraftDlg) then FreeAndNil(FDraftDlg);
+  if Assigned(FModalSelectDlg) then FreeAndNil(FModalSelectDlg);
+  if Assigned(FListDlg) then FreeAndNil(FListDlg);
+  if Assigned(FMessgExDlg) then FreeAndNil(FMessgExDlg);
+  if Assigned(FHelpDlg) then FreeAndNil(FHelpDlg);
+
   MainFormKeyDown := nil;
   FreeAndNil(sb);
@@ -3555 +3684 @@
   FreeAndNil(Panel);
   for I := 0 to nPl - 1 do
-    if AILogo[i] <> nil then
+    if AILogo[I] <> nil then
       FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
@@ -3586 +3715 @@
 end;
 
+procedure TMainScreen.mAfforestClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jAfforest);
+end;
+
+procedure TMainScreen.mAirBaseClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jBase);
+end;
+
+procedure TMainScreen.mCanalClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jCanal);
+end;
+
+procedure TMainScreen.mCancelClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
+    if Job > jNone then
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+  end;
+end;
+
+procedure TMainScreen.mCentreClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    Centre(Loc);
+    PaintAllMaps;
+  end;
+end;
+
+procedure TMainScreen.mcityClick(Sender: TObject);
+var
+  Loc0: Integer;
+  cix: Integer;
+  ServerResult: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    Loc0 := Loc;
+    if MyMap[Loc] and fCity = 0 then
+    begin // build city
+      if DoJob(jCity) = eCity then
+      begin
+        MapValid := False;
+        PaintAll;
+        ZoomToCity(Loc0, True, chFounded);
+      end;
+    end else begin
+      CityOptimizer_BeforeRemoveUnit(UnFocus);
+      ServerResult := Server(sAddToCity, Me, UnFocus, nil^);
+      if ServerResult >= rExecuted then
+      begin
+        cix := MyRO.nCity - 1;
+        while (cix >= 0) and (MyCity[cix].Loc <> Loc0) do
+          Dec(cix);
+        Assert(cix >= 0);
+        CityOptimizer_CityChange(cix);
+        CityOptimizer_AfterRemoveUnit; // does nothing here
+        SetTroopLoc(Loc0);
+        UpdateViews(True);
+        DestinationMarkON := False;
+        PaintDestination;
+        UnFocus := -1;
+        PaintLoc(Loc0);
+        NextUnit(UnStartLoc, True);
+      end
+      else if ServerResult = eMaxSize then
+        SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
+    end;
+  end;
+end;
+
+procedure TMainScreen.mCityStatClick(Sender: TObject);
+begin
+  ListDlg.ShowNewContent(wmPersistent, kCities);
+end;
+
+procedure TMainScreen.mCityTypesClick(Sender: TObject);
+begin
+  CityTypeDlg.ShowNewContent(wmModal);
+  // must be modal because types are not saved before closing
+end;
+
+procedure TMainScreen.mClearClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jClear);
+end;
+
+procedure TMainScreen.mDiagramClick(Sender: TObject);
+begin
+  DiaDlg.ShowNewContent_Charts(wmPersistent);
+end;
+
+procedure TMainScreen.mEmpireClick(Sender: TObject);
+begin
+  RatesDlg.ShowNewContent(wmPersistent);
+end;
+
+procedure TMainScreen.mEnhanceClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(-1);
+end;
+
+procedure TMainScreen.mEnhanceDefClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    EnhanceDlg.ShowNewContent(wmPersistent,
+      MyMap[MyUn[UnFocus].Loc] and fTerrain)
+  else
+    EnhanceDlg.ShowNewContent(wmPersistent);
+end;
+
+procedure TMainScreen.mEUnitStatClick(Sender: TObject);
+begin
+  if MyRO.nEnemyModel > 0 then
+    ListDlg.ShowNewContent(wmPersistent, kAllEModels);
+end;
+
+procedure TMainScreen.mFarmClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jFarm);
+end;
+
+procedure TMainScreen.mfortClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jFort);
+end;
+
+procedure TMainScreen.mGoOnClick(Sender: TObject);
+var
+  Destination: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if Status shr 16 = $7FFF then
+      Destination := maNextCity
+    else
+      Destination := Status shr 16;
+    Status := Status and not(usStay or usRecover) or usWaiting;
+    MoveToLoc(Destination, True);
+  end;
+end;
+
+procedure TMainScreen.mHelpClick(Sender: TObject);
+begin
+  if ClientMode = cEditMap then
+    HelpDlg.ShowNewContent(wmPersistent, hkText, HelpDlg.TextIndex('MAPEDIT'))
+  else
+    HelpDlg.ShowNewContent(wmPersistent, hkMisc, Integer(miscMain));
+end;
+
+procedure TMainScreen.mhomeClick(Sender: TObject);
+var
+  cixOldHome: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if MyMap[Loc] and fCity <> 0 then
+    begin
+      cixOldHome := Home;
+      if Server(sSetUnitHome, Me, UnFocus, nil^) >= rExecuted then
+      begin
+        CityOptimizer_CityChange(cixOldHome);
+        CityOptimizer_CityChange(Home);
+        UpdateViews(True);
+      end
+      else
+        Play('INVALID');
+    end
+    else
+    begin
+      Status := Status and not(usStay or usRecover or usEnhance);
+      MoveToLoc(maNextCity, True);
+    end;
+  end;
+end;
+
+procedure TMainScreen.mirrigationClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+        DoJob(jIrr);
+end;
+
+procedure TMainScreen.mirrigationDrawItem(Sender: TObject; ACanvas: TDpiCanvas;
+  ARect: TRect; AState: TOwnerDrawState);
+begin
+
+end;
+
+procedure TMainScreen.mJumpClick(Sender: TObject);
+begin
+  if Supervising then
+    Jump[0] := 20
+  else
+    Jump[Me] := 20;
+  EndTurn(True);
+end;
+
+procedure TMainScreen.mLoadClick(Sender: TObject);
+var
+  I: Integer;
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    I := Server(sLoadUnit, Me, UnFocus, nil^);
+    if I >= rExecuted then
+    begin
+      if MyModel[mix].Domain = dAir then
+        Play('MOVE_PLANELANDING')
+      else
+        Play('MOVE_LOAD');
+      DestinationMarkON := False;
+      PaintDestination;
+      Status := Status and ($FFFF - usWaiting - usStay - usRecover - usGoto - usEnhance);
+      NextUnit(UnStartLoc, True);
+    end
+    else if I = eNoTime_Load then
+      if MyModel[mix].Domain = dAir then
+        SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+      else
+        SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+          [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+  end;
+end;
+
+procedure TMainScreen.mmineClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jMine);
+end;
+
+procedure TMainScreen.mNationsClick(Sender: TObject);
+begin
+  NatStatDlg.ShowNewContent(wmPersistent);
+end;
+
+procedure TMainScreen.mNextUnitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    FocusNextUnit(1);
+  end;
+end;
+
+procedure TMainScreen.mnoordersClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    NextUnit(UnStartLoc, True);
+  end;
+end;
+
+procedure TMainScreen.mPillageClick(Sender: TObject);
+begin
+  DoJob(jPillage);
+end;
+
+procedure TMainScreen.mpollutionClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jPoll);
+end;
+
+procedure TMainScreen.mPrevUnitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    Status := Status and not usWaiting;
+    FocusNextUnit(-1);
+  end;
+end;
+
+procedure TMainScreen.mRandomMapClick(Sender: TObject);
+begin
+  if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
+      = mrOK) then begin
+    Server(sRandomMap, Me, 0, nil^);
+    Edited := True;
+    MapValid := False;
+    PaintAllMaps;
+  end;
+end;
+
+procedure TMainScreen.mRecoverClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usStay - usGoto - usEnhance) or usRecover;
+    if Job > jNone then
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+    NextUnit(UnStartLoc, True);
+  end;
+end;
+
+procedure TMainScreen.mResignClick(Sender: TObject);
+var
+  QueryText: string;
+begin
+  if ClientMode = cEditMap then begin
+    if Edited then begin
+      QueryText := Phrases.Lookup('MAP_CLOSE');
+      case SimpleQuery(mkYesNoCancel, QueryText, '') of
+        mrIgnore: Server(sAbandonMap, Me, 0, nil^);
+        mrOK: Server(sSaveMap, Me, 0, nil^);
+      end;
+    end else
+      Server(sAbandonMap, Me, 0, nil^);
+  end else begin
+    if Server(sGetGameChanged, 0, 0, nil^) = eOK then begin
+      QueryText := Phrases.Lookup('RESIGN');
+      case SimpleQuery(mkYesNoCancel, QueryText, '') of
+        mrIgnore: Server(sResign, 0, 0, nil^);
+        mrOK: Server(sBreak, 0, 0, nil^);
+      end;
+    end else
+      Server(sResign, 0, 0, nil^);
+  end;
+end;
+
+procedure TMainScreen.mRevolutionClick(Sender: TObject);
+var
+  AltGovs: Boolean;
+  RevolutionChanged: Boolean;
+  I: Integer;
+begin
+  AltGovs := False;
+    for I := 2 to nGov - 1 do
+      if (GovPreq[I] <> preNA) and
+        ((GovPreq[I] = preNone) or (MyRO.Tech[GovPreq[I]] >= tsApplicable)) then
+        AltGovs := True;
+
+    if not AltGovs then
+      SoundMessage(Phrases.Lookup('NOALTGOVS'), 'MSG_DEFAULT')
+    else
+    begin
+      RevolutionChanged := False;
+      if MyRO.Happened and phChangeGov <> 0 then
+      begin
+        ModalSelectDlg.ShowNewContent(wmModal, kGov);
+        if ModalSelectDlg.Result >= 0 then
+        begin
+          Play('NEWGOV');
+          Server(sSetGovernment, Me, ModalSelectDlg.Result, nil^);
+          CityOptimizer_BeginOfTurn;
+          RevolutionChanged := True;
+        end;
+      end
+      else
+      with MessgExDlg do
+      begin // revolution!
+        MessgExDlg.MessgText := Tribe[Me].TPhrase('REVOLUTION');
+        MessgExDlg.Kind := mkYesNo;
+        MessgExDlg.IconKind := mikPureIcon;
+        MessgExDlg.IconIndex := 72; // anarchy palace
+        MessgExDlg.ShowModal;
+        if ModalResult = mrOK then
+        begin
+          Play('REVOLUTION');
+          Server(sRevolution, Me, 0, nil^);
+          RevolutionChanged := True;
+          if NatStatDlg.Visible then
+            NatStatDlg.Close;
+          if CityDlg.Visible then
+            CityDlg.Close;
+        end
+      end;
+      if RevolutionChanged then
+        UpdateViews(True);
+    end;
+end;
+
+procedure TMainScreen.mroadClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jRoad);
+end;
+
+procedure TMainScreen.mRailRoadClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jRR);
+end;
+
+procedure TMainScreen.mRunClick(Sender: TObject);
+begin
+  if Supervising then
+    Jump[0] := 999999
+  else
+    Jump[Me] := 999999;
+  EndTurn(True);
+end;
+
+procedure TMainScreen.mScienceStatClick(Sender: TObject);
+begin
+  ListDlg.ShowNewContent(wmPersistent, kScience);
+end;
+
+procedure TMainScreen.mSelectTransportClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      Server(sSelectTransport, Me, UnFocus, nil^);
+end;
+
+procedure TMainScreen.mShipsClick(Sender: TObject);
+begin
+  DiaDlg.ShowNewContent_Ship(wmPersistent);
+end;
+
+procedure TMainScreen.mstayClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usRecover - usGoto - usEnhance) or usStay;
+    if Job > jNone then
+      Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+    NextUnit(UnStartLoc, True);
+  end;
+end;
+
+procedure TMainScreen.mTechTreeClick(Sender: TObject);
+begin
+  TechTreeDlg.ShowModal;
+end;
+
+procedure TMainScreen.mtransClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+    with TUn(MyUn[UnFocus]) do
+      DoJob(jTrans);
+end;
+
+procedure TMainScreen.mUnitStatClick(Sender: TObject);
+var
+  I: Integer;
+begin
+  if G.Difficulty[Me] > 0 then
+    ListDlg.ShowNewContent_MilReport(wmPersistent, Me)
+  else
+  begin
+    I := 1;
+    while (I < nPl) and (1 shl I and MyRO.Alive = 0) do
+      Inc(I);
+    if I < nPl then
+      ListDlg.ShowNewContent_MilReport(wmPersistent, I);
+  end;
+end;
+
+procedure TMainScreen.mUnloadClick(Sender: TObject);
+var
+  I: Integer;
+  OldMaster: Integer;
+  NewFocus: Integer;
+  uix: Integer;
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    if Master >= 0 then begin
+      OldMaster := Master;
+      I := Server(sUnloadUnit, Me, UnFocus, nil^);
+      if I >= rExecuted then
+      begin
+        if MyModel[mix].Domain = dAir then
+          Play('MOVE_PLANESTART')
+        else if (MyModel[MyUn[OldMaster].mix].Domain = dAir) and
+          (MyMap[Loc] and fCity = 0) and (MyMap[Loc] and fTerImp <> tiBase)
+        then
+          Play('MOVE_PARACHUTE')
+        else
+          Play('MOVE_UNLOAD');
+        Status := Status and not usWaiting;
+        if MyModel[mix].Domain <> dAir then
+          NextUnit(Loc, True)
+        else
+          PanelPaint;
+      end
+      else if I = eNoTime_Load then
+        if MyModel[mix].Domain = dAir then
+          SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
+        else
+          SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
+            [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
+    end else begin
+      NewFocus := -1;
+      uix := UnFocus;
+      for I := 1 to MyRO.nUn - 1 do
+      begin
+        uix := (uix + MyRO.nUn - 1) mod MyRO.nUn;
+        if (MyUn[uix].Master = UnFocus) and
+          (MyUn[uix].Movement = Integer(MyModel[MyUn[uix].mix].speed)) then
+        begin
+          MyUn[uix].Status := MyUn[uix].Status or usWaiting;
+          NewFocus := uix;
+        end;
+      end;
+      if NewFocus >= 0 then
+      begin
+        SetUnFocus(NewFocus);
+        SetTroopLoc(Loc);
+        PanelPaint;
+      end;
+    end;
+  end;
+end;
+
+procedure TMainScreen.mwaitClick(Sender: TObject);
+begin
+  if UnFocus >= 0 then
+  with MyUn[UnFocus] do begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
+  end;
+  NextUnit(-1, False);
+end;
+
+procedure TMainScreen.mWebsiteClick(Sender: TObject);
+begin
+  OpenURL(CevoHomepage);
+end;
+
+procedure TMainScreen.mWondersClick(Sender: TObject);
+begin
+  WondersDlg.ShowNewContent(wmPersistent);
+end;
+
 procedure TMainScreen.FormResize(Sender: TObject);
 var
-  MiniFrame, MaxMapWidth: integer;
+  MiniFrame, MaxMapWidth: Integer;
 begin
   SmallScreen := ClientWidth < 1024;
@@ -3666 +4352 @@
   begin
     RectInvalidate(0, TopBarHeight, ClientWidth, TopBarHeight + MapHeight);
-    MapValid := false;
+    MapValid := False;
     PaintAll;
   end;
 end;
 
-procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+procedure TMainScreen.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
   CanClose := Closable;
-  if not Closable and idle and (me = 0) and (ClientMode < scContact) then
-    MenuClick(mResign);
+  if not Closable and Idle and (Me = 0) and (ClientMode < scContact) then
+    mResign.Click;
 end;
 
@@ -3696 +4382 @@
   begin
     MessgExDlg.CancelMovie;
-    Server(sBreak, me, 0, nil^);
+    Server(sBreak, Me, 0, nil^);
   end
   else if ClientMode < 0 then
-    skipped := true
+    Skipped := True
   else if ClientMode >= scContact then
     NegoDlg.ShowNewContent(wmPersistent)
@@ -3705 +4391 @@
   begin
     Jump[pTurn] := 0;
-    StartRunning := false;
+    StartRunning := False;
   end
   else
@@ -3718 +4404 @@
   else
   with MainMap do begin
-    if supervising then
+    if Supervising then
       xTerrain := xMidPanel + 2 * xxt + 14
     else if ClientWidth < 1280 then
@@ -3725 +4411 @@
       xTerrain := ClientWidth div 2;
     xTroop := xTerrain + 2 * xxt + 12;
-    if SmallScreen and not supervising then
+    if SmallScreen and not Supervising then
       xTroop := xRightPanel + 10 - 3 * 66 -
         DpiGetSystemMetrics(SM_CXVSCROLL) - 19 - 4;
@@ -3734 +4420 @@
 end;
 
-function TMainScreen.EndTurn(WasSkipped: boolean): boolean;
-
-  function IsResourceUnused(cix, NeedFood, NeedProd: integer): boolean;
+function TMainScreen.EndTurn(WasSkipped: Boolean): Boolean;
+
+  function IsResourceUnused(cix, NeedFood, NeedProd: Integer): Boolean;
   var
-    dx, dy, fix: integer;
+    dx, dy, fix: Integer;
     CityAreaInfo: TCityAreaInfo;
     TileInfo: TTileInfo;
   begin
-    Server(sGetCityAreaInfo, me, cix, CityAreaInfo);
+    Server(sGetCityAreaInfo, Me, cix, CityAreaInfo);
     for dy := -3 to 3 do
       for dx := -3 to 3 do
@@ -3752 +4438 @@
           begin
             TileInfo.ExplCity := cix;
-            Server(sGetHypoCityTileInfo, me, dLoc(MyCity[cix].Loc, dx, dy),
+            Server(sGetHypoCityTileInfo, Me, dLoc(MyCity[cix].Loc, dx, dy),
               TileInfo);
             if (TileInfo.Food >= NeedFood) and (TileInfo.Prod >= NeedProd) then
             begin
-              result := true;
-              exit
+              Result := True;
+              Exit
             end;
           end
         end;
-    result := false;
+    Result := False;
   end;
 
 var
-  i, p1, uix, cix, CenterLoc: integer;
+  p1, uix, cix, CenterLoc: Integer;
   MsgItem: string;
   CityReport: TCityReport;
   PlaneReturnData: TPlaneReturnData;
-  Zoom: boolean;
-begin
-  result := false;
+  Zoom: Boolean;
+begin
+  Result := False;
   if ClientMode >= scDipOffer then
-    exit;
-
-  if supervising and (me <> 0) then
-  begin
-    for i := 0 to DpiScreen.FormCount - 1 do
-      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
-        DpiScreen.Forms[i].Close; // close windows
+    Exit;
+
+  if Supervising and (Me <> 0) then begin
+    ApplyToVisibleForms(faClose);
     ItsMeAgain(0);
   end;
@@ -3797 +4480 @@
           PlaneReturnData.Loc := Loc;
           PlaneReturnData.Movement := 0; // end turn without further movement?
-          if Server(sGetPlaneReturn, me, uix, PlaneReturnData) = eNoWay then
+          if Server(sGetPlaneReturn, Me, uix, PlaneReturnData) = eNoWay then
           begin
             CenterLoc := Loc + G.lx * 6;
             // centering the unit itself would make it covered by the query dialog
             while CenterLoc >= G.lx * G.ly do
-              dec(CenterLoc, G.lx * 2);
+              Dec(CenterLoc, G.lx * 2);
             Centre(CenterLoc);
             SetTroopLoc(-1);
@@ -3817 +4500 @@
               SetTroopLoc(Loc);
               PanelPaint;
-              exit;
+              Exit;
             end;
             MyUn[uix].Status := MyUn[uix].Status or usToldNoReturn;
-          end
+          end;
         end;
 
-    if not supervising and (MyRO.TestFlags and tfImmImprove = 0) and
+    if not Supervising and (MyRO.TestFlags and tfImmImprove = 0) and
       (MyRO.Government <> gAnarchy) and (MyRO.Money + TaxSum < 0) and
       (MyRO.TaxRate < 100) then // low funds!
@@ -3835 +4518 @@
         ShowModal;
         if ModalResult <> mrOK then
-          exit
+          Exit;
       end;
 
@@ -3843 +4526 @@
           if (Loc >= 0) and (Flags and chCaptured = 0) then
           begin
-            Zoom := false;
+            Zoom := False;
             CityReport.HypoTiles := -1;
             CityReport.HypoTax := -1;
             CityReport.HypoLux := -1;
-            Server(sGetCityReport, me, cix, CityReport);
+            Server(sGetCityReport, Me, cix, CityReport);
 
             if (CityReport.Working - CityReport.Happy > Size shr 1) and
@@ -3904 +4587 @@
             begin // zoom to city
               ZoomToCity(Loc);
-              exit
-            end
+              Exit;
+            end;
           end;
 
@@ -3911 +4594 @@
       (MyData.FarTech <> adNexus) then
       if not ChooseResearch then
-        exit;
+        Exit;
   end;
 
@@ -3921 +4604 @@
 
   CityDlg.CloseAction := None;
-  if IsMultiPlayerGame then
-  begin // close windows for next player
-    for i := 0 to DpiScreen.FormCount - 1 do
-      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
-        DpiScreen.Forms[i].Close;
-  end
-  else
-  begin
+  if IsMultiPlayerGame then begin
+    // Close windows for next player
+    ApplyToVisibleForms(faClose);
+  end else begin
     if CityDlg.Visible then
       CityDlg.Close;
@@ -3934 +4613 @@
       UnitStatDlg.Close;
   end;
-  for i := 0 to DpiScreen.FormCount - 1 do
-    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
-      DpiScreen.Forms[i].Enabled := false;
+  ApplyToVisibleForms(faDisable);
 
   if Server(sTurn, pTurn, 0, nil^) >= rExecuted then
@@ -3944 +4621 @@
     else
       EOT.Hint := Phrases.Lookup('BTN_SKIP');
-    result := true;
+    Result := True;
     SetTroopLoc(-1);
     pTurn := -1;
     pLogo := -1;
-    UnitInfoBtn.Visible := false;
-    UnitBtn.Visible := false;
-    TerrainBtn.Visible := false;
+    UnitInfoBtn.Visible := False;
+    UnitBtn.Visible := False;
+    TerrainBtn.Visible := False;
     EOT.ButtonIndex := eotCancel;
-    EOT.Visible := true;
-    MapValid := false;
+    EOT.Visible := True;
+    MapValid := False;
     PanelPaint;
     Update;
     ClientMode := -1;
-    idle := false;
-    skipped := WasSkipped;
+    Idle := False;
+    Skipped := WasSkipped;
     for p1 := 1 to nPl - 1 do
       if G.RO[p1] <> nil then
-        skipped := true; // don't show enemy moves in hotseat mode
+        Skipped := True; // don't show enemy moves in hotseat mode
   end
   else
-    PanelPaint
-end; // EndTurn
+    PanelPaint;
+end;
 
 procedure TMainScreen.EndNego;
@@ -3971 +4648 @@
   if NegoDlg.Visible then
     NegoDlg.Close;
-  HaveStrategyAdvice := false;
-  // AdvisorDlg.HaveStrategyAdvice;
-  // negotiation might have changed advices
+  HaveStrategyAdvice := False;
   EOT.ButtonIndex := eotCancel;
-  EOT.Visible := true;
+  EOT.Visible := True;
   PanelPaint;
   Update;
   ClientMode := -1;
-  idle := false;
-end;
-
-procedure TMainScreen.ProcessRect(x0, y0, nx, ny, Options: integer);
+  Idle := False;
+end;
+
+procedure TMainScreen.ProcessRect(x0, y0, nx, ny, Options: Integer);
 var
-  xs, ys, xl, yl: integer;
+  xs, ys, xl, yl: Integer;
 begin
   with MainMap do begin
@@ -3993 +4668 @@
     while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
       abs(2 * xs + xl - MapWidth) do
-        inc(xs, G.lx * (xxt * 2));
+        Inc(xs, G.lx * (xxt * 2));
     ys := (y0 - yw) * yyt - yyt;
     if xs + xl > MapWidth then
@@ -4000 +4675 @@
       yl := MapHeight - ys;
     if (xl <= 0) or (yl <= 0) then
-      exit;
+      Exit;
     if Options and prPaint <> 0 then begin
       if Options and prAutoBounds <> 0 then
@@ -4012 +4687 @@
 end;
 
-procedure TMainScreen.PaintLoc(Loc: integer; Radius: integer = 0);
+procedure TMainScreen.PaintLoc(Loc: Integer; Radius: Integer = 0);
 var
-  yLoc, x0: integer;
+  yLoc, x0: Integer;
 begin
   if MapValid then begin
     yLoc := (Loc + G.lx * 1024) div G.lx - 1024;
     x0 := (Loc + (yLoc and 1 - 2 * Radius + G.lx * 1024) div 2) mod G.lx;
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+    Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     ProcessRect(x0, yLoc - 2 * Radius, 4 * Radius + 1, 4 * Radius + 1,
       prPaint or prAutoBounds or prInvalidate);
@@ -4026 +4701 @@
 end;
 
-procedure TMainScreen.PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle);
+procedure TMainScreen.PaintLocTemp(Loc: Integer; Style: TPaintLocTempStyle);
 var
-  y0, x0, xMap, yMap: integer;
+  y0, x0, xMap, yMap: Integer;
 begin
   with NoMap do begin
     if not MapValid then
-      exit;
+      Exit;
     Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
     y0 := Loc div G.lx;
@@ -4040 +4715 @@
     while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
       abs(2 * xMap + 2 * xxt - MapWidth) do
-      inc(xMap, G.lx * (xxt * 2));
+      Inc(xMap, G.lx * (xxt * 2));
     yMap := (y0 - yw) * yyt - yyt;
     NoMap.SetOutput(Buffer);
@@ -4052 +4727 @@
 // panel protusions are added
 // NoMap must be set to buffer and bounds before
-procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: integer);
+procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: Integer);
 begin
   if xMap + width > MapWidth then
@@ -4060 +4735 @@
   if (width <= 0) or (height <= 0) or (width + xMap <= 0) or (height + yMap <= 0)
   then
-    exit;
+    Exit;
 
   NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap, xMidPanel,
@@ -4070 +4745 @@
   begin
     if xMap < 0 then
-      DpiBitCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
+      DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
         height + yMap, Buffer.Canvas, -xMap, -yMap)
     else
-      DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
+      DpiBitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
         height + yMap, Buffer.Canvas, 0, -yMap);
   end
@@ -4079 +4754 @@
   begin
     if xMap < 0 then
-      DpiBitCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
+      DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
         height, Buffer.Canvas, -xMap, 0)
     else
-      DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
+      DpiBitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
         height, Buffer.Canvas, 0, 0);
   end;
 end;
 
-procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: integer);
+procedure TMainScreen.PaintLoc_BeforeMove(FromLoc: Integer);
 var
-  yLoc, x0: integer;
+  yLoc, x0: Integer;
 begin
   if MapValid then
@@ -4095 +4770 @@
     yLoc := (FromLoc + G.lx * 1024) div G.lx - 1024;
     x0 := (FromLoc + (yLoc and 1 + G.lx * 1024) div 2) mod G.lx;
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+    Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     ProcessRect(x0, yLoc, 1, 1, prPaint or prAutoBounds);
   end
@@ -4102 +4777 @@
 procedure TMainScreen.PaintDestination;
 var
-  Destination: integer;
+  Destination: Integer;
 begin
   if (UnFocus >= 0) and (MyUn[UnFocus].Status and usGoto <> 0) then
@@ -4112 +4787 @@
 end;
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 // Can't do scrolling of DC under Linux, then fallback into BitBlt.
 function DpiScrollDC(Canvas: TDpiCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
-  Result := DpiBitCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+  Result := DpiBitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
     Canvas, lprcScroll.Left, lprcScroll.Top);
 end;
@@ -4123 +4798 @@
 procedure TMainScreen.MainOffscreenPaint;
 var
-  ProcessOptions: integer;
+  ProcessOptions: Integer;
   rec: TRect;
-  DoInvalidate: boolean;
-begin
-  if me < 0 then
-    with offscreen.Canvas do
+  DoInvalidate: Boolean;
+begin
+  if Me < 0 then
+    with Offscreen.Canvas do
     begin
       Brush.Color := $000000;
@@ -4134 +4809 @@
       Brush.Style := bsClear;
       OffscreenUser := self;
-      exit;
+      Exit;
     end;
 
@@ -4145 +4820 @@
     if MapValid and (xwd = xw) and (ywd = yw) then
       MainMap.SetPaintBounds(0, 0, UsedOffscreenWidth, UsedOffscreenHeight);
-    MapValid := false;
+    MapValid := False;
     OffscreenUser := self;
   end;
@@ -4158 +4833 @@
       (ywd - yw > MapHeight div yyt) then
     begin
-      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
       ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
         prPaint or prInvalidate);
     end else begin
       if (xwd = xw) and (ywd = yw) then
-        exit; { map window not moved }
-      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+        Exit; { map window not moved }
+      Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
       rec := Rect(0, 0, MapWidth, MapHeight);
 {$IFDEF WINDOWS}
-      DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+      DpiScrollDC(Offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
 {$ENDIF}
-{$IFDEF LINUX}
-      DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+{$IFDEF UNIX}
+      DpiScrollDC(Offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
         rec, rec, 0, nil);
 {$ENDIF}
-      for DoInvalidate := false to FastScrolling do begin
+      for DoInvalidate := False to FastScrolling do begin
         if DoInvalidate then begin
           rec.Bottom := MapHeight - overlap;
 {$IFDEF WINDOWS}
-          DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+          DpiScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
             rec, 0, nil);
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
           DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
             rec, rec, 0, nil);
@@ -4231 +4906 @@
   xwd := xw;
   ywd := yw;
-  MapValid := true;
+  MapValid := True;
 end;
 
@@ -4264 +4939 @@
 begin
   with MainMap do begin
-    DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+    DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
       MiniMap.Bitmap.Canvas, 0, 0);
     if MarkCityLoc >= 0 then
@@ -4288 +4963 @@
   function MovementToString(var Un: TUn): string;
   begin
-    result := ScreenTools.MovementToString(Un.Movement);
+    Result := ScreenTools.MovementToString(Un.Movement);
     if Un.Master >= 0 then
-      result := '(' + result + ')'
+      Result := '(' + Result + ')'
     else if (MyModel[Un.mix].Domain = dAir) and
       (MyModel[Un.mix].Kind <> mkSpecial_Glider) then
-      result := Format('%s(%d)', [result, Un.Fuel]);
+      Result := Format('%s(%d)', [Result, Un.Fuel]);
   end;
 
 var
-  i, uix, uixDefender, x, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
+  I, uix, uixDefender, X, xSrc, ySrc, xSrcBase, ySrcBase, CostFactor, Count,
     mixShow, xTreasurySection, xResearchSection, JobFocus, TrueMoney,
-    TrueResearch: integer;
+    TrueResearch: Integer;
   Tile: Cardinal;
-  s: string;
+  S: string;
   unx: TUn;
   UnitInfo: TUnitInfo;
   JobProgressData: TJobProgressData;
-  Prio: boolean;
+  Prio: Boolean;
 begin
   if not Assigned(MyRO) then Exit;
@@ -4349 +5024 @@
     if ClientMode <> cEditMap then
     begin
-      if supervising then
+      if Supervising then
       begin
         ScreenTools.Frame(Panel.Canvas, ClientWidth - xPalace - 1, yPalace - 1,
@@ -4357 +5032 @@
           ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
           $FFFFFF, $B0B0B0);
-        DpiBitCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
+        DpiBitBltCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
           ySizeBig, HGrSystem2.Data.Canvas, 70, 123);
       end
@@ -4382 +5057 @@
     CopyMiniToPanel;
     if ClientMode <> cEditMap then // MapBtn icons
-      for i := 0 to 5 do
-        if i <> 3 then
-          Dump(Panel, HGrSystem, xMini + G.lx - 42 + 16 * i, PanelHeight - 26,
-            8, 8, 121 + i * 9, 61);
+      for I := 0 to 5 do
+        if I <> 3 then
+          Dump(Panel, HGrSystem, xMini + G.lx - 42 + 16 * I, PanelHeight - 26,
+            8, 8, 121 + I * 9, 61);
 
     if ClientMode = cEditMap then
     begin
-      for i := 0 to TrRow - 1 do
-        trix[i] := -1;
+      for I := 0 to TrRow - 1 do
+        trix[I] := -1;
       Count := 0;
-      for i := 0 to nBrushTypes - 1 do
+      for I := 0 to nBrushTypes - 1 do
       begin // display terrain types
         if (Count >= TrRow * sb.Position) and (Count < TrRow * (sb.Position + 1))
         then
         begin
-          trix[Count - TrRow * sb.Position] := BrushTypes[i];
-          x := (Count - TrRow * sb.Position) * TrPitch;
+          trix[Count - TrRow * sb.Position] := BrushTypes[I];
+          X := (Count - TrRow * sb.Position) * TrPitch;
           xSrcBase := -1;
-          case BrushTypes[i] of
+          case BrushTypes[I] of
             0 .. 8:
               begin
-                xSrc := BrushTypes[i];
+                xSrc := BrushTypes[I];
                 ySrc := 0
               end;
@@ -4411 +5086 @@
                 ySrcBase := 2;
                 xSrc := 0;
-                ySrc := 2 * integer(BrushTypes[i]) - 15
+                ySrc := 2 * Integer(BrushTypes[I]) - 15
               end;
             fRiver:
@@ -4444 +5119 @@
                 ySrcBase := 2;
                 xSrc := 8;
-                ySrc := 12 + BrushTypes[i] shr 25;
+                ySrc := 12 + BrushTypes[I] shr 25;
               end;
             tiIrrigation, tiFarm, tiMine, tiBase:
               begin
-                xSrc := BrushTypes[i] shr 12 - 1;
+                xSrc := BrushTypes[I] shr 12 - 1;
                 ySrc := 12
               end;
@@ -4471 +5146 @@
           with MainMap do begin
             if xSrcBase >= 0 then
-              Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+              Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
                 yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
                 1 + ySrcBase * (yyt * 3 + 1));
-            Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+            Sprite(Panel, HGrTerrain, xTroop + 2 + X, yTroop + 9 - yyt, xxt * 2,
               yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
-            if BrushTypes[i] = BrushType then begin
-              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + x,
-                yTroop + 7 - yyt div 2, xTroop + 2 * xxt + x,
+            if BrushTypes[I] = BrushType then begin
+              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + X,
+                yTroop + 7 - yyt div 2, xTroop + 2 * xxt + X,
                 yTroop + 2 * yyt + 11, $000000, $000000);
-              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x,
-                yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + x,
+              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + X,
+                yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + X,
                 yTroop + 2 * yyt + 10, MainTexture.ColorMark, MainTexture.ColorMark);
             end;
           end;
         end;
-        inc(Count)
+        Inc(Count)
       end;
       case BrushType of
         fDesert, fPrairie, fTundra, fArctic, fSwamp, fHills, fMountains:
-          s := Phrases.Lookup('TERRAIN', BrushType);
+          S := Phrases.Lookup('TERRAIN', BrushType);
         fShore:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fOcean), Phrases.Lookup('TERRAIN',
             fShore)]);
         fGrass:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fGrass), Phrases.Lookup('TERRAIN',
             fGrass + 12)]);
         fForest:
-          s := Format(Phrases.Lookup('TWOTERRAINS'),
+          S := Format(Phrases.Lookup('TWOTERRAINS'),
             [Phrases.Lookup('TERRAIN', fForest), Phrases.Lookup('TERRAIN',
             fJungle)]);
         fRiver:
-          s := Phrases.Lookup('RIVER');
+          S := Phrases.Lookup('RIVER');
         fDeadLands, fDeadLands or fCobalt, fDeadLands or fUranium,
           fDeadLands or fMercury:
-          s := Phrases.Lookup('TERRAIN', 3 * 12 + BrushType shr 25);
+          S := Phrases.Lookup('TERRAIN', 3 * 12 + BrushType shr 25);
         fPrefStartPos:
-          s := Phrases.Lookup('MAP_PREFSTART');
+          S := Phrases.Lookup('MAP_PREFSTART');
         fStartPos:
-          s := Phrases.Lookup('MAP_START');
+          S := Phrases.Lookup('MAP_START');
         fPoll:
-          s := Phrases.Lookup('POLL');
+          S := Phrases.Lookup('POLL');
       else // terrain improvements
         begin
           case BrushType of
             fRoad:
-              i := 1;
+              I := 1;
             fRR:
-              i := 2;
+              I := 2;
             tiIrrigation:
-              i := 4;
+              I := 4;
             tiFarm:
-              i := 5;
+              I := 5;
             tiMine:
-              i := 7;
+              I := 7;
             fCanal:
-              i := 8;
+              I := 8;
             tiFort:
-              i := 10;
+              I := 10;
             tiBase:
-              i := 12;
+              I := 12;
           end;
-          s := Phrases.Lookup('JOBRESULT', i);
+          S := Phrases.Lookup('JOBRESULT', I);
         end
       end;
       LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 1,
-        PanelHeight - 19, s);
+        PanelHeight - 19, S);
     end
     else if TroopLoc >= 0 then
@@ -4544 +5219 @@
       Brush.Style := bsClear;
       if UnFocus >= 0 then
-        with MyUn[UnFocus] do
-        with MyModel[mix] do
+        with MyUn^[UnFocus] do
+        with MyModel^[mix] do
         begin { display info about selected unit }
           if Job = jCity then
@@ -4551 +5226 @@
           else
             mixShow := mix;
-          with Tribe[me].ModelPicture[mixShow] do
+          with Tribe[Me].ModelPicture[mixShow] do
           begin
             Sprite(Panel, HGr, xMidPanel + 7 + 12, yTroop + 1, 64, 48,
@@ -4561 +5236 @@
 
           MakeBlue(Panel, xMidPanel + 7 + 12 + 10, yTroop - 13, 44, 12);
-          s := MovementToString(MyUn[UnFocus]);
+          S := MovementToString(MyUn[UnFocus]);
           RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
-            BiColorTextWidth(Panel.Canvas, s) div 2, yTroop - 16, s);
-
-          s := IntToStr(Health) + '%';
+            BiColorTextWidth(Panel.Canvas, S) div 2, yTroop - 16, S);
+
+          S := IntToStr(Health) + '%';
           LightGradient(Panel.Canvas, xMidPanel + 7 + 12 + 7, PanelHeight - 22,
             (Health + 1) div 2, (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
@@ -4572 +5247 @@
               div 2, PanelHeight - 22, 50 - (Health + 1) div 2, $000000);
           RisedTextOut(Panel.Canvas, xMidPanel + 7 + 12 + 32 -
-            BiColorTextWidth(Panel.Canvas, s) div 2, PanelHeight - 23, s);
+            BiColorTextWidth(Panel.Canvas, S) div 2, PanelHeight - 23, S);
 
           FrameImage(Panel.Canvas, HGrSystem.Data,
@@ -4578 +5253 @@
             121 + Exp div ExpCost * 13, 28);
           if Job = jCity then
-            s := Tribe[me].ModelName[-1]
+            S := Tribe[Me].ModelName[-1]
           else
-            s := Tribe[me].ModelName[mix];
+            S := Tribe[Me].ModelName[mix];
           if Home >= 0 then
           begin
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
-              xMidPanel + 7 + xUnitText + 18, yTroop + 5, s);
+              xMidPanel + 7 + xUnitText + 18, yTroop + 5, S);
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
               xMidPanel + 7 + xUnitText + 18, yTroop + 21,
@@ -4591 +5266 @@
           else
             LoweredTextOut(Panel.Canvas, -1, MainTexture,
-              xMidPanel + 7 + xUnitText + 18, yTroop + 13, s);
+              xMidPanel + 7 + xUnitText + 18, yTroop + 13, S);
         end;
 
       if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> TroopLoc) then
       begin // divide panel
-        if SmallScreen and not supervising then
-          x := xTroop - 8
+        if SmallScreen and not Supervising then
+          X := xTroop - 8
         else
-          x := xTroop - 152;
+          X := xTroop - 152;
         Pen.Color := MainTexture.ColorBevelShade;
-        MoveTo(x - 1, PanelHeight - MidPanelHeight + 2);
-        LineTo(x - 1, PanelHeight);
+        MoveTo(X - 1, PanelHeight - MidPanelHeight + 2);
+        LineTo(X - 1, PanelHeight);
         Pen.Color := MainTexture.ColorBevelLight;
-        MoveTo(x, PanelHeight - MidPanelHeight + 2);
-        LineTo(x, PanelHeight);
-      end;
-
-      for i := 0 to 23 do
-        trix[i] := -1;
+        MoveTo(X, PanelHeight - MidPanelHeight + 2);
+        LineTo(X, PanelHeight);
+      end;
+
+      for I := 0 to 23 do
+        trix[I] := -1;
       if MyMap[TroopLoc] and fUnit <> 0 then
       begin
@@ -4619 +5294 @@
             LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 10,
               PanelHeight - 24, Phrases.Lookup('PRESENT'));
-            Server(sGetDefender, me, TroopLoc, uixDefender);
+            Server(sGetDefender, Me, TroopLoc, uixDefender);
             Count := 0;
-            for Prio := true downto false do
+            for Prio := True downto False do
               for uix := 0 to MyRO.nUn - 1 do
                 if (uix = uixDefender) = Prio then
@@ -4632 +5307 @@
                     begin
                       trix[Count - TrRow * sb.Position] := uix;
-                      MakeUnitInfo(me, unx, UnitInfo);
-                      x := (Count - TrRow * sb.Position) * TrPitch;
+                      MakeUnitInfo(Me, unx, UnitInfo);
+                      X := (Count - TrRow * sb.Position) * TrPitch;
                       if uix = UnFocus then
                       begin
-                        ScreenTools.Frame(Panel.Canvas, xTroop + 4 + x,
-                          yTroop + 3, xTroop + 64 + x, yTroop + 47,
+                        ScreenTools.Frame(Panel.Canvas, xTroop + 4 + X,
+                          yTroop + 3, xTroop + 64 + X, yTroop + 47,
                           $000000, $000000);
-                        ScreenTools.Frame(Panel.Canvas, xTroop + 3 + x,
-                          yTroop + 2, xTroop + 63 + x, yTroop + 46,
+                        ScreenTools.Frame(Panel.Canvas, xTroop + 3 + X,
+                          yTroop + 2, xTroop + 63 + X, yTroop + 46,
                           MainTexture.ColorMark, MainTexture.ColorMark);
                       end
                       else if (unx.Master >= 0) and (unx.Master = UnFocus) then
                       begin
-                        CFrame(Panel.Canvas, xTroop + 4 + x, yTroop + 3,
-                          xTroop + 64 + x, yTroop + 47, 8, $000000);
-                        CFrame(Panel.Canvas, xTroop + 3 + x, yTroop + 2,
-                          xTroop + 63 + x, yTroop + 46, 8, MainTexture.ColorMark);
+                        CFrame(Panel.Canvas, xTroop + 4 + X, yTroop + 3,
+                          xTroop + 64 + X, yTroop + 47, 8, $000000);
+                        CFrame(Panel.Canvas, xTroop + 3 + X, yTroop + 2,
+                          xTroop + 63 + X, yTroop + 46, 8, MainTexture.ColorMark);
                       end;
                       NoMapPanel.SetOutput(Panel);
-                      NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1, UnitInfo,
+                      NoMapPanel.PaintUnit(xTroop + 2 + X, yTroop + 1, UnitInfo,
                         unx.Status);
                       if (ClientMode < scContact) and
@@ -4657 +5332 @@
                         (unx.Status and (usStay or usRecover or usGoto) <> 0))
                       then
-                        Sprite(Panel, HGrSystem, xTroop + 2 + 60 - 20 + x,
+                        Sprite(Panel, HGrSystem, xTroop + 2 + 60 - 20 + X,
                           yTroop + 35, 20, 20, 81, 25);
 
-                      if not supervising then
+                      if not Supervising then
                       begin
-                        MakeBlue(Panel, xTroop + 2 + 10 + x,
+                        MakeBlue(Panel, xTroop + 2 + 10 + X,
                           yTroop - 13, 44, 12);
-                        s := MovementToString(unx);
+                        S := MovementToString(unx);
                         RisedTextOut(Panel.Canvas,
-                          xTroop + x + 34 - BiColorTextWidth(Panel.Canvas, s)
-                          div 2, yTroop - 16, s);
+                          xTroop + X + 34 - BiColorTextWidth(Panel.Canvas, S)
+                          div 2, yTroop - 16, S);
                       end;
                     end;
-                    inc(Count)
+                    Inc(Count)
                   end;
                 end; // for uix:=0 to MyRO.nUn-1
-            assert(Count = TrCnt);
+            Assert(Count = TrCnt);
           end;
         end
@@ -4680 +5355 @@
           LoweredTextOut(Panel.Canvas, -1, MainTexture, xTroop + 8,
             PanelHeight - 24, Phrases.Lookup('PRESENT'));
-          Server(sGetUnits, me, TroopLoc, Count);
-          for i := 0 to Count - 1 do
-            if (i >= TrRow * sb.Position) and (i < TrRow * (sb.Position + 1)) then
+          Server(sGetUnits, Me, TroopLoc, Count);
+          for I := 0 to Count - 1 do
+            if (I >= TrRow * sb.Position) and (I < TrRow * (sb.Position + 1)) then
             begin // display enemy units
-              trix[i - TrRow * sb.Position] := i;
-              x := (i - TrRow * sb.Position) * TrPitch;
+              trix[I - TrRow * sb.Position] := I;
+              X := (I - TrRow * sb.Position) * TrPitch;
               NoMapPanel.SetOutput(Panel);
-              NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1,
-                MyRO.EnemyUn[MyRO.nEnemyUn + i], 0);
+              NoMapPanel.PaintUnit(xTroop + 2 + X, yTroop + 1,
+                MyRO.EnemyUn[MyRO.nEnemyUn + I], 0);
             end;
         end;
       end;
-      if not SmallScreen or supervising then
+      if not SmallScreen or Supervising then
       begin // show terrain and improvements
         with NoMapPanel do
@@ -4698 +5373 @@
         if (UnFocus >= 0) and (MyUn[UnFocus].Job <> jNone) then begin
           JobFocus := MyUn[UnFocus].Job;
-          Server(sGetJobProgress, me, MyUn[UnFocus].Loc, JobProgressData);
+          Server(sGetJobProgress, Me, MyUn[UnFocus].Loc, JobProgressData);
           MakeBlue(Panel, xTerrain - 72, 148 - 17, 144, 31);
           PaintRelativeProgressBar(Panel.Canvas, 3, xTerrain - 68, 148 + 3, 63,
             JobProgressData[JobFocus].Done,
             JobProgressData[JobFocus].NextTurnPlus,
-            JobProgressData[JobFocus].Required, true, MainTexture);
-          s := Format('%s/%s',
+            JobProgressData[JobFocus].Required, True, MainTexture);
+          S := Format('%s/%s',
             [ScreenTools.MovementToString(JobProgressData[JobFocus].Done),
             ScreenTools.MovementToString(JobProgressData[JobFocus].Required)]);
-          RisedTextOut(Panel.Canvas, xTerrain + 6, 148 - 3, s);
+          RisedTextOut(Panel.Canvas, xTerrain + 6, 148 - 3, S);
           Tile := MyMap[MyUn[UnFocus].Loc];
           if (JobFocus = jRoad) and (Tile and fRiver <> 0) then
@@ -4722 +5397 @@
               JobFocus := nJob + 4
           end;
-          s := Phrases.Lookup('JOBRESULT', JobFocus);
+          S := Phrases.Lookup('JOBRESULT', JobFocus);
           RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas,
-            s) div 2, 148 - 19, s);
+            S) div 2, 148 - 19, S);
         end;
         if MyMap[TroopLoc] and (fTerrain or fSpecial) = fGrass or fSpecial1 then
-          s := Phrases.Lookup('TERRAIN', fGrass + 12)
+          S := Phrases.Lookup('TERRAIN', fGrass + 12)
         else if MyMap[TroopLoc] and fDeadLands <> 0 then
-          s := Phrases.Lookup('TERRAIN', 3 * 12)
+          S := Phrases.Lookup('TERRAIN', 3 * 12)
         else if (MyMap[TroopLoc] and fTerrain = fForest) and
           IsJungle(TroopLoc div G.lx) then
-          s := Phrases.Lookup('TERRAIN', fJungle)
+          S := Phrases.Lookup('TERRAIN', fJungle)
         else
-          s := Phrases.Lookup('TERRAIN', MyMap[TroopLoc] and fTerrain);
-        RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas, s)
-          div 2, 99, s);
+          S := Phrases.Lookup('TERRAIN', MyMap[TroopLoc] and fTerrain);
+        RisedTextOut(Panel.Canvas, xTerrain - BiColorTextWidth(Panel.Canvas, S)
+          div 2, 99, S);
       end;
 
@@ -4747 +5422 @@
   end;
 
-  for i := 0 to ControlCount - 1 do
-    if Controls[i] is TButtonB then
-      with TButtonB(Controls[i]) do
+  for I := 0 to ControlCount - 1 do
+    if Controls[I] is TButtonB then
+      with TButtonB(Controls[I]) do
       begin
         if Visible then
@@ -4765 +5440 @@
   if ClientMode <> cEditMap then
   begin
-    for i := 0 to ControlCount - 1 do
-      if Controls[i] is TButtonC then
-        with TButtonC(Controls[i]) do
+    for I := 0 to ControlCount - 1 do
+      if Controls[I] is TButtonC then
+        with TButtonC(Controls[I]) do
         begin
           Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
@@ -4807 +5482 @@
     TrueMoney := MyRO.Money;
     TrueResearch := MyRO.Research;
-    if supervising then
+    if Supervising then
     begin // normalize values from after-turn state
-      dec(TrueMoney, TaxSum);
+      Dec(TrueMoney, TaxSum);
       if TrueMoney < 0 then
         TrueMoney := 0; // shouldn't happen
-      dec(TrueResearch, ScienceSum);
+      Dec(TrueResearch, ScienceSum);
       if TrueResearch < 0 then
         TrueResearch := 0; // shouldn't happen
@@ -4820 +5495 @@
     ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 8, 1), TreasuryIcon.BoundsRect,
       $40A040, $4030C0);
-    s := IntToStr(TrueMoney);
+    S := IntToStr(TrueMoney);
     LoweredTextOut(TopBar.Canvas, -1, MainTexture, xTreasurySection + 48, 0,
-      s + '%c');
+      S + '%c');
     if MyRO.Government <> gAnarchy then
     begin
@@ -4828 +5503 @@
         $0000C0, $0080C0);
       if TaxSum >= 0 then
-        s := Format(Phrases.Lookup('MONEYGAINPOS'), [TaxSum])
+        S := Format(Phrases.Lookup('MONEYGAINPOS'), [TaxSum])
       else
-        s := Format(Phrases.Lookup('MONEYGAINNEG'), [TaxSum]);
+        S := Format(Phrases.Lookup('MONEYGAINNEG'), [TaxSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xTreasurySection + 48 +
-        15, 18, s);
+        15, 18, S);
     end;
 
@@ -4852 +5527 @@
       else
         CostFactor := 2;
-      Server(sGetTechCost, me, 0, i);
+      Server(sGetTechCost, Me, 0, I);
       CostFactor := CostFactor * 22; // length of progress bar
       PaintRelativeProgressBar(TopBar.Canvas, 2, xResearchSection + 48 + 1, 26,
-        CostFactor, TrueResearch, ScienceSum, i, true, MainTexture);
+        CostFactor, TrueResearch, ScienceSum, I, True, MainTexture);
 
       if MyRO.ResearchTech < 0 then
-        s := Phrases.Lookup('SCIENCE')
+        S := Phrases.Lookup('SCIENCE')
       else if MyRO.ResearchTech = adMilitary then
-        s := Phrases.Lookup('INITUNIT')
+        S := Phrases.Lookup('INITUNIT')
       else
       begin
-        s := Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
+        S := Phrases.Lookup('ADVANCES', MyRO.ResearchTech);
         if MyRO.ResearchTech in FutureTech then
           if MyRO.Tech[MyRO.ResearchTech] >= 1 then
-            s := s + ' ' + IntToStr(MyRO.Tech[MyRO.ResearchTech] + 1)
+            S := S + ' ' + IntToStr(MyRO.Tech[MyRO.ResearchTech] + 1)
           else
-            s := s + ' 1';
+            S := S + ' 1';
       end;
       if ScienceSum > 0 then
       begin
         { j:=(i-MyRO.Research-1) div ScienceSum +1;
-          if j<1 then j:=1;
-          if j>1 then
-          s:=Format(Phrases.Lookup('TECHWAIT'),[s,j]); }
+          if J<1 then J:=1;
+          if J>1 then
+          S:=Format(Phrases.Lookup('TECHWAIT'),[S,J]); }
         LoweredTextOut(TopBar.Canvas, -1, MainTexture,
-          xResearchSection + 48, 0, s);
+          xResearchSection + 48, 0, S);
       end
       else
         LoweredTextOut(TopBar.Canvas, -1, MainTexture,
-          xResearchSection + 48, 0, s);
+          xResearchSection + 48, 0, S);
     end
     else
@@ -4889 +5564 @@
       ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11,
         22), ChangeIcon.BoundsRect, $0000C0, $0080C0);
-      s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
+      S := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
-        CostFactor + 26, 18, s);
+        CostFactor + 26, 18, S);
     end;
   end;
@@ -4897 +5572 @@
   begin
     TopBar.Canvas.Font.Assign(UniFont[ftCaption]);
-    s := TurnToString(MyRO.Turn);
+    S := TurnToString(MyRO.Turn);
     RisedTextOut(TopBar.Canvas,
-      40 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, s))
-      div 2, 6, s);
+      40 + (xTreasurySection - 40 - BiColorTextWidth(TopBar.Canvas, S))
+      div 2, 6, S);
     TopBar.Canvas.Font.Assign(UniFont[ftNormal]);
   end;
@@ -4908 +5583 @@
 procedure TMainScreen.FocusNextUnit(Dir: Integer);
 var
-  i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
 begin
   if ClientMode >= scContact then
@@ -4915 +5590 @@
   PaintDestination;
   NewFocus := -1;
-  for i := 1 to MyRO.nUn do begin
-    uix := (UnFocus + i * Dir + MyRO.nUn) mod MyRO.nUn;
+  for I := 1 to MyRO.nUn do begin
+    uix := (UnFocus + I * Dir + MyRO.nUn) mod MyRO.nUn;
     if (MyUn[uix].Loc >= 0) and (MyUn[uix].Status and usStay = 0) then begin
       NewFocus := uix;
@@ -4929 +5604 @@
 end;
 
-procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
+procedure TMainScreen.FocusOnLoc(Loc: Integer; Options: Integer = 0);
 var
-  dx: integer;
-  Outside, Changed: boolean;
+  dx: Integer;
+  Outside, Changed: Boolean;
 begin
   with MainMap do begin
@@ -4940 +5615 @@
       (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
   end;
-  Changed := true;
+  Changed := True;
   if Outside then begin
     Centre(Loc);
@@ -4948 +5623 @@
     PaintAllMaps
   else
-    Changed := false;
+    Changed := False;
   if Options and flRepaintPanel <> 0 then
     PanelPaint;
@@ -4958 +5633 @@
 var
   Dist, TestDist: Single;
-  i, uix, NewFocus: Integer;
+  I, uix, NewFocus: Integer;
   GotoOnly: Boolean;
 begin
@@ -4968 +5643 @@
   for GotoOnly := GoOnPhase downto False do begin
     NewFocus := -1;
-    for i := 1 to MyRO.nUn do begin
-      uix := (UnFocus + i) mod MyRO.nUn;
+    for I := 1 to MyRO.nUn do begin
+      uix := (UnFocus + I) mod MyRO.nUn;
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].Job = jNone) and
         (MyUn[uix].Status and (usStay or usRecover or usWaiting) = usWaiting)
@@ -5008 +5683 @@
 end;
 
-procedure TMainScreen.Scroll(dx, dy: integer);
+procedure TMainScreen.Scroll(dx, dy: Integer);
 begin
   xw := (xw + G.lx + dx) mod G.lx;
@@ -5032 +5707 @@
 procedure TMainScreen.Timer1Timer(Sender: TObject);
 var
-  dx, dy, ScrollSpeed: integer;
-begin
-  if idle and (me >= 0) and (GameMode <> cMovie) then
+  dx, dy, ScrollSpeed: Integer;
+begin
+  if Idle and (Me >= 0) and (GameMode <> cMovie) then
     if (fsModal in DpiScreen.ActiveForm.FormState) or
       (DpiScreen.ActiveForm is TBufferedDrawDlg) and
@@ -5042 +5717 @@
       if not BlinkON then
       begin
-        BlinkON := true;
+        BlinkON := True;
         if UnFocus >= 0 then
           PaintLocTemp(MyUn[UnFocus].Loc)
-        else if TurnComplete and not supervising then
+        else if TurnComplete and not Supervising then
           EOT.SetButtonIndexFast(eotBlinkOn);
       end;
@@ -5057 +5732 @@
         dx := 0;
         dy := 0;
-        if DpiMouse.CursorPos.y < DpiScreen.height - PanelHeight then
-          if DpiMouse.CursorPos.x = 0 then
+        if DpiMouse.CursorPos.Y < DpiScreen.height - PanelHeight then
+          if DpiMouse.CursorPos.X = 0 then
             dx := -ScrollSpeed // scroll left
-          else if DpiMouse.CursorPos.x = DpiScreen.width - 1 then
+          else if DpiMouse.CursorPos.X = DpiScreen.width - 1 then
             dx := ScrollSpeed; // scroll right
-        if DpiMouse.CursorPos.y = 0 then
+        if DpiMouse.CursorPos.Y = 0 then
           dy := -ScrollSpeed // scroll up
-        else if (DpiMouse.CursorPos.y = DpiScreen.height - 1) and
-          (DpiMouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
-          (DpiMouse.CursorPos.x < xRightPanel + 10 - 8) then
+        else if (DpiMouse.CursorPos.Y = DpiScreen.height - 1) and
+          (DpiMouse.CursorPos.X >= TerrainBtn.Left + TerrainBtn.width) and
+          (DpiMouse.CursorPos.X < xRightPanel + 10 - 8) then
           dy := ScrollSpeed; // scroll down
         if (dx <> 0) or (dy <> 0) then
@@ -5079 +5754 @@
       BlinkTime := (BlinkTime + 1) mod (BlinkOnTime + BlinkOffTime);
       BlinkON := BlinkTime >= BlinkOffTime;
-      DestinationMarkON := true;
+      DestinationMarkON := True;
       if UnFocus >= 0 then
       begin
@@ -5090 +5765 @@
         end;
       end
-      else if TurnComplete and not supervising then
+      else if TurnComplete and not Supervising then
       begin
         if BlinkTime = 0 then
@@ -5100 +5775 @@
 end;
 
-procedure TMainScreen.SetMapPos(Loc: integer; MapPos: TPoint);
+procedure TMainScreen.SetMapPos(Loc: Integer; MapPos: TPoint);
 begin
   with MainMap do begin
@@ -5118 +5793 @@
 end;
 
-procedure TMainScreen.Centre(Loc: integer);
+procedure TMainScreen.Centre(Loc: Integer);
 begin
   SetMapPos(Loc, Point(MapWidth div 2, MapHeight div 2));
 end;
 
-function TMainScreen.ZoomToCity(Loc: integer; NextUnitOnClose: boolean = false;
-  ShowEvent: integer = 0): boolean;
-begin
-  result := MyMap[Loc] and (fOwned or fSpiedOut) <> 0;
-  if result then
+function TMainScreen.ZoomToCity(Loc: Integer; NextUnitOnClose: Boolean = False;
+  ShowEvent: Integer = 0): Boolean;
+begin
+  Result := MyMap[Loc] and (fOwned or fSpiedOut) <> 0;
+  if Result then
     with CityDlg do
     begin
@@ -5153 +5828 @@
 end;
 
-function TMainScreen.LocationOfScreenPixel(x, y: integer): Integer;
+function TMainScreen.LocationOfScreenPixel(X, Y: Integer): Integer;
 var
-  qx, qy: integer;
+  qx, qy: Integer;
 begin
   with MainMap do begin
-    qx := (x * (yyt * 2) + y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
-    qy := (y * (xxt * 2) - x * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
+    qx := (X * (yyt * 2) + Y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
+    qy := (Y * (xxt * 2) - X * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
       div (xxt * yyt * 4) - 999;
     Result := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx *
@@ -5173 +5848 @@
 
 procedure TMainScreen.MapBoxMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, uix, emix, p1, dx, dy, MouseLoc: integer;
+  I, uix, emix, p1, dx, dy, MouseLoc: Integer;
   EditTileData: TEditTileData;
-  m, m2: TDpiMenuItem;
+  M, m2: TDpiMenuItem;
   MoveAdviceData: TMoveAdviceData;
-  DoCenter: boolean;
+  DoCenter: Boolean;
 begin
   if GameMode = cMovie then
-    exit;
-
-  if CityDlg.Visible then
+    Exit;
+
+  if Assigned(FCityDlg) and CityDlg.Visible then
     CityDlg.Close;
-  if UnitStatDlg.Visible then
+  if Assigned(FUnitStatDlg) and UnitStatDlg.Visible then
     UnitStatDlg.Close;
-  MouseLoc := LocationOfScreenPixel(x, y);
+  MouseLoc := LocationOfScreenPixel(X, Y);
   if (MouseLoc < 0) or (MouseLoc >= G.lx * G.ly) then
-    exit;
+    Exit;
   if (Button = mbLeft) and not(ssShift in Shift) then
   begin
-    DoCenter := true;
+    DoCenter := True;
     if ClientMode = cEditMap then
     begin
-      DoCenter := false;
+      DoCenter := False;
       EditTileData.Loc := MouseLoc;
       if ssCtrl in Shift then // toggle special resource
@@ -5234 +5909 @@
       else
         EditTileData.NewTile := MyMap[MouseLoc] xor BrushType;
-      Server(sEditTile, me, 0, EditTileData);
-      Edited := true;
+      Server(sEditTile, Me, 0, EditTileData);
+      Edited := True;
       BrushLoc := MouseLoc;
       PaintLoc(MouseLoc, 2);
       MiniMapPaint;
-      DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         MiniMap.Bitmap.Canvas, 0, 0);
       with MainMap do begin
@@ -5261 +5936 @@
       begin
         ZoomToCity(MouseLoc);
-        DoCenter := false;
+        DoCenter := False;
       end
       else
       begin
         UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
-        DoCenter := false;
+        DoCenter := False;
       end;
     end
@@ -5272 +5947 @@
       if MyMap[MouseLoc] and fOwned <> 0 then
       begin
-        DoCenter := false;
-        if not supervising and (ClientMode < scContact) then
+        DoCenter := False;
+        if not Supervising and (ClientMode < scContact) then
         begin // not in negotiation mode
           if (UnFocus >= 0) and (MyUn[UnFocus].Loc = MouseLoc) then
           begin // rotate
             uix := (UnFocus + 1) mod MyRO.nUn;
-            i := MyRO.nUn - 1;
-            while i > 0 do
+            I := MyRO.nUn - 1;
+            while I > 0 do
             begin
               if (MyUn[uix].Loc = MouseLoc) and (MyUn[uix].Job = jNone) and
@@ -5285 +5960 @@
                 usWaiting) = usWaiting) then
                 Break;
-              dec(i);
+              Dec(I);
               uix := (uix + 1) mod MyRO.nUn;
             end;
-            if i = 0 then
+            if I = 0 then
               uix := UnFocus;
           end
           else
-            Server(sGetDefender, me, MouseLoc, uix);
+            Server(sGetDefender, Me, MouseLoc, uix);
           if uix <> UnFocus then
             SetUnFocus(uix);
-          TurnComplete := false;
+          TurnComplete := False;
           EOT.ButtonIndex := eotGray;
         end;
@@ -5303 +5978 @@
       else if (MyMap[MouseLoc] and fSpiedOut <> 0) and not(ssCtrl in Shift) then
       begin
-        DoCenter := false;
+        DoCenter := False;
         SetTroopLoc(MouseLoc);
         PanelPaint;
@@ -5309 +5984 @@
       else
       begin
-        DoCenter := false;
+        DoCenter := False;
         UnitStatDlg.ShowNewContent_EnemyLoc(wmPersistent, MouseLoc);
       end;
@@ -5321 +5996 @@
     not(ssShift in Shift) then
   begin
-    if supervising then
+    if Supervising then
     begin
       EditLoc := MouseLoc;
-      Server(sGetModels, me, 0, nil^);
+      Server(sGetModels, Me, 0, nil^);
       EmptyMenu(mCreateUnit);
       for p1 := 0 to nPl - 1 do
         if 1 shl p1 and MyRO.Alive <> 0 then
         begin
-          m := TDpiMenuItem.Create(mCreateUnit);
-          m.Caption := Tribe[p1].TPhrase('SHORTNAME');
+          M := TDpiMenuItem.Create(mCreateUnit);
+          M.Caption := Tribe[p1].TPhrase('SHORTNAME');
           for emix := MyRO.nEnemyModel - 1 downto 0 do
             if (MyRO.EnemyModel[emix].Owner = p1) and
-              (Server(sCreateUnit - sExecute + p1 shl 4, me,
+              (Server(sCreateUnit - sExecute + p1 shl 4, Me,
               MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
             begin
               if not Assigned(Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr) then
                 InitEnemyModel(emix);
-              m2 := TDpiMenuItem.Create(m);
+              m2 := TDpiMenuItem.Create(M);
               m2.Caption := Tribe[p1].ModelName[MyRO.EnemyModel[emix].mix];
               m2.Tag := p1 shl 16 + MyRO.EnemyModel[emix].mix;
               m2.OnClick := CreateUnitClick;
-              m.Add(m2);
+              M.Add(m2);
             end;
-          m.Visible := m.Count > 0;
-          mCreateUnit.Add(m);
+          M.Visible := M.Count > 0;
+          mCreateUnit.Add(M);
         end;
       if FullScreen then
-        EditPopup.Popup(Left + x, Top + y)
+        EditPopup.Popup(Left + X, Top + Y)
       else
-        EditPopup.Popup(Left + x + 4,
-          Top + y + DpiGetSystemMetrics(SM_CYCAPTION) + 4);
+        EditPopup.Popup(Left + X + 4,
+          Top + Y + DpiGetSystemMetrics(SM_CYCAPTION) + 4);
     end
     else if (UnFocus >= 0) and (MyUn[UnFocus].Loc <> MouseLoc) then
@@ -5362 +6037 @@
         if abs(dx) + abs(dy) < 3 then
         begin
-          DestinationMarkON := false;
+          DestinationMarkON := False;
           PaintDestination;
           Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance)
@@ -5375 +6050 @@
             with MyUn[UnFocus], BattleDlg.Forecast do
             begin
-              pAtt := me;
+              pAtt := Me;
               mixAtt := mix;
               HealthAtt := Health;
@@ -5382 +6057 @@
             end;
             BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-            if (Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast)
+            if (Server(sGetBattleForecastEx, Me, MouseLoc, BattleDlg.Forecast)
               >= rExecuted) and (BattleDlg.Forecast.EndHealthAtt <= 0) then
             begin
               BattleDlg.uix := UnFocus;
               BattleDlg.ToLoc := MouseLoc;
-              BattleDlg.IsSuicideQuery := true;
+              BattleDlg.IsSuicideQuery := True;
               BattleDlg.ShowModal;
               if BattleDlg.ModalResult <> mrOK then
-                exit;
+                Exit;
             end;
           end;
-          DestinationMarkON := false;
+          DestinationMarkON := False;
           PaintDestination;
           Status := Status and not(usStay or usRecover or usEnhance) or
             usWaiting;
-          MoveToLoc(MouseLoc, false); { goto }
+          MoveToLoc(MouseLoc, False); { goto }
         end;
       end;
@@ -5404 +6079 @@
     (MyModel[MyUn[UnFocus].mix].Kind in [mkSettler, mkSlaves]) then
   begin
-    DestinationMarkON := false;
+    DestinationMarkON := False;
     PaintDestination;
     MyUn[UnFocus].Status := MyUn[UnFocus].Status and
@@ -5410 +6085 @@
     uix := UnFocus;
     if MouseLoc <> MyUn[uix].Loc then
-      MoveToLoc(MouseLoc, true); { goto }
+      MoveToLoc(MouseLoc, True); { goto }
     if (UnFocus = uix) and (MyUn[uix].Loc = MouseLoc) then
-      MenuClick(mEnhance);
+      mEnhance.Click;
   end
   else if (Button = mbLeft) and (ssShift in Shift) and
@@ -5423 +6098 @@
     with MyUn[UnFocus], BattleDlg.Forecast do
     begin
-      pAtt := me;
+      pAtt := Me;
       mixAtt := mix;
       HealthAtt := Health;
@@ -5430 +6105 @@
     end;
     BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-    if Server(sGetBattleForecastEx, me, MouseLoc, BattleDlg.Forecast) >= rExecuted
+    if Server(sGetBattleForecastEx, Me, MouseLoc, BattleDlg.Forecast) >= rExecuted
     then
     begin
       BattleDlg.uix := UnFocus;
       BattleDlg.ToLoc := MouseLoc;
-      BattleDlg.Left := x - BattleDlg.width div 2;
+      BattleDlg.Left := X - BattleDlg.width div 2;
       if BattleDlg.Left < 0 then
         BattleDlg.Left := 0
       else if BattleDlg.Left + BattleDlg.width > DpiScreen.width then
         BattleDlg.Left := DpiScreen.width - BattleDlg.width;
-      BattleDlg.Top := y - BattleDlg.height div 2;
+      BattleDlg.Top := Y - BattleDlg.height div 2;
       if BattleDlg.Top < 0 then
         BattleDlg.Top := 0
       else if BattleDlg.Top + BattleDlg.height > DpiScreen.height then
         BattleDlg.Top := DpiScreen.height - BattleDlg.height;
-      BattleDlg.IsSuicideQuery := false;
+      BattleDlg.IsSuicideQuery := False;
       BattleDlg.Show;
     end;
@@ -5451 +6126 @@
 end;
 
-function TMainScreen.MoveUnit(dx, dy: integer; Options: integer): integer;
+function TMainScreen.MoveUnit(dx, dy: Integer; Options: Integer): Integer;
 // move focused unit to adjacent tile
 var
-  i, cix, uix, euix, FromLoc, ToLoc, DirCode, UnFocus0, Defender, Mission, p1,
-    NewTiles, cixChanged: integer;
+  I, cix, uix, euix, FromLoc, ToLoc, DirCode, UnFocus0, Defender, Mission, p1,
+    NewTiles, cixChanged: Integer;
   OldToTile: Cardinal;
   CityCaptured, IsAttack, OldUnrest, NewUnrest, NeedEcoUpdate, NeedRepaintPanel,
-    ToTransport, ToShip: boolean;
+    ToTransport, ToShip: Boolean;
   PlaneReturnData: TPlaneReturnData;
   QueryItem: string;
 begin
-  result := eInvalid;
+  Result := eInvalid;
   UnFocus0 := UnFocus;
   FromLoc := MyUn[UnFocus].Loc;
@@ -5468 +6143 @@
   if (ToLoc < 0) or (ToLoc >= G.lx * G.ly) then
   begin
-    result := eInvalid;
-    exit;
+    Result := eInvalid;
+    Exit;
   end;
   if MyMap[ToLoc] and fStealthUnit <> 0 then
   begin
     SoundMessage(Phrases.Lookup('ATTACKSTEALTH'), '');
-    exit;
+    Exit;
   end;
   if MyMap[ToLoc] and fHiddenUnit <> 0 then
   begin
     SoundMessage(Phrases.Lookup('ATTACKSUB'), '');
-    exit;
+    Exit;
   end;
 
@@ -5489 +6164 @@
     begin
       SoundMessage(Phrases.Lookup('NOATTACKER'), '');
-      exit;
+      Exit;
     end;
     euix := MyRO.nEnemyUn - 1;
     while (euix >= 0) and (MyRO.EnemyUn[euix].Loc <> ToLoc) do
-      dec(euix);
+      Dec(euix);
   end;
 
   DirCode := dx and 7 shl 4 + dy and 7 shl 7;
-  result := Server(sMoveUnit - sExecute + DirCode, me, UnFocus, nil^);
-  if (result < rExecuted) and (MyUn[UnFocus].Job > jNone) then
-    Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-  if (result < rExecuted) and (result <> eNoTime_Move) then
-  begin
-    case result of
+  Result := Server(sMoveUnit - sExecute + DirCode, Me, UnFocus, nil^);
+  if (Result < rExecuted) and (MyUn[UnFocus].Job > jNone) then
+    Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
+  if (Result < rExecuted) and (Result <> eNoTime_Move) then
+  begin
+    case Result of
       eNoTime_Load:
         if MyModel[MyUn[UnFocus].mix].Domain = dAir then
@@ -5538 +6213 @@
             (MyMap[ToLoc] and (fUnit or fOwned) = fUnit or fOwned) then
           begin // false load attempt
-            ToShip := false;
-            ToTransport := false;
+            ToShip := False;
+            ToTransport := False;
             for uix := 0 to MyRO.nUn - 1 do
               if (MyUn[uix].Loc = ToLoc) and
                 (MyModel[MyUn[uix].mix].Domain = dSea) then
               begin
-                ToShip := true;
+                ToShip := True;
                 if MyModel[MyUn[uix].mix].Cap[mcSeaTrans] > 0 then
-                  ToTransport := true;
+                  ToTransport := True;
               end;
             if ToTransport then
@@ -5561 +6236 @@
       Play('NOMOVE_DEFAULT');
     end;
-    exit;
-  end;
-
-  if ((result = eWon) or (result = eLost) or (result = eBloody)) and
+    Exit;
+  end;
+
+  if ((Result = eWon) or (Result = eLost) or (Result = eBloody)) and
     (MyUn[UnFocus].Movement < 100) and
     (MyModel[MyUn[UnFocus].mix].Cap[mcWill] = 0) then
@@ -5571 +6246 @@
       [MyUn[UnFocus].Movement]), 'NOMOVE_TIME') <> mrOK then
     begin
-      result := eInvalid;
-      exit;
+      Result := eInvalid;
+      Exit;
     end;
     Update; // remove message box from screen
   end;
 
-  OldUnrest := false;
-  NewUnrest := false;
-  if (result >= rExecuted) and (result and rUnitRemoved = 0) and
+  OldUnrest := False;
+  NewUnrest := False;
+  if (Result >= rExecuted) and (Result and rUnitRemoved = 0) and
     (MyMap[ToLoc] and (fUnit or fOwned) <> fUnit) then
   begin
@@ -5589 +6264 @@
       begin
         QueryItem := 'UNREST_NOTOWN';
-        p1 := me;
+        p1 := Me;
       end
       else
@@ -5606 +6281 @@
         if ModalResult <> mrOK then
         begin
-          result := eInvalid;
-          exit;
+          Result := eInvalid;
+          Exit;
         end;
       end;
       Update; // remove message box from screen
-    end
-  end;
-
-  if (result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
+    end;
+  end;
+
+  if (Result >= rExecuted) and (MyModel[MyUn[UnFocus].mix].Domain = dAir) and
     (MyUn[UnFocus].Status and usToldNoReturn = 0) then
   begin // can plane return?
@@ -5634 +6309 @@
         PlaneReturnData.Movement := MyUn[UnFocus].Movement - 150;
     end;
-    if Server(sGetPlaneReturn, me, UnFocus, PlaneReturnData) = eNoWay then
+    if Server(sGetPlaneReturn, Me, UnFocus, PlaneReturnData) = eNoWay then
     begin
       if MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_Glider then
@@ -5643 +6318 @@
         <> mrOK then
       begin
-        result := eInvalid;
-        exit;
+        Result := eInvalid;
+        Exit;
       end;
       Update; // remove message box from screen
       MyUn[UnFocus].Status := MyUn[UnFocus].Status or usToldNoReturn;
-    end
-  end;
-
-  if result = eMissionDone then
+    end;
+  end;
+
+  if Result = eMissionDone then
   begin
     ModalSelectDlg.ShowNewContent(wmModal, kMission);
     Update; // dialog still on screen
-    Mission := ModalSelectDlg.result;
+    Mission := ModalSelectDlg.Result;
     if Mission < 0 then
-      exit;
-    Server(sSetSpyMission + Mission shl 4, me, 0, nil^);
-  end;
-
-  CityCaptured := false;
-  if result = eNoTime_Move then
+      Exit;
+    Server(sSetSpyMission + Mission shl 4, Me, 0, nil^);
+  end;
+
+  CityCaptured := False;
+  if Result = eNoTime_Move then
     Play('NOMOVE_TIME')
   else
   begin
-    NeedEcoUpdate := false;
-    DestinationMarkON := false;
+    NeedEcoUpdate := False;
+    DestinationMarkON := False;
     PaintDestination;
-    if result and rUnitRemoved <> 0 then
+    if Result and rUnitRemoved <> 0 then
       CityOptimizer_BeforeRemoveUnit(UnFocus);
-    IsAttack := (result = eBombarded) or (result <> eMissionDone) and
+    IsAttack := (Result = eBombarded) or (Result <> eMissionDone) and
       (MyMap[ToLoc] and (fUnit or fOwned) = fUnit);
     if not IsAttack then
@@ -5677 +6352 @@
       cix := MyRO.nCity - 1; { look for own city at dest location }
       while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-        dec(cix);
-      if (result <> eMissionDone) and (MyMap[ToLoc] and fCity <> 0) and (cix < 0)
+        Dec(cix);
+      if (Result <> eMissionDone) and (MyMap[ToLoc] and fCity <> 0) and (cix < 0)
       then
-        CityCaptured := true;
-      result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
-      case result of
+        CityCaptured := True;
+      Result := Server(sMoveUnit + DirCode, Me, UnFocus, nil^);
+      case Result of
         eHiddenUnit:
           begin
             Play('NOMOVE_SUBMARINE');
-            PaintLoc(ToLoc)
+            PaintLoc(ToLoc);
           end;
         eStealthUnit:
           begin
             Play('NOMOVE_STEALTH');
-            PaintLoc(ToLoc)
+            PaintLoc(ToLoc);
           end;
         eZOC_EnemySpotted:
           begin
             Play('NOMOVE_ZOC');
-            PaintLoc(ToLoc, 1)
+            PaintLoc(ToLoc, 1);
           end;
-        rExecuted .. maxint:
+        rExecuted..MaxInt:
           begin
-            if result and rUnitRemoved <> 0 then
+            if Result and rUnitRemoved <> 0 then
               UnFocus := -1 // unit died
             else
             begin
-              assert(UnFocus >= 0);
+              Assert(UnFocus >= 0);
               MyUn[UnFocus].Status := MyUn[UnFocus].Status and
                 not(usStay or usRecover);
@@ -5714 +6389 @@
               begin // borders have moved, unrest might have changed in any city
                 CityOptimizer_BeginOfTurn;
-                NeedEcoUpdate := true;
+                NeedEcoUpdate := True;
               end
               else
@@ -5724 +6399 @@
                     if MyUn[uix].Master = UnFocus then
                       CityOptimizer_CityChange(MyUn[uix].Home);
-                  NeedEcoUpdate := true;
+                  NeedEcoUpdate := True;
                 end;
                 if (MyRO.Government = gDespotism) and
@@ -5734 +6409 @@
                     while (cixChanged >= 0) and
                       (MyCity[cixChanged].Loc <> FromLoc) do
-                      dec(cixChanged);
-                    assert(cixChanged >= 0);
+                      Dec(cixChanged);
+                    Assert(cixChanged >= 0);
                     if cixChanged >= 0 then
                     begin
                       CityOptimizer_CityChange(cixChanged);
-                      NeedEcoUpdate := true;
+                      NeedEcoUpdate := True;
                     end;
                   end;
@@ -5747 +6422 @@
                     while (cixChanged >= 0) and
                       (MyCity[cixChanged].Loc <> ToLoc) do
-                      dec(cixChanged);
-                    assert(cixChanged >= 0);
+                      Dec(cixChanged);
+                    Assert(cixChanged >= 0);
                     if cixChanged >= 0 then
                     begin
                       CityOptimizer_CityChange(cixChanged);
-                      NeedEcoUpdate := true;
+                      NeedEcoUpdate := True;
                     end;
                   end;
@@ -5760 +6435 @@
           end;
       else
-        assert(false);
+        Assert(False);
       end;
       SetTroopLoc(ToLoc);
@@ -5766 +6441 @@
     else
     begin { enemy unit -- attack }
-      if result = eBombarded then
+      if Result = eBombarded then
         Defender := MyRO.Territory[ToLoc]
       else
@@ -5773 +6448 @@
         if SimpleQuery(mkYesNo,Phrases.Lookup('FRCANCELQUERY_CEASEFIRE'),
         'MSG_DEFAULT')<>mrOK then
-        exit; }
-      if (Options and muNoSuicideCheck = 0) and (result and rUnitRemoved <> 0)
-        and (result <> eMissionDone) then
+        Exit; }
+      if (Options and muNoSuicideCheck = 0) and (Result and rUnitRemoved <> 0)
+        and (Result <> eMissionDone) then
       begin // suicide query
         with MyUn[UnFocus], BattleDlg.Forecast do
         begin
-          pAtt := me;
+          pAtt := Me;
           mixAtt := mix;
           HealthAtt := Health;
@@ -5786 +6461 @@
         end;
         BattleDlg.Forecast.Movement := MyUn[UnFocus].Movement;
-        Server(sGetBattleForecastEx, me, ToLoc, BattleDlg.Forecast);
+        Server(sGetBattleForecastEx, Me, ToLoc, BattleDlg.Forecast);
         BattleDlg.uix := UnFocus;
         BattleDlg.ToLoc := ToLoc;
-        BattleDlg.IsSuicideQuery := true;
+        BattleDlg.IsSuicideQuery := True;
         BattleDlg.ShowModal;
         if BattleDlg.ModalResult <> mrOK then
-          exit;
+          Exit;
       end;
 
       cixChanged := -1;
-      if (result and rUnitRemoved <> 0) and (MyRO.Government = gDespotism) and
+      if (Result and rUnitRemoved <> 0) and (MyRO.Government = gDespotism) and
         (MyModel[MyUn[UnFocus].mix].Kind = mkSpecial_TownGuard) and
         (MyMap[FromLoc] and fCity <> 0) then
@@ -5802 +6477 @@
         cixChanged := MyRO.nCity - 1;
         while (cixChanged >= 0) and (MyCity[cixChanged].Loc <> FromLoc) do
-          dec(cixChanged);
-        assert(cixChanged >= 0);
-      end;
-
-      for i := 0 to MyRO.nEnemyModel - 1 do
-        LostArmy[i] := MyRO.EnemyModel[i].Lost;
+          Dec(cixChanged);
+        Assert(cixChanged >= 0);
+      end;
+
+      for I := 0 to MyRO.nEnemyModel - 1 do
+        LostArmy[I] := MyRO.EnemyModel[I].Lost;
       OldToTile := MyMap[ToLoc];
-      result := Server(sMoveUnit + DirCode, me, UnFocus, nil^);
+      Result := Server(sMoveUnit + DirCode, Me, UnFocus, nil^);
       nLostArmy := 0;
-      for i := 0 to MyRO.nEnemyModel - 1 do
+      for I := 0 to MyRO.nEnemyModel - 1 do
       begin
-        LostArmy[i] := MyRO.EnemyModel[i].Lost - LostArmy[i];
-        inc(nLostArmy, LostArmy[i])
-      end;
-      if result and rUnitRemoved <> 0 then
+        LostArmy[I] := MyRO.EnemyModel[I].Lost - LostArmy[I];
+        Inc(nLostArmy, LostArmy[I]);
+      end;
+      if Result and rUnitRemoved <> 0 then
       begin
         UnFocus := -1;
@@ -5825 +6500 @@
       begin // city was destroyed, borders have moved, unrest might have changed in any city
         CityOptimizer_BeginOfTurn;
-        NeedEcoUpdate := true;
-      end
-      else
-      begin
+        NeedEcoUpdate := True;
+      end else begin
         if cixChanged >= 0 then
         begin
           CityOptimizer_CityChange(cixChanged);
-          NeedEcoUpdate := true;
+          NeedEcoUpdate := True;
         end;
-        if (result = eWon) or (result = eBloody) or (result = eExpelled) then
+        if (Result = eWon) or (Result = eBloody) or (Result = eExpelled) then
         begin
           CityOptimizer_TileBecomesAvailable(ToLoc);
-          NeedEcoUpdate := true;
+          NeedEcoUpdate := True;
         end;
       end;
@@ -5849 +6522 @@
             MyRO.EnemyModel[MyRO.EnemyUn[euix].emix].Domain));
           ShowModal;
-        end
-      end
-    end;
-    if result and rUnitRemoved <> 0 then
+        end;
+      end;
+    end;
+    if Result and rUnitRemoved <> 0 then
     begin
       CityOptimizer_AfterRemoveUnit;
       ListDlg.RemoveUnit;
-      NeedEcoUpdate := true;
+      NeedEcoUpdate := True;
     end;
     if NeedEcoUpdate then
     begin
-      UpdateViews(true);
-      Update
-    end
-  end;
-
-  if result = eMissionDone then
+      UpdateViews(True);
+      Update;
+    end;
+  end;
+
+  if Result = eMissionDone then
   begin
     p1 := MyRO.Territory[ToLoc];
@@ -5871 +6544 @@
       smStealMap:
         begin
-          MapValid := false;
+          MapValid := False;
           PaintAllMaps
         end;
@@ -5884 +6557 @@
     CheckToldNoReturn(UnFocus);
 
-  NeedRepaintPanel := false;
-  if result >= rExecuted then
+  NeedRepaintPanel := False;
+  if Result >= rExecuted then
   begin
     if CityCaptured and (MyMap[ToLoc] and fCity = 0) then
     begin // city destroyed
-      for i := 0 to nWonder - 1 do { tell about destroyed wonders }
-        if (MyRO.Wonder[i].CityID = WonderDestroyed) and (MyData.ToldWonders[i].CityID <> WonderDestroyed)
+      for I := 0 to nWonder - 1 do { tell about destroyed wonders }
+        if (MyRO.Wonder[I].CityID = WonderDestroyed) and (MyData.ToldWonders[I].CityID <> WonderDestroyed)
         then
           with MessgExDlg do
           begin
             if WondersDlg.Visible then
-              WondersDlg.SmartUpdateContent(false);
+              WondersDlg.SmartUpdateContent(False);
             OpenSound := 'WONDER_DESTROYED';
             MessgText := Format(Phrases.Lookup('WONDERDEST'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
-            MyData.ToldWonders[i] := MyRO.Wonder[i];
-          end
+            MyData.ToldWonders[I] := MyRO.Wonder[I];
+          end;
     end;
     if CityCaptured and (MyMap[ToLoc] and fCity <> 0) then
     begin // city captured
       ListDlg.AddCity;
-      for i := 0 to nWonder - 1 do { tell about capture of wonders }
-        if MyRO.City[MyRO.nCity - 1].Built[i] > 0 then
+      for I := 0 to nWonder - 1 do { tell about capture of wonders }
+        if MyRO.City[MyRO.nCity - 1].Built[I] > 0 then
           with MessgExDlg do
           begin
             if WondersDlg.Visible then
-              WondersDlg.SmartUpdateContent(false);
+              WondersDlg.SmartUpdateContent(False);
             OpenSound := 'WONDER_CAPTURED';
-            MessgText := Format(Tribe[me].TPhrase('WONDERCAPTOWN'),
-              [Phrases.Lookup('IMPROVEMENTS', i)]);
+            MessgText := Format(Tribe[Me].TPhrase('WONDERCAPTOWN'),
+              [Phrases.Lookup('IMPROVEMENTS', I)]);
             Kind := mkOkHelp;
             HelpKind := hkImp;
-            HelpNo := i;
+            HelpNo := I;
             IconKind := mikImp;
-            IconIndex := i;
+            IconIndex := I;
             ShowModal;
-            MyData.ToldWonders[i] := MyRO.Wonder[i];
+            MyData.ToldWonders[I] := MyRO.Wonder[I];
           end;
 
@@ -5932 +6605 @@
       begin { Temple of Zeus -- choose advance to steal }
         ModalSelectDlg.ShowNewContent(wmModal, kStealTech);
-        Server(sStealTech, me, ModalSelectDlg.result, nil^);
+        Server(sStealTech, Me, ModalSelectDlg.Result, nil^);
       end;
       TellNewModels;
@@ -5938 +6611 @@
       cix := MyRO.nCity - 1;
       while (cix >= 0) and (MyCity[cix].Loc <> ToLoc) do
-        dec(cix);
-      assert(cix >= 0);
+        Dec(cix);
+      Assert(cix >= 0);
       MyCity[cix].Status := MyCity[cix].Status and not csResourceWeightsMask or
         (3 shl 4);
       // captured city, set to maximum growth
       NewTiles := 1 shl 13; { exploit central tile only }
-      Server(sSetCityTiles, me, cix, NewTiles);
+      Server(sSetCityTiles, Me, cix, NewTiles);
     end
     else
-      NeedRepaintPanel := true;
+      NeedRepaintPanel := True;
   end;
   TellNewContacts;
@@ -5961 +6634 @@
   if Options and (muAutoNoWait or muAutoNext) <> 0 then
   begin
-    if (UnFocus >= 0) and ((result = eNoTime_Move) or UnitExhausted(UnFocus) or
+    if (UnFocus >= 0) and ((Result = eNoTime_Move) or UnitExhausted(UnFocus) or
       (MyUn[UnFocus].Master >= 0) or (MyModel[MyUn[UnFocus].mix].Domain = dAir)
       and ((MyMap[MyUn[UnFocus].Loc] and fCity <> 0)
@@ -5975 +6648 @@
         end
         else
-          NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
     end
     else if (UnFocus < 0) and (Options and muAutoNext <> 0) then
-      NextUnit(UnStartLoc, result <> eMissionDone);
+      NextUnit(UnStartLoc, Result <> eMissionDone);
   end;
 
@@ -5986 +6659 @@
     else
     begin
-      assert(result <> eMissionDone);
+      Assert(Result <> eMissionDone);
       CheckTerrainBtnVisible;
-      FocusOnLoc(ToLoc, flRepaintPanel or flImmUpdate)
-    end;
-
-  if (result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
+      FocusOnLoc(ToLoc, flRepaintPanel or flImmUpdate);
+    end;
+
+  if (Result >= rExecuted) and CityCaptured and (MyMap[ToLoc] and fCity <> 0)
   then
     ZoomToCity(ToLoc, UnFocus < 0, chCaptured); // show captured city
-end; // moveunit
+end;
 
 procedure TMainScreen.MoveOnScreen(ShowMove: TShowMove;
-  Step0, Step1, nStep: integer; Restore: boolean = true);
+  Step0, Step1, nStep: Integer; Restore: Boolean = True);
 var
   ToLoc, xFromLoc, yFromLoc, xToLoc, yToLoc, xFrom, yFrom, xTo, yTo, xMin, yMin,
-    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: integer;
+    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: Integer;
   UnitInfo: TUnitInfo;
   Ticks0, Ticks: TDateTime;
 begin
-  Timer1.Enabled := false;
+  Timer1.Enabled := False;
   Ticks0 := NowPrecise;
   with ShowMove do
@@ -6013 +6686 @@
     UnitInfo.Job := jNone;
     UnitInfo.Flags := Flags;
-    if Owner <> me then
+    if Owner <> Me then
       UnitInfo.emix := emix;
 
@@ -6032 +6705 @@
         * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
         * 2 + dx * xxt - MapWidth) do
-        dec(xw1, G.lx);
+        Dec(xw1, G.lx);
 
       xTo := (xToLoc - xw1) * (xxt * 2) + yToLoc and 1 * xxt + (xxt - xxu);
@@ -6040 +6713 @@
       if xFrom < xTo then begin
         xMin := xFrom;
-        xRange := xTo - xFrom
+        xRange := xTo - xFrom;
       end else begin
         xMin := xTo;
-        xRange := xFrom - xTo
+        xRange := xFrom - xTo;
       end;
       if yFrom < yTo then begin
         yMin := yFrom;
-        yRange := yTo - yFrom
+        yRange := yTo - yFrom;
       end else begin
         yMin := yTo;
-        yRange := yFrom - yTo
-      end;
-      inc(xRange, xxt * 2);
-      inc(yRange, yyt * 3);
+        yRange := yFrom - yTo;
+      end;
+      Inc(xRange, xxt * 2);
+      Inc(yRange, yyt * 3);
     end;
 
@@ -6061 +6734 @@
     for Step := 0 to abs(Step1 - Step0) do
     begin
-      DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
-        offscreen.Canvas, xMin, yMin);
+      DpiBitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
+        Offscreen.Canvas, xMin, yMin);
       if Step1 <> Step0 then
       begin
@@ -6079 +6752 @@
       NoMap.PaintUnit(xMoving - xMin, yMoving - yMin, UnitInfo, 0);
       PaintBufferToScreen(xMin, yMin, xRange, yRange);
-      {$IFDEF LINUX}
-      // TODO: Force animation under linux
+      {$IFDEF UNIX}
+      // TODO: Force animation under UNIX
       DpiApplication.ProcessMessages;
       {$ENDIF}
@@ -6091 +6764 @@
           < MoveTime) then
         begin
-          if not idle or (GameMode = cMovie) then
+          if not Idle or (GameMode = cMovie) then
             DpiApplication.ProcessMessages;
           Sleep(1);
-          inc(SliceCount)
+          Inc(SliceCount)
         end;
         Ticks := NowPrecise;
       until (((Ticks - Ticks0) * 12) / OneMillisecond) >= MoveTime;
-      Ticks0 := Ticks
+      Ticks0 := Ticks;
     end;
   end;
   if Restore then
   begin
-    DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange, offscreen.Canvas, xMin, yMin);
+    DpiBitBltCanvas(Buffer.Canvas, 0, 0, xRange, yRange, Offscreen.Canvas, xMin, yMin);
     PaintBufferToScreen(xMin, yMin, xRange, yRange);
   end;
   BlinkTime := -1;
-  Timer1.Enabled := true;
-end;
-
-procedure TMainScreen.MoveToLoc(Loc: integer; CheckSuicide: boolean);
+  Timer1.Enabled := True;
+end;
+
+procedure TMainScreen.MoveToLoc(Loc: Integer; CheckSuicide: Boolean);
 // path finder: move focused unit to loc, start multi-turn goto if too far
 var
-  uix, i, MoveOptions, NextLoc, MoveResult: integer;
+  uix, I, MoveOptions, NextLoc, MoveResult: Integer;
   MoveAdviceData: TMoveAdviceData;
   StopReason: (None, Arrived, Dead, NoTime, EnemySpotted, MoveError);
 begin
   if MyUn[UnFocus].Job > jNone then
-    Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
+    Server(sStartJob + jNone shl 4, Me, UnFocus, nil^);
   if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) >= rExecuted then
   begin
@@ -6124 +6797 @@
     StopReason := None;
     repeat
-      for i := 0 to MoveAdviceData.nStep - 1 do
+      for I := 0 to MoveAdviceData.nStep - 1 do
       begin
-        if i = MoveAdviceData.nStep - 1 then
+        if I = MoveAdviceData.nStep - 1 then
           MoveOptions := muAutoNext
         else
           MoveOptions := 0;
-        NextLoc := dLoc(MyUn[uix].Loc, MoveAdviceData.dx[i],
-          MoveAdviceData.dy[i]);
+        NextLoc := dLoc(MyUn[uix].Loc, MoveAdviceData.dx[I],
+          MoveAdviceData.dy[I]);
         if (NextLoc = Loc) or (Loc = maNextCity) and
           (MyMap[NextLoc] and fCity <> 0) then
@@ -6137 +6810 @@
         if not CheckSuicide and (NextLoc = Loc) then
           MoveOptions := MoveOptions or muNoSuicideCheck;
-        MoveResult := MoveUnit(MoveAdviceData.dx[i], MoveAdviceData.dy[i],
+        MoveResult := MoveUnit(MoveAdviceData.dx[I], MoveAdviceData.dy[I],
           MoveOptions);
         if MoveResult < rExecuted then
@@ -6149 +6822 @@
       end;
       if (StopReason = None) and ((MoveAdviceData.nStep < 25) or
-        (MyRO.Wonder[woShinkansen].EffectiveOwner <> me)) then
+        (MyRO.Wonder[woShinkansen].EffectiveOwner <> Me)) then
         StopReason := NoTime;
       if StopReason <> None then
@@ -6155 +6828 @@
       if GetMoveAdvice(UnFocus, Loc, MoveAdviceData) < rExecuted then
       begin
-        assert(false);
+        Assert(False);
         Break;
       end;
-    until false;
+    until False;
 
     case StopReason of
       None:
-        assert(false);
+        Assert(False);
       Arrived:
         MyUn[uix].Status := MyUn[uix].Status and ($FFFF - usGoto);
       Dead:
         if UnFocus < 0 then
-          NextUnit(UnStartLoc, false);
+          NextUnit(UnStartLoc, False);
     else
       begin // multi-turn goto
@@ -6180 +6853 @@
         begin
           MyUn[uix].Status := MyUn[uix].Status and not usWaiting;
-          NextUnit(UnStartLoc, true);
+          NextUnit(UnStartLoc, True);
         end;
       end;
@@ -6188 +6861 @@
 
 procedure TMainScreen.PanelBoxMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 var
-  i, xMouse, MouseLoc, p1: integer;
+  I, xMouse, MouseLoc, p1: Integer;
 begin
   if GameMode = cMovie then
-    exit;
+    Exit;
 
   if Button = mbLeft then
   begin
-    if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx) and
-      (y < yMini + 2 + G.ly) then
+    if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
+      (Y < yMini + 2 + G.ly) then
       if ssShift in Shift then
       begin
         with MainMap do
-          xMouse := (xwMini + (x - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
+          xMouse := (xwMini + (X - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
             div 2) mod G.lx;
-        MouseLoc := xMouse + G.lx * (y - (yMini + 2));
+        MouseLoc := xMouse + G.lx * (Y - (yMini + 2));
         if MyMap[MouseLoc] and fTerrain <> fUNKNOWN then
         begin
           p1 := MyRO.Territory[MouseLoc];
-          if (p1 = me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
+          if (p1 = Me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
             NatStatDlg.ShowNewContent(wmPersistent, p1);
         end;
@@ -6218 +6891 @@
         if UnitStatDlg.Visible then
           UnitStatDlg.Close;
-        Tracking := true;
-        PanelBoxMouseMove(Sender, Shift + [ssLeft], x, y);
+        Tracking := True;
+        PanelBoxMouseMove(Sender, Shift + [ssLeft], X, Y);
       end
-    else if (ClientMode <> cEditMap) and (x >= ClientWidth - xPalace) and
-      (y >= yPalace) and (x < ClientWidth - xPalace + xSizeBig) and
-      (y < yPalace + ySizeBig) then
+    else if (ClientMode <> cEditMap) and (X >= ClientWidth - xPalace) and
+      (Y >= yPalace) and (X < ClientWidth - xPalace + xSizeBig) and
+      (Y < yPalace + ySizeBig) then
     begin
       InitPopup(StatPopup);
@@ -6234 +6907 @@
           DpiGetSystemMetrics(SM_CYCAPTION) + 3)
     end
-    (* else if (x>=xAdvisor-3) and (y>=yAdvisor-3)
-      and (x<xAdvisor+16+3) and (y<yAdvisor+16+3) and HaveStrategyAdvice then
+    (* else if (X>=xAdvisor-3) and (Y>=yAdvisor-3)
+      and (X<xAdvisor+16+3) and (Y<yAdvisor+16+3) and HaveStrategyAdvice then
       AdviceBtnClick *)
-    else if (x >= xTroop + 1) and (y >= yTroop + 1) and
-      (x < xTroop + TrRow * TrPitch) and (y <= yTroop + 55) then
+    else if (X >= xTroop + 1) and (Y >= yTroop + 1) and
+      (X < xTroop + TrRow * TrPitch) and (Y <= yTroop + 55) then
     begin
-      i := (x - xTroop - 1) div TrPitch;
-      if trix[i] >= 0 then
+      I := (X - xTroop - 1) div TrPitch;
+      if trix[I] >= 0 then
         if ClientMode = cEditMap then
         begin
-          BrushType := trix[i];
-          PanelPaint
+          BrushType := trix[I];
+          PanelPaint;
         end
         else if (TroopLoc >= 0) then
@@ -6252 +6925 @@
             if ssShift in Shift then
               UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
-                MyUn[trix[i]].mix)
-            else if not supervising and (ClientMode < scContact) and
-              (x - xTroop - 1 - i * TrPitch >= 60 - 20) and (y >= yTroop + 35)
-              and ((MyUn[trix[i]].Job > jNone) or (MyUn[trix[i]].Status and
+                MyUn[trix[I]].mix)
+            else if not Supervising and (ClientMode < scContact) and
+              (X - xTroop - 1 - I * TrPitch >= 60 - 20) and (Y >= yTroop + 35)
+              and ((MyUn[trix[I]].Job > jNone) or (MyUn[trix[I]].Status and
               (usStay or usRecover or usGoto) <> 0)) then
             begin // wake up
-              MyUn[trix[i]].Status := MyUn[trix[i]].Status and
+              MyUn[trix[I]].Status := MyUn[trix[I]].Status and
                 ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
-              if MyUn[trix[i]].Job > jNone then
-                Server(sStartJob + jNone shl 4, me, trix[i], nil^);
+              if MyUn[trix[I]].Job > jNone then
+                Server(sStartJob + jNone shl 4, Me, trix[I], nil^);
               if (UnFocus < 0) and not CityDlg.Visible then
               begin
-                SetUnFocus(trix[i]);
-                SetTroopLoc(MyUn[trix[i]].Loc);
+                SetUnFocus(trix[I]);
+                SetTroopLoc(MyUn[trix[I]].Loc);
                 FocusOnLoc(TroopLoc, flRepaintPanel)
               end
@@ -6271 +6944 @@
               begin
                 if CityDlg.Visible and (CityDlg.RestoreUnFocus < 0) then
-                  CityDlg.RestoreUnFocus := trix[i];
+                  CityDlg.RestoreUnFocus := trix[I];
                 PanelPaint;
               end
@@ -6277 +6950 @@
             else if (ClientMode < scContact) then
             begin
-              if supervising then
-                UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[i])
+              if Supervising then
+                UnitStatDlg.ShowNewContent_OwnUnit(wmPersistent, trix[I])
               else if CityDlg.Visible then
               begin
@@ -6284 +6957 @@
                 CityDlg.Close;
                 SumCities(TaxSum, ScienceSum);
-                SetUnFocus(trix[i]);
+                SetUnFocus(trix[I]);
               end
               else
               begin
-                DestinationMarkON := false;
+                DestinationMarkON := False;
                 PaintDestination;
-                UnFocus := trix[i];
+                UnFocus := trix[I];
                 UnStartLoc := TroopLoc;
                 BlinkTime := 0;
-                BlinkON := false;
+                BlinkON := False;
                 PaintLoc(TroopLoc);
               end;
               if UnFocus >= 0 then
               begin
-                UnitInfoBtn.Visible := true;
-                UnitBtn.Visible := true;
-                TurnComplete := false;
+                UnitInfoBtn.Visible := True;
+                UnitBtn.Visible := True;
+                TurnComplete := False;
                 EOT.ButtonIndex := eotGray;
               end;
@@ -6307 +6980 @@
             end;
           end
-          else if Server(sGetUnits, me, TroopLoc, TrCnt) >= rExecuted then
+          else if Server(sGetUnits, Me, TroopLoc, TrCnt) >= rExecuted then
             if ssShift in Shift then
               UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
-                MyRO.EnemyUn[MyRO.nEnemyUn + trix[i]].emix) // model info
+                MyRO.EnemyUn[MyRO.nEnemyUn + trix[I]].emix) // model info
             else
               UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
-                MyRO.nEnemyUn + trix[i]); // unit info
-    end;
-  end;
-end;
-
-procedure TMainScreen.SetTroopLoc(Loc: integer);
+                MyRO.nEnemyUn + trix[I]); // unit info
+    end;
+  end;
+end;
+
+procedure TMainScreen.SetTroopLoc(Loc: Integer);
 var
-  trixFocus, uix, uixDefender: integer;
-  Prio: boolean;
+  trixFocus, uix, uixDefender: Integer;
+  Prio: Boolean;
 begin
   TroopLoc := Loc;
@@ -6333 +7006 @@
     if MyMap[Loc] and fOwned <> 0 then
     begin // count own units here
-      Server(sGetDefender, me, TroopLoc, uixDefender);
-      for Prio := true downto false do
+      Server(sGetDefender, Me, TroopLoc, uixDefender);
+      for Prio := True downto False do
         for uix := 0 to MyRO.nUn - 1 do
           if ((uix = uixDefender) = Prio) and (MyUn[uix].Loc = Loc) then
@@ -6340 +7013 @@
             if uix = UnFocus then
               trixFocus := TrCnt;
-            inc(TrCnt);
+            Inc(TrCnt);
           end;
     end
     else // count enemy units here
-      Server(sGetUnits, me, Loc, TrCnt);
+      Server(sGetUnits, Me, Loc, TrCnt);
   if TrCnt = 0 then
     sb.Init(0, 1)
@@ -6355 +7028 @@
 end;
 
-(* procedure TMainScreen.ShowMoveHint(ToLoc: integer; Force: boolean = false);
+(* procedure TMainScreen.ShowMoveHint(ToLoc: Integer; Force: Boolean = False);
   var
-  Step,Loc,x0,y0,xs,ys: integer;
+  Step,Loc,x0,y0,xs,ys: Integer;
   Info: string;
   InfoSize: TSize;
@@ -6370 +7043 @@
   MoveAdvice.MoreTurns:=0;
   MoveAdvice.MaxHostile_MovementLeft:=MyUn[UnFocus].Health-50;
-  if Server(sGetMoveAdvice,me,UnFocus,MoveAdvice)<rExecuted then
+  if Server(sGetMoveAdvice,Me,UnFocus,MoveAdvice)<rExecuted then
   ToLoc:=-1
   end;
-  if (ToLoc=MoveHintToLoc) and not Force then exit;
+  if (ToLoc=MoveHintToLoc) and not Force then Exit;
   if (ToLoc<>MoveHintToLoc) and (MoveHintToLoc>=0) then
   begin invalidate; update end; // clear old hint from screen
   MoveHintToLoc:=ToLoc;
-  if ToLoc<0 then exit;
-
-  with canvas do
+  if ToLoc<0 then Exit;
+
+  with Canvas do
   begin
   Pen.Color:=$80C0FF;
@@ -6390 +7063 @@
   xs:=(x0-xw)*66+y0 and 1*33-G.lx*66;
   while abs(2*(xs+G.lx*66)-MapWidth)<abs(2*xs-MapWidth) do
-  inc(xs,G.lx*66);
+  Inc(xs,G.lx*66);
   ys:=(y0-yw)*16;
   if Step=0 then moveto(xs+33,ys+16)
@@ -6398 +7071 @@
   end;
   Brush.Color:=$80C0FF;
-  Info:=' '+inttostr(88)+' ';
+  Info:=' '+IntToStr(88)+' ';
   InfoSize:=TextExtent(Info);
   TextOut(xs+33-InfoSize.cx div 2, ys+16-InfoSize.cy div 2, Info);
@@ -6405 +7078 @@
   end; *)
 
-procedure TMainScreen.SetDebugMap(p: integer);
-begin
-  MainMap.pDebugMap := p;
+procedure TMainScreen.SetDebugMap(P: Integer);
+begin
+  MainMap.pDebugMap := P;
   MapOptions := MapOptions - [moLocCodes];
-  mLocCodes.Checked := false;
-  MapValid := false;
+  mLocCodes.Checked := False;
+  MapValid := False;
   MainOffscreenPaint;
 end;
 
-procedure TMainScreen.SetViewpoint(p: integer);
+procedure TMainScreen.SetViewpoint(P: Integer);
 var
-  i: Integer;
-begin
-  if supervising and (G.RO[0].Turn > 0) and
-    ((p = 0) or (1 shl p and G.RO[0].Alive <> 0)) then
-  begin
-    for i := 0 to DpiScreen.FormCount - 1 do
-      if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
-        DpiScreen.Forms[i].Close; // close windows
-    ItsMeAgain(p);
+  I: Integer;
+begin
+  if Supervising and (G.RO[0].Turn > 0) and
+    ((P = 0) or (1 shl P and G.RO[0].Alive <> 0)) then
+  begin
+    ApplyToVisibleForms(faClose);
+    ItsMeAgain(P);
     SumCities(TaxSum, ScienceSum);
-    for i := 0 to MyRO.nModel - 1 do
-      if not Assigned(Tribe[me].ModelPicture[i].HGr) then
-        InitMyModel(i, True);
+    for I := 0 to MyRO.nModel - 1 do
+      if not Assigned(Tribe[Me].ModelPicture[I].HGr) then
+        InitMyModel(I, True);
 
     SetTroopLoc(-1);
@@ -6481 +7152 @@
   MTrans.ShortCut := BTrans.ShortCut;
   mPollution.ShortCut := BPollution.ShortCut;
-  mRR.ShortCut := BRailRoad.ShortCut;
+  mRailRoad.ShortCut := BRailRoad.ShortCut;
   mRoad.ShortCut := BRailRoad.ShortCut;
   mUnload.ShortCut := BUnload.ShortCut;
@@ -6516 +7187 @@
 end;
 
-procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: word;
+procedure TMainScreen.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 
@@ -6523 +7194 @@
     InitPopup(Popup);
     if Item.Visible and Item.Enabled then
-      MenuClick(Item);
-  end;
-
-  procedure SetViewpointMe(p: Integer);
-  begin
-    if p = me then SetViewpoint(p)
-      else SetViewpoint(p);
+      Item.Click;
+  end;
+
+  procedure SetViewpointMe(P: Integer);
+  begin
+    if P = Me then SetViewpoint(P)
+      else SetViewpoint(P);
   end;
 
@@ -6558 +7229 @@
 
   if ClientMode = cEditMap then begin
-    if BResign.Test(ShortCut) then MenuClick(mResign)
-    else if BRandomMap.Test(ShortCut) then MenuClick(mRandomMap)
-    else if BHelp.Test(ShortCut) then MenuClick(mHelp);
+    if BResign.Test(ShortCut) then mResign.Click
+    else if BRandomMap.Test(ShortCut) then mRandomMap.Click
+    else if BHelp.Test(ShortCut) then mHelp.Click;
     (*if Shift = [ssCtrl] then
       case char(Key) of
          'A':
           begin // auto symmetry
-          Server($7F0,me,0,nil^);
-          MapValid:=false;
+          Server($7F0,Me,0,nil^);
+          MapValid:=False;
           PaintAll;
           end;
@@ -6573 +7244 @@
           dy:=0;
           for dx:=G.lx to G.lx*(G.ly-1)-1 do
-          if MyMap[dx] and fTerrain>=fGrass then inc(dy);
+          if MyMap[dx] and fTerrain>=fGrass then Inc(dy);
           dy:=dy
           end;
@@ -6586 +7257 @@
     SetFullScreen(FullScreen);
   end
-  else if BHelp.Test(ShortCut) then MenuClick(mHelp)
+  else if BHelp.Test(ShortCut) then mHelp.Click
   else if BUnitStat.Test(ShortCut) then MenuClick_Check(StatPopup, mUnitStat)
   else if BCityStat.Test(ShortCut) then MenuClick_Check(StatPopup, mCityStat)
@@ -6608 +7279 @@
   else if BSetDebugMap9.Test(ShortCut) then SetDebugMap(9)
 
-  else if BJump.Test(ShortCut) then MenuClick(mJump)
+  else if BJump.Test(ShortCut) then mJump.Click
   else if BDebugMap.Test(ShortCut) then mShowClick(mDebugMap)
   else if BLocCodes.Test(ShortCut) then mShowClick(mLocCodes)
@@ -6617 +7288 @@
   else if BNames.Test(ShortCut) then mNamesClick(mNames)
   else if BResign.Test(ShortCut) then MenuClick_Check(GamePopup, mResign)
-  else if BRun.Test(ShortCut) then MenuClick(mRun)
+  else if BRun.Test(ShortCut) then mRun.Click
   else if BTestMapRepaint.Test(ShortCut) then begin // test map repaint time
     Time0 := NowPrecise;
@@ -6642 +7313 @@
   else if BMapBtn5.Test(ShortCut) then MapBtnClick(MapBtn5)
   else if BMapBtn6.Test(ShortCut) then MapBtnClick(MapBtn6)
-  else if BTechTree.Test(ShortCut) then MenuClick(mTechTree)
-  else if BWait.Test(ShortCut) then MenuClick(mWait);
+  else if BTechTree.Test(ShortCut) then mTechTree.Click
+  else if BWait.Test(ShortCut) then mWait.Click;
 
   if UnFocus >= 0 then begin
-    if BDisbandUnit.Test(ShortCut) then MenuClick(mDisband)
+    if BDisbandUnit.Test(ShortCut) then mDisband.Click
     else if BFortify.Test(ShortCut) then MenuClick_Check(TerrainPopup, mFort)
-    else if BCenterUnit.Test(ShortCut) then MenuClick(mCentre)
-    else if BStay.Test(ShortCut) then MenuClick(mStay)
-    else if BNoOrders.Test(ShortCut) then MenuClick(mNoOrders)
-    else if BPrevUnit.Test(ShortCut) then MenuClick(mPrevUnit)
-    else if BNextUnit.Test(ShortCut) then MenuClick(mNextUnit)
+    else if BCenterUnit.Test(ShortCut) then mCentre.Click
+    else if BStay.Test(ShortCut) then mStay.Click
+    else if BNoOrders.Test(ShortCut) then mNoOrders.Click
+    else if BPrevUnit.Test(ShortCut) then mPrevUnit.Click
+    else if BNextUnit.Test(ShortCut) then mNextUnit.Click
     else if BCancel.Test(ShortCut) then MenuClick_Check(UnitPopup, mCancel)
     else if BPillage.Test(ShortCut) then MenuClick_Check(UnitPopup, mPillage)
@@ -6660 +7331 @@
     else if BEnhance.Test(ShortCut) then begin
       InitPopup(TerrainPopup);
-      if mEnhance.Visible and mEnhance.Enabled then MenuClick(mEnhance)
-        else MenuClick(mEnhanceDef)
+      if mEnhance.Visible and mEnhance.Enabled then mEnhance.Click
+        else mEnhanceDef.Click
     end
     else if BGoOn.Test(ShortCut) then MenuClick_Check(UnitPopup, mGoOn)
@@ -6667 +7338 @@
     else if BFarmClearIrrigation.Test(ShortCut) then begin
       if JobTest(UnFocus, jFarm, [eTreaty]) then
-        MenuClick(mFarm)
+        mFarm.Click
       else if JobTest(UnFocus, jClear, [eTreaty]) then
-        MenuClick(mClear)
+        mClear.Click
       else MenuClick_Check(TerrainPopup, mIrrigation);
     end
     else if BLoad.Test(ShortCut) then MenuClick_Check(UnitPopup, mLoad)
     else if BAfforestMine.Test(ShortCut) then begin
-      if JobTest(UnFocus, jAfforest, [eTreaty]) then MenuClick(mAfforest)
+      if JobTest(UnFocus, jAfforest, [eTreaty]) then mAfforest.Click
         else MenuClick_Check(TerrainPopup, mMine);
     end
@@ -6681 +7352 @@
     else if BPollution.Test(ShortCut) then MenuClick_Check(TerrainPopup, mPollution)
     else if BRailRoad.Test(ShortCut) then begin
-      if JobTest(UnFocus, jRR, [eTreaty]) then MenuClick(mRR)
+      if JobTest(UnFocus, jRR, [eTreaty]) then mRailRoad.Click
         else MenuClick_Check(TerrainPopup, mRoad);
     end
@@ -6698 +7369 @@
 end;
 
-procedure TMainScreen.MenuClick(Sender: TObject);
-
-  function DoJob(j0: integer): integer;
-  var
-    Loc0, Movement0: integer;
-  begin
-    with MyUn[UnFocus] do
+function TMainScreen.DoJob(j0: Integer): Integer;
+var
+  Loc0, Movement0: Integer;
+begin
+  with MyUn[UnFocus] do
+  begin
+    DestinationMarkON := False;
+    PaintDestination;
+    Loc0 := Loc;
+    Movement0 := Movement;
+    if j0 < 0 then
+      Result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
+      // terrain enhancement
+    else
+      Result := Server(sStartJob + j0 shl 4, Me, UnFocus, nil^);
+    if Result >= rExecuted then
     begin
-      DestinationMarkON := false;
-      PaintDestination;
-      Loc0 := Loc;
-      Movement0 := Movement;
-      if j0 < 0 then
-        result := ProcessEnhancement(UnFocus, MyData.EnhancementJobs)
-        // terrain enhancement
-      else
-        result := Server(sStartJob + j0 shl 4, me, UnFocus, nil^);
-      if result >= rExecuted then
+      if Result = eDied then
+        UnFocus := -1;
+      PaintLoc(Loc0);
+      if UnFocus >= 0 then
       begin
-        if result = eDied then
-          UnFocus := -1;
-        PaintLoc(Loc0);
-        if UnFocus >= 0 then
+        if (j0 < 0) and (Result <> eJobDone) then
+          // multi-turn terrain enhancement
+          Status := Status and ($FFFF - usStay - usRecover - usGoto) or
+            usEnhance
+        else
+          Status := Status and
+            ($FFFF - usStay - usRecover - usGoto - usEnhance);
+        if (Job <> jNone) or (Movement0 < 100) then
         begin
-          if (j0 < 0) and (result <> eJobDone) then
-            // multi-turn terrain enhancement
-            Status := Status and ($FFFF - usStay - usRecover - usGoto) or
-              usEnhance
-          else
-            Status := Status and
-              ($FFFF - usStay - usRecover - usGoto - usEnhance);
-          if (Job <> jNone) or (Movement0 < 100) then
-          begin
-            Status := Status and not usWaiting;
-            NextUnit(UnStartLoc, true);
-          end
-          else
-            PanelPaint;
+          Status := Status and not usWaiting;
+          NextUnit(UnStartLoc, True);
         end
         else
-          NextUnit(UnStartLoc, true);
-      end;
-    end;
-    case result of
-      eNoBridgeBuilding:
-        SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
-      eNoCityTerrain:
-        SoundMessage(Phrases.Lookup('NOCITY'), 'INVALID');
-      eTreaty:
-        SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),
-          'NOMOVE_TREATY');
-    else
-      if result < rExecuted then
-        Play('INVALID')
-    end;
-  end;
-
-var
-  i, uix, NewFocus, Loc0, OldMaster, Destination, cix, cixOldHome,
-    ServerResult: integer;
-  AltGovs, RevolutionChanged: boolean;
-  QueryText: string;
-
-begin
-  if Sender = mResign then
-    if ClientMode = cEditMap then
-    begin
-      if Edited then
-      begin
-        QueryText := Phrases.Lookup('MAP_CLOSE');
-        case SimpleQuery(mkYesNoCancel, QueryText, '') of
-          mrIgnore:
-            Server(sAbandonMap, me, 0, nil^);
-          mrOK:
-            Server(sSaveMap, me, 0, nil^);
-        end
+          PanelPaint;
       end
       else
-        Server(sAbandonMap, me, 0, nil^)
-    end
+        NextUnit(UnStartLoc, True);
+    end;
+  end;
+  case Result of
+    eNoBridgeBuilding:
+      SoundMessage(Phrases.Lookup('NOBB'), 'INVALID');
+    eNoCityTerrain:
+      SoundMessage(Phrases.Lookup('NOCITY'), 'INVALID');
+    eTreaty:
+      SoundMessage(Tribe[MyRO.Territory[Loc0]].TPhrase('PEACE_NOWORK'),
+        'NOMOVE_TREATY');
+  else
+    if Result < rExecuted then
+      Play('INVALID');
+  end;
+end;
+
+function TMainScreen.GetBattleDlg: TBattleDlg;
+begin
+  if not Assigned(FBattleDlg) then FBattleDlg := TBattleDlg.Create(nil);
+  Result := FBattleDlg;
+end;
+
+function TMainScreen.GetCityDlg: TCityDlg;
+begin
+  if not Assigned(FCityDlg) then begin
+    FCityDlg := TCityDlg.Create(nil);
+    FCityDlg.CheckAge;
+  end;
+  Result := FCityDlg;
+end;
+
+function TMainScreen.GetCityTypeDlg: TCityTypeDlg;
+begin
+  if not Assigned(FCityTypeDlg) then FCityTypeDlg := TCityTypeDlg.Create(nil);
+  Result := FCityTypeDlg;
+end;
+
+function TMainScreen.GetDiaDlg: TDiaDlg;
+begin
+  if not Assigned(FDiaDlg) then begin
+    FDiaDlg := TDiaDlg.Create(nil);
+    ArrangeDialog(FDiaDlg);
+  end;
+  Result := FDiaDlg;
+end;
+
+function TMainScreen.GetDraftDlg: TDraftDlg;
+begin
+  if not Assigned(FDraftDlg) then FDraftDlg := TDraftDlg.Create(nil);
+  Result := FDraftDlg;
+end;
+
+function TMainScreen.GetEnhanceDlg: TEnhanceDlg;
+begin
+  if not Assigned(FEnhanceDlg) then FEnhanceDlg := TEnhanceDlg.Create(nil);
+  Result := FEnhanceDlg;
+end;
+
+function TMainScreen.GetHelpDlg: THelpDlg;
+begin
+  if not Assigned(FHelpDlg) then begin
+    FHelpDlg := THelpDlg.Create(nil);
+    ArrangeDialog(FHelpDlg);
+    FHelpDlg.Difficulty := G.Difficulty[Me];
+  end;
+  Result := FHelpDlg;
+end;
+
+function TMainScreen.GetListDlg: TListDlg;
+begin
+  if not Assigned(FListDlg) then begin
+    FListDlg := TListDlg.Create(nil);
+    ArrangeDialog(FListDlg);
+  end;
+  Result := FListDlg;
+end;
+
+function TMainScreen.GetMessgExDlg: TMessgExDlg;
+begin
+  if not Assigned(FMessgExDlg) then FMessgExDlg := TMessgExDlg.Create(nil);
+    Result := FMessgExDlg;
+end;
+
+function TMainScreen.GetModalSelectDlg: TModalSelectDlg;
+begin
+  if not Assigned(FModalSelectDlg) then FModalSelectDlg := TModalSelectDlg.Create(nil);
+  Result := FModalSelectDlg;
+end;
+
+function TMainScreen.GetNatStatDlg: TNatStatDlg;
+begin
+  if not Assigned(FNatStatDlg) then begin
+    FNatStatDlg := TNatStatDlg.Create(nil);
+    ArrangeDialog(FNatStatDlg);
+    FNatStatDlg.CheckAge;
+  end;
+  Result := FNatStatDlg;
+end;
+
+function TMainScreen.GetNegoDlg: TNegoDlg;
+begin
+  if not Assigned(FNegoDlg) then FNegoDlg := TNegoDlg.Create(nil);
+  Result := FNegoDlg;
+end;
+
+function TMainScreen.GetRatesDlg: TRatesDlg;
+begin
+  if not Assigned(FRatesDlg) then begin
+    //FRatesDlg := TRatesDlg.Create(nil);
+    DpiApplication.CreateForm(TRatesDlg, FRatesDlg);
+    FRatesDlg.Show;
+  end;
+  Result := FRatesDlg;
+end;
+
+function TMainScreen.GetTechTreeDlg: TTechTreeDlg;
+begin
+  if not Assigned(FTechTreeDlg) then FTechTreeDlg := TTechTreeDlg.Create(nil);
+  Result := FTechTreeDlg;
+end;
+
+procedure TMainScreen.mDisbandOrUtilizeClick(Sender: TObject);
+var
+  Loc0: Integer;
+begin
+  if UnFocus >= 0 then
+  with TUn(MyUn[UnFocus]) do begin
+    if (Sender = mUtilize) and
+      not(Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
+    begin
+      SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
+      // freight for colony ship is the only case in which the command is
+      // available to player though not valid
+      Exit;
+    end;
+    if (Sender = mUtilize) and (Health < 100) then
+      if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
+      then
+        Exit;
+    Loc0 := Loc;
+    CityOptimizer_BeforeRemoveUnit(UnFocus);
+    if Server(sRemoveUnit, Me, UnFocus, nil^) = eUtilized then
+      Play('CITY_UTILIZE')
     else
-    begin
-      if Server(sGetGameChanged, 0, 0, nil^) = eOK then
-      begin
-        QueryText := Phrases.Lookup('RESIGN');
-        case SimpleQuery(mkYesNoCancel, QueryText, '') of
-          mrIgnore:
-            Server(sResign, 0, 0, nil^);
-          mrOK:
-            Server(sBreak, 0, 0, nil^)
-        end
-      end
-      else
-        Server(sResign, 0, 0, nil^)
-    end
-  else if Sender = mEmpire then
-    RatesDlg.ShowNewContent(wmPersistent)
-  else if Sender = mRevolution then
-  begin
-    AltGovs := false;
-    for i := 2 to nGov - 1 do
-      if (GovPreq[i] <> preNA) and
-        ((GovPreq[i] = preNone) or (MyRO.Tech[GovPreq[i]] >= tsApplicable)) then
-        AltGovs := true;
-
-    if not AltGovs then
-      SoundMessage(Phrases.Lookup('NOALTGOVS'), 'MSG_DEFAULT')
-    else
-    begin
-      RevolutionChanged := false;
-      if MyRO.Happened and phChangeGov <> 0 then
-      begin
-        ModalSelectDlg.ShowNewContent(wmModal, kGov);
-        if ModalSelectDlg.result >= 0 then
-        begin
-          Play('NEWGOV');
-          Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
-          CityOptimizer_BeginOfTurn;
-          RevolutionChanged := true;
-        end
-      end
-      else
-      with MessgExDlg do
-      begin // revolution!
-        MessgExDlg.MessgText := Tribe[me].TPhrase('REVOLUTION');
-        MessgExDlg.Kind := mkYesNo;
-        MessgExDlg.IconKind := mikPureIcon;
-        MessgExDlg.IconIndex := 72; // anarchy palace
-        MessgExDlg.ShowModal;
-        if ModalResult = mrOK then
-        begin
-          Play('REVOLUTION');
-          Server(sRevolution, me, 0, nil^);
-          RevolutionChanged := true;
-          if NatStatDlg.Visible then
-            NatStatDlg.Close;
-          if CityDlg.Visible then
-            CityDlg.Close;
-        end
-      end;
-      if RevolutionChanged then
-        UpdateViews(true);
-    end
-  end
-  else if Sender = mWebsite then
-    OpenURL(CevoHomepage)
-  else if Sender = mRandomMap then
-  begin
-    if not Edited or (SimpleQuery(mkYesNo, Phrases.Lookup('MAP_RANDOM'), '')
-      = mrOK) then
-    begin
-      Server(sRandomMap, me, 0, nil^);
-      Edited := true;
-      MapValid := false;
-      PaintAllMaps;
-    end
-  end
-  else if Sender = mJump then
-  begin
-    if supervising then
-      Jump[0] := 20
-    else
-      Jump[me] := 20;
-    EndTurn(true);
-  end
-  else if Sender = mRun then
-  begin
-    if supervising then
-      Jump[0] := 999999
-    else
-      Jump[me] := 999999;
-    EndTurn(true);
-  end
-  else if Sender = mEnhanceDef then
-  begin
-    if UnFocus >= 0 then
-      EnhanceDlg.ShowNewContent(wmPersistent,
-        MyMap[MyUn[UnFocus].Loc] and fTerrain)
-    else
-      EnhanceDlg.ShowNewContent(wmPersistent)
-  end
-  else if Sender = mCityTypes then
-    CityTypeDlg.ShowNewContent(wmModal)
-    // must be modal because types are not saved before closing
-  else if Sender = mUnitStat then
-  begin
-    if G.Difficulty[me] > 0 then
-      ListDlg.ShowNewContent_MilReport(wmPersistent, me)
-    else
-    begin
-      i := 1;
-      while (i < nPl) and (1 shl i and MyRO.Alive = 0) do
-        inc(i);
-      if i < nPl then
-        ListDlg.ShowNewContent_MilReport(wmPersistent, i);
-    end;
-  end
-  else if Sender = mEUnitStat then
-  begin
-    if MyRO.nEnemyModel > 0 then
-      ListDlg.ShowNewContent(wmPersistent, kAllEModels);
-  end
-  else if Sender = mCityStat then
-    ListDlg.ShowNewContent(wmPersistent, kCities)
-  else if Sender = mScienceStat then
-    ListDlg.ShowNewContent(wmPersistent, kScience)
-  else if Sender = mNations then
-    NatStatDlg.ShowNewContent(wmPersistent)
-  else if Sender = mHelp then
-    if ClientMode = cEditMap then
-      HelpDlg.ShowNewContent(wmPersistent, hkText, HelpDlg.TextIndex('MAPEDIT'))
-    else
-      HelpDlg.ShowNewContent(wmPersistent, hkMisc, miscMain)
-  else if Sender = mTechTree then
-    TechTreeDlg.ShowModal
-  else if Sender = mWonders then
-    WondersDlg.ShowNewContent(wmPersistent)
-  else if Sender = mDiagram then
-    DiaDlg.ShowNewContent_Charts(wmPersistent)
-  else if Sender = mShips then
-    DiaDlg.ShowNewContent_Ship(wmPersistent)
-  else if Sender = mWait then
-  begin
-    if UnFocus >= 0 then
-    begin
-      DestinationMarkON := false;
-      PaintDestination;
-      MyUn[UnFocus].Status := MyUn[UnFocus].Status and
-        ($FFFF - usStay - usRecover - usGoto - usEnhance) or usWaiting;
-    end;
-    NextUnit(-1, false);
-  end
-  else if UnFocus >= 0 then
-    with TUn(MyUn[UnFocus]) do
-      if Sender = mGoOn then
-      begin
-        if Status shr 16 = $7FFF then
-          Destination := maNextCity
-        else
-          Destination := Status shr 16;
-        Status := Status and not(usStay or usRecover) or usWaiting;
-        MoveToLoc(Destination, true);
-      end
-      else if Sender = mHome then
-        if MyMap[Loc] and fCity <> 0 then
-        begin
-          cixOldHome := Home;
-          if Server(sSetUnitHome, me, UnFocus, nil^) >= rExecuted then
-          begin
-            CityOptimizer_CityChange(cixOldHome);
-            CityOptimizer_CityChange(Home);
-            UpdateViews(true);
-          end
-          else
-            Play('INVALID');
-        end
-        else
-        begin
-          Status := Status and not(usStay or usRecover or usEnhance);
-          MoveToLoc(maNextCity, true)
-        end
-      else if Sender = mCentre then
-      begin
-        Centre(Loc);
-        PaintAllMaps;
-      end
-      else if Sender = mCity then
-      begin
-        Loc0 := Loc;
-        if MyMap[Loc] and fCity = 0 then
-        begin // build city
-          if DoJob(jCity) = eCity then
-          begin
-            MapValid := false;
-            PaintAll;
-            ZoomToCity(Loc0, true, chFounded);
-          end;
-        end
-        else
-        begin
-          CityOptimizer_BeforeRemoveUnit(UnFocus);
-          ServerResult := Server(sAddToCity, me, UnFocus, nil^);
-          if ServerResult >= rExecuted then
-          begin
-            cix := MyRO.nCity - 1;
-            while (cix >= 0) and (MyCity[cix].Loc <> Loc0) do
-              dec(cix);
-            assert(cix >= 0);
-            CityOptimizer_CityChange(cix);
-            CityOptimizer_AfterRemoveUnit; // does nothing here
-            SetTroopLoc(Loc0);
-            UpdateViews(true);
-            DestinationMarkON := false;
-            PaintDestination;
-            UnFocus := -1;
-            PaintLoc(Loc0);
-            NextUnit(UnStartLoc, true);
-          end
-          else if ServerResult = eMaxSize then
-            SimpleMessage(Phrases.Lookup('ADDTOMAXSIZE'));
-        end
-      end
-      else if Sender = mRoad then
-        DoJob(jRoad)
-      else if Sender = mRR then
-        DoJob(jRR)
-      else if Sender = mClear then
-        DoJob(jClear)
-      else if Sender = mIrrigation then
-        DoJob(jIrr)
-      else if Sender = mFarm then
-        DoJob(jFarm)
-      else if Sender = mAfforest then
-        DoJob(jAfforest)
-      else if Sender = mMine then
-        DoJob(jMine)
-      else if Sender = mCanal then
-        DoJob(jCanal)
-      else if Sender = MTrans then
-        DoJob(jTrans)
-      else if Sender = mFort then
-        DoJob(jFort)
-      else if Sender = mAirBase then
-        DoJob(jBase)
-      else if Sender = mPollution then
-        DoJob(jPoll)
-      else if Sender = mPillage then
-        DoJob(jPillage)
-      else if Sender = mEnhance then
-        DoJob(-1)
-      else if Sender = mStay then
-      begin
-        DestinationMarkON := false;
-        PaintDestination;
-        Status := Status and ($FFFF - usRecover - usGoto - usEnhance) or usStay;
-        if Job > jNone then
-          Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true);
-      end
-      else if Sender = mRecover then
-      begin
-        DestinationMarkON := false;
-        PaintDestination;
-        Status := Status and ($FFFF - usStay - usGoto - usEnhance) or usRecover;
-        if Job > jNone then
-          Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-        NextUnit(UnStartLoc, true);
-      end
-      else if Sender = mNoOrders then
-      begin
-        Status := Status and not usWaiting;
-        NextUnit(UnStartLoc, true);
-      end
-      else if Sender = mPrevUnit then
-      begin
-        Status := Status and not usWaiting;
-        FocusNextUnit(-1);
-      end
-      else if Sender = mNextUnit then
-      begin
-        Status := Status and not usWaiting;
-        FocusNextUnit(1);
-      end
-      else if Sender = mCancel then
-      begin
-        DestinationMarkON := false;
-        PaintDestination;
-        Status := Status and ($FFFF - usRecover - usGoto - usEnhance);
-        if Job > jNone then
-          Server(sStartJob + jNone shl 4, me, UnFocus, nil^);
-      end
-      else if (Sender = mDisband) or (Sender = mUtilize) then
-      begin
-        if (Sender = mUtilize) and
-          not(Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized)
-        then
-        begin
-          SimpleMessage(Phrases2.Lookup('SHIP_UTILIZE'));
-          // freight for colony ship is the only case in which the command is
-          // available to player though not valid
-          exit
-        end;
-        if (Sender = mUtilize) and (Health < 100) then
-          if SimpleQuery(mkYesNo, Phrases.Lookup('DAMAGED_UTILIZE'), '') <> mrOK
-          then
-            exit;
-        Loc0 := Loc;
-        CityOptimizer_BeforeRemoveUnit(UnFocus);
-        if Server(sRemoveUnit, me, UnFocus, nil^) = eUtilized then
-          Play('CITY_UTILIZE')
-        else
-          Play('DISBAND');
-        CityOptimizer_AfterRemoveUnit;
-        SetTroopLoc(Loc0);
-        UpdateViews(true);
-        DestinationMarkON := false;
-        PaintDestination;
-        UnFocus := -1;
-        PaintLoc(Loc0);
-        NextUnit(UnStartLoc, true);
-      end
-      else if Sender = mLoad then
-      begin
-        i := Server(sLoadUnit, me, UnFocus, nil^);
-        if i >= rExecuted then
-        begin
-          if MyModel[mix].Domain = dAir then
-            Play('MOVE_PLANELANDING')
-          else
-            Play('MOVE_LOAD');
-          DestinationMarkON := false;
-          PaintDestination;
-          Status := Status and ($FFFF - usWaiting - usStay - usRecover - usGoto
-            - usEnhance);
-          NextUnit(UnStartLoc, true);
-        end
-        else if i = eNoTime_Load then
-          if MyModel[mix].Domain = dAir then
-            SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
-          else
-            SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
-              [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
-      end
-      else if Sender = mUnload then
-        if Master >= 0 then
-        begin
-          OldMaster := Master;
-          i := Server(sUnloadUnit, me, UnFocus, nil^);
-          if i >= rExecuted then
-          begin
-            if MyModel[mix].Domain = dAir then
-              Play('MOVE_PLANESTART')
-            else if (MyModel[MyUn[OldMaster].mix].Domain = dAir) and
-              (MyMap[Loc] and fCity = 0) and (MyMap[Loc] and fTerImp <> tiBase)
-            then
-              Play('MOVE_PARACHUTE')
-            else
-              Play('MOVE_UNLOAD');
-            Status := Status and not usWaiting;
-            if MyModel[mix].Domain <> dAir then
-              NextUnit(Loc, true)
-            else
-              PanelPaint;
-          end
-          else if i = eNoTime_Load then
-            if MyModel[mix].Domain = dAir then
-              SoundMessage(Phrases.Lookup('NOTIMELOADAIR'), 'NOMOVE_TIME')
-            else
-              SoundMessage(Format(Phrases.Lookup('NOTIMELOADGROUND'),
-                [MovementToString(MyModel[mix].speed)]), 'NOMOVE_TIME');
-        end
-        else
-        begin
-          NewFocus := -1;
-          uix := UnFocus;
-          for i := 1 to MyRO.nUn - 1 do
-          begin
-            uix := (uix + MyRO.nUn - 1) mod MyRO.nUn;
-            if (MyUn[uix].Master = UnFocus) and
-              (MyUn[uix].Movement = integer(MyModel[MyUn[uix].mix].speed)) then
-            begin
-              MyUn[uix].Status := MyUn[uix].Status or usWaiting;
-              NewFocus := uix
-            end;
-          end;
-          if NewFocus >= 0 then
-          begin
-            SetUnFocus(NewFocus);
-            SetTroopLoc(Loc);
-            PanelPaint
-          end;
-        end
-      else if Sender = mSelectTransport then
-        Server(sSelectTransport, me, UnFocus, nil^)
+      Play('DISBAND');
+    CityOptimizer_AfterRemoveUnit;
+    SetTroopLoc(Loc0);
+    UpdateViews(True);
+    DestinationMarkON := False;
+    PaintDestination;
+    UnFocus := -1;
+    PaintLoc(Loc0);
+    NextUnit(UnStartLoc, True);
+  end;
 end;
 
 procedure TMainScreen.InitPopup(Popup: TDpiPopupMenu);
 var
-  i, p1, Tile, Test: integer;
-  NoSuper, extended, Multi, NeedSep, HaveCities: boolean;
-  LastSep, m: TDpiMenuItem;
+  I, p1, Tile, Test: Integer;
+  NoSuper, Extended, Multi, NeedSep, HaveCities: Boolean;
+  LastSep, M: TDpiMenuItem;
   mox: ^TModel;
 begin
-  NoSuper := not supervising and (1 shl me and MyRO.Alive <> 0);
-  HaveCities := false;
-  for i := 0 to MyRO.nCity - 1 do
-    if MyCity[i].Loc >= 0 then
+  NoSuper := not Supervising and (1 shl Me and MyRO.Alive <> 0);
+  HaveCities := False;
+  for I := 0 to MyRO.nCity - 1 do
+    if MyCity[I].Loc >= 0 then
     begin
-      HaveCities := true;
+      HaveCities := True;
       Break;
     end;
@@ -7192 +7582 @@
   begin
     mTechTree.Visible := ClientMode <> cEditMap;
-    mResign.Enabled := supervising or (me = 0) and (ClientMode < scContact);
+    mResign.Enabled := Supervising or (Me = 0) and (ClientMode < scContact);
     mRandomMap.Visible := (ClientMode = cEditMap) and
-      (Server(sMapGeneratorRequest, me, 0, nil^) = eOK);
+      (Server(sMapGeneratorRequest, Me, 0, nil^) = eOK);
     mOptions.Visible := ClientMode <> cEditMap;
     mManip.Visible := ClientMode <> cEditMap;
@@ -7208 +7598 @@
       case SoundMode of
         smOff:
-          mSoundOff.Checked := true;
+          mSoundOff.Checked := True;
         smOn:
-          mSoundOn.Checked := true;
+          mSoundOn.Checked := True;
         smOnAlt:
-          mSoundOnAlt.Checked := true;
-      end;
-
-      for i := 0 to nTestFlags - 1 do
-        mManip[i].Checked := MyRO.TestFlags and (1 shl i) <> 0;
-      mManip.Enabled := supervising or (me = 0);
-
-      Multi := false;
+          mSoundOnAlt.Checked := True;
+      end;
+
+      for I := 0 to nTestFlags - 1 do
+        mManip[I].Checked := MyRO.TestFlags and (1 shl I) <> 0;
+      mManip.Enabled := Supervising or (Me = 0);
+
+      Multi := False;
       for p1 := 1 to nPl - 1 do
         if G.RO[p1] <> nil then
-          Multi := true;
+          Multi := True;
       mEnemyMovement.Visible := not Multi;
     end;
@@ -7228 +7618 @@
     if NoSuper and (ClientMode < scContact) then
     begin
-      mCityTypes.Enabled := false;
+      mCityTypes.Enabled := False;
       // check if city types already usefull:
       if MyRO.nCity > 0 then
-        for i := nWonder to nImp - 1 do
-          if (i <> imTrGoods) and (Imp[i].Kind = ikCommon) and
-            (Imp[i].Preq <> preNA) and
-            ((Imp[i].Preq = preNone) or (MyRO.Tech[Imp[i].Preq] >= tsApplicable))
+        for I := nWonder to nImp - 1 do
+          if (I <> imTrGoods) and (Imp[I].Kind = ikCommon) and
+            (Imp[I].Preq <> preNA) and
+            ((Imp[I].Preq = preNone) or (MyRO.Tech[Imp[I].Preq] >= tsApplicable))
           then
           begin
-            mCityTypes.Enabled := true;
+            mCityTypes.Enabled := True;
             Break
           end;
     end;
-    mViewpoint.Visible := (ClientMode <> cEditMap) and supervising;
+    mViewpoint.Visible := (ClientMode <> cEditMap) and Supervising;
     mViewpoint.Enabled := G.RO[0].Turn > 0;
-    if supervising then
+    if Supervising then
     begin
       EmptyMenu(mViewpoint);
@@ -7249 +7639 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TDpiMenuItem.Create(mViewpoint);
+          M := TDpiMenuItem.Create(mViewpoint);
           if p1 = 0 then
-            m.Caption := Phrases.Lookup('SUPER')
+            M.Caption := Phrases.Lookup('SUPER')
           else
-            m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
-          m.Tag := p1;
-          m.OnClick := ViewpointClick;
+            M.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+          M.Tag := p1;
+          M.OnClick := ViewpointClick;
           if p1 < 10 then
-            m.ShortCut := ShortCut(48 + p1, [ssCtrl]);
-          m.RadioItem := true;
-          if p1 = me then
-            m.Checked := true;
-          mViewpoint.Add(m);
+            M.ShortCut := ShortCut(48 + p1, [ssCtrl]);
+          M.RadioItem := True;
+          if p1 = Me then
+            M.Checked := True;
+          mViewpoint.Add(M);
         end
     end;
-    mDebugMap.Visible := (ClientMode <> cEditMap) and supervising;
-    if supervising then
+    mDebugMap.Visible := (ClientMode <> cEditMap) and Supervising;
+    if Supervising then
     begin
       EmptyMenu(mDebugMap);
@@ -7271 +7661 @@
         if (p1 = 0) or (1 shl p1 and G.RO[0].Alive <> 0) then
         begin
-          m := TDpiMenuItem.Create(mDebugMap);
+          M := TDpiMenuItem.Create(mDebugMap);
           if p1 = 0 then
-            m.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
+            M.Caption := Phrases2.Lookup('MENU_DEBUGMAPOFF')
           else
-            m.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
+            M.Caption := Tribe[p1].TString(Phrases2.Lookup('BELONG'));
           if p1 = 0 then
-            m.Tag := -1
+            M.Tag := -1
           else
-            m.Tag := p1;
-          m.OnClick := DebugMapClick;
+            M.Tag := p1;
+          M.OnClick := DebugMapClick;
           if p1 < 10 then
-            m.ShortCut := ShortCut(48 + p1, [ssAlt]);
-          m.RadioItem := true;
-          if m.Tag = MainMap.pDebugMap then
-            m.Checked := true;
-          mDebugMap.Add(m);
+            M.ShortCut := ShortCut(48 + p1, [ssAlt]);
+          M.RadioItem := True;
+          if M.Tag = MainMap.pDebugMap then
+            M.Checked := True;
+          mDebugMap.Add(M);
         end;
     end;
@@ -7301 +7691 @@
       (ClientMode < scContact);
     mUnitStat.Enabled := NoSuper or (MyRO.Turn > 0);
-    mCityStat.Visible := 1 shl me and MyRO.Alive <> 0;
+    mCityStat.Visible := 1 shl Me and MyRO.Alive <> 0;
     mCityStat.Enabled := HaveCities;
-    mScienceStat.Visible := true;
+    mScienceStat.Visible := True;
     mScienceStat.Enabled := not NoSuper or (MyRO.ResearchTech >= 0) or
       (MyRO.Happened and phTech <> 0) or (MyRO.Happened and phGameEnd <> 0)
@@ -7310 +7700 @@
     mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
     { mWonders.Enabled:= false;
-      for i:=0 to nWonder - 1 do if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
-      mWonders.Enabled:=true; }
+      for I:=0 to nWonder - 1 do if MyRO.Wonder[I].CityID <> WonderNotBuiltYet then
+      mWonders.Enabled:=True; }
     mDiagram.Enabled := MyRO.Turn >= 2;
-    mShips.Enabled := false;
+    mShips.Enabled := False;
     for p1 := 0 to nPl - 1 do
       if MyRO.Ship[p1].Parts[spComp] + MyRO.Ship[p1].Parts[spPow] +
         MyRO.Ship[p1].Parts[spHab] > 0 then
-        mShips.Enabled := true;
+        mShips.Enabled := True;
   end
   else if Popup = UnitPopup then
@@ -7323 +7713 @@
     mox := @MyModel[MyUn[UnFocus].mix];
     Tile := MyMap[MyUn[UnFocus].Loc];
-    extended := Tile and fCity = 0;
-    if extended then
+    Extended := Tile and fCity = 0;
+    if Extended then
     begin
       mCity.Caption := Phrases.Lookup('BTN_FOUND');
@@ -7335 +7725 @@
     end;
 
-    extended := extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
+    Extended := Extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
       and (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
       (MyUn[UnFocus].Master < 0) and (Tile and fDeadLands = 0);
     if (mox.Kind = mkFreight) and (Tile and fCity <> 0) and
       not Phrases2FallenBackToEnglish or
-      (Server(sRemoveUnit - sExecute, me, UnFocus, nil^) = eUtilized) then
+      (Server(sRemoveUnit - sExecute, Me, UnFocus, nil^) = eUtilized) then
     begin
-      mDisband.Visible := false;
-      mUtilize.Visible := true;
+      mDisband.Visible := False;
+      mUtilize.Visible := True;
       if mox.Kind = mkFreight then
         mUtilize.Caption := Phrases.Lookup('UTILIZE')
@@ -7351 +7741 @@
     else
     begin
-      mDisband.Visible := true;
-      mUtilize.Visible := false
+      mDisband.Visible := True;
+      mUtilize.Visible := False
     end;
     mGoOn.Visible := MyUn[UnFocus].Status and (usGoto or usWaiting) = usGoto or
@@ -7359 +7749 @@
     mRecover.Visible := (MyUn[UnFocus].Health < 100) and
       (Tile and fTerrain >= fGrass) and
-      ((MyRO.Wonder[woGardens].EffectiveOwner = me) or
+      ((MyRO.Wonder[woGardens].EffectiveOwner = Me) or
       (Tile and fTerrain <> fArctic) and (Tile and fTerrain <> fDesert)) and
       not((mox.Domain = dAir) and (Tile and fCity = 0) and
@@ -7365 +7755 @@
     mStay.Visible := not((mox.Domain = dAir) and (Tile and fCity = 0) and
       (Tile and fTerImp <> tiBase));
-    mCity.Visible := extended and (mox.Kind = mkSettler) or
+    mCity.Visible := Extended and (mox.Kind = mkSettler) or
       (Tile and fCity <> 0) and ((mox.Kind in [mkSettler, mkSlaves]) or
       (MyUn[UnFocus].Flags and unConscripts <> 0));
@@ -7373 +7763 @@
       (MyUn[UnFocus].Status and (usRecover or usGoto) <> 0);
 
-    Test := Server(sLoadUnit - sExecute, me, UnFocus, nil^);
+    Test := Server(sLoadUnit - sExecute, Me, UnFocus, nil^);
     mLoad.Visible := (Test >= rExecuted) or (Test = eNoTime_Load);
     mUnload.Visible := (MyUn[UnFocus].Master >= 0) or
       (MyUn[UnFocus].TroopLoad + MyUn[UnFocus].AirLoad > 0);
-    mSelectTransport.Visible := Server(sSelectTransport - sExecute, me, UnFocus,
+    mSelectTransport.Visible := Server(sSelectTransport - sExecute, Me, UnFocus,
       nil^) >= rExecuted;
   end
@@ -7384 +7774 @@
     mox := @MyModel[MyUn[UnFocus].mix];
     Tile := MyMap[MyUn[UnFocus].Loc];
-    extended := Tile and fCity = 0;
+    Extended := Tile and fCity = 0;
 
     if (Tile and fRiver <> 0) and (MyRO.Tech[adBridgeBuilding] >= tsApplicable)
@@ -7390 +7780 @@
     begin
       mRoad.Caption := Phrases.Lookup('BTN_BUILDBRIDGE');
-      mRR.Caption := Phrases.Lookup('BTN_BUILDRRBRIDGE');
+      mRailRoad.Caption := Phrases.Lookup('BTN_BUILDRRBRIDGE');
     end
     else
     begin
       mRoad.Caption := Phrases.Lookup('BTN_BUILDROAD');
-      mRR.Caption := Phrases.Lookup('BTN_BUILDRR');
+      mRailRoad.Caption := Phrases.Lookup('BTN_BUILDRR');
     end;
     if Tile and fTerrain = fForest then
@@ -7404 +7794 @@
       mClear.Caption := Phrases.Lookup('BTN_DRAIN');
 
-    extended := extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
+    Extended := Extended and ((mox.Kind = mkSettler) or (mox.Kind = mkSlaves)
       and (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) and
       (MyUn[UnFocus].Master < 0);
-    if extended then
+    if Extended then
     begin
       mRoad.Visible := JobTest(UnFocus, jRoad, [eNoBridgeBuilding, eTreaty]);
-      mRR.Visible := JobTest(UnFocus, jRR, [eNoBridgeBuilding, eTreaty]);
+      mRailRoad.Visible := JobTest(UnFocus, jRR, [eNoBridgeBuilding, eTreaty]);
       mClear.Visible := JobTest(UnFocus, jClear, [eTreaty]);
       mIrrigation.Visible := JobTest(UnFocus, jIrr, [eTreaty]);
@@ -7427 +7817 @@
     else
     begin
-      for i := 0 to Popup.Items.Count - 1 do
-        Popup.Items[i].Visible := false;
+      for I := 0 to Popup.Items.Count - 1 do
+        Popup.Items[I].Visible := False;
     end;
   end;
@@ -7434 +7824 @@
   // set menu seperators
   LastSep := nil;
-  NeedSep := false;
-  for i := 0 to Popup.Items.Count - 1 do
-    if Popup.Items[i].Caption = '-' then
+  NeedSep := False;
+  for I := 0 to Popup.Items.Count - 1 do
+    if Popup.Items[I].Caption = '-' then
     begin
-      Popup.Items[i].Visible := NeedSep;
+      Popup.Items[I].Visible := NeedSep;
       if NeedSep then
-        LastSep := Popup.Items[i];
-      NeedSep := false
+        LastSep := Popup.Items[I];
+      NeedSep := False
     end
-    else if Popup.Items[i].Visible then
-      NeedSep := true;
+    else if Popup.Items[I].Visible then
+      NeedSep := True;
   if (LastSep <> nil) and not NeedSep then
-    LastSep.Visible := false
+    LastSep.Visible := False
 end;
 
@@ -7465 +7855 @@
 end;
 
-procedure TMainScreen.CityClosed(Activateuix: integer; StepFocus: boolean;
-  SelectFocus: boolean);
-begin
-  if supervising then
+procedure TMainScreen.CityClosed(Activateuix: Integer; StepFocus: Boolean;
+  SelectFocus: Boolean);
+begin
+  if Supervising then
   begin
     SetTroopLoc(-1);
@@ -7485 +7875 @@
     end
     else if StepFocus then
-      NextUnit(TroopLoc, true)
+      NextUnit(TroopLoc, True)
     else
     begin
@@ -7496 +7886 @@
 procedure TMainScreen.Toggle(Sender: TObject);
 begin
-  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked
+  TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
 end;
 
 procedure TMainScreen.PanelBoxMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  xCentre, yCentre: integer;
+  xCentre, yCentre: Integer;
 begin
   if Tracking and (ssLeft in Shift) then
   with MainMap do begin
-    if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx) and
-      (y < yMini + 2 + G.ly) then
+    if (X >= xMini + 2) and (Y >= yMini + 2) and (X < xMini + 2 + 2 * G.lx) and
+      (Y < yMini + 2 + G.ly) then
     begin
-      xCentre := (xwMini + (x - xMini - 2) div 2 + G.lx div 2 +
+      xCentre := (xwMini + (X - xMini - 2) div 2 + G.lx div 2 +
         MapWidth div (xxt * 4)) mod G.lx;
-      yCentre := (y - yMini - 2);
+      yCentre := (Y - yMini - 2);
       xw := (xCentre - MapWidth div (xxt * 4) + G.lx) mod G.lx;
       if ywmax <= 0 then
@@ -7523 +7913 @@
           yw := ywmax;
       end;
-      DpiBitCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
+      DpiBitBltCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
       if ywmax <= 0 then
-        Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
-          x - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
+        Frame(Buffer.Canvas, X - xMini - 2 - MapWidth div (xxt * 2), 0,
+          X - xMini - 2 + MapWidth div (xxt * 2) - 1, G.ly - 1,
           MainTexture.ColorMark, MainTexture.ColorMark)
       else
-        Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), yw,
-          x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
+        Frame(Buffer.Canvas, X - xMini - 2 - MapWidth div (xxt * 2), yw,
+          X - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
           2, MainTexture.ColorMark, MainTexture.ColorMark);
-      DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      DpiBitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         Buffer.Canvas, 0, 0);
       MainOffscreenPaint;
@@ -7542 +7932 @@
   end
   else
-    Tracking := false;
+    Tracking := False;
 end;
 
 procedure TMainScreen.PanelBoxMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
+  Shift: TShiftState; X, Y: Integer);
 begin
   if Tracking then
   begin
-    Tracking := false;
+    Tracking := False;
     xwMini := xw;
     ywMini := yw;
@@ -7559 +7949 @@
 
 procedure TMainScreen.MapBoxMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
+  X, Y: Integer);
 var
-  MouseLoc: integer;
-begin
-  xMouse := x;
-  yMouse := y;
+  MouseLoc: Integer;
+begin
+  xMouse := X;
+  yMouse := Y;
   if (ClientMode = cEditMap) and (ssLeft in Shift) and not Tracking then
   begin
-    MouseLoc := LocationOfScreenPixel(x, y);
+    MouseLoc := LocationOfScreenPixel(X, Y);
     if MouseLoc <> BrushLoc then
-      MapBoxMouseDown(nil, mbLeft, Shift, x, y);
+      MapBoxMouseDown(nil, mbLeft, Shift, X, Y);
   end
-  (* else if idle and (UnFocus>=0) then
+  (* else if Idle and (UnFocus>=0) then
     begin
     qx:=(xMouse*32+yMouse*66+16*66) div(32*66)-1;
@@ -7584 +7974 @@
   TDpiMenuItem(Sender).Checked := not TDpiMenuItem(Sender).Checked;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
@@ -7590 +7980 @@
 procedure TMainScreen.mNamesClick(Sender: TObject);
 var
-  p1: integer;
+  p1: Integer;
 begin
   mNames.Checked := not mNames.Checked;
@@ -7600 +7990 @@
       else
         Tribe[p1].NumberName := p1;
-  MapValid := false;
+  MapValid := False;
   PaintAll;
 end;
 
-function TMainScreen.IsPanelPixel(x, y: integer): boolean;
-begin
-  result := (y >= TopBarHeight + MapHeight) or (y >= ClientHeight - PanelHeight)
-    and ((x < xMidPanel) or (x >= xRightPanel));
+function TMainScreen.IsPanelPixel(X, Y: Integer): Boolean;
+begin
+  Result := (Y >= TopBarHeight + MapHeight) or (Y >= ClientHeight - PanelHeight)
+    and ((X < xMidPanel) or (X >= xRightPanel));
 end;
 
 procedure TMainScreen.FormMouseDown(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-  if idle then
-    if (x < 40) and (y < 40) then
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Idle then
+    if (X < 40) and (Y < 40) then
     begin
       if GameMode <> cMovie then
@@ -7626 +8016 @@
       end;
     end
-    else if IsPanelPixel(x, y) then
-      PanelBoxMouseDown(Sender, Button, Shift, x,
-        y - (ClientHeight - PanelHeight))
-    else if (y >= TopBarHeight) and (x >= MapOffset) and
-      (x < MapOffset + MapWidth) then
-      MapBoxMouseDown(Sender, Button, Shift, x - MapOffset, y - TopBarHeight)
+    else if IsPanelPixel(X, Y) then
+      PanelBoxMouseDown(Sender, Button, Shift, X,
+        Y - (ClientHeight - PanelHeight))
+    else if (Y >= TopBarHeight) and (X >= MapOffset) and
+      (X < MapOffset + MapWidth) then
+      MapBoxMouseDown(Sender, Button, Shift, X - MapOffset, Y - TopBarHeight)
 end;
 
 procedure TMainScreen.FormMouseMove(Sender: TObject; Shift: TShiftState;
-  x, y: integer);
-begin
-  if idle then
-    if IsPanelPixel(x, y) then
-      PanelBoxMouseMove(Sender, Shift, x, y - (ClientHeight - PanelHeight))
-    else if (y >= TopBarHeight) and (x >= MapOffset) and
-      (x < MapOffset + MapWidth) then
-      MapBoxMouseMove(Sender, Shift, x - MapOffset, y - TopBarHeight);
+  X, Y: Integer);
+begin
+  if Idle then
+    if IsPanelPixel(X, Y) then
+      PanelBoxMouseMove(Sender, Shift, X, Y - (ClientHeight - PanelHeight))
+    else if (Y >= TopBarHeight) and (X >= MapOffset) and
+      (X < MapOffset + MapWidth) then
+      MapBoxMouseMove(Sender, Shift, X - MapOffset, Y - TopBarHeight);
 end;
 
 procedure TMainScreen.FormMouseUp(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; x, y: integer);
-begin
-  if idle then
-    PanelBoxMouseUp(Sender, Button, Shift, x, y - (ClientHeight - PanelHeight));
+  Shift: TShiftState; X, Y: Integer);
+begin
+  if Idle then
+    PanelBoxMouseUp(Sender, Button, Shift, X, Y - (ClientHeight - PanelHeight));
 end;
 
@@ -7658 +8048 @@
     with Canvas do
     begin // pillarbox, make left and right border black
-      if me < 0 then
+      if Me < 0 then
         Brush.Color := $000000
       else
@@ -7684 +8074 @@
       Brush.Style := bsClear;
     end;
-  DpiBitCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
-    offscreen.Canvas, 0, 0);
-  DpiBitCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
+  DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+    Offscreen.Canvas, 0, 0);
+  DpiBitBltCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
     0, 0);
   if xMidPanel > MapOffset then
-    DpiBitCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas,
+    DpiBitBltCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - xMidPanel, overlap, Offscreen.Canvas,
       xMidPanel - MapOffset, MapHeight - overlap)
   else
-    DpiBitCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas, 0,
+    DpiBitBltCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - MapOffset, overlap, Offscreen.Canvas, 0,
       MapHeight - overlap);
   if xRightPanel < MapOffset + MapWidth then
-    DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
-      xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas,
+    DpiBitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+      xRightPanel - ClientWidth div 2, overlap, Offscreen.Canvas,
       ClientWidth div 2 - MapOffset, MapHeight - overlap)
   else
-    DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+    DpiBitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       MapOffset + MapWidth - ClientWidth div 2, overlap,
-      offscreen.Canvas, ClientWidth div 2 - MapOffset,
+      Offscreen.Canvas, ClientWidth div 2 - MapOffset,
       MapHeight - overlap);
-  DpiBitCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
+  DpiBitBltCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
     overlap, Panel.Canvas, 0, 0);
-  DpiBitCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
+  DpiBitBltCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
     Panel.width - xRightPanel, overlap, Panel.Canvas, xRightPanel, 0);
-  DpiBitCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.width,
+  DpiBitBltCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.width,
     PanelHeight - overlap, Panel.Canvas, 0, overlap);
   if (pLogo >= 0) and (G.RO[pLogo] = nil) and (AILogo[pLogo] <> nil) then
-    DpiBitCanvas(Canvas, xRightPanel + 10 - (16 + 64),
+    DpiBitBltCanvas(Canvas, xRightPanel + 10 - (16 + 64),
       ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas, 0, 0);
 end;
 
-procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: integer);
+procedure TMainScreen.RectInvalidate(Left, Top, Rigth, Bottom: Integer);
 var
   r0: HRgn;
 begin
   r0 := DpiCreateRectRgn(Left, Top, Rigth, Bottom);
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
 
-procedure TMainScreen.SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+procedure TMainScreen.SmartRectInvalidate(Left, Top, Rigth, Bottom: Integer);
 var
-  i: integer;
+  I: Integer;
   r0, r1: HRgn;
 begin
   r0 := DpiCreateRectRgn(Left, Top, Rigth, Bottom);
-  for i := 0 to ControlCount - 1 do
-    if not(Controls[i] is TArea) and Controls[i].Visible then
+  for I := 0 to ControlCount - 1 do
+    if not(Controls[I] is TArea) and Controls[I].Visible then
     begin
-      with Controls[i].BoundsRect do
+      with Controls[I].BoundsRect do
         r1 := DpiCreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);
     end;
-  InvalidateRgn(Handle, r0, false);
+  InvalidateRgn(Handle, r0, False);
   DeleteObject(r0);
 end;
@@ -7804 +8194 @@
 procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Timer1.Enabled := false;
+  Timer1.Enabled := False;
 end;
 
 procedure TMainScreen.Radio(Sender: TObject);
 begin
-  TDpiMenuItem(Sender).Checked := true;
+  TDpiMenuItem(Sender).Checked := True;
 end;
 
 procedure TMainScreen.mManipClick(Sender: TObject);
 var
-  Flag: integer;
+  Flag: Integer;
 begin
   with TDpiMenuItem(Sender) do
@@ -7826 +8216 @@
       Play('CHEAT');
     end;
-    if not supervising then
+    if not Supervising then
     begin
       if Flag = tfUncover then
       begin
-        MapValid := false;
+        MapValid := False;
         PaintAllMaps;
       end
@@ -7854 +8244 @@
   else
   begin
-    MapValid := false;
+    MapValid := False;
     PaintAllMaps;
   end; // update main map
@@ -7873 +8263 @@
   end;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
@@ -7891 +8281 @@
   end;
   SetMapOptions;
-  MapValid := false;
+  MapValid := False;
   PaintAllMaps;
 end;
 
-procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: word;
+procedure TMainScreen.FormKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-  if idle and (Key = VK_APPS) then
+  if Idle and (Key = VK_APPS) then
   begin
     InitPopup(GamePopup);
@@ -7906 +8296 @@
       GamePopup.Popup(Left + 4, Top + DpiGetSystemMetrics(SM_CYCAPTION) + 4 +
         TopBarHeight - 1);
-    exit;
+    Exit;
   end; // windows menu button calls game menu
 end;
@@ -7912 +8302 @@
 procedure TMainScreen.CreateUnitClick(Sender: TObject);
 var
-  p1, mix: integer;
+  p1, mix: Integer;
 begin
   p1 := TComponent(Sender).Tag shr 16;
   mix := TComponent(Sender).Tag and $FFFF;
-  if Server(sCreateUnit + p1 shl 4, me, mix, EditLoc) >= rExecuted then
+  if Server(sCreateUnit + p1 shl 4, Me, mix, EditLoc) >= rExecuted then
     PaintLoc(EditLoc);
 end;
@@ -7934 +8324 @@
   SoundMode := smOnAlt;
 end;
-
-{ procedure TMainScreen.AdviceBtnClick;
-  var
-  OldAdviceLoc: integer;
-  begin
-  DestinationMarkON:=false;
-  PaintDestination;
-  AdvisorDlg.GiveStrategyAdvice;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=-1;
-  PaintLoc(OldAdviceLoc);
-  end; }
-
-{ procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
-  var
-  OldAdviceLoc,x,y: integer;
-  begin
-  if Loc<>MainMap.AdviceLoc then
-  begin
-  if Loc>=0 then
-  begin // center
-  y:=Loc div G.lx;
-  x:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
-  Centre(y*G.lx+x);
-  PaintAllMaps;
-  end;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=Loc;
-  PaintLoc(OldAdviceLoc);
-  PaintLoc(MainMap.AdviceLoc);
-  end;
-  end; }
 
 procedure TMainScreen.UnitInfoBtnClick(Sender: TObject);
@@ -8004 +8362 @@
 
 procedure TMainScreen.SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
-var
-  i: integer;
 begin
   MainMap.TileSize := TileSize;
@@ -8012 +8368 @@
   SetMapPos(Loc, MapPos);
   PaintAllMaps;
-  for i := 0 to DpiScreen.FormCount - 1 do
-    if DpiScreen.Forms[i].Visible and (DpiScreen.Forms[i] is TBufferedDrawDlg) then
-      TBufferedDrawDlg(DpiScreen.Forms[i]).SmartUpdateContent(false);
+  ApplyToVisibleForms(faSmartUpdateContent);
 end;
 
 procedure TMainScreen.SaveMenuItemsState;
 var
-  i, j: integer;
+  I, J: Integer;
 begin
   if soTellAI in OptionChecked then OptionChecked := [soTellAI]
     else OptionChecked := [];
-  for i := 0 to ComponentCount - 1 do
-    if Components[i] is TDpiMenuItem then
-      for j := 0 to Length(SaveOption) - 1 do
-        if TDpiMenuItem(Components[i]).Checked and
-          (TDpiMenuItem(Components[i]).Tag = SaveOption[j]) then
-          OptionChecked := OptionChecked + [TSaveOption(j)];
+  for I := 0 to ComponentCount - 1 do
+    if Components[I] is TDpiMenuItem then
+      for J := 0 to Length(SaveOption) - 1 do
+        if TDpiMenuItem(Components[I]).Checked and
+          (TDpiMenuItem(Components[I]).Tag = SaveOption[J]) then
+          OptionChecked := OptionChecked + [TSaveOption(J)];
 end;
 
@@ -8040 +8394 @@
   with Reg do
   try
-    OpenKey(AppRegistryKey, true);
+    OpenKey(AppRegistryKey, True);
     WriteInteger('TileSize', Integer(MainMap.TileSize));
     WriteInteger('OptionChecked', Integer(OptionChecked));
     WriteInteger('MapOptionChecked', Integer(MapOptionChecked));
-    WriteInteger('CityReport', integer(CityRepMask));
+    WriteInteger('CityReport', Integer(CityRepMask));
   finally
     Free;
@@ -8056 +8410 @@
 end;
 
+procedure TMainScreen.ArrangeDialogs;
+begin
+  ArrangeDialog(FListDlg);
+  ArrangeDialog(FHelpDlg);
+  ArrangeDialog(FUnitStatDlg);
+  ArrangeDialog(FDiaDlg);
+  ArrangeDialog(FNatStatDlg);
+end;
+
+procedure TMainScreen.ArrangeDialog(Form: TBufferedDrawDlg);
+begin
+  if not Assigned(Form) then Exit;
+
+  if Form is TListDlg then begin;
+    ListDlg.UserLeft := 8;
+    ListDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is THelpDlg then begin
+   HelpDlg.UserLeft := DpiScreen.Width - HelpDlg.Width - 8;
+    HelpDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is TUnitStatDlg then begin
+    UnitStatDlg.UserLeft := 397;
+    UnitStatDlg.UserTop := TopBarHeight + 64;
+  end;
+  if Form is TDiaDlg then begin
+    DiaDlg.UserLeft := (DpiScreen.Width - DiaDlg.Width) div 2;
+    DiaDlg.UserTop := (DpiScreen.Height - DiaDlg.Height) div 2;
+  end;
+  if Form is TNatStatDlg then begin
+    NatStatDlg.UserLeft := DpiScreen.Width - NatStatDlg.Width - 8;
+    NatStatDlg.UserTop := DpiScreen.Height - PanelHeight - NatStatDlg.Height - 8;
+    if NatStatDlg.UserTop < 8 then
+      NatStatDlg.UserTop := 8;
+  end;
+end;
+
 procedure TMainScreen.ScrollBarUpdate(Sender: TObject);
 begin

branches/highdpi/LocalPlayer/Tribes.pas ¶

@@ -6 +6 @@
 uses
   Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global,
-  UGraphicSet;
+  GraphicSet;
 
 type
@@ -20 +20 @@
     yShield: Integer;
   end;
+
+  { TModelPictureInfo }
 
   TModelPictureInfo = record
@@ -27 +29 @@
     Hash: Integer;
     GrName: ShortString;
+    function GetCommandDataSize: Byte;
   end;
 
@@ -46 +49 @@
     constructor Create(FileName: string);
     destructor Destroy; override;
-    function GetCityName(i: Integer): string;
-{$IFNDEF SCR} procedure SetCityName(i: Integer; NewName: string); {$ENDIF}
+    function GetCityName(I: Integer): string;
+{$IFNDEF SCR} procedure SetCityName(I: Integer; NewName: string); {$ENDIF}
 {$IFNDEF SCR} function TString(Template: string): string;
     function TPhrase(Item: string): string; {$ENDIF}
@@ -69 +72 @@
 function CityName(Founder: Integer): string;
 function ModelCode(const ModelInfo: TModelInfo): Integer;
-procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
+procedure FindStdModelPicture(Code: Integer; out pix: Integer; out Name: string);
 function GetTribeInfo(FileName: string; var Name: string; var Color: TColor): Boolean;
-procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; X, Y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 
@@ -212 +215 @@
 function Get: string;
 var
-  p: Integer;
+  P: Integer;
 begin
   while (Input <> '') and ((Input[1] = ' ') or (Input[1] = #9)) do
     Delete(Input, 1, 1);
-  p := Pos(',', Input);
-  if p = 0 then
-    p := Length(Input) + 1;
-  Result := Copy(Input, 1, p - 1);
-  Delete(Input, 1, p);
+  P := Pos(',', Input);
+  if P = 0 then
+    P := Length(Input) + 1;
+  Result := Copy(Input, 1, P - 1);
+  Delete(Input, 1, P);
 end;
 
 function GetNum: Integer;
 var
-  i: Integer;
-begin
-  Val(Get, Result, i);
-  if i <> 0 then
+  I: Integer;
+begin
+  Val(Get, Result, I);
+  if I <> 0 then
     Result := 0;
 end;
 
-procedure FindStdModelPicture(Code: Integer; var pix: Integer; var Name: string);
-var
-  i: Integer;
-begin
-  for i := 0 to StdUnitScript.Count - 1 do
+procedure FindStdModelPicture(Code: Integer; out pix: Integer; out Name: string);
+var
+  I: Integer;
+begin
+  for I := 0 to StdUnitScript.Count - 1 do
   begin // look through StdUnits
-    Input := StdUnitScript[i];
+    Input := StdUnitScript[I];
     pix := GetNum;
     if Code = GetNum then
@@ -281 +284 @@
   CloseFile(TribeScript);
   Result := Found = 3;
+end;
+
+{ TModelPictureInfo }
+
+function TModelPictureInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + SizeOf(mix) + SizeOf(pix) + SizeOf(Hash) + 1 +
+    Length(GrName);
 end;
 
@@ -329 +340 @@
 end;
 
-procedure FindPosition(HGr: TGraphicSet; x, y, xmax, ymax: Integer; Mark: TColor;
+procedure FindPosition(HGr: TGraphicSet; X, Y, xmax, ymax: Integer; Mark: TColor;
   var xp, yp: Integer);
 begin
   xp := 0;
-  while (xp < xmax) and (HGr.Data.Canvas.Pixels[x + 1 + xp, y] <> Mark) do
+  while (xp < xmax) and (HGr.Data.Canvas.Pixels[X + 1 + xp, Y] <> Mark) do
     Inc(xp);
   yp := 0;
-  while (yp < ymax) and (HGr.Data.Canvas.Pixels[x, y + 1 + yp] <> Mark) do
+  while (yp < ymax) and (HGr.Data.Canvas.Pixels[X, Y + 1 + yp] <> Mark) do
     Inc(yp);
 end;
 
-function TTribe.GetCityName(i: Integer): string;
+function TTribe.GetCityName(I: Integer): string;
 begin
   Result := '';
-  if nCityLines > i then
-  begin
-    Result := Script[CityLine0 + i];
+  if nCityLines > I then
+  begin
+    Result := Script[CityLine0 + I];
     while (Result <> '') and ((Result[1] = ' ') or (Result[1] = #9)) do
       Delete(Result, 1, 1);
@@ -351 +362 @@
 {$IFNDEF SCR}
   else
-    Result := Format(TPhrase('GENCITY'), [i + 1]);
+    Result := Format(TPhrase('GENCITY'), [I + 1]);
 {$ENDIF}
 end;
 
 {$IFNDEF SCR}
-procedure TTribe.SetCityName(i: Integer; NewName: string);
-begin
-  while nCityLines <= i do
+procedure TTribe.SetCityName(I: Integer; NewName: string);
+begin
+  while nCityLines <= I do
   begin
     Script.Insert(CityLine0 + nCityLines, Format(TPhrase('GENCITY'),
@@ -364 +375 @@
     Inc(nCityLines);
   end;
-  Script[CityLine0 + i] := NewName;
+  Script[CityLine0 + I] := NewName;
 end;
 
 function TTribe.TString(Template: string): string;
 var
-  p: Integer;
+  P: Integer;
   Variant: Char;
   CaseUp: Boolean;
 begin
   repeat
-    p := pos('#', Template);
-    if (p = 0) or (p = Length(Template)) then
+    P := Pos('#', Template);
+    if (P = 0) or (P = Length(Template)) then
       Break;
-    Variant := Template[p + 1];
+    Variant := Template[P + 1];
     CaseUp := Variant in ['A' .. 'Z'];
     if CaseUp then
       Inc(Variant, 32);
-    Delete(Template, p, 2);
+    Delete(Template, P, 2);
     if Variant in ['a' .. 'z'] then
     begin
       if NumberName < 0 then
-        Insert(Name[Variant], Template, p)
+        Insert(Name[Variant], Template, P)
       else
-        Insert(Format('P%d', [NumberName]), Template, p);
-      if CaseUp and (Length(Template) >= p) and
-        (Template[p] in ['a' .. 'z', #$E0 .. #$FF]) then
-        Dec(Template[p], 32);
+        Insert(Format('P%d', [NumberName]), Template, P);
+      if CaseUp and (Length(Template) >= P) and
+        (Template[P] in ['a' .. 'z', #$E0 .. #$FF]) then
+        Dec(Template[P], 32);
     end
   until False;
@@ -407 +418 @@
   TLine = array [0 .. 649, 0 .. 2] of Byte;
 var
-  i, x, Gray: Integer;
+  I, X, Gray: Integer;
   Item: string;
 begin
@@ -415 +426 @@
   with Script do
   begin
-    i := 0;
-    while (i < Count) and (Copy(Strings[i], 1, 6) <>
+    I := 0;
+    while (I < Count) and (Copy(Strings[I], 1, 6) <>
         '#AGE' + char(48 + Age) + ' ') do
-      Inc(i);
-    if i < Count then
-    begin
-      Input := Strings[i];
+      Inc(I);
+    if I < Count then
+    begin
+      Input := Strings[I];
       system.Delete(Input, 1, 6);
       Item := Get;
@@ -430 +441 @@
         if CompareText(Item, 'stdcities') = 0 then
           case cpix of
-            3:
-              cpix := 0;
-            6:
-            begin
+            3: cpix := 0;
+            6: begin
               cpix := 0;
               Item := 'Nation2';
-            end
+            end;
           end;
         cHGr := LoadGraphicSet(Item + '.png');
-        for x := 0 to 3 do
-          with CityPicture[x] do
-          begin
-            FindPosition(cHGr, x * 65, cpix * 49, 63, 47, $00FFFF,
+        for X := 0 to 3 do
+          with CityPicture[X] do begin
+            FindPosition(cHGr, X * 65, cpix * 49, 63, 47, $00FFFF,
               xShield, yShield);
             // FindPosition(cHGr,x*65,cpix*49,$FFFFFF,xf,yf);
@@ -478 +486 @@
 procedure TTribe.SetModelPicture(const Info: TModelPictureInfo; IsNew: Boolean);
 var
-  i: Integer;
+  I: Integer;
   ok: Boolean;
 begin
@@ -485 +493 @@
     if not IsNew then
     begin
-      i := nPictureList - 1;
-      while (i >= 0) and (PictureList[i].Hash <> Info.Hash) do
-        Dec(i);
-      assert(i >= 0);
-      assert(PictureList[i].HGr = LoadGraphicSet(GrName));
-      assert(PictureList[i].pix = pix);
-      ModelPicture[mix].HGr := PictureList[i].HGr;
-      ModelPicture[mix].pix := PictureList[i].pix;
-      ModelName[mix] := PictureList[i].ModelName;
+      I := nPictureList - 1;
+      while (I >= 0) and (PictureList[I].Hash <> Info.Hash) do
+        Dec(I);
+      Assert(I >= 0);
+      Assert(PictureList[I].HGr = LoadGraphicSet(GrName));
+      Assert(PictureList[I].pix = pix);
+      ModelPicture[mix].HGr := PictureList[I].HGr;
+      ModelPicture[mix].pix := PictureList[I].pix;
+      ModelName[mix] := PictureList[I].ModelName;
     end
     else
@@ -507 +515 @@
       // read model name from tribe script
       ok := False;
-      for i := 0 to Script.Count - 1 do
-      begin
-        Input := Script[i];
+      for I := 0 to Script.Count - 1 do
+      begin
+        Input := Script[I];
         if Input = '#UNITS ' + ExtractFileNameOnly(GrName) then
           ok := True
@@ -523 +531 @@
       if ModelName[mix] = '' then
       begin // read model name from StdUnits.txt
-        for i := 0 to StdUnitScript.Count - 1 do
+        for I := 0 to StdUnitScript.Count - 1 do
         begin
-          Input := StdUnitScript[i];
+          Input := StdUnitScript[I];
           if GetNum = pix then
           begin
@@ -559 +567 @@
   Code, Turn: Integer; ForceNew: Boolean): Boolean;
 var
-  i: Integer;
+  I: Integer;
   Cnt: Integer;
   HGr: TGraphicSet;
@@ -598 +606 @@
   if not ForceNew and (Picture.Hash > 0) then
   begin
-    for i := 0 to nPictureList - 1 do
-      if PictureList[i].Hash = Picture.Hash then
-      begin
-        Picture.GrName := PictureList[i].HGr.Name;
-        Picture.pix := PictureList[i].pix;
+    for I := 0 to nPictureList - 1 do
+      if PictureList[I].Hash = Picture.Hash then
+      begin
+        Picture.GrName := PictureList[I].HGr.Name;
+        Picture.pix := PictureList[I].pix;
         Result := False;
         Exit;
@@ -614 +622 @@
   TestPic.GrName := 'StdUnits.png';
   HGr := HGrStdUnits;
-  for i := 0 to StdUnitScript.Count - 1 do
+  for I := 0 to StdUnitScript.Count - 1 do
   begin // look through StdUnits
-    Input := StdUnitScript[i];
+    Input := StdUnitScript[I];
     Check;
   end;
 
   ok := False;
-  for i := 0 to Script.Count - 1 do
+  for I := 0 to Script.Count - 1 do
   begin // look through units defined in tribe script
-    Input := Script[i];
+    Input := Script[I];
     if Copy(Input, 1, 6) = '#UNITS' then
     begin

branches/highdpi/LocalPlayer/UnitStat.pas ¶

@@ -5 +5 @@
 
 uses
-  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC, IsoEngine;
+  UDpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Classes, Graphics, Controls, Forms, ButtonB, ButtonC, IsoEngine;
 
 type
+  TUnitStatDialogKind = (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit,
+    dkEnemyCityDefense, dkEnemyCity);
+
   TUnitStatDlg = class(TBufferedDrawDlg)
     SwitchBtn: TButtonB;
@@ -26 +28 @@
   private
     NoMap: TIsoMap;
+  protected
+    mixShow, // for dkOwnModel
+    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: Integer;
+    // for dkEnemyUnit, euixShow=-1 ->
+    mox: ^TModelInfo; // for dkEnemyModel
+    Kind: TUnitStatDialogKind;
+    Back: TDpiBitmap;
+    Template: TDpiBitmap;
+    procedure OffscreenPaint; override;
   public
     procedure CheckAge;
-    procedure ShowNewContent_OwnModel(NewMode, mix: integer);
-    procedure ShowNewContent_OwnUnit(NewMode, uix: integer);
-    procedure ShowNewContent_EnemyUnit(NewMode, euix: integer);
-    procedure ShowNewContent_EnemyLoc(NewMode, Loc: integer);
-    procedure ShowNewContent_EnemyModel(NewMode, emix: integer);
-    procedure ShowNewContent_EnemyCity(NewMode, Loc: integer);
-
-  protected
-    mixShow, // for dkOwnModel
-    uixShow, euixShow, ecixShow, UnitLoc, AgePrepared: integer;
-    // for dkEnemyUnit, euixShow=-1 ->
-    mox: ^TModelInfo; // for dkEnemyModel
-    Kind: (dkOwnModel, dkOwnUnit, dkEnemyModel, dkEnemyUnit, dkEnemyCityDefense,
-      dkEnemyCity);
-    Back, Template: TDpiBitmap;
-    procedure OffscreenPaint; override;
-  end;
-
-var
-  UnitStatDlg: TUnitStatDlg;
+    procedure ShowNewContent_OwnModel(NewMode: TWindowMode; mix: Integer);
+    procedure ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: Integer);
+    procedure ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: Integer);
+    procedure ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: Integer);
+    procedure ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
+    procedure ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
+  end;
+
 
 implementation
 
 uses
-  Tribes, Help, Directories, UTexture;
+  Term, Tribes, Help, Directories, Texture;
 
 {$R *.lfm}
@@ -82 +81 @@
   Back.PixelFormat := pf24bit;
   Back.SetSize(5 * wCommon, hMax);
-  Back.Canvas.FillRect(0, 0, Back.Width,Back.Height);
+  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
@@ -100 +99 @@
   if MainTexture.Age <> AgePrepared then begin
     AgePrepared := MainTexture.Age;
-    DpiBitCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
+    DpiBitBltCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hOwnModel) div 2);
-    DpiBitCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
+    DpiBitBltCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyModel) div 2);
-    DpiBitCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
+    DpiBitBltCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyUnit) div 2);
-    DpiBitCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
+    DpiBitBltCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyCityDefense) div 2);
-    DpiBitCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
+    DpiBitBltCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
       MainTexture.Image.Canvas, (MainTexture.Width - wCommon) div 2,
       (MainTexture.Height - hEnemyCity) div 2);
@@ -121 +120 @@
 procedure TUnitStatDlg.FormShow(Sender: TObject);
 var
-  owner, mix: integer;
-  IsSpecialUnit: boolean;
+  Owner, mix: Integer;
+  IsSpecialUnit: Boolean;
 begin
   if Kind in [dkEnemyUnit, dkEnemyCityDefense, dkEnemyCity] then
@@ -132 +131 @@
         euixShow := MyRO.nEnemyUn - 1;
         while (euixShow >= 0) and (MyRO.EnemyUn[euixShow].Loc <> UnitLoc) do
-          dec(euixShow);
-        assert(euixShow >= 0);
+          Dec(euixShow);
+        Assert(euixShow >= 0);
       end;
       with MyRO.EnemyUn[euixShow] do
       begin
         mox := @MyRO.EnemyModel[emix];
-        if not Assigned(Tribe[owner].ModelPicture[mix].HGr) then
+        if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
           InitEnemyModel(emix);
-      end
+      end;
     end
     else
@@ -148 +147 @@
       ecixShow := MyRO.nEnemyCity - 1;
       while (ecixShow >= 0) and (MyRO.EnemyCity[ecixShow].Loc <> UnitLoc) do
-        dec(ecixShow);
-      assert(ecixShow >= 0);
+        Dec(ecixShow);
+      Assert(ecixShow >= 0);
     end;
   end;
   case Kind of
-    dkOwnModel:
-      ClientHeight := hOwnModel;
-    dkOwnUnit:
-      ClientHeight := hEnemyUnit;
-    dkEnemyModel:
-      ClientHeight := hEnemyModel;
-    dkEnemyUnit:
-      ClientHeight := hEnemyUnit;
-    dkEnemyCityDefense:
-      ClientHeight := hEnemyCityDefense;
-    dkEnemyCity:
-      ClientHeight := hEnemyCity;
+    dkOwnModel: ClientHeight := hOwnModel;
+    dkOwnUnit: ClientHeight := hEnemyUnit;
+    dkEnemyModel: ClientHeight := hEnemyModel;
+    dkEnemyUnit: ClientHeight := hEnemyUnit;
+    dkEnemyCityDefense: ClientHeight := hEnemyCityDefense;
+    dkEnemyCity: ClientHeight := hEnemyCity;
   end;
 
@@ -171 +164 @@
     Left := UserLeft;
     Top := UserTop;
-  end
-  else
-  begin
+  end else begin
     Left := (DpiScreen.Width - Width) div 2;
     Top := (DpiScreen.Height - Height) div 2;
   end;
 
-  SwitchBtn.Visible := not supervising and (Kind = dkOwnModel);
-  ConscriptsBtn.Visible := not supervising and (Kind = dkOwnModel) and
+  SwitchBtn.Visible := not Supervising and (Kind = dkOwnModel);
+  ConscriptsBtn.Visible := not Supervising and (Kind = dkOwnModel) and
     (MyRO.Tech[adConscription] >= tsApplicable) and
     (MyModel[mixShow].Domain = dGround) and (MyModel[mixShow].Kind < mkScout);
-  IsSpecialUnit := false;
+  IsSpecialUnit := False;
   if Kind in [dkEnemyCity, dkEnemyCityDefense] then
     Caption := CityName(MyRO.EnemyCity[ecixShow].ID)
@@ -188 +179 @@
   begin
     case Kind of
-      dkOwnModel:
-        begin
-          owner := me;
-          mix := mixShow;
-          IsSpecialUnit := MyModel[mix].Kind >= $10;
-        end;
-      dkOwnUnit:
-        begin
-          owner := me;
-          mix := MyUn[uixShow].mix;
-          IsSpecialUnit := MyModel[mix].Kind >= $10;
-        end
-    else
-      begin
-        owner := mox.owner;
+      dkOwnModel: begin
+        Owner := Me;
+        mix := mixShow;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      dkOwnUnit: begin
+        Owner := Me;
+        mix := MyUn[uixShow].mix;
+        IsSpecialUnit := MyModel[mix].Kind >= $10;
+      end;
+      else begin
+        Owner := mox.Owner;
         mix := mox.mix;
         IsSpecialUnit := mox.Kind >= $10;
@@ -218 +206 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode, mix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnModel(NewMode: TWindowMode; mix: Integer);
 begin
   Kind := dkOwnModel;
@@ -225 +213 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode, uix: integer);
+procedure TUnitStatDlg.ShowNewContent_OwnUnit(NewMode: TWindowMode; uix: Integer);
 begin
   Kind := dkOwnUnit;
@@ -232 +220 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode, euix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyUnit(NewMode: TWindowMode; euix: Integer);
 begin
   Kind := dkEnemyUnit;
@@ -240 +228 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyLoc(NewMode: TWindowMode; Loc: Integer);
 begin
   Kind := dkEnemyUnit;
@@ -248 +236 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode, emix: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyModel(NewMode: TWindowMode; emix: Integer);
 begin
   Kind := dkEnemyModel;
@@ -255 +243 @@
 end;
 
-procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode, Loc: integer);
+procedure TUnitStatDlg.ShowNewContent_EnemyCity(NewMode: TWindowMode; Loc: Integer);
 begin
   if MyMap[Loc] and fUnit <> 0 then
@@ -271 +259 @@
   begin
     UserLeft := Left;
-    UserTop := Top
-  end;
-  if OffscreenUser = self then
+    UserTop := Top;
+  end;
+  if OffscreenUser = Self then
     OffscreenUser := nil;
 end;
@@ -286 +274 @@
   PPicture: ^TModelPicture;
 
-  function IsToCount(emix: integer): boolean;
+  function IsToCount(emix: Integer): Boolean;
   var
     PTestPicture: ^TModelPicture;
@@ -294 +282 @@
       PTestPicture := @Tribe[MyRO.EnemyModel[emix].owner].ModelPicture
         [MyRO.EnemyModel[emix].mix];
-      result := (PPicture.HGr = PTestPicture.HGr) and
+      Result := (PPicture.HGr = PTestPicture.HGr) and
         (PPicture.pix = PTestPicture.pix) and
         (ModelHash(mox^) = ModelHash(MyRO.EnemyModel[emix]));
     end
     else
-      result := (MyRO.EnemyModel[emix].owner = mox.owner) and
+      Result := (MyRO.EnemyModel[emix].owner = mox.owner) and
         (MyRO.EnemyModel[emix].mix = mox.mix);
   end;
 
-  procedure FeatureBar(dst: TDpiBitmap; x, y: integer; const mi: TModelInfo;
+  procedure FeatureBar(dst: TDpiBitmap; X, Y: Integer; const mi: TModelInfo;
     T: TTexture);
   var
-    i, w, dx, num: integer;
-    s: string;
-  begin
-    DarkGradient(dst.Canvas, x - 6, y + 1, 180, 1);
+    I, W, dx, num: Integer;
+    S: string;
+  begin
+    DarkGradient(dst.Canvas, X - 6, Y + 1, 180, 1);
     with dst.Canvas do
       if mi.Kind >= $10 then
       begin
-        s := Phrases.Lookup('UNITSPECIAL');
+        S := Phrases.Lookup('UNITSPECIAL');
         Font.Color := $000000;
-        Textout(x - 1, y + 1, s);
+        Textout(X - 1, Y + 1, S);
         Font.Color := $B0B0B0;
-        Textout(x - 2, y, s);
+        Textout(X - 2, Y, S);
       end
       else
@@ -323 +311 @@
         Font.Color := $000000;
         dx := 2;
-        for i := 3 to nFeature - 1 do
+        for I := 3 to nFeature - 1 do
         begin
           num := 0;
-          case i of
+          case I of
             mcSeaTrans:
               if mi.Domain = dSea then
@@ -342 +330 @@
                 num := mi.TTrans;
             mcFirstNonCap .. nFeature - 1:
-              if mi.Cap and (1 shl (i - mcFirstNonCap)) <> 0 then
-                num := 1
+              if mi.Cap and (1 shl (I - mcFirstNonCap)) <> 0 then
+                num := 1;
           end;
           if (num > 0) and
-            ((i <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
+            ((I <> mcSE) or (mi.Cap and (1 shl (mcNP - mcFirstNonCap)) = 0))
           then
           begin
             if num > 1 then
             begin
-              s := IntToStr(num);
-              w := TextWidth(s);
+              S := IntToStr(num);
+              W := TextWidth(S);
               Brush.Color := $FFFFFF;
-              FillRect(Rect(x - 3 + dx, y + 2, x + w - 1 + dx, y + 16));
+              FillRect(Rect(X - 3 + dx, Y + 2, X + W - 1 + dx, Y + 16));
               Brush.Style := bsClear;
-              Textout(x - 3 + dx + 1, y, s);
-              inc(dx, w + 1)
+              Textout(X - 3 + dx + 1, Y, S);
+              Inc(dx, W + 1);
             end;
             Brush.Color := $C0C0C0;
-            FrameRect(Rect(x - 3 + dx, y + 2, x + 11 + dx, y + 16));
+            FrameRect(Rect(X - 3 + dx, Y + 2, X + 11 + dx, Y + 16));
             Brush.Style := bsClear;
-            Sprite(dst, HGrSystem, x - 1 + dx, y + 4, 10, 10,
-              66 + i mod 11 * 11, 137 + i div 11 * 11);
-            inc(dx, 15)
+            Sprite(dst, HGrSystem, X - 1 + dx, Y + 4, 10, 10,
+              66 + I mod 11 * 11, 137 + I div 11 * 11);
+            Inc(dx, 15);
           end;
         end;
       end;
-  end; { featurebar }
-
-  procedure NumberBarS(dst: TDpiBitmap; x, y: integer; Cap, s: string; T: TTexture);
-  begin
-    DLine(dst.Canvas, x - 2, x + 170, y + 16, T.ColorBevelShade, T.ColorBevelLight);
-    LoweredTextOut(dst.Canvas, -1, T, x - 2, y, Cap);
-    RisedTextout(dst.Canvas, x + 170 - BiColorTextWidth(dst.Canvas, s), y, s);
+  end;
+
+  procedure NumberBarS(dst: TDpiBitmap; X, Y: Integer; Cap, S: string; T: TTexture);
+  begin
+    DLine(dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade, T.ColorBevelLight);
+    LoweredTextOut(dst.Canvas, -1, T, X - 2, Y, Cap);
+    RisedTextout(dst.Canvas, X + 170 - BiColorTextWidth(dst.Canvas, S), Y, S);
   end;
 
 var
-  i, j, x, y, cix, uix, emix, InProd, Available, Destroyed, Loc, Cnt, yView,
-    yTotal, yCaption: integer;
-  s: string;
+  I, J, X, Y, cix, uix, emix, InProd, Available, Destroyed, Loc, Cnt, yView,
+    yTotal, yCaption: Integer;
+  S: string;
   ui: TUnitInfo;
   mi: TModelInfo;
@@ -387 +375 @@
 
   case Kind of
-    dkOwnModel:
-      begin
-        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hOwnModel,
-          Back.Canvas, 0, 0);
-        yView := 13;
-        yTotal := 92;
-      end;
-    dkEnemyModel:
-      begin
-        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
-          Back.Canvas, wCommon, 0);
-        yView := 13;
-        yTotal := 92;
-      end;
-    dkEnemyUnit, dkOwnUnit:
-      begin
-        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
-          Back.Canvas, 2 * wCommon, 0);
-        yView := 13;
-        yTotal := 123;
-      end;
-    dkEnemyCityDefense:
-      begin
-        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
-          Back.Canvas, 3 * wCommon, 0);
-        yView := 171;
-        yTotal := 231;
-      end;
-    dkEnemyCity:
-      begin
-        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
-          Back.Canvas, 4 * wCommon, 0);
-      end;
+    dkOwnModel: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+        Back.Canvas, 0, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyModel: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+        Back.Canvas, wCommon, 0);
+      yView := 13;
+      yTotal := 92;
+    end;
+    dkEnemyUnit, dkOwnUnit: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+        Back.Canvas, 2 * wCommon, 0);
+      yView := 13;
+      yTotal := 123;
+    end;
+    dkEnemyCityDefense: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+        Back.Canvas, 3 * wCommon, 0);
+      yView := 171;
+      yTotal := 231;
+    end;
+    dkEnemyCity: begin
+      DpiBitBltCanvas(Offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+        Back.Canvas, 4 * wCommon, 0);
+    end;
   end;
   MarkUsedOffscreen(ClientWidth, ClientHeight);
@@ -427 +410 @@
   begin // show city defense facilities
     Cnt := 0;
-    for i := 0 to 3 do
-      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
-        inc(Cnt);
-    x := (wCommon - Cnt * xSizeSmall) div 2 - (Cnt - 1) * 2;
-    for i := 0 to 3 do
-      if MyRO.EnemyCity[ecixShow].Flags and (2 shl i) <> 0 then
-      begin
-        case i of
-          0: j := imWalls;
-          1: j := imCoastalFort;
-          2: j := imMissileBat;
-          3: j := imBunker
+    for I := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl I) <> 0 then
+        Inc(Cnt);
+    X := (wCommon - Cnt * xSizeSmall) div 2 - (Cnt - 1) * 2;
+    for I := 0 to 3 do
+      if MyRO.EnemyCity[ecixShow].Flags and (2 shl I) <> 0 then
+      begin
+        case I of
+          0: J := imWalls;
+          1: J := imCoastalFort;
+          2: J := imMissileBat;
+          3: J := imBunker;
         end;
-        Frame(offscreen.Canvas, x - 1, yImp - 1, x + xSizeSmall,
+        Frame(Offscreen.Canvas, X - 1, yImp - 1, X + xSizeSmall,
           yImp + ySizeSmall, MainTexture.ColorBevelLight,
           MainTexture.ColorBevelShade);
-        DpiBitCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
-          SmallImp.Canvas, j mod 7 * xSizeSmall,
-          (j + SystemIconLines * 7) div 7 * ySizeSmall);
-        inc(x, xSizeSmall + 4);
+        DpiBitBltCanvas(Offscreen.Canvas, X, yImp, xSizeSmall, ySizeSmall,
+          SmallImp.Canvas, J mod 7 * xSizeSmall,
+          (J + SystemIconLines * 7) div 7 * ySizeSmall);
+        Inc(X, xSizeSmall + 4);
       end;
   end;
@@ -454 +437 @@
     PPicture := @Tribe[mox.owner].ModelPicture[mox.mix];
     Available := 0;
-    if G.Difficulty[me] = 0 then // supervisor -- count stacked units too
+    if G.Difficulty[Me] = 0 then // supervisor -- count stacked units too
       for Loc := 0 to G.lx * G.ly - 1 do
       begin
         if MyMap[Loc] and fUnit <> 0 then
         begin
-          Server(sGetUnits, me, Loc, Cnt);
+          Server(sGetUnits, Me, Loc, Cnt);
           for uix := 0 to Cnt - 1 do
             if IsToCount(MyRO.EnemyUn[MyRO.nEnemyUn + uix].emix) then
-              inc(Available);
+              Inc(Available);
         end;
       end
@@ -469 +452 @@
         if (MyRO.EnemyUn[uix].Loc >= 0) and IsToCount(MyRO.EnemyUn[uix].emix)
         then
-          inc(Available);
+          Inc(Available);
     Destroyed := 0;
     for emix := 0 to MyRO.nEnemyModel - 1 do
       if IsToCount(emix) then
-        inc(Destroyed, MyRO.EnemyModel[emix].Lost);
+        Inc(Destroyed, MyRO.EnemyModel[emix].Lost);
   end
   else
@@ -480 +463 @@
     for uix := 0 to MyRO.nUn - 1 do
       if (MyUn[uix].Loc >= 0) and (MyUn[uix].mix = mixShow) then
-        inc(Available);
+        Inc(Available);
     InProd := 0;
     for cix := 0 to MyRO.nCity - 1 do
       if (MyCity[cix].Loc >= 0) and
         (MyCity[cix].Project and (cpImp + cpIndex) = mixShow) then
-        inc(InProd);
-  end;
-
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+        Inc(InProd);
+  end;
+
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   if Kind in [dkEnemyCityDefense, dkEnemyCity] then
   begin
-    NoMap.SetOutput(offscreen);
-    NoMap.PaintCity(ClientWidth div 2, 53, MyRO.EnemyCity[ecixShow], false);
-
-    s := Tribe[MyRO.EnemyCity[ecixShow].owner].TPhrase('UNITOWNER');
-    LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-      (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2, 105, s);
+    NoMap.SetOutput(Offscreen);
+    NoMap.PaintCity(ClientWidth div 2, 53, MyRO.EnemyCity[ecixShow], False);
+
+    S := Tribe[MyRO.EnemyCity[ecixShow].owner].TPhrase('UNITOWNER');
+    LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+      (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2, 105, S);
   end;
 
@@ -502 +485 @@
   begin // show unit stats
     if Kind = dkOwnModel then
-      MakeModelInfo(me, mixShow, MyModel[mixShow], mi)
+      MakeModelInfo(Me, mixShow, MyModel[mixShow], mi)
     else if Kind = dkOwnUnit then
     begin
-      MakeUnitInfo(me, MyUn[uixShow], ui);
-      MakeModelInfo(me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi);
+      MakeUnitInfo(Me, MyUn[uixShow], ui);
+      MakeModelInfo(Me, MyUn[uixShow].mix, MyModel[MyUn[uixShow].mix], mi);
     end
     else
@@ -522 +505 @@
           { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,
             MainTexture.ColorBevelShade,MainTexture.ColorBevelLight);
-            RFrame(offscreen.canvas,xView-2,yView-2,xView+65,yView+49,
+            RFrame(Offscreen.Canvas,xView-2,yView-2,xView+65,yView+49,
             MainTexture.ColorBevelShade,MainTexture.ColorBevelLight); }
-          with offscreen.Canvas do
+          with Offscreen.Canvas do
           begin
             Brush.Color := HGrSystem.Data.Canvas.Pixels[98, 67];
-            offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
+            Offscreen.Canvas.FillRect(Rect(xView, yView, xView + 64,
               yView + 16));
             Brush.Style := bsClear;
@@ -534 +517 @@
           if MyMap[Loc] and fTerrain >= fForest then
           begin
-            x := 1 + 2 * (xxt * 2 + 1);
-            y := 1 + yyt + 2 * (yyt * 3 + 1);
+            X := 1 + 2 * (xxt * 2 + 1);
+            Y := 1 + yyt + 2 * (yyt * 3 + 1);
           end
           else
           begin
-            x := integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
-            y := 1 + yyt;
+            X := Integer(MyMap[Loc] and fTerrain) * (xxt * 2 + 1) + 1;
+            Y := 1 + yyt;
           end;
-          for j := -1 to 1 do
-            for i := -1 to 1 do
-              if (i + j) and 1 = 0 then
+          for J := -1 to 1 do
+            for I := -1 to 1 do
+              if (I + J) and 1 = 0 then
               begin
-                Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2,
-                  yyt * 2, x, y);
+                Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2,
+                  yyt * 2, X, Y);
                 if MyMap[Loc] and (fTerrain or fSpecial) = fGrass or fSpecial1
                 then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 2 * (xxt * 2 + 1), 1 + yyt + 1 * (yyt * 3 + 1))
                 else if (MyMap[Loc] and fTerrain = fForest) and
                   IsJungle(Loc div G.lx) then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 7 * (xxt * 2 + 1), 1 + yyt + 19 * (yyt * 3 + 1))
                 else if MyMap[Loc] and fTerrain >= fForest then
-                  Sprite(Buffer, HGrTerrain, i * xxt, j * yyt, xxt * 2, yyt * 2,
+                  Sprite(Buffer, HGrTerrain, I * xxt, J * yyt, xxt * 2, yyt * 2,
                     1 + 7 * (xxt * 2 + 1),
-                    1 + yyt + 2 * integer(2 + MyMap[Loc] and fTerrain - fForest)
+                    1 + yyt + 2 * Integer(2 + MyMap[Loc] and fTerrain - fForest)
                     * (yyt * 3 + 1));
               end;
-          DpiBitCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
+          DpiBitBltCanvas(Offscreen.Canvas, xView, yView + 16, 64, 32,
             Buffer.Canvas, 1, 0);
 
           // show unit, experience and health
-          Sprite(offscreen, HGr, xView, yView, 64, 48, pix mod 10 * 65 + 1,
+          Sprite(Offscreen, HGr, xView, yView, 64, 48, pix mod 10 * 65 + 1,
             pix div 10 * 49 + 1);
           if Flags and unFortified <> 0 then
-            Sprite(offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
+            Sprite(Offscreen, HGrStdUnits, xView, yView, xxu * 2, yyu * 2,
               1 + 6 * (xxu * 2 + 1), 1);
-          FrameImage(offscreen.Canvas, HGrSystem.Data, xView - 20,
+          FrameImage(Offscreen.Canvas, HGrSystem.Data, xView - 20,
             yView + 5, 12, 14, 121 + Exp div ExpCost * 13, 28);
           if Health < 100 then
           begin
-            s := IntToStr(Health) + '%';
-            LightGradient(offscreen.Canvas, xView - 45, yView + 24, 38,
+            S := IntToStr(Health) + '%';
+            LightGradient(Offscreen.Canvas, xView - 45, yView + 24, 38,
               (ColorOfHealth(Health) and $FEFEFE shr 2) * 3);
-            RisedTextout(offscreen.Canvas, xView - 45 + 20 -
-              BiColorTextWidth(offscreen.Canvas, s) div 2, yView + 23, s);
+            RisedTextout(Offscreen.Canvas, xView - 45 + 20 -
+              BiColorTextWidth(Offscreen.Canvas, S) div 2, yView + 23, S);
           end;
 
           if Kind = dkEnemyUnit then
           begin
-            s := Tribe[mox.owner].TPhrase('UNITOWNER');
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture,
-              (ClientWidth - BiColorTextWidth(offscreen.Canvas, s)) div 2,
-              yView + 80, s);
+            S := Tribe[mox.owner].TPhrase('UNITOWNER');
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture,
+              (ClientWidth - BiColorTextWidth(Offscreen.Canvas, S)) div 2,
+              yView + 80, S);
           end;
         end
       else
       begin
-        FrameImage(offscreen.Canvas, BigImp, xView + 4, yView, 56, 40, 0, 0);
-        Sprite(offscreen, HGr, xView, yView - 4, 64, 44, pix mod 10 * 65 + 1,
+        FrameImage(Offscreen.Canvas, BigImp, xView + 4, yView, 56, 40, 0, 0);
+        Sprite(Offscreen, HGr, xView, yView - 4, 64, 44, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1);
       end;
 
-      DarkGradient(offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
-      RisedTextout(offscreen.Canvas, xTotal - 2, yTotal,
+      DarkGradient(Offscreen.Canvas, xTotal - 6, yTotal + 1, 180, 2);
+      RisedTextout(Offscreen.Canvas, xTotal - 2, yTotal,
         Phrases.Lookup('UNITSTRENGTH'));
-      s := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
-      RisedTextout(offscreen.Canvas,
-        xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s), yTotal, s);
-      FeatureBar(offscreen, xTotal, yTotal + 19, mi, MainTexture);
-      NumberBarS(offscreen, xTotal, yTotal + 38, Phrases.Lookup('UNITSPEED'),
+      S := IntToStr(mi.Attack) + '/' + IntToStr(mi.Defense);
+      RisedTextout(Offscreen.Canvas,
+        xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S), yTotal, S);
+      FeatureBar(Offscreen, xTotal, yTotal + 19, mi, MainTexture);
+      NumberBarS(Offscreen, xTotal, yTotal + 38, Phrases.Lookup('UNITSPEED'),
         MovementToString(mi.Speed), MainTexture);
-      LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2, yTotal + 57,
+      LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2, yTotal + 57,
         Phrases.Lookup('UNITCOST'));
-      DLine(offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
+      DLine(Offscreen.Canvas, xTotal - 2, xTotal + 170, yTotal + 57 + 16,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
-      if G.Difficulty[me] = 0 then
-        s := IntToStr(mi.cost)
+      if G.Difficulty[Me] = 0 then
+        S := IntToStr(mi.cost)
       else
-        s := IntToStr(mi.cost * BuildCostMod[G.Difficulty[me]] div 12);
-      RisedTextout(offscreen.Canvas,
-        xTotal + 159 - BiColorTextWidth(offscreen.Canvas, s), yTotal + 57, s);
-      Sprite(offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
+        S := IntToStr(mi.cost * BuildCostMod[G.Difficulty[Me]] div 12);
+      RisedTextout(Offscreen.Canvas,
+        xTotal + 159 - BiColorTextWidth(Offscreen.Canvas, S), yTotal + 57, S);
+      Sprite(Offscreen, HGrSystem, xTotal + 160, yTotal + 57 + 5, 10,
         10, 88, 115);
 
@@ -624 +607 @@
         begin
           if MyModel[mixShow].Kind = mkEnemyDeveloped then
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2,
               (yTotal + StatDown - 19), Phrases.Lookup('UNITADOPT'))
           else
-            LoweredTextOut(offscreen.Canvas, -1, MainTexture, xTotal - 2,
+            LoweredTextOut(Offscreen.Canvas, -1, MainTexture, xTotal - 2,
               (yTotal + StatDown - 19), Phrases.Lookup('UNITINTRO'));
-          DLine(offscreen.Canvas, xTotal - 2, xTotal + 170,
+          DLine(Offscreen.Canvas, xTotal - 2, xTotal + 170,
             (yTotal + StatDown - 19) + 16, MainTexture.ColorTextShade,
             MainTexture.ColorTextLight);
-          s := TurnToString(MyModel[mixShow].IntroTurn);
-          RisedTextout(offscreen.Canvas,
-            xTotal + 170 - BiColorTextWidth(offscreen.Canvas, s),
-            (yTotal + StatDown - 19), s);
+          S := TurnToString(MyModel[mixShow].IntroTurn);
+          RisedTextout(Offscreen.Canvas,
+            xTotal + 170 - BiColorTextWidth(Offscreen.Canvas, S),
+            (yTotal + StatDown - 19), S);
         end;
 
-        NumberBar(offscreen, xTotal, yTotal + StatDown,
+        NumberBar(Offscreen, xTotal, yTotal + StatDown,
           Phrases.Lookup('UNITBUILT'), MyModel[mixShow].Built, MainTexture);
         if MyModel[mixShow].Lost > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 19,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 19,
             Phrases.Lookup('UNITLOST'), MyModel[mixShow].Lost, MainTexture);
         if InProd > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 57,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 57,
             Phrases.Lookup('UNITINPROD'), InProd, MainTexture);
         if Available > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown + 38,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown + 38,
             Phrases.Lookup('UNITAVAILABLE'), Available, MainTexture);
 
@@ -674 +657 @@
       begin
         if Destroyed > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown - 19,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown - 19,
             Phrases.Lookup('UNITDESTROYED'), Destroyed, MainTexture);
         if Available > 0 then
-          NumberBar(offscreen, xTotal, yTotal + StatDown,
+          NumberBar(Offscreen, xTotal, yTotal + StatDown,
             Phrases.Lookup('UNITKNOWN'), Available, MainTexture);
       end;
@@ -683 +666 @@
   end;
 
-  offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftNormal]);
   case Kind of
     dkOwnModel, dkEnemyModel:
@@ -692 +675 @@
       yCaption := 79;
   end;
-  RisedTextout(offscreen.Canvas,
-    (ClientWidth - BiColorTextWidth(offscreen.Canvas, Caption)) div 2,
+  RisedTextout(Offscreen.Canvas,
+    (ClientWidth - BiColorTextWidth(Offscreen.Canvas, Caption)) div 2,
     yCaption, Caption);
-end; { OffscreenPaint }
+end;
 
 procedure TUnitStatDlg.ModelBoxChange(Sender: TObject);
@@ -734 +717 @@
 procedure TUnitStatDlg.HelpBtnClick(Sender: TObject);
 begin
-  HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
+  MainScreen.HelpDlg.ShowNewContent(wmPersistent, hkModel, 0);
 end;
 

branches/highdpi/LocalPlayer/Wonders.pas ¶

@@ -23 +23 @@
     Selection: Integer;
     Center: TPoint;
-    procedure DarkIcon(i: Integer);
-    procedure Glow(i, GlowColor: Integer);
+    procedure DarkIcon(I: Integer);
+    procedure Glow(I, GlowColor: Integer);
     procedure PaintBackgroundShape;
   public
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: Integer);
-  end;
-
-var
-  WondersDlg: TWondersDlg;
+    procedure ShowNewContent(NewMode: TWindowMode);
+  end;
 
 
@@ -38 +35 @@
 
 uses
-  Term, ClientTools, Help, Tribes, UPixelPointer;
+  Term, ClientTools, Help, Tribes, PixelPointer;
 
 {$R *.lfm}
@@ -76 +73 @@
 procedure TWondersDlg.FormShow(Sender: TObject);
 begin
+  Caption := Phrases.Lookup('TITLE_WONDERS');
   Selection := -1;
   OffscreenPaint;
 end;
 
-procedure TWondersDlg.ShowNewContent(NewMode: Integer);
+procedure TWondersDlg.ShowNewContent(NewMode: TWindowMode);
 begin
   inherited ShowNewContent(NewMode);
@@ -109 +107 @@
   Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
-  Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
-  Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
-  Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
+  Line[0] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
-      r := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
+      R := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
       ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
-      if (r < ScaleToNative(8) * Height * Width * Width) and
-        ((r >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
+      if (R < ScaleToNative(8) * Height * Width * Width) and
+        ((R >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
         ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
         ((ax < amax1 * X) or (ax > amin3 * X))) then begin
         for ch := 0 to 2 do begin
-          c := Line[0].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[0].Pixel^.Planes[ch] := 0
-            else Line[0].Pixel^.Planes[ch] := c;
-          c := Line[1].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[1].Pixel^.Planes[ch] := 0
-            else Line[1].Pixel^.Planes[ch] := c;
-          c := Line[2].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[2].Pixel^.Planes[ch] := 0
-            else Line[2].Pixel^.Planes[ch] := c;
-          c := Line[3].Pixel^.Planes[ch] - Darken;
-          if c < 0 then Line[3].Pixel^.Planes[ch] := 0
-            else Line[3].Pixel^.Planes[ch] := c;
+          C := Line[0].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[0].Pixel^.Planes[ch] := 0
+            else Line[0].Pixel^.Planes[ch] := C;
+          C := Line[1].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[1].Pixel^.Planes[ch] := 0
+            else Line[1].Pixel^.Planes[ch] := C;
+          C := Line[2].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[2].Pixel^.Planes[ch] := 0
+            else Line[2].Pixel^.Planes[ch] := C;
+          C := Line[3].Pixel^.Planes[ch] - Darken;
+          if C < 0 then Line[3].Pixel^.Planes[ch] := 0
+            else Line[3].Pixel^.Planes[ch] := C;
         end;
       end;
@@ -149 +147 @@
 end;
 
-procedure TWondersDlg.DarkIcon(i: Integer);
+procedure TWondersDlg.DarkIcon(I: Integer);
 var
-  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
+  X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, C: Integer;
   Src, Dst: TPixelPointer;
 begin
   Offscreen.BeginUpdate;
-  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X;
-  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y;
-  x0Src := (i mod 7) * xSizeBig;
-  y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
-  Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X;
+  y0Dst := ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y;
+  x0Src := (I mod 7) * xSizeBig;
+  y0Src := (I div 7 + SystemIconLines) * ySizeBig;
+  Src := TPixelPointer.Create(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := TPixelPointer.Create(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
   for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
     for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
@@ -166 +164 @@
         15 + (255 - Src.Pixel^.R) * 9) div 128;
       for ch := 0 to 2 do begin
-        c := Dst.Pixel^.Planes[ch] - Darken;
-        if c < 0 then Dst.Pixel^.Planes[ch] := 0
-          else Dst.Pixel^.Planes[ch] := c;
+        C := Dst.Pixel^.Planes[ch] - Darken;
+        if C < 0 then Dst.Pixel^.Planes[ch] := 0
+          else Dst.Pixel^.Planes[ch] := C;
       end;
       Src.NextPixel;
@@ -179 +177 @@
 end;
 
-procedure TWondersDlg.Glow(i, GlowColor: Integer);
+procedure TWondersDlg.Glow(I, GlowColor: Integer);
 begin
   GlowFrame(Offscreen,
-    ClientWidth div 2 - xSizeBig div 2 + RingPosition[i].X,
-    ClientHeight div 2 - ySizeBig div 2 + RingPosition[i].Y,
+    ClientWidth div 2 - xSizeBig div 2 + RingPosition[I].X,
+    ClientHeight div 2 - ySizeBig div 2 + RingPosition[I].Y,
     xSizeBig, ySizeBig, GlowColor);
 end;
@@ -235 +233 @@
         WonderDestroyed: begin
           HaveWonder := True;
-          DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig,
@@ -243 +241 @@
         else begin
           HaveWonder := True;
-          DpiBitCanvas(Offscreen.Canvas,
+          DpiBitBltCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig, ySizeBig,
@@ -280 +278 @@
 
   MarkUsedOffscreen(ClientWidth, ClientHeight);
-end; { OffscreenPaint }
+end;
 
 procedure TWondersDlg.CloseBtnClick(Sender: TObject);
@@ -350 +348 @@
 begin
   if Selection >= 0 then
-    HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, Selection);
+    MainScreen.HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Selection);
 end;