Changeset 210 for branches/highdpi/LocalPlayer

Timestamp:

May 9, 2020, 4:02:07 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

Location:

branches/highdpi/LocalPlayer

Files:

• Battle.lfm (modified) ( previous)
• Battle.pas (modified) (6 diffs)
• CityScreen.pas (modified) (19 diffs)
• CityType.lfm (modified) ( previous)
• CityType.pas (modified) (8 diffs)
• ClientTools.pas (modified) (1 diff)
• Diagram.pas (modified) (1 diff)
• Draft.pas (modified) (3 diffs)
• Enhance.lfm (modified) ( previous)
• Enhance.pas (modified) (3 diffs)
• Help.lfm (modified) (5 diffs)
• Help.pas (modified) (105 diffs)
• IsoEngine.pas (modified) (33 diffs)
• LocalPlayer.pas (modified) (2 diffs)
• MessgEx.pas (modified) (20 diffs)
• NatStat.pas (modified) (4 diffs)
• Nego.lfm (modified) ( previous)
• Nego.pas (modified) (2 diffs)
• PVSB.pas (modified) (3 diffs)
• Rates.lfm (modified) ( previous)
• Rates.pas (modified) (4 diffs)
• Select.pas (modified) (6 diffs)
• TechTree.lfm (modified) ( previous)
• TechTree.pas (modified) (10 diffs)
• Term.lfm (modified) (20 diffs)
• Term.pas (modified) (46 diffs)
• UnitStat.pas (modified) (10 diffs)
• Wonders.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, Messg, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg;
 
 type
@@ -107 +107 @@
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
-  DpiBitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Mask.Canvas.Handle, 26, 146, SRCAND);
-  DpiBitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Data.Canvas.Handle, 26, 146, SRCPAINT);
+  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Mask.Canvas, 26, 146, SRCAND);
+  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Data.Canvas, 26, 146, SRCPAINT);
 
   LabelText := Format('%d', [Forecast.AStr]);
@@ -132 +132 @@
   if Forecast.EndHealthDef <= 0 then
   begin
-    DpiBitBlt(ca.Handle, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+    DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [DDamage]);
@@ -152 +152 @@
   if Forecast.EndHealthAtt <= 0 then
   begin
-    DpiBitBlt(ca.Handle, xm - 6, ym + 9 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+    DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);
@@ -173 +173 @@
 
   NoMap.SetOutput(Buffer);
-  DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm + 8 + 4,
-    ym - 8 - 12 - 48, SRCCOPY);
+  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
+    ym - 8 - 12 - 48);
   { if TerrType<fForest then
     Sprite(Buffer,HGrTerrain,0,16,66,32,1+TerrType*(xxt*2+1),1+yyt)
@@ -185 +185 @@
     end; }
   NoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitBlt(ca.Handle, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas.Handle,
-    0, 0, SRCCOPY);
-
-  DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm - 8 - 4 - 66,
-    ym + 8 + 12, SRCCOPY);
+  DpiBitCanvas(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,
+    ym + 8 + 12);
   MakeUnitInfo(me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   NoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitBlt(ca.Handle, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas.Handle,
-    0, 0, SRCCOPY);
+  DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }
 

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF LINUX}
+  UDpiControls, {$IFDEF LINUX}
   LMessages,
   {$ENDIF}
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin, UDpiControls,
+  Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA, ButtonC, Area, GraphType;
@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
 
 {$R *.lfm}
@@ -216 +216 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'City.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'City.png', gfNoGamma);
   CityMapTemplate := TDpiBitmap.Create;
   CityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(CityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
+  LoadGraphicFile(CityMapTemplate, GetGraphicsDir + DirectorySeparator + 'BigCityMap.png', gfNoGamma);
   SmallCityMapTemplate := TDpiBitmap.Create;
   SmallCityMapTemplate.PixelFormat := pf24bit;
-  LoadGraphicFile(SmallCityMapTemplate, HomeDir + 'Graphics' + DirectorySeparator + 'SmallCityMap.png',
+  LoadGraphicFile(SmallCityMapTemplate, GetGraphicsDir + DirectorySeparator + 'SmallCityMap.png',
     gfNoGamma);
   SmallCityMap := TDpiBitmap.Create;
@@ -260 +260 @@
     Back.Canvas.FillRect(0, 0, ClientWidth, ClientHeight);
 
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas.Handle, 0, 0, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas, 0, 0);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end;
@@ -291 +291 @@
   Color2 := Colors.Canvas.Pixels[clkAge0 + Age, cliHouse];
   SmallCityMap.Canvas.FillRect(0, 0, SmallCityMap.Width, SmallCityMap.Height);
-  Dpibitblt(SmallCityMap.Canvas.Handle, 0, 0, 83, hSmallMap,
-    SmallCityMapTemplate.Canvas.Handle, 83 * SizeClass, 0, SRCCOPY);
+  DpiBitCanvas(SmallCityMap.Canvas, 0, 0, 83, hSmallMap,
+    SmallCityMapTemplate.Canvas, 83 * SizeClass, 0);
   if IsPort then
   begin
-    Dpibitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas.Handle, 332 + 15, 0, SRCCOPY);
+    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas, 332 + 15, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, 83, hSmallMap, Color0, Color1, Color2);
     Color2 := Colors.Canvas.Pixels[clkCity, cliWater];
@@ -303 +303 @@
   else
   begin
-    Dpibitblt(SmallCityMap.Canvas.Handle, 83, 0, 15, hSmallMap,
-      SmallCityMapTemplate.Canvas.Handle, 332, 0, SRCCOPY);
+    DpiBitCanvas(SmallCityMap.Canvas, 83, 0, 15, hSmallMap,
+      SmallCityMapTemplate.Canvas, 332, 0);
     ImageOp_CCC(SmallCityMap, 0, 0, wSmallMap, hSmallMap, Color0,
       Color1, Color2);
@@ -311 +311 @@
   with SmallCityMap.Canvas do
   begin
-    brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
+    Brush.Color := ScreenTools.Colors.Canvas.Pixels[clkAge0 + Age, cliImp];
     for i := 0 to 29 do
     begin
@@ -359 +359 @@
   ZoomCityMap.Canvas.FillRect(0, 0, ZoomCityMap.Width, ZoomCityMap.Height);
 
-  Dpibitblt(ZoomCityMap.Canvas.Handle, 0, 0, wZoomMap, hZoomMap,
-    Back.Canvas.Handle, xZoomMap, yZoomMap, SRCCOPY);
+  DpiBitCanvas(ZoomCityMap.Canvas, 0, 0, wZoomMap, hZoomMap,
+    Back.Canvas, xZoomMap, yZoomMap);
   if Mode = mImp then begin
     if ZoomArea < 3 then begin
@@ -442 +442 @@
     PixelPtr: TPixelPointer;
   begin
+    X := ScaleToVcl(X);
+    Y := ScaleToVcl(Y);
+    W := ScaleToVcl(W);
+    H := ScaleToVcl(H);
     Offscreen.BeginUpdate;
-    PixelPtr.Init(Offscreen, X, Y);
+    PixelPtr := PixelPointer(Offscreen, X, Y);
     for YY := 0 to H - 1 do begin
       for XX := 0 to W - 1 do begin
@@ -498 +502 @@
 
 var
-  x, y, xGr, i, i1, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
+  x, y, xGr, i, j, iix, d, dx, dy, PrCost, Cnt, Loc1, FreeSupp, Paintiix,
     HappyGain, OptiType, rx, ry, TrueFood, TrueProd, TruePoll: integer;
   av: integer;
@@ -542 +546 @@
   RedTex.clTextShade := $0000FF;
 
-  Dpibitblt(offscreen.Canvas.Handle, 0, 0, 640, 480, Back.Canvas.Handle, 0,
-    0, SRCCOPY);
-
-  offscreen.Canvas.Font.Assign(UniFont[ftCaption]);
+  DpiBitCanvas(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
@@ -558 +561 @@
     TextOut(8 + 14 - textwidth(s) div 2, 7, s);
   end;
-  offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+  Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
 
   if not IsCityAlive then
@@ -614 +617 @@
     false, AllowChange and IsCityAlive and
     (c.Status and csResourceWeightsMask = 0));
-  Dpibitblt(offscreen.Canvas.Handle, xmArea + 102, 42, 90, 33, Back.Canvas.Handle,
-    xmArea + 102, 42, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xmArea + 102, 42, 90, 33, Back.Canvas,
+    xmArea + 102, 42);
 
   if IsCityAlive then
@@ -645 +648 @@
     else
       xGr := 141;
-    Dpibitblt(offscreen.Canvas.Handle, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
-      27, 30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+      27, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
       30, xGr, 171);
@@ -657 +660 @@
   begin
     xGr := 1 + 112;
-    Dpibitblt(offscreen.Canvas.Handle, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
-      30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+      30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
       xGr, 171);
@@ -803 +806 @@
 
   // small map
-  Dpibitblt(offscreen.Canvas.Handle, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
-    SmallCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xSmallMap, ySmallMap, wSmallMap, hSmallMap,
+    SmallCityMap.Canvas, 0, 0);
   if Mode = mImp then
     Frame(offscreen.Canvas, xSmallMap + 48 * (ZoomArea div 3),
@@ -831 +834 @@
   Sprite(offscreen, HGrSystem, x + 6, y - 5, 10, 10, 154, 126);
 
-  Dpibitblt(offscreen.Canvas.Handle, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
-    ZoomCityMap.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, xZoomMap, yZoomMap, wZoomMap, hZoomMap,
+    ZoomCityMap.Canvas, 0, 0);
 
   for i := 0 to 5 do
@@ -1620 +1623 @@
       with Canvas do
       begin
-        Dpibitblt(Canvas.Handle, xView + 5, yView + 1, 64, 2, Back.Canvas.Handle,
-          xView + 5, yView + 1, SRCCOPY);
-        Dpibitblt(Canvas.Handle, xView + 5, yView + 3, 2, 42, Back.Canvas.Handle,
-          xView + 5, yView + 3, SRCCOPY);
-        Dpibitblt(Canvas.Handle, xView + 5 + 62, yView + 3, 2, 42,
-          Back.Canvas.Handle, xView + 5 + 62, yView + 3, SRCCOPY);
+        DpiBitCanvas(Canvas, xView + 5, yView + 1, 64, 2, Back.Canvas,
+          xView + 5, yView + 1);
+        DpiBitCanvas(Canvas, xView + 5, yView + 3, 2, 42, Back.Canvas,
+          xView + 5, yView + 3);
+        DpiBitCanvas(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,
           yView + 5 + ySizeBig, $B0B0B0, $FFFFFF);
         RFrame(Canvas, xView + 9 - 2, yView + 5 - 2, xView + 9 + xSizeBig + 1,
           yView + 5 + ySizeBig + 1, $FFFFFF, $B0B0B0);
-        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
     else if BlinkTime = 6 then
@@ -1644 +1647 @@
       else if c.Project and cpImp = 0 then
       begin // project is unit
-        Dpibitblt(Canvas.Handle, xView + 9, yView + 5, xSizeBig, ySizeBig,
-          bigimp.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, xView + 9, yView + 5, xSizeBig, ySizeBig,
+          Bigimp.Canvas, 0, 0);
         with Tribe[cOwner].ModelPicture[c.Project and cpIndex] do
           Sprite(Canvas, HGr, xView + 5, yView + 1, 64, 44, pix mod 10 * 65 + 1,

branches/highdpi/LocalPlayer/CityType.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ExtCtrls;
@@ -39 +39 @@
   CityTypeDlg: TCityTypeDlg;
 
-
 implementation
 
-uses
-  Help, UDpiControls;
+uses Help;
 
 {$R *.lfm}
@@ -116 +114 @@
         xSwitch + 38 + i * 42, ySwitch + 22, MainTexture.clBevelLight,
         MainTexture.clBevelShade);
-    DpiBitBlt(offscreen.Canvas.Handle, xSwitch + 2 + i * 42, ySwitch + 2,
-      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle, (i + 3) * xSizeSmall,
-      0, SRCCOPY)
+    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,
@@ -151 +148 @@
       yList + 16 + ySizeSmall div 2 + i div nListCol * 32,
       MainTexture.clBevelLight, MainTexture.clBevelShade);
-    DpiBitBlt(offscreen.Canvas.Handle, xList + 21 - xSizeSmall div 2 +
+    DpiBitCanvas(offscreen.Canvas, xList + 21 - xSizeSmall div 2 +
       i mod nListCol * 42, yList + 16 - ySizeSmall div 2 + i div nListCol * 32,
-      xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+      xSizeSmall, ySizeSmall, SmallImp.Canvas,
       MyData.ImpOrder[ctype, i] mod 7 * xSizeSmall,
       (MyData.ImpOrder[ctype, i] + SystemIconLines * 7) div 7 *
-      ySizeSmall, SRCCOPY);
+      ySizeSmall);
     inc(i);
   end;
@@ -174 +171 @@
         nPool div nPoolCol * 32, MainTexture.clBevelLight,
         MainTexture.clBevelShade);
-      DpiBitBlt(offscreen.Canvas.Handle, xPool + 21 - xSizeSmall div 2 +
+      DpiBitCanvas(offscreen.Canvas, xPool + 21 - xSizeSmall div 2 +
         nPool mod nPoolCol * 42, yPool + 16 - ySizeSmall div 2 +
-        nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+        nPool div nPoolCol * 32, xSizeSmall, ySizeSmall, SmallImp.Canvas,
         iix mod 7 * xSizeSmall, (iix + SystemIconLines * 7) div 7 *
-        ySizeSmall, SRCCOPY);
-      inc(nPool)
+        ySizeSmall);
+      inc(nPool);
     end;
   DeleteBtn.Visible := MyData.ImpOrder[ctype, 0] >= 0;
@@ -254 +251 @@
     begin
       dragiix := MyData.ImpOrder[ctype, i];
-      Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
@@ -270 +267 @@
     begin
       dragiix := Pooliix[i];
-      Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
@@ -332 +329 @@
     SmartUpdateContent
   end;
-  Screen.Cursor := crDefault
+  DpiScreen.Cursor := crDefault
 end;
 

branches/highdpi/LocalPlayer/ClientTools.pas

@@ -695 +695 @@
 initialization
 
-assert(nImp < 128);
+Assert(nImp < 128);
 CalculateAdvValues;
 

branches/highdpi/LocalPlayer/Diagram.pas

@@ -5 +5 @@
 
 uses
-  BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, Menus, UDpiControls;
+  UDpiControls, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  ButtonB, Menus;
 
 type

branches/highdpi/LocalPlayer/Draft.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA,
@@ -91 +92 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png', gfNoGamma);
 end;
 
@@ -238 +239 @@
   // assemble background from 2 texture tiles
   begin
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, 64,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      hMainTexture - 64, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, 0, 64, ClientWidth, ClientHeight - 64,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      0, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, 64,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      hMainTexture - 64);
+    DpiBitCanvas(Back.Canvas, 0, 64, ClientWidth, ClientHeight - 64,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      0);
   end
   else
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      (hMainTexture - ClientHeight) div 2, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      (hMainTexture - ClientHeight) div 2);
   ImageOp_B(Back, Template, 0, 0, 0, 0, Template.Width, 64);
   ImageOp_B(Back, Template, 0, 64, 0, 64 + Cut, Template.Width,
     Template.Height - 64 - Cut);
 
-  Dpibitblt(offscreen.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-    Back.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+    Back.Canvas, 0, 0);
 
   offscreen.Canvas.Font.Assign(UniFont[ftCaption]);

branches/highdpi/LocalPlayer/Enhance.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
+  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
 
   SysUtils, Classes, Graphics, Controls, Forms,
@@ -45 +45 @@
   EnhanceDlg: TEnhanceDlg;
 
-
 implementation
 
-uses
-  Help, UDpiControls;
+uses Help;
 
 {$R *.lfm}
@@ -98 +96 @@
   for i := 0 to ControlCount - 1 do
     if Controls[i] is TButtonC then
-      DpiBitBlt(Canvas.Handle, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
-        GrExt[HGrSystem].Data.Canvas.Handle, 121 + Controls[i].Tag mod 7 * 9,
-        1 + Controls[i].Tag div 7 * 9, SRCCOPY);
+      DpiBitCanvas(Canvas, Controls[i].Left + 2, Controls[i].Top - 11, 8, 8,
+        GrExt[HGrSystem].Data.Canvas, 121 + Controls[i].Tag mod 7 * 9,
+        1 + Controls[i].Tag div 7 * 9);
 end;
 

branches/highdpi/LocalPlayer/Help.lfm

@@ -1 +1 @@
 object HelpDlg: THelpDlg
   Left = 394
-  Height = 718
   Top = 180
-  Width = 840
   BorderIcons = []
   BorderStyle = bsNone
-  ClientHeight = 718
-  ClientWidth = 840
+  ClientHeight = 479
+  ClientWidth = 560
   Color = clBtnFace
-  DesignTimePPI = 144
+  Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -20
+  Font.Height = -13
   Font.Name = 'MS Sans Serif'
+  Font.Style = []
   FormStyle = fsStayOnTop
   OnClose = FormClose
@@ -18 +17 @@
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
+  OnMouseWheel = FormMouseWheel
   OnMouseDown = PaintBox1MouseDown
   OnMouseMove = PaintBox1MouseMove
-  OnMouseWheel = FormMouseWheel
   OnPaint = FormPaint
-  LCLVersion = '2.0.8.0'
+  PixelsPerInch = 96
   object CloseBtn: TButtonB
-    Left = 783
-    Height = 38
-    Top = 9
-    Width = 38
+    Left = 522
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False
@@ -34 +33 @@
   end
   object BackBtn: TButtonB
-    Left = 63
-    Height = 38
-    Top = 9
-    Width = 38
+    Left = 42
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False
@@ -44 +43 @@
   end
   object TopBtn: TButtonB
-    Left = 20
-    Height = 38
-    Top = 9
-    Width = 38
+    Left = 13
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False
@@ -54 +53 @@
   end
   object SearchBtn: TButtonB
-    Left = 740
-    Height = 38
-    Top = 9
-    Width = 38
+    Left = 493
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False

branches/highdpi/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, StringTables, Math, UDpiControls,
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-  ExtCtrls, ButtonB, PVSB, Types;
+  UDpiControls, Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
+  ButtonB, PVSB, Types, fgl;
 
 const
@@ -41 +41 @@
   THyperText = class(TStringList)
   public
-    procedure AddLine(s: String = ''; Format: integer = 0; Picpix: integer = 0;
+    procedure AddLine(s: String = ''; Format: integer = 0; Picpix: Integer = 0;
       LinkCategory: integer = 0; LinkIndex: integer = 0);
-    procedure LF;
+    procedure LineFeed;
+    procedure AppendList(Source: THyperText);
     destructor Destroy; override;
+  end;
+
+  { THistItem }
+
+  THistItem = class
+    Kind: Integer;
+    No: Integer;
+    Pos: Integer;
+    SearchContent: string;
+    procedure Assign(Source: THistItem);
+  end;
+
+  { THistItems }
+
+  THistItems = class(TFPGObjectList<THistItem>)
+    function AddNew(Kind, No, Pos: Integer; SearchContent: string): THistItem;
   end;
 
@@ -72 +89 @@
     procedure OffscreenPaint; override;
   private
-    Kind, no, Sel, nHist, CaptionColor: integer;
-    hADVHELP, hIMPHELP, hFEATUREHELP, hGOVHELP, hSPECIALMODEL,
-      hJOBHELP: integer;
-    SearchContent, NewSearchContent: string;
+    Kind: Integer;
+    no: Integer;
+    Sel: Integer;
+    CaptionColor: Integer;
+    hADVHELP, hIMPHELP, hFEATUREHELP, hGOVHELP, hSPECIALMODEL, hJOBHELP: Integer;
+    SearchContent: string;
+    NewSearchContent: string;
     CaptionFont: TDpiFont;
-    MainText, SearchResult: THyperText;
+    MainText: THyperText;
+    SearchResult: THyperText;
     HelpText: TStringTable;
     ExtPic, TerrIcon: TDpiBitmap;
-    sb: TPVScrollbar;
-    x0: array [-2 .. 180] of integer;
-    HistKind: array [0 .. MaxHist - 1] of integer;
-    HistNo: array [0 .. MaxHist - 1] of integer;
-    HistPos: array [0 .. MaxHist - 1] of integer;
-    HistSearchContent: array [0 .. MaxHist - 1] of shortstring;
+    ScrollBar: TPVScrollbar;
+    x0: array [-2..180] of Integer;
+    procedure PaintTerrIcon(x, y, xSrc, ySrc: Integer);
     procedure ScrollBarUpdate(Sender: TObject);
-    procedure line(ca: TDpiCanvas; i: integer; lit: boolean);
-    procedure Prepare(sbPos: integer = 0);
-    procedure WaterSign(x0, y0, iix: integer);
+    procedure Line(ca: TDpiCanvas; i: Integer; lit: Boolean);
+    procedure Prepare(sbPos: Integer = 0);
+    procedure ShowNewContentProcExecute(NewMode: Integer; HelpContext: string);
+    procedure WaterSign(x0, y0, iix: Integer);
     procedure Search(SearchString: string);
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
     procedure OnMouseLeave(var Msg: TMessage); message CM_MOUSELEAVE;
   public
-    Difficulty: integer;
-    procedure ShowNewContent(NewMode, Category, Index: integer);
+    HistItems: THistItems;
+    Difficulty: Integer;
     procedure ClearHistory;
-    function TextIndex(Item: string): integer;
+    procedure ShowNewContent(NewMode, Category, Index: Integer);
+    function TextIndex(Item: string): Integer;
   end;
 
@@ -103 +123 @@
   HelpDlg: THelpDlg;
 
+
 implementation
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global;
 
 {$R *.lfm}
 
 type
+
+  { THelpLineInfo }
+
   THelpLineInfo = class
-    Format, Picpix: Byte;
+    Format: Byte;
+    Picpix: Byte;
     Link: Word;
-  end;
+    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;
@@ -130 +188 @@
 end;
 
-procedure THyperText.LF;
+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;
 
@@ -198 +268 @@
 begin
   inherited;
+  HistItems := THistItems.Create;
+
   CaptionLeft := BackBtn.Left + BackBtn.Width;
   CaptionRight := SearchBtn.Left;
@@ -205 +277 @@
   SearchResult := THyperText.Create;
   SearchResult.OwnsObjects := True;
-  sb := TPVScrollbar.Create(Self);
-  sb.SetBorderSpacing(36, 9, 11);
-  sb.OnUpdate := ScrollBarUpdate;
+  ScrollBar := TPVScrollbar.Create(Self);
+  ScrollBar.SetBorderSpacing(36, 9, 11);
+  ScrollBar.OnUpdate := ScrollBarUpdate;
 
   HelpText := TStringTable.Create;
@@ -218 +290 @@
   hJOBHELP := HelpText.Gethandle('JOBHELP');
 
-  CaptionFont := TDpiFont.Create;
+  CaptionFont := Font.Create;
   CaptionFont.Assign(UniFont[ftNormal]);
   CaptionFont.Style := CaptionFont.Style + [fsItalic, fsBold];
@@ -233 +305 @@
   TerrIcon.Canvas.FillRect(0, 0, TerrIcon.Width, TerrIcon.Height);
   SearchContent := '';
-  nHist := -1;
-end;
-
-procedure THelpDlg.ClearHistory;
-begin
-  nHist := -1;
+  ShowNewContentProc := ShowNewContentProcExecute;
+end;
+
+procedure THelpDlg.ShowNewContentProcExecute(NewMode: Integer;
+  HelpContext: string);
+begin
+  HelpDlg.ShowNewContent(NewMode, hkText,
+    HelpDlg.TextIndex(HelpContext))
 end;
 
 procedure THelpDlg.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(sb);
+  ShowNewContentProc := nil;
+  FreeAndNil(ScrollBar);
   FreeAndNil(MainText);
   FreeAndNil(SearchResult);
@@ -250 +325 @@
   FreeAndNil(HelpText);
   // FreeAndNil(CaptionFont);
+  FreeAndNil(HistItems);
 end;
 
@@ -255 +331 @@
   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);
@@ -269 +345 @@
 begin
   { TODO: Handled by MouseWheel event
-  if sb.Process(m) then begin
+  if ScrollBar.Process(m) then begin
     Sel := -1;
     SmartUpdateContent(true)
@@ -279 +355 @@
 begin
   if Sel <> -1 then begin
-    line(Canvas, Sel, false);
+    Line(Canvas, Sel, false);
     Sel := -1
   end
 end;
 
+procedure THelpDlg.ClearHistory;
+begin
+  HistItems.Clear;
+end;
+
 procedure THelpDlg.FormPaint(Sender: TObject);
 begin
@@ -290 +371 @@
 end;
 
-procedure THelpDlg.line(ca: TDpiCanvas; i: integer; lit: boolean);
+procedure THelpDlg.Line(ca: TDpiCanvas; i: Integer; lit: Boolean);
 var
-  TextColor, x, y: integer;
+  TextColor, x, y: Integer;
   TextSize: TSize;
   s: string;
 begin
-  s := MainText[sb.Position + i];
+  s := MainText[ScrollBar.Position + i];
   if s = '' then
-    exit;
+    Exit;
   x := x0[i];
   y := 2 + i * 24;
@@ -306 +387 @@
     y := y + WideFrame
   end;
-  if THelpLineInfo(MainText.Objects[sb.Position + i]).Format
+  if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format
     in [pkCaption, pkBigTer, pkRightIcon, pkBigFeature] then
   begin
@@ -315 +396 @@
       ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
       ca.Brush.Style:=bsClear; }
-    DpiBitBlt(ca.Handle, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas.Handle, 1,
-      146, SRCCOPY);
+    DpiBitCanvas(ca, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas, 1,
+      146);
     BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
       y - 3, s[1]);
@@ -322 +403 @@
     ca.Font.Assign(UniFont[ftNormal]);
   end
-  else if THelpLineInfo(MainText.Objects[sb.Position + i]).Format = pkSection
+  else if THelpLineInfo(MainText.Objects[ScrollBar.Position + i]).Format = pkSection
   then
   begin
@@ -341 +422 @@
         TextSize.cy := WideFrame + InnerHeight - y;
       FillSeamless(ca, x, y, TextSize.cx, TextSize.cy, -SideFrame,
-        sb.Position * 24 - WideFrame, Paper);
+        ScrollBar.Position * 24 - WideFrame, Paper);
     end;
     BiColorTextOut(ca, TextColor, $7F007F, x, y, s);
@@ -347 +428 @@
       with ca do
       begin
-        assert(ca = Canvas);
-        pen.color := TextColor;
-        moveto(x + 1, y + TextSize.cy - 2);
-        lineto(x + TextSize.cx, y + TextSize.cy - 2);
+        Assert(ca = Canvas);
+        Pen.Color := TextColor;
+        MoveTo(x + 1, y + TextSize.cy - 2);
+        LineTo(x + TextSize.cx, y + TextSize.cy - 2);
       end;
     if (Kind = hkMisc) and (no = miscMain) then
@@ -363 +444 @@
 var
   x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
-  Heaven: array [0 .. nHeaven] of integer;
+  Heaven: array [0..nHeaven] of integer;
   PaintPtr, CoalPtr: TPixelPointer;
-  ImpPtr: array [-1 .. 1] of TPixelPointer;
-begin
-  { TODO
+  ImpPtr: array [-1..1] of TPixelPointer;
+begin
   // assume eiffel tower has free common heaven
   for dy := 0 to nHeaven - 1 do
@@ -377 +457 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ScaleToVcl(ySizeBig * 2) - 1 do
+  for y := 0 to ySizeBig * 2 - 1 do
     if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
-      PaintPtr.Init(OffScreen, 0, ScaleToVcl(y0 + y));
-      CoalPtr.Init(Templates, 0, ScaleToVcl(yCoal + y));
+      PaintPtr := PixelPointer(OffScreen, 0, y0 + y);
+      CoalPtr := PixelPointer(Templates, 0, yCoal + y);
       for dy := -1 to 1 do
         if ((Max(y + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
-          ImpPtr[dy].Init(BigImp, 0, ScaleToVcl(ySrc + (Max(y + dy, 0) shr 1)));
-      for x := 0 to ScaleToVcl(xSizeBig * 2) - 1 do begin
+          ImpPtr[dy] := PixelPointer(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
+      for x := 0 to xSizeBig * 2 - 1 do begin
         sum := 0;
         for dx := -1 to 1 do begin
@@ -413 +493 @@
   Offscreen.EndUpdate;
   BigImp.EndUpdate;
-  }
+end;
+
+procedure THelpDlg.PaintTerrIcon(x, y, xSrc, ySrc: integer);
+begin
+  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,
+      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,
+    xSrc, ySrc);
 end;
 
 procedure THelpDlg.OffscreenPaint;
-
-  procedure PaintTerrIcon(x, y, xSrc, ySrc: integer);
-  begin
-    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,
-        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,
-      xSrc, ySrc);
-  end;
-
 var
-  i, j, yl, srcno, ofs, cnt, y: integer;
+  i, j, yl, srcno, ofs, cnt, y: Integer;
   s: string;
   HelpLineInfo: THelpLineInfo;
@@ -445 +521 @@
   CaptionColor := Colors.Canvas.Pixels[clkMisc, cliPaperCaption];
   FillSeamless(OffScreen.Canvas, 0, 0, InnerWidth, InnerHeight, 0,
-    sb.Position * 24, Paper);
+    ScrollBar.Position * 24, Paper);
   with OffScreen.Canvas do
   begin
     Font.Assign(UniFont[ftNormal]);
-    for i := -sb.Position to InnerHeight div 24 do
-      if sb.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[sb.Position + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
         if HelpLineInfo.Format = pkExternal then
         begin
@@ -458 +534 @@
           if 4 + i * 24 + yl > InnerHeight then
             yl := InnerHeight - (4 + i * 24);
-          DpiBitBlt(Handle, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas.Handle,
-            0, 0, SRCCOPY);
+          DpiBitCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+            0, 0);
         end;
       end;
     for i := -2 to InnerHeight div 24 do
-      if (sb.Position + i >= 0) and (sb.Position + i < MainText.Count) then
+      if (ScrollBar.Position + i >= 0) and (ScrollBar.Position + i < MainText.Count) then
       begin
-        HelpLineInfo := THelpLineInfo(MainText.Objects[sb.Position + i]);
+        HelpLineInfo := THelpLineInfo(MainText.Objects[ScrollBar.Position + i]);
         if HelpLineInfo.Link <> 0 then
         begin
@@ -499 +575 @@
                 8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
               if HelpLineInfo.Picpix = imPalace then
-                DpiBitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
-                  0 * xSizeSmall, 1 * ySizeSmall, SRCCOPY)
+                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
+                  0 * xSizeSmall, 1 * ySizeSmall)
               else
-                DpiBitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   HelpLineInfo.Picpix mod 7 * xSizeSmall,
                   (HelpLineInfo.Picpix + SystemIconLines * 7) div 7 *
-                  ySizeSmall, SRCCOPY);
+                  ySizeSmall);
               x0[i] := x0[i] + (8 + 8 + 36);
             end;
@@ -566 +642 @@
                 $000000, $000000);
               if AdvIcon[HelpLineInfo.Picpix] < 84 then
-                DpiBitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 7 *
                   xSizeSmall, (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines *
-                  7) div 7 * ySizeSmall, SRCCOPY)
+                  7) div 7 * ySizeSmall)
               else
                 Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
@@ -576 +652 @@
                   295 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
               j := AdvValue[HelpLineInfo.Picpix] div 1000;
-              DpiBitBlt(Handle, x0[i] + 4, 4 + i * 24, 14, 14,
-                GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15, 85, SRCAND);
+              DpiBitCanvas(OffScreen.Canvas, x0[i] + 4, 4 + i * 24, 14, 14,
+                GrExt[HGrSystem].Mask.Canvas, 127 + j * 15, 85, SRCAND);
               Sprite(OffScreen, HGrSystem, x0[i] + 3, 3 + i * 24, 14, 14,
                 127 + j * 15, 85);
@@ -753 +829 @@
               ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
                 8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              DpiBitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24, xSizeSmall,
-                ySizeSmall, SmallImp.Canvas.Handle, (HelpLineInfo.Picpix - 1) *
-                xSizeSmall, ySizeSmall, SRCCOPY);
+              DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24, xSizeSmall,
+                ySizeSmall, SmallImp.Canvas, (HelpLineInfo.Picpix - 1) *
+                xSizeSmall, ySizeSmall);
               x0[i] := x0[i] + (8 + 8 + 36);
             end;
@@ -769 +845 @@
             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;
   MarkUsedOffscreen(InnerWidth, InnerHeight + 13 + 48);
-end; { OffscreenPaint }
+end;
 
 procedure THelpDlg.ScrollBarUpdate(Sender: TObject);
@@ -785 +861 @@
 procedure THelpDlg.Prepare(sbPos: integer = 0);
 var
-  i, j, special, Domain, Headline, TerrType, TerrSubType: integer;
+  i, j, Special, Domain, Headline, TerrType, TerrSubType: integer;
   s: string;
   ps: pchar;
   List: THyperText;
-  CheckSeeAlso: boolean;
-
-  procedure AddAdv(i: integer);
+  CheckSeeAlso: Boolean;
+
+  procedure AddAdvance(i: integer);
   begin
     MainText.AddLine(Phrases.Lookup('ADVANCES', i), pkAdvIcon, i,
@@ -803 +879 @@
   end;
 
-  procedure AddImp(i: integer);
+  procedure AddImprovement(i: integer);
   begin
     MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
@@ -815 +891 @@
   end;
 
-  procedure AddTer(i: integer);
+  procedure AddTerrain(i: integer);
   begin
     if MainText.Count > 1 then
     begin
-      MainText.LF;
+      MainText.LineFeed;
     end;
     MainText.AddLine(Phrases.Lookup('TERRAIN', i), pkTer, i, hkTer, i);
@@ -836 +912 @@
   begin
     if MainText.Count > 1 then
-      MainText.LF;
+      MainText.LineFeed;
     FindStdModelPicture(SpecialModelPictureCode[i], pix, Name);
     MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, i)
@@ -850 +926 @@
       begin
         AddLine('', pkLogo);
-        LF;
+        LineFeed;
       end
       else if Item = 'TECHFORMULA' then
@@ -866 +942 @@
         for i := 1 to 3 do
         begin
-          LF;
+          LineFeed;
           AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + i), pkTer, 3 * 12 + i);
         end
@@ -877 +953 @@
   end;
 
-  procedure DecodeItem(s: string; var Category, Index: integer);
+  procedure DecodeItem(s: string; var Category, Index: Integer);
   var
-    i: integer;
-  begin
-    if (length(s) > 0) and (s[1] = ':') then
-    begin
+    i: Integer;
+  begin
+    if (Length(s) > 0) and (s[1] = ':') then begin
       Category := hkMisc;
       Index := 0;
       for i := 3 to length(s) do
-        Index := Index * 10 + ord(s[i]) - 48;
+        Index := Index * 10 + Ord(s[i]) - 48;
       case s[2] of
-        'A':
-          Category := hkAdv;
-        'B':
-          Category := hkImp;
-        'T':
-          Category := hkTer;
-        'F':
-          Category := hkFeature;
-        'E':
-          Category := hkInternet;
-        'S':
-          Category := hkModel;
-        'C':
-          Index := miscCredits;
-        'J':
-          Index := miscJobList;
-        'G':
-          Index := miscGovList;
+        'A': Category := hkAdv;
+        'B': Category := hkImp;
+        'T': Category := hkTer;
+        'F': Category := hkFeature;
+        'E': Category := hkInternet;
+        'S': Category := hkModel;
+        'C': Index := miscCredits;
+        'J': Index := miscJobList;
+        'G': Index := miscGovList;
       end;
       if (Category <> hkMisc) and (Index = 0) then
         Index := 200;
-    end
-    else
-    begin
+    end else begin
       Category := hkText;
-      Index := HelpText.Gethandle(copy(s, 1, 255));
+      Index := HelpText.Gethandle(Copy(s, 1, 255));
     end;
   end;
@@ -935 +999 @@
         repeat
           inc(p)
-        until (p > length(s)) or (s[p] = '\');
-        Caption := copy(s, 2, p - 2);
+        until (p > Length(s)) or (s[p] = '\');
+        Caption := Copy(s, 2, p - 2);
         Delete(s, 1, p);
       end
@@ -944 +1008 @@
         repeat
           inc(p)
-        until (p > length(s)) or (s[p] = '\');
-        AddStandardBlock(copy(s, 2, p - 2));
+        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
+        if (Length(s) >= 2) and (s[2] = '@') then
         begin // generate from icon
           Picpix := 0;
           p := 3;
-          while (p <= length(s)) and (s[p] <> '\') do
+          while (p <= Length(s)) and (s[p] <> '\') do
           begin
-            Picpix := Picpix * 10 + ord(s[p]) - 48;
+            Picpix := Picpix * 10 + Ord(s[p]) - 48;
             inc(p)
           end;
@@ -962 +1026 @@
             Picpix := 0;
           MainText.AddLine('', pkIllu, Picpix);
-          MainText.LF;
-          MainText.LF;
+          MainText.LineFeed;
+          MainText.LineFeed;
         end
         else
@@ -969 +1033 @@
           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
-              MainText.LF;
+              MainText.LineFeed;
           end;
         end;
@@ -989 +1053 @@
               repeat
                 inc(p)
-              until (p > length(s)) or (s[p] = '\') or (s[p] = ' ');
-              DecodeItem(copy(s, 2, p - 2), LinkCategory, LinkIndex);
+              until (p > Length(s)) or (s[p] = '\') or (s[p] = ' ');
+              DecodeItem(Copy(s, 2, p - 2), LinkCategory, LinkIndex);
               CurrentFormat := 0;
               if (LinkCategory <> hkText) and (LinkIndex < 200) then
@@ -1008 +1072 @@
                     begin
                       CurrentFormat := pkTer;
-                      Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkFeature:
@@ -1024 +1088 @@
               if s[1] = ':' then
                 LinkCategory := LinkCategory + hkCrossLink;
-              if (p > length(s)) or (s[p] = ' ') then
+              if (p > Length(s)) or (s[p] = ' ') then
                 Delete(s, 1, p)
               else
@@ -1030 +1094 @@
             end;
           '!': // highlited
-            if (length(s) >= 2) and (s[2] = '!') then
+            if (Length(s) >= 2) and (s[2] = '!') then
             begin
               if MainText.Count > 1 then
-                MainText.LF;
+                MainText.LineFeed;
               FollowFormat := pkCaption;
               CurrentFormat := pkCaption;
@@ -1060 +1124 @@
         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
           else
             Break;
-        until (p >= length(s)) or (s[l + 1] = '\');
-        MainText.AddLine(copy(s, 1, l), CurrentFormat, Picpix, LinkCategory,
+        until (p >= Length(s)) or (s[l + 1] = '\');
+        MainText.AddLine(Copy(s, 1, l), CurrentFormat, Picpix, LinkCategory,
           LinkIndex);
-        if (l < length(s)) and (s[l + 1] = '\') then
+        if (l < Length(s)) and (s[l + 1] = '\') then
           FollowFormat := pkNormal;
         Delete(s, 1, l + 1);
@@ -1082 +1146 @@
   end;
 
-  procedure AddModelText(i: integer);
+  procedure AddModelText(i: Integer);
   var
-    pix: integer;
+    pix: Integer;
     s: string;
   begin
-    with MainText do
-    begin
-      if Count > 1 then
-      begin
-        LF;
-        LF;
+    with MainText do begin
+      if Count > 1 then begin
+        LineFeed;
+        LineFeed;
       end;
       FindStdModelPicture(SpecialModelPictureCode[i], pix, s);
@@ -1126 +1188 @@
   procedure AddJobList;
   var
-    i, JobCost: integer;
-  begin
-    with MainText do
-    begin
-      for i := 0 to nJobHelp - 1 do
-      begin
-        if i > 0 then
-        begin
-          LF;
-          LF
+    i, JobCost: Integer;
+  begin
+    with MainText do begin
+      for i := 0 to nJobHelp - 1 do begin
+        if i > 0 then begin
+          LineFeed;
+          LineFeed;
         end;
         AddLine(Phrases.Lookup('JOBRESULT', JobHelp[i]), pkSection);
@@ -1144 +1203 @@
         JobCost := -1;
         case JobHelp[i] of
-          jCanal:
-            JobCost := CanalWork;
-          jFort:
-            JobCost := FortWork;
-          jBase:
-            JobCost := BaseWork;
+          jCanal: JobCost := CanalWork;
+          jFort: JobCost := FortWork;
+          jBase: JobCost := BaseWork;
         end;
         if JobCost >= 0 then
@@ -1156 +1212 @@
         else
           AddTextual(HelpText.Lookup('JOBCOSTVAR'));
-        if JobPreq[JobHelp[i]] <> preNone then
-        begin
+        if JobPreq[JobHelp[i]] <> preNone then begin
           AddPreqAdv(JobPreq[JobHelp[i]]);
           MainText[Count - 1] := Format(HelpText.Lookup('REQUIRED'),
@@ -1168 +1223 @@
   procedure AddGraphicCredits;
   var
-    i: integer;
+    i: Integer;
     s: string;
     sr: TSearchRec;
-    List, plus: TStringList;
+    List, Plus: TStringList;
   begin
     List := TStringList.Create;
-    plus := TStringList.Create;
-    if FindFirst(HomeDir + 'Graphics' + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
+    Plus := TStringList.Create;
+    if FindFirst(GetGraphicsDir + DirectorySeparator + '*.credits.txt', $27, sr) = 0 then
       repeat
-        plus.LoadFromFile(HomeDir + 'Graphics' + DirectorySeparator + sr.Name);
-        List.AddStrings(plus);
+        Plus.LoadFromFile(GetGraphicsDir + DirectorySeparator + sr.Name);
+        List.AddStrings(Plus);
       until FindNext(sr) <> 0;
     FindClose(sr);
-    plus.Free;
+    Plus.Free;
 
     List.Sort;
@@ -1189 +1244 @@
         List.Delete(i)
       else
-        inc(i);
-
-    for i := 0 to List.Count - 1 do
-    begin
+        Inc(i);
+
+    for i := 0 to List.Count - 1 do begin
       s := List[i];
       while BiColorTextWidth(OffScreen.Canvas, s) > InnerWidth - 16 -
@@ -1204 +1258 @@
   procedure AddSoundCredits;
   var
-    i: integer;
+    i: Integer;
     s: string;
     List: TStringList;
   begin
     List := TStringList.Create;
-    List.LoadFromFile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.credits.txt');
-    for i := 0 to List.Count - 1 do
-    begin
+    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 -
@@ -1227 +1280 @@
         MainText.Delete(Headline)
       else
-        MainText.LF;
+        MainText.LineFeed;
     MainText.AddLine(HelpText.Lookup(Item), pkSection);
     Headline := MainText.Count - 1;
@@ -1233 +1286 @@
 
 begin { Prepare }
-  with MainText do
-  begin
+  with MainText do begin
     OffScreen.Canvas.Font.Assign(UniFont[ftNormal]);
-    CheckSeeAlso := false;
+    CheckSeeAlso := False;
     Clear;
     Headline := -1;
     if (no >= 200) or not(Kind in [hkAdv, hkImp, hkTer, hkFeature]) then
-      LF;
+      LineFeed;
     case Kind of
       hkText:
@@ -1252 +1304 @@
                 AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'), pkSpecialIcon,
                   0, { pkBigIcon,22, } hkText, HelpText.Gethandle('QUICK'));
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CONCEPTS'), pkBigIcon, 6,
                   hkText, HelpText.Gethandle('CONCEPTS'));
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_TERLIST'), pkSpecialIcon, 1,
                   hkTer, 200);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkSpecialIcon, 2,
                   hkMisc, miscJobList);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_TECHLIST'), pkBigIcon, 39,
                   hkAdv, 200);
-                LF;
+                LineFeed;
                 FindStdModelPicture(SpecialModelPictureCode[6], i, s);
                 AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkModel, i,
                   hkModel, 0);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_FEATURELIST'), pkBigIcon, 28,
                   hkFeature, 200);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'), pkBigIcon,
                   7 * SystemIconLines + imCourt, hkImp, 200);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'), pkBigIcon,
                   7 * SystemIconLines + imStockEx, hkImp, 201);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'), pkBigIcon,
                   7 * SystemIconLines, hkImp, 202);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkBigIcon,
                   gDemocracy + 6, hkMisc, miscGovList);
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_KEYS'), pkBigIcon, 2, hkText,
                   HelpText.Gethandle('HOTKEYS'));
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_ABOUT'), pkBigIcon, 1,
                   hkText, HelpText.Gethandle('ABOUT'));
-                LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_CREDITS'), pkBigIcon, 22,
                   hkMisc, miscCredits);
@@ -1296 +1348 @@
               begin
                 AddItem('CREDITS');
-                LF;
+                LineFeed;
                 AddGraphicCredits;
                 NextSection('CRED_CAPSOUND');
@@ -1310 +1362 @@
                 Caption := HelpText.Lookup('HELPTITLE_JOBLIST');
                 AddJobList;
-                LF;
+                LineFeed;
                 AddItem('TERIMPEXCLUDE');
-                LF;
+                LineFeed;
                 AddItem('TERIMPCITY');
               end;
@@ -1321 +1373 @@
                 begin
                   AddLine(Phrases.Lookup('GOVERNMENT', i mod nGov), pkSection);
-                  LF;
+                  LineFeed;
                   if i = nGov then
                     AddLine('', pkBigIcon, 7 * SystemIconLines + imPalace)
                   else
                     AddLine('', pkBigIcon, i + 6);
-                  LF;
+                  LineFeed;
                   AddTextual(HelpText.LookupByHandle(hGOVHELP, i mod nGov));
                   if i mod nGov >= 2 then
@@ -1336 +1388 @@
                   if i < nGov then
                   begin
-                    LF;
-                    LF;
+                    LineFeed;
+                    LineFeed;
                   end
                 end
@@ -1345 +1397 @@
                 Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
                 AddTextual(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
-                MainText.AddStrings(SearchResult);
-              end
+                MainText.AppendList(SearchResult);
+              end;
           end; // case no
         end;
@@ -1355 +1407 @@
           Caption := HelpText.Lookup('HELPTITLE_TECHLIST');
           List := THyperText.Create;
+          List.OwnsObjects := True;
           for j := 0 to 3 do
           begin
             if j > 0 then
             begin
-              LF;
-              LF;
+              LineFeed;
+              LineFeed;
             end;
             AddLine(HelpText.Lookup('TECHAGE', j), pkSection);
@@ -1378 +1431 @@
                   hkAdv, i);
             List.Sort;
-            AddStrings(List);
+            AppendList(List);
           end;
-          List.Free
+          List.Free;
         end
         else // single advance
         begin
           Caption := Phrases.Lookup('ADVANCES', no);
-          LF;
+          LineFeed;
           AddLine(Phrases.Lookup('ADVANCES', no), pkCaption);
           if no in FutureTech then
           begin
             AddLine(HelpText.Lookup('HELPSPEC_FUTURE'));
-            LF;
+            LineFeed;
             if no = futResearchTechnology then
               AddItem('FUTURETECHHELP100')
@@ -1413 +1466 @@
           for i := 0 to 27 do
             if Imp[i].Preq = no then
-              AddImp(i);
+              AddImprovement(i);
           for i := 28 to nImp - 1 do
             if (Imp[i].Preq = no) and (Imp[i].Kind <> ikCommon) then
-              AddImp(i);
+              AddImprovement(i);
           for i := 28 to nImp - 1 do
             if (Imp[i].Preq = no) and (Imp[i].Kind = ikCommon) then
-              AddImp(i);
+              AddImprovement(i);
           NextSection('MODELALLOW');
           for i := 0 to nSpecialModel - 1 do
@@ -1432 +1485 @@
             if (AdvPreq[i, 0] = no) or (AdvPreq[i, 1] = no) or
               (AdvPreq[i, 2] = no) then
-              AddAdv(i);
+              AddAdvance(i);
           NextSection('UPGRADEALLOW');
           for Domain := 0 to nDomains - 1 do
@@ -1456 +1509 @@
           for i := 0 to 27 do
             if (Imp[i].Preq <> preNA) and (Imp[i].Expiration = no) then
-              AddImp(i);
+              AddImprovement(i);
           NextSection('ADVEFFECT');
           s := HelpText.LookupByHandle(hADVHELP, no);
@@ -1471 +1524 @@
           // AddLine(HelpText.Lookup('HELPTITLE_IMPLIST'),pkSection);
           List := THyperText.Create;
+          List.OwnsObjects := True;
           for i := 28 to nImp - 1 do
             if (i <> imTrGoods) and (Imp[i].Preq <> preNA) and
@@ -1477 +1531 @@
                 i, hkImp, i);
           List.Sort;
-          AddStrings(List);
-          List.Free
+          AppendList(List);
+          List.Free;
         end
         else if no = 201 then
@@ -1489 +1543 @@
               AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
                 hkImp, i);
-          { LF;
-            LF;
+          { LineFeed;
+            LineFeed;
             AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
             for i:=28 to nImp-1 do
@@ -1508 +1562 @@
         begin // single building
           Caption := Phrases.Lookup('IMPROVEMENTS', no);
-          LF;
+          LineFeed;
           AddLine(Phrases.Lookup('IMPROVEMENTS', no), pkRightIcon, no);
           case Imp[no].Kind of
-            ikWonder:
-              AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
-            ikCommon:
-              AddLine(HelpText.Lookup('HELPSPEC_IMP'));
-            ikShipPart:
-              AddLine(HelpText.Lookup('HELPSPEC_SHIPPART'));
+            ikWonder: AddLine(HelpText.Lookup('HELPSPEC_WONDER'));
+            ikCommon: AddLine(HelpText.Lookup('HELPSPEC_IMP'));
+            ikShipPart: AddLine(HelpText.Lookup('HELPSPEC_SHIPPART'));
           else
             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));
           end;
-          if no = woSun then
-          begin
+          if no = woSun then begin
             AddFeature(mcFirst);
             AddFeature(mcWill);
@@ -1533 +1582 @@
           if (no < 28) and not Phrases2FallenBackToEnglish then
           begin
-            LF;
+            LineFeed;
             if Imp[no].Expiration >= 0 then
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE1'))
@@ -1563 +1612 @@
                 j := 1
               end;
-              AddImp(ImpReplacement[i].OldImp);
+              AddImprovement(ImpReplacement[i].OldImp);
             end;
           if Imp[no].Kind = ikShipPart then
           begin
-            LF;
+            LineFeed;
             if no = imShipComp then
               i := 1
@@ -1588 +1637 @@
           NextSection('SEEALSO');
           if (no < 28) and (Imp[no].Expiration >= 0) then
-            AddImp(woEiffel);
+            AddImprovement(woEiffel);
           for i := 0 to nImpReplacement - 1 do
             if ImpReplacement[i].OldImp = no then
-              AddImp(ImpReplacement[i].NewImp);
+              AddImprovement(ImpReplacement[i].NewImp);
           if no = imSupermarket then
             AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
@@ -1604 +1653 @@
           // AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
           for i := 0 to nTerrainHelp - 1 do
-            AddTer(TerrainHelp[i]);
+            AddTerrain(TerrainHelp[i]);
         end
         else
@@ -1620 +1669 @@
           begin
             Caption := Phrases.Lookup('TERRAIN', no);
-            LF;
+            LineFeed;
             AddLine(Phrases.Lookup('TERRAIN', no), pkBigTer, no);
             AddLine(HelpText.Lookup('HELPSPEC_TER'));
-            LF;
+            LineFeed;
             if (ProdRes[TerrSubType] > 0) or (MineEff > 0) then
               AddLine(Format(HelpText.Lookup('RESPROD'),
@@ -1649 +1698 @@
             if no = 3 * 12 then
             begin
-              LF;
+              LineFeed;
               AddTextual(HelpText.Lookup('DEADLANDS'));
             end;
             if (TerrType = fDesert) and (no <> fDesert + 12) then
             begin
-              LF;
+              LineFeed;
               AddTextual(Format(HelpText.Lookup('HOSTILE'), [DesertThurst]));
             end;
             if TerrType = fArctic then
             begin
-              LF;
+              LineFeed;
               AddTextual(Format(HelpText.Lookup('HOSTILE'), [ArcticThurst]));
             end;
             if (no < 3 * 12) and (TransTerrain >= 0) then
             begin
-              LF;
+              LineFeed;
               i := TransTerrain;
               if (TerrType <> fGrass) and (i <> fGrass) then
                 i := i + TerrSubType * 12;
-              // trafo to same special resource group
+              // trafo to same Special resource group
               AddLine(Format(HelpText.Lookup('TRAFO'),
                 [Phrases.Lookup('TERRAIN', i)]), pkTer, i,
@@ -1674 +1723 @@
               if no = fSwamp + 12 then
               begin
-                LF;
+                LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', TransTerrain + 24)]), pkTer,
@@ -1681 +1730 @@
               else if i = fGrass then
               begin
-                LF;
+                LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
@@ -1690 +1739 @@
             if no = 3 * 12 then
             begin
-              LF;
-              for special := 1 to 3 do
+              LineFeed;
+              for Special := 1 to 3 do
               begin
-                if special > 1 then
-                  LF;
-                AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + special), pkTer,
-                  3 * 12 + special);
+                if Special > 1 then
+                  LineFeed;
+                AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + Special), pkTer,
+                  3 * 12 + Special);
               end
             end
             else if (no < 12) and (no <> fGrass) and (no <> fOcean) then
             begin
-              LF;
-              for special := 1 to 2 do
-                if (no <> fArctic) and (no <> fSwamp) or (special < 2) then
+              LineFeed;
+              for Special := 1 to 2 do
+                if (no <> fArctic) and (no <> fSwamp) or (Special < 2) then
                 begin
-                  if special > 1 then
-                    LF;
-                  AddLine(Phrases.Lookup('TERRAIN', no + special * 12), pkTer,
-                    no + special * 12);
-                  i := FoodRes[special] - FoodRes[0];
+                  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
                     MainText[Count - 1] := MainText[Count - 1] +
                       Format(HelpText.Lookup('SPECIALFOOD'), [i]);
-                  i := ProdRes[special] - ProdRes[0];
+                  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];
+                  i := TradeRes[Special] - TradeRes[0];
                   if i <> 0 then
                     MainText[Count - 1] := MainText[Count - 1] +
@@ -1725 +1774 @@
             if no = 3 * 12 then
             begin
-              LF;
+              LineFeed;
               AddTextual(HelpText.Lookup('RARE'));
             end;
@@ -1731 +1780 @@
             begin
               NextSection('SEEALSO');
-              AddImp(woGardens);
+              AddImprovement(woGardens);
               CheckSeeAlso := true
             end
@@ -1742 +1791 @@
           Caption := HelpText.Lookup('HELPTITLE_FEATURELIST');
           List := THyperText.Create;
-          for special := 0 to 2 do
+          List.OwnsObjects := True;
+          for Special := 0 to 2 do
           begin
-            if special > 0 then
-            begin
-              LF;
-              LF
-            end;
-            case special of
-              0:
-                AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'), pkSection);
-              1:
-                AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'), pkSection);
-              2:
-                AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'), pkSection);
+            if Special > 0 then
+            begin
+              LineFeed;
+              LineFeed;
+            end;
+            case Special of
+              0: AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'), pkSection);
+              1: AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'), pkSection);
+              2: AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'), pkSection);
             end;
             List.Clear;
@@ -1767 +1814 @@
                 else
                   j := 1;
-                if j = special then
+                if j = Special then
                   List.AddLine(Phrases.Lookup('FEATURES', i), pkFeature, i,
                     hkFeature, i);
               end;
             List.Sort;
-            AddStrings(List);
+            AppendList(List);
           end;
-          List.Free
+          List.Free;
         end
         else
         begin // single feature
           Caption := Phrases.Lookup('FEATURES', no);
-          LF;
+          LineFeed;
           AddLine(Phrases.Lookup('FEATURES', no), pkBigFeature, no);
           if no < mcFirstNonCap then
@@ -1807 +1854 @@
           if Feature[no].Preq <> preNone then
           begin
-            LF;
+            LineFeed;
             if Feature[no].Preq = preSun then
               AddPreqImp(woSun) // sun tsu feature
@@ -1816 +1863 @@
           end;
           NextSection('SEEALSO');
-          CheckSeeAlso := true
+          CheckSeeAlso := True;
         end;
 
@@ -1825 +1872 @@
             if i <> 2 then
               AddModelText(i);
-          LF;
+          LineFeed;
           AddItem('MODELNOTE');
         end;
@@ -1834 +1881 @@
         if (SeeAlso[i].Kind = Kind) and (SeeAlso[i].no = no) then
           case SeeAlso[i].SeeKind of
-            hkImp:
-              AddImp(SeeAlso[i].SeeNo);
-            hkAdv:
-              AddAdv(SeeAlso[i].SeeNo);
-            hkFeature:
-              AddFeature(SeeAlso[i].SeeNo);
+            hkImp: AddImprovement(SeeAlso[i].SeeNo);
+            hkAdv: AddAdvance(SeeAlso[i].SeeNo);
+            hkFeature: AddFeature(SeeAlso[i].SeeNo);
           end;
     if (Headline >= 0) and (Count = Headline + 1) then
       Delete(Headline)
     else
-      LF;
+      LineFeed;
 
     //Self.Show;
-    sb.Init(Count - 1, InnerHeight div 24);
-    sb.SetPos(sbPos);
-    BackBtn.Visible := nHist > 0;
-    TopBtn.Visible := (nHist > 0) or (Kind <> hkMisc) or (no <> miscMain);
+    ScrollBar.Init(Count - 1, InnerHeight div 24);
+    ScrollBar.SetPos(sbPos);
+    BackBtn.Visible := HistItems.Count > 1;
+    TopBtn.Visible := (HistItems.Count > 1) or (Kind <> hkMisc) or (no <> miscMain);
     Sel := -1;
   end; // with MainText
-end; { Prepare }
-
-procedure THelpDlg.ShowNewContent(NewMode, Category, Index: integer);
+end;
+
+procedure THelpDlg.ShowNewContent(NewMode, Category, Index: Integer);
 begin
   if (Category <> Kind) or (Index <> no) or (Category = hkMisc) and
-    (Index = miscSearchResult) then
-  begin
-    if nHist = MaxHist then
-    begin
-      move(HistKind[2], HistKind[1], 4 * (nHist - 2));
-      move(HistNo[2], HistNo[1], 4 * (nHist - 2));
-      move(HistPos[2], HistPos[1], 4 * (nHist - 2));
-      move(HistSearchContent[2], HistSearchContent[1],
-        sizeof(shortstring) * (nHist - 2));
-    end
-    else
-      inc(nHist);
-    if nHist > 0 then
-    begin
-      HistKind[nHist - 1] := Kind;
-      HistNo[nHist - 1] := no;
-      HistPos[nHist - 1] := sb.Position;
-      HistSearchContent[nHist - 1] := SearchContent
-    end
+    (Index = miscSearchResult) then begin
+    if HistItems.Count = MaxHist then HistItems.Delete(0);
+    if HistItems.Count = 0 then
+      HistItems.AddNew(Category, Index, ScrollBar.Position, NewSearchContent)
+      else HistItems.AddNew(Kind, No, ScrollBar.Position, SearchContent);
   end;
   Kind := Category;
@@ -1889 +1919 @@
   x, y: integer);
 var
-  i0, Sel0: integer;
+  i0, Sel0: Integer;
 begin
   y := y - WideFrame;
-  i0 := sb.Position;
+  i0 := ScrollBar.Position;
   Sel0 := Sel;
   if (x >= SideFrame) and (x < SideFrame + InnerWidth) and (y >= 0) and
@@ -1905 +1935 @@
   begin
     if Sel0 <> -1 then
-      line(Canvas, Sel0, false);
+      Line(Canvas, Sel0, False);
     if Sel <> -1 then
-      line(Canvas, Sel, true)
+      Line(Canvas, Sel, True)
   end
 end;
@@ -1915 +1945 @@
 begin
   if Sel >= 0 then
-    with THelpLineInfo(MainText.Objects[Sel + sb.Position]) do
+    with THelpLineInfo(MainText.Objects[Sel + ScrollBar.Position]) do
       if Link shr 8 and $3F = hkInternet then
         case Link and $FF of
-          1: OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
-          2: OpenURL('http://c-evo.org');
-          3: OpenURL('http://c-evo.org/_sg/contact');
+          1: OpenDocument(HomeDir + AITemplateFileName);
+          2: OpenURL(CevoHomepage);
+          3: OpenURL(CevoContact);
         end
       else
@@ -1934 +1964 @@
 
 procedure THelpDlg.BackBtnClick(Sender: TObject);
-begin
-  if nHist > 0 then
-  begin
-    dec(nHist);
-    if (HistKind[nHist] = hkMisc) and (HistNo[nHist] = miscSearchResult) and
-      (HistSearchContent[nHist] <> SearchContent) then
+var
+  HistItem: THistItem;
+begin
+  if HistItems.Count > 1 then begin
+    HistItem := THistItem.Create;
+    HistItem.Assign(HistItems.Last);
+    HistItems.Delete(HistItems.Count - 1);
+    if (HistItem.Kind = hkMisc) and (HistItem.No = miscSearchResult) and
+      (HistItem.SearchContent <> SearchContent) then
     begin
-      SearchContent := HistSearchContent[nHist];
+      SearchContent := HistItem.SearchContent;
       Search(SearchContent);
     end;
-    Kind := HistKind[nHist];
-    no := HistNo[nHist];
-    Prepare(HistPos[nHist]);
+    Kind := HistItem.Kind;
+    no := HistItem.No;
+    Prepare(HistItem.Pos);
     OffscreenPaint;
     Invalidate;
-  end
+    HistItem.Free;
+  end;
 end;
 
 procedure THelpDlg.TopBtnClick(Sender: TObject);
 begin
-  nHist := 0;
+  while HistItems.Count > 1 do HistItems.Delete(HistItems.Count - 1);
   Kind := hkMisc;
   no := miscMain;
@@ -1968 +2002 @@
 end;
 
-function THelpDlg.TextIndex(Item: string): integer;
-begin
-  result := HelpText.Gethandle(Item)
+function THelpDlg.TextIndex(Item: string): Integer;
+begin
+  Result := HelpText.Gethandle(Item)
 end;
 
@@ -1987 +2021 @@
   InputDlg.CenterToRect(BoundsRect);
   InputDlg.ShowModal;
-  if (InputDlg.ModalResult = mrOK) and (length(InputDlg.EInput.Text) >= 2) then
+  if (InputDlg.ModalResult = mrOK) and (Length(InputDlg.EInput.Text) >= 2) then
   begin
     Search(InputDlg.EInput.Text);
@@ -2004 +2038 @@
         NewSearchContent := InputDlg.EInput.Text;
         ShowNewContent(FWindowMode, hkMisc, miscSearchResult);
-      end
-    end
-  end
+      end;
+    end;
+  end;
 end;
 
 procedure THelpDlg.Search(SearchString: string);
 var
-  h, i, PrevHandle, PrevIndex, p, RightMargin: integer;
+  h, i, PrevHandle, PrevIndex, p, RightMargin: Integer;
   s: string;
   mADVHELP, mIMPHELP, mFEATUREHELP: set of 0 .. 255;
-  bGOVHELP, bSPECIALMODEL, bJOBHELP: boolean;
+  bGOVHELP, bSPECIALMODEL, bJOBHELP: Boolean;
 begin
   SearchResult.Clear;
@@ -2020 +2054 @@
   mIMPHELP := [];
   mFEATUREHELP := [];
-  bGOVHELP := false;
-  bSPECIALMODEL := false;
-  bJOBHELP := false;
+  bGOVHELP := False;
+  bSPECIALMODEL := False;
+  bJOBHELP := False;
 
   // search in generic reference
   SearchString := UpperCase(SearchString);
-  for i := 0 to 35 + 4 do
-  begin
+  for i := 0 to 35 + 4 do begin
     s := Phrases.Lookup('TERRAIN', i);
     if pos(SearchString, UpperCase(s)) > 0 then
@@ -2042 +2075 @@
             imShipComp + i - 37) + ' ' + HelpText.Lookup('HELPSPEC_SHIPPART'),
             pkNormal, 0, hkImp + hkCrossLink, imShipComp + i - 37);
-        Break
-      end
+        Break;
+      end;
   end;
   for i := 0 to nJobHelp - 1 do
@@ -2051 +2084 @@
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_JOBLIST'), pkNormal, 0,
         hkMisc + hkCrossLink, miscJobList);
-      bJOBHELP := true;
-      Break
+      bJOBHELP := True;
+      Break;
     end;
   for i := 0 to nAdv - 1 do
@@ -2065 +2098 @@
       SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i);
       include(mADVHELP, i);
-    end
+    end;
   end;
   for i := 0 to nSpecialModel - 1 do
@@ -2074 +2107 @@
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal, 0,
         hkModel + hkCrossLink, 0);
-      bSPECIALMODEL := true;
-      Break
+      bSPECIALMODEL := True;
+      Break;
     end;
   end;
@@ -2081 +2114 @@
   begin
     s := Phrases.Lookup('FEATURES', i);
-    if pos(SearchString, UpperCase(s)) > 0 then
+    if Pos(SearchString, UpperCase(s)) > 0 then
     begin
       if i < mcFirstNonCap then
@@ -2090 +2123 @@
         s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
       SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
-      include(mFEATUREHELP, i);
-    end
+      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
+    if Pos(SearchString, UpperCase(s)) > 0 then
     begin
       case Imp[i].Kind of
@@ -2109 +2142 @@
       end;
       SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i);
-      include(mIMPHELP, i);
+      Include(mIMPHELP, i);
     end
   end;
   for i := 0 to nGov - 1 do
-    if pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', i))) > 0 then
+    if Pos(SearchString, UpperCase(Phrases.Lookup('GOVERNMENT', i))) > 0 then
     begin
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_GOVLIST'), pkNormal, 0,
         hkMisc + hkCrossLink, miscGovList);
-      bGOVHELP := true;
-      Break
+      bGOVHELP := True;
+      Break;
     end;
 
@@ -2139 +2172 @@
           s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
         SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i)
-      end
+      end;
     end
     else if h = hIMPHELP then
@@ -2158 +2191 @@
         end;
         SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i)
-      end
+      end;
     end
     else if h = hFEATUREHELP then
@@ -2173 +2206 @@
           s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
         SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
-      end
+      end;
     end
     else if h = hGOVHELP then
@@ -2196 +2229 @@
     begin
       s := HelpText.LookupByHandle(h);
-      p := pos('$', s);
+      p := Pos('$', s);
       if p > 0 then
       begin
-        s := copy(s, p + 1, maxint);
-        p := pos('\', s);
+        s := Copy(s, p + 1, maxint);
+        p := Pos('\', s);
         if p > 0 then
-          s := copy(s, 1, p - 1);
+          s := Copy(s, 1, p - 1);
         SearchResult.AddLine(s, pkNormal, 0, hkText + hkCrossLink, h);
-      end
-    end
-    until false;
+      end;
+    end;
+    until False;
 
     // cut lines to fit to window

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, Tribes, UDpiControls,
-{$IFNDEF SCR}Term, {$ENDIF}
-  LCLIntf, LCLType, SysUtils, Classes, Graphics;
+  UDpiControls, Protocol, ClientTools, ScreenTools, Tribes, {$IFNDEF SCR}Term, {$ENDIF}
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, UPixelPointer;
 
 type
@@ -24 +23 @@
     procedure PaintCity(x, y: integer; const CityInfo: TCityInfo;
       accessory: boolean = true);
-    procedure BitBlt(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
+    procedure BitBltBitmap(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
       Rop: integer);
 
@@ -40 +39 @@
     FLeft, FTop, FRight, FBottom, RealTop, RealBottom, AttLoc, DefLoc,
       DefHealth, FAdviceLoc: integer;
-    DataDC, MaskDC: HDC;
+    DataCanvas: TDpiCanvas;
+    MaskCanvas: TDpiCanvas;
     function Connection4(Loc, Mask, Value: integer): integer;
     function Connection8(Loc, Mask: integer): integer;
@@ -89 +89 @@
 
   // sprites indexes
-  spDeadLands = 2 * TerrainIconCols + 6;
+  spRow2 = 2 * TerrainIconCols + 6;
   spBlink1 = 1 * TerrainIconCols + 8;
   spBlink2 = 2 * TerrainIconCols + 8;
@@ -107 +107 @@
   spPollution = 12 * TerrainIconCols + 6;
   spFortBack = 12 * TerrainIconCols + 7;
+  spMinerals = 12 * TerrainIconCols + 8;
   spRiver = 13 * TerrainIconCols;
+  spRiverMouths = 15 * TerrainIconCols;
+  spGrid = 15 * TerrainIconCols + 6;
   spJungle = 18 * TerrainIconCols;
+  spCanalMouths = 20 * TerrainIconCols;
 
 var
@@ -137 +141 @@
   i, x, y, xSrc, ySrc, HGrTerrainNew, HGrCitiesNew, age, size: integer;
   LandMore, OceanMore, DitherMask, Mask24: TDpiBitmap;
-  MaskLine: array [0 .. 32 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt
+  MaskLine: array [0 .. 50 * 3 - 1] of TPixelPointer; // 32 = assumed maximum for yyt
   Border: boolean;
 begin
@@ -191 +195 @@
   DitherMask.SetSize(xxt * 2, yyt * 2);
   DitherMask.Canvas.FillRect(0, 0, DitherMask.Width, DitherMask.Height);
-  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
-    GrExt[HGrTerrain].Mask.Canvas.Handle, 1 + 7 * (xxt * 2 + 1),
+  DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt * 2,
+    GrExt[HGrTerrain].Mask.Canvas, 1 + 7 * (xxt * 2 + 1),
     1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 
@@ -213 +217 @@
     end;
     for y := -1 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
-        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc,
-        SRCCOPY);
+      DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc);
     for y := -2 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
-        yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+      DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+        yyt, GrExt[HGrTerrain].Data.Canvas, xSrc + xxt, ySrc + yyt,
         SRCPAINT);
     for y := -2 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
-        xxt, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt,
+      DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+        xxt, yyt, GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc + yyt,
         SRCPAINT);
     for y := -2 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
-        yyt, DitherMask.Canvas.Handle, xxt, yyt, SRCAND);
+      DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt, xxt,
+        yyt, DitherMask.Canvas, xxt, yyt, SRCAND);
     for y := -2 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
-        xxt, yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
+      DpiBitCanvas(LandPatch.Canvas, (x + 2) * (xxt * 2) + xxt, (y + 2) * yyt,
+        xxt, yyt, DitherMask.Canvas, 0, yyt, SRCAND);
   end;
 
@@ -250 +253 @@
     end;
     for x := -2 to 6 do
-      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
-        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc,
-        SRCCOPY);
-    BitBlt(LandMore.Canvas.Handle, xxt * 2, (y + 2) * yyt, xxt, yyt,
-      GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt, SRCPAINT);
+      DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc);
+    DpiBitCanvas(LandMore.Canvas, xxt * 2, (y + 2) * yyt, xxt, yyt,
+      GrExt[HGrTerrain].Data.Canvas, xSrc + xxt, ySrc + yyt, SRCPAINT);
     for x := 0 to 7 do
-      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
-        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt,
+      DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
+        xxt * 2, yyt, GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc + yyt,
         SRCPAINT);
     for x := -2 to 6 do
-      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
-        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, 0, SRCAND);
+      DpiBitCanvas(LandMore.Canvas, (x + 2) * (xxt * 2), (y + 2) * yyt,
+        xxt * 2, yyt, DitherMask.Canvas, 0, 0, SRCAND);
   end;
 
@@ -273 +275 @@
       ySrc := 1 + yyt;
       if (x >= 1) = (y >= 2) then
-        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc, SRCCOPY);
+        DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc);
       if (x >= 1) and ((y < 2) or (x >= 2)) then
       begin
-        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+        DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
-        BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt, SRCPAINT);
+        DpiBitCanvas(OceanPatch.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
-      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
-        DitherMask.Canvas.Handle, xxt, yyt, SRCAND);
-      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
-        DitherMask.Canvas.Handle, 0, yyt, SRCAND);
+      DpiBitCanvas(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,
+        DitherMask.Canvas, 0, yyt, SRCAND);
     end;
 
@@ -298 +300 @@
       ySrc := 1 + yyt;
       if (x < 1) or (y >= 2) then
-        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc, SRCCOPY);
+        DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc);
       if (x = 1) and (y < 2) or (x >= 2) and (y >= 1) then
       begin
-        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc + xxt, ySrc + yyt,
+        DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc + xxt, ySrc + yyt,
           SRCPAINT);
-        BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
-          GrExt[HGrTerrain].Data.Canvas.Handle, xSrc, ySrc + yyt, SRCPAINT);
+        DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2) + xxt, y * yyt, xxt, yyt,
+          GrExt[HGrTerrain].Data.Canvas, xSrc, ySrc + yyt, SRCPAINT);
       end;
-      BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
-        DitherMask.Canvas.Handle, 0, 0, SRCAND);
+      DpiBitCanvas(OceanMore.Canvas, x * (xxt * 2), y * yyt, xxt * 2, yyt,
+        DitherMask.Canvas, 0, 0, SRCAND);
     end;
 
-  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
-    DitherMask.Canvas.Handle, 0, 0, DSTINVERT); { invert dither mask }
-  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt * 2,
-    GrExt[HGrTerrain].Mask.Canvas.Handle, 1, 1 + yyt, SRCPAINT);
+  DpiBitCanvas(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,
+    GrExt[HGrTerrain].Mask.Canvas, 1, 1 + yyt, SRCPAINT);
 
   for x := -1 to 6 do
     for y := -2 to 6 do
-      BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), (y + 2) * yyt,
-        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, 0, SRCAND);
+      DpiBitCanvas(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
-      BitBlt(LandMore.Canvas.Handle, (x + 2) * (xxt * 2) - xxt, (y + 2) * yyt,
-        xxt * 2, yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
-
-  BitBlt(LandPatch.Canvas.Handle, 0, 0, (xxt * 2) * 9, yyt * 9,
-    LandMore.Canvas.Handle, 0, 0, SRCPAINT);
+      DpiBitCanvas(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,
+    LandMore.Canvas, 0, 0, SRCPAINT);
 
   for x := 0 to 3 do
     for y := 0 to 3 do
-      BitBlt(OceanPatch.Canvas.Handle, x * (xxt * 2), y * yyt, xxt * 2, yyt,
-        DitherMask.Canvas.Handle, 0, 0, SRCAND);
+      DpiBitCanvas(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
-      BitBlt(OceanMore.Canvas.Handle, x * (xxt * 2) - xxt, y * yyt, xxt * 2,
-        yyt, DitherMask.Canvas.Handle, 0, yyt, SRCAND);
-
-  BitBlt(OceanPatch.Canvas.Handle, 0, 0, (xxt * 2) * 4, yyt * 4,
-    OceanMore.Canvas.Handle, 0, 0, SRCPAINT);
+      DpiBitCanvas(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,
+    OceanMore.Canvas, 0, 0, SRCPAINT);
 
   with DitherMask.Canvas do
@@ -348 +350 @@
     FillRect(Rect(0, 0, xxt * 2, yyt));
   end;
-  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt,
-    GrExt[HGrTerrain].Mask.Canvas.Handle, 1, 1 + yyt, SRCCOPY);
+  DpiBitCanvas(DitherMask.Canvas, 0, 0, xxt * 2, yyt,
+    GrExt[HGrTerrain].Mask.Canvas, 1, 1 + yyt);
 
   for x := 0 to 6 do
-    BitBlt(LandPatch.Canvas.Handle, (x + 2) * (xxt * 2), yyt, xxt * 2, yyt,
-      DitherMask.Canvas.Handle, 0, 0, SRCAND);
-  BitBlt(DitherMask.Canvas.Handle, 0, 0, xxt * 2, yyt, DitherMask.Canvas.Handle,
+    DpiBitCanvas(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,
     0, 0, DSTINVERT);
 
   for y := 0 to 6 do
-    BitBlt(LandPatch.Canvas.Handle, xxt * 2, (y + 2) * yyt, xxt * 2, yyt,
-      DitherMask.Canvas.Handle, 0, 0, SRCAND);
+    DpiBitCanvas(LandPatch.Canvas, xxt * 2, (y + 2) * yyt, xxt * 2, yyt,
+      DitherMask.Canvas, 0, 0, SRCAND);
 
   LandMore.Free;
@@ -373 +375 @@
   begin
     for i := 0 to yyt * 3 - 1 do
-      MaskLine[i].Init(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
+      MaskLine[i] := PixelPointer(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
     for xSrc := 0 to 9 - 1 do
     begin
@@ -422 +424 @@
   Borders := TDpiBitmap.Create;
   Borders.PixelFormat := pf24bit;
-  Borders.SetSize(xxt * 2,(yyt * 2) * nPl);
+  Borders.SetSize(xxt * 2, (yyt * 2) * nPl);
   Borders.Canvas.FillRect(0, 0, Borders.Width, Borders.Height);
   BordersOK := 0;
@@ -474 +476 @@
   begin
     Width := Width - (FLeft - x);
-    x := FLeft
+    x := FLeft;
   end;
   if y < FTop then
   begin
     Height := Height - (FTop - y);
-    y := FTop
+    y := FTop;
   end;
   if x + Width >= FRight then
@@ -499 +501 @@
 end;
 
-procedure TIsoMap.BitBlt(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
+procedure TIsoMap.BitBltBitmap(Src: TDpiBitmap; x, y, Width, Height, xSrc, ySrc,
   Rop: integer);
 begin
@@ -506 +508 @@
     Width := Width - (FLeft - x);
     xSrc := xSrc + (FLeft - x);
-    x := FLeft
+    x := FLeft;
   end;
   if y < FTop then
@@ -512 +514 @@
     Height := Height - (FTop - y);
     ySrc := ySrc + (FTop - y);
-    y := FTop
+    y := FTop;
   end;
   if x + Width >= FRight then
@@ -521 +523 @@
     exit;
 
-  DpiBitBlt(FOutput.Canvas.Handle, x, y, Width, Height, Src.Canvas.Handle,
-    xSrc, ySrc, Rop);
+  DpiBitCanvas(FOutput.Canvas, x, y, Width, Height, Src.Canvas, xSrc, ySrc, Rop);
 end;
 
 procedure TIsoMap.Sprite(HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
-  BitBlt(GrExt[HGr].Mask, xDst, yDst, Width, Height, xGr, yGr, SRCAND);
-  BitBlt(GrExt[HGr].Data, xDst, yDst, Width, Height, xGr, yGr, SRCPAINT);
+  BitBltBitmap(GrExt[HGr].Mask, xDst, yDst, Width, Height, xGr, yGr, SRCAND);
+  BitBltBitmap(GrExt[HGr].Data, xDst, yDst, Width, Height, xGr, yGr, SRCPAINT);
 end;
 
@@ -561 +562 @@
     exit;
 
-  DpiBitBlt(FOutput.Canvas.Handle, xDst, yDst, Width, Height, MaskDC, xSrc, ySrc, SRCAND);
+  DpiBitCanvas(FOutput.Canvas, xDst, yDst, Width, Height, MaskCanvas, xSrc, ySrc, SRCAND);
   if not PureBlack then
-    DpiBitBlt(FOutput.Canvas.Handle, xDst, yDst, Width, Height, DataDC, xSrc, ySrc,
-      SRCPAINT);
+    DpiBitCanvas(FOutput.Canvas, xDst, yDst, Width, Height, DataCanvas, xSrc, ySrc, SRCPAINT);
 end;
 
@@ -612 +612 @@
         xGr := 121 + j mod 7 * 9;
         yGr := 1 + j div 7 * 9;
-        BitBlt(GrExt[HGrSystem].Mask, x + xsh + 3, y + ysh + 9, 8, 8, xGr,
+        BitBltBitmap(GrExt[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);
@@ -620 +620 @@
       if Flags and unFortified <> 0 then
       begin
-        { DataDC:=GrExt[HGrTerrain].Data.Canvas.Handle;
-          MaskDC:=GrExt[HGrTerrain].Mask.Canvas.Handle;
+        { DataCanvas:=GrExt[HGrTerrain].Data.Canvas;
+          MaskCanvas:=GrExt[HGrTerrain].Mask.Canvas;
           TSprite(x,y+16,12*9+7); }
         Sprite(HGrStdUnits, x, y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
-      end
-    end
+      end;
+    end;
 end; { PaintUnit }
 
@@ -819 +819 @@
     exit;
 
-  BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y, xxt, yyt,
+  BitBltBitmap(GrExt[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);
-  BitBlt(GrExt[HGrTerrain].Data, x + xxt, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(GrExt[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);
-  BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y + yyt, xxt, yyt,
+  BitBltBitmap(GrExt[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);
-  BitBlt(GrExt[HGrTerrain].Data, x, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(GrExt[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
-    BitBlt(GrExt[HGrTerrain].Mask, x + xxt, y, xxt, yyt, 1 + 7 * (xxt * 2 + 1) +
+    BitBltBitmap(GrExt[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
-    BitBlt(GrExt[HGrTerrain].Mask, x + xxt, y + yyt, xxt, yyt,
+    BitBltBitmap(GrExt[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
-    BitBlt(GrExt[HGrTerrain].Mask, x, y + yyt, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
+    BitBltBitmap(GrExt[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
-    BitBlt(GrExt[HGrTerrain].Mask, x, y, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
+    BitBltBitmap(GrExt[HGrTerrain].Mask, x, y, xxt, yyt, 1 + 7 * (xxt * 2 + 1),
       1 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 end;
@@ -876 +876 @@
   end
   else if Tile and fDeadLands <> 0 then
-    TSprite(x, y, spDeadLands);
+    TSprite(x, y, spRow2);
 
   if ShowObjects then
@@ -898 +898 @@
     for Dir := 0 to 3 do
       if Conn and (1 shl Dir) <> 0 then { river mouths }
-        TSprite(x, y, 15 * TerrainIconCols + Dir);
+        TSprite(x, y, spRiverMouths + Dir);
     if ShowObjects then
     begin
@@ -904 +904 @@
       for Dir := 0 to 7 do
         if Conn and (1 shl Dir) <> 0 then { canal mouths }
-          TSprite(x, y, 20 * TerrainIconCols + 1 + Dir);
+          TSprite(x, y, spCanalMouths + 1 + Dir);
     end
   end;
@@ -1007 +1007 @@
         if BordersOK and (1 shl p1) = 0 then
         begin
-          // Clearing before bitblt SRCCOPY shouldn't be neccesary but for some
+          // Clearing before BitBltBitmap SRCCOPY shouldn't be neccesary but for some
           // reason without it code works different then under Delphi
           Borders.Canvas.FillRect(Bounds(0, p1 * (yyt * 2), xxt * 2, yyt * 2));
 
-          DpiBitBlt(Borders.Canvas.Handle, 0, p1 * (yyt * 2), xxt * 2,
-            yyt * 2, GrExt[HGrTerrain].Data.Canvas.Handle,
-            1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1), SRCCOPY);
+          DpiBitCanvas(Borders.Canvas, 0, p1 * (yyt * 2), xxt * 2,
+            yyt * 2, GrExt[HGrTerrain].Data.Canvas,
+            1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
           Borders.BeginUpdate;
           for dy := 0 to yyt * 2 - 1 do
           begin
-            PixelPtr.Init(Borders, 0, p1 * (yyt * 2) + dy);
+            PixelPtr := PixelPointer(Borders, 0, p1 * (yyt * 2) + dy);
             for dx := 0 to xxt * 2 - 1 do begin
               if PixelPtr.Pixel^.B = 99 then begin
@@ -1043 +1043 @@
               if p2 <> p1 then
               begin
-                BitBlt(GrExt[HGrTerrain].Mask, x + dx * xxt, y + dy * yyt, xxt,
+                BitBltBitmap(GrExt[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);
-                BitBlt(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
@@ -1112 +1112 @@
     end;
   end;
-  if Tile and fDeadLands <> 0 then
-    TSprite(x, y, (12 + Tile shr 25 and 3) * TerrainIconCols + 8);
+  if (Tile and fDeadLands) <> 0 then
+    TSprite(x, y, spMinerals + (Tile shr 25 and 3) * TerrainIconCols);
 
   if Options and (1 shl moEditMode) <> 0 then
@@ -1131 +1131 @@
         1 + yyt + 15 * (yyt * 3 + 1))
     else
-      TSprite(x, y, 6 + TerrainIconCols * 15, xxt <> 33);
+      TSprite(x, y, spGrid, xxt <> 33);
 
   if FoW and (Tile and fObserved = 0) then
@@ -1340 +1340 @@
   FOutput.BeginUpdate;
   for y := y0 to y1 - 1 do begin
-    Line.Init(FOutput, 0, y);
+    Line := PixelPointer(FOutput, 0, y);
     y_n := (y - ym) / yyt;
     if abs(y_n) < rShade then begin
@@ -1487 +1487 @@
                   bix := 0
                 end;
-              BitBlt(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
@@ -1535 +1535 @@
                 bix := Aix;
             if Aix = -1 then
-              BitBlt(GrExt[HGrTerrain].Data, x + dx * xxt, y + dy * yyt, xxt,
+              BitBltBitmap(GrExt[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
-              BitBlt(GrExt[HGrTerrain].Data, x + dx * xxt, y + dy * yyt, xxt,
+              BitBltBitmap(GrExt[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
-              BitBlt(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
       end;
 
-  DataDC := GrExt[HGrTerrain].Data.Canvas.Handle;
-  MaskDC := GrExt[HGrTerrain].Mask.Canvas.Handle;
+  DataCanvas := GrExt[HGrTerrain].Data.Canvas;
+  MaskCanvas := GrExt[HGrTerrain].Mask.Canvas;
   for dy := -2 to ny + 1 do
     for dx := -1 to nx do

branches/highdpi/LocalPlayer/LocalPlayer.pas

@@ -11 +11 @@
 
 uses
-  Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
+  UDpiControls, Term, CityScreen, Draft, MessgEx, Select, CityType, Help, UnitStat, Diagram,
   NatStat, Wonders, Nego, Enhance, BaseWin, Battle, Rates, TechTree,
 
@@ -25 +25 @@
     FormsCreated := true;
     // TODO: Changing application name in runtime will cause change of Linux XML registry file path
-//    Application.MainForm := MainScreen;
-    Application.CreateForm(TMainScreen, MainScreen);
-    Application.CreateForm(TCityDlg, CityDlg);
-    Application.CreateForm(TModalSelectDlg, ModalSelectDlg);
-    Application.CreateForm(TListDlg, ListDlg);
-    Application.CreateForm(TMessgExDlg, MessgExDlg);
-    Application.CreateForm(TDraftDlg, DraftDlg);
-    Application.CreateForm(TCityTypeDlg, CityTypeDlg);
-    Application.CreateForm(THelpDlg, HelpDlg);
-    Application.CreateForm(TUnitStatDlg, UnitStatDlg);
-    Application.CreateForm(TDiaDlg, DiaDlg);
-    Application.CreateForm(TNatStatDlg, NatStatDlg);
-    Application.CreateForm(TWondersDlg, WondersDlg);
-    Application.CreateForm(TNegoDlg, NegoDlg);
-    Application.CreateForm(TEnhanceDlg, EnhanceDlg);
-    Application.CreateForm(TBattleDlg, BattleDlg);
-    // Application.CreateForm(TAdvisorDlg, AdvisorDlg);
-    Application.CreateForm(TRatesDlg, RatesDlg);
-    Application.CreateForm(TTechTreeDlg, TechTreeDlg);
+//    DpiApplication.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);

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -5 +5 @@
 
 uses
-  Messg, Protocol, ScreenTools, Platform, DateUtils, UDpiControls,
+  UDpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ButtonA,
   ButtonB, StdCtrls, DrawDlg;
@@ -73 +73 @@
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes,
-  IsoEngine, Diagram;
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
+  IsoEngine, Diagram, Sound;
 
 {$R *.lfm}
@@ -209 +209 @@
       Ticks0 := NowPrecise;
       repeat
-        Application.ProcessMessages;
+        DpiApplication.ProcessMessages;
         Sleep(1);
         Ticks := NowPrecise;
@@ -246 +246 @@
     for iy := 0 to 39 do begin
       for ix := 0 to 55 do begin
-        SrcPtr.Init(BigImp, ix + xIcon, iy + yIcon);
+        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
         xR := ix * (37 + iy * 5 / 40) / 56;
         xDst := Trunc(xR);
@@ -291 +291 @@
 
   // paint
-  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y, SRCCOPY);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, wb, hb, ca, x, y);
 
   if IconIndex >= 0 then
@@ -304 +304 @@
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, xb, yb, wb, hb, clCover, clPage);
 
-  DpiBitBlt(ca.Handle, x, y, wb, hb, LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(ca, x, y, wb, hb, LogoBuffer.Canvas, 0, 0);
 end;
 
@@ -328 +328 @@
       with MyRO.EnemyModel[emix], Tribe[Owner].ModelPicture[mix] do
       begin
-        DpiBitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Mask.Canvas.Handle,
+        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Mask.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCAND);
-        DpiBitBlt(Canvas.Handle, x, y, 64, 48, GrExt[HGr].Data.Canvas.Handle,
+        DpiBitCanvas(Canvas, x, y, 64, 48, GrExt[HGr].Data.Canvas,
           pix mod 10 * 65 + 1, pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -345 +345 @@
         if UnitsInLine > LostUnitsPerLine then
           UnitsInLine := LostUnitsPerLine;
-      end
+      end;
     end;
 end;
@@ -371 +371 @@
       begin
         p1 := MyRO.Wonder[IconIndex].EffectiveOwner;
-        DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xSizeBig + 2 * GlowRange,
-          ySizeBig + 2 * GlowRange, Canvas.Handle,
-          ClientWidth div 2 - (28 + GlowRange), 24 - GlowRange, SRCCOPY);
-        DpiBitBlt(Buffer.Canvas.Handle, GlowRange, GlowRange, xSizeBig, ySizeBig,
-          BigImp.Canvas.Handle, IconIndex mod 7 * xSizeBig,
-          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig, SRCCOPY);
+        DpiBitCanvas(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,
+          BigImp.Canvas, IconIndex mod 7 * xSizeBig,
+          (IconIndex + SystemIconLines * 7) div 7 * ySizeBig);
         if p1 < 0 then
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig, $000000)
@@ -382 +382 @@
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - (28 + GlowRange),
+        DpiBitCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
           24 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+          Buffer.Canvas, 0, 0);
       end
       else
@@ -400 +400 @@
         FrameImage(Canvas, BigImp, ClientWidth div 2 - 28, 24, xSizeBig,
           ySizeBig, 0, 0);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Mask.Canvas.Handle, pix mod 10 * 65 + 1,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Mask.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCAND);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 20, 64, 44,
-          GrExt[HGr].Data.Canvas.Handle, pix mod 10 * 65 + 1,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 20, 64, 44,
+          GrExt[HGr].Data.Canvas, pix mod 10 * 65 + 1,
           pix div 10 * 49 + 1, SRCPAINT);
       end;
@@ -415 +415 @@
         Frame(Canvas, ClientWidth div 2 - 32 - 1, 24 - 1,
           ClientWidth div 2 + 32, 24 + 48, $000000, $000000);
-        DpiBitBlt(Canvas.Handle, ClientWidth div 2 - 32, 24, 64, 48,
-          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas.Handle,
+        DpiBitCanvas(Canvas, ClientWidth div 2 - 32, 24, 64, 48,
+          GrExt[Tribe[IconIndex].faceHGr].Data.Canvas,
           1 + Tribe[IconIndex].facepix mod 10 * 65,
-          1 + Tribe[IconIndex].facepix div 10 * 49, SRCCOPY)
+          1 + Tribe[IconIndex].facepix div 10 * 49)
       end;
     mikPureIcon:
@@ -429 +429 @@
     mikEnemyShipComplete:
       begin
-        BitBltCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
-          (ClientWidth - 140) div 2, 24, SRCCOPY);
+        DpiBitCanvas(Buffer.Canvas, 0, 0, 140, 120, Canvas,
+          (ClientWidth - 140) div 2, 24);
         ImageOp_BCC(Buffer, Templates, 0, 0, 1, 279, 140, 120, 0, $FFFFFF);
-        DpiBitBlt(Canvas.Handle, (ClientWidth - 140) div 2, 24, 140, 120,
-          Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, (ClientWidth - 140) div 2, 24, 140, 120,
+          Buffer.Canvas, 0, 0);
       end;
     mikMyArmy:
@@ -450 +450 @@
   if OpenSound <> '' then
     PostMessage(Handle, WM_PLAYSOUND, 0, 0);
-end; { FormPaint }
+end;
 
 procedure TMessgExDlg.Button1Click(Sender: TObject);
@@ -469 +469 @@
 procedure TMessgExDlg.Button3Click(Sender: TObject);
 begin
-  ModalResult := mrCancel
+  ModalResult := mrCancel;
 end;
 
 procedure TMessgExDlg.RemoveBtnClick(Sender: TObject);
 begin
-  ModalResult := mrNo
+  ModalResult := mrNo;
 end;
 
@@ -485 +485 @@
       ModalResult := mrCancel
     else if Button2.Visible then
-      ModalResult := mrIgnore
+      ModalResult := mrIgnore;
 end;
 
@@ -497 +497 @@
     Kind := mkOk;
     ShowModal;
-  end
+  end;
 end;
 
@@ -522 +522 @@
     Kind := QueryKind;
     ShowModal;
-    result := ModalResult
-  end
+    result := ModalResult;
+  end;
 end;
 
@@ -537 +537 @@
     HelpNo := ContextNo;
     ShowModal;
-  end
+  end;
 end;
 
@@ -552 +552 @@
 end;
 
+
 initialization
 

branches/highdpi/LocalPlayer/NatStat.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
+
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ButtonC, Menus, EOTButton;
@@ -92 +93 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png', gfNoGamma);
 end;
 
@@ -108 +109 @@
   begin
     AgePrepared := MainTextureAge;
-    Dpibitblt(Back.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - ClientWidth) div 2,
-      (hMainTexture - ClientHeight) div 2, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, ClientWidth, ClientHeight,
+      MainTexture.Image.Canvas, (wMainTexture - ClientWidth) div 2,
+      (hMainTexture - ClientHeight) div 2);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
   end
@@ -263 +264 @@
   Extinct := 1 shl pView and MyRO.Alive = 0;
 
-  Dpibitblt(offscreen.Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
-    Back.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,
+    Back.Canvas, 0, 0);
 
   offscreen.Canvas.Font.Assign(UniFont[ftCaption]);

branches/highdpi/LocalPlayer/Nego.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, Term, LCLType, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonA, ButtonB, ButtonN, UDpiControls;
+  UDpiControls, ScreenTools, BaseWin, Protocol, Term, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonA, ButtonB, ButtonN;
 
 const
@@ -15 +15 @@
 type
   THistory = record
-    n: integer;
-    Text: array [0 .. MaxHistory - 1] of ansistring;
-  end;
-
-  TCommandAllowedEnum = scDipNoticeStart .. scDipBreakStart;
+    n: Integer;
+    Text: array[0 .. MaxHistory - 1] of ansistring;
+  end;
+
+  TCommandAllowedEnum = scDipNoticeStart..scDipBreakStart;
 
   { TNegoDlg }

branches/highdpi/LocalPlayer/PVSB.pas

@@ -5 +5 @@
 
 uses
-  {$IFDEF WINDOWS}
+  UDpiControls, {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
-  StdCtrls, Math, UDpiControls;
+  StdCtrls, Math;
 
 type
@@ -109 +109 @@
     if Max < ScrollBar.PageSize then Result := False
     else begin
-      NewPos := ScrollBar.Position - Delta div 300;
+      NewPos := ScrollBar.Position - Delta div 30;
       if NewPos < 0 then NewPos := 0;
       if NewPos > Max - ScrollBar.PageSize + 1 then
@@ -153 +153 @@
 begin
   FMax := AValue;
-  ScrollBar.Max := Math.Max(0, Max{$IFDEF LINUX} - PageSize + 1{$ENDIF});
+  ScrollBar.Max := Math.Max(0, FMax);
 end;
 

branches/highdpi/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
 
   SysUtils, Classes, Graphics, Controls, Forms,
@@ -29 +29 @@
   RatesDlg: TRatesDlg;
 
-
 implementation
 
 uses
-  ClientTools, Term, Tribes, UDpiControls;
+  ClientTools, Term, Tribes;
 
 {$R *.lfm}
@@ -96 +95 @@
     GlowFrame(Offscreen, ClientWidth div 2 - xSizeBig div 2, 52, xSizeBig,
       ySizeBig, Tribe[me].Color);
-    DpiBitBlt(Offscreen.Canvas.Handle, ClientWidth div 2 - xSizeBig div 2, 52,
-      xSizeBig, ySizeBig, BigImp.Canvas.Handle, (woLiberty mod 7) * xSizeBig,
-      (woLiberty div 7 + SystemIconLines) * ySizeBig, SRCCOPY);
+    DpiBitCanvas(Offscreen.Canvas, ClientWidth div 2 - xSizeBig div 2, 52,
+      xSizeBig, ySizeBig, BigImp.Canvas, (woLiberty mod 7) * xSizeBig,
+      (woLiberty div 7 + SystemIconLines) * ySizeBig);
   end
   else
@@ -123 +122 @@
     begin
       for i := 0 to current div 8 - 1 do
-        DpiBitBlt(Handle, x + max - 8 - i * 8, y, 8, 7,
-          GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * 2, SRCCOPY);
-      DpiBitBlt(Handle, x + max - current, y, current - 8 * (current div 8), 7,
-        GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * 2, SRCCOPY);
+        DpiBitCanvas(Offscreen.Canvas, x + max - 8 - i * 8, y, 8, 7,
+          GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * 2);
+      DpiBitCanvas(Offscreen.Canvas, x + max - current, y, current - 8 * (current div 8), 7,
+        GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * 2);
       Brush.Color := $000000;
       FillRect(Rect(x, y, x + max - current, y + 7));

branches/highdpi/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin, UDpiControls,
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
 
@@ -196 +197 @@
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
-          DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-            ySizeSmall, SmallImp.Canvas.Handle, (MyRO.Government - 1) *
-            xSizeSmall, ySizeSmall, SRCCOPY)
+          DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+            ySizeSmall, SmallImp.Canvas, (MyRO.Government - 1) *
+            xSizeSmall, ySizeSmall)
         else
-          DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-            ySizeSmall, SmallImp.Canvas.Handle, pix and cpIndex mod 7 *
+          DpiBitCanvas(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, SRCCOPY)
+            ySizeSmall)
       else
-        DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-          ySizeSmall, SmallImp.Canvas.Handle, (3 + pix and cpIndex) *
-          xSizeSmall, 0, SRCCOPY)
+        DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          ySizeSmall, SmallImp.Canvas, (3 + pix and cpIndex) *
+          xSizeSmall, 0);
     end;
   end;
@@ -567 +568 @@
                   MainTexture.clBevelLight, MainTexture.clBevelShade);
                 if AdvIcon[lix] < 84 then
-                  DpiBitBlt(offscreen.Canvas.Handle, (8 + 16), y0, xSizeSmall,
-                    ySizeSmall, SmallImp.Canvas.Handle,
+                  DpiBitCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
+                    ySizeSmall, SmallImp.Canvas,
                     (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
                     (AdvIcon[lix] + SystemIconLines * 7) div 7 *
-                    ySizeSmall, SRCCOPY)
+                    ySizeSmall)
                 else
                   Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
@@ -577 +578 @@
                     295 + (AdvIcon[lix] - 84) div 8 * 21);
                 j := AdvValue[lix] div 1000;
-                DpiBitBlt(Handle, (8 + 16 - 4), y0 + 2, 14, 14,
-                  GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15,
+                DpiBitCanvas(Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                  GrExt[HGrSystem].Mask.Canvas, 127 + j * 15,
                   85, SRCAND);
                 Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
@@ -672 +673 @@
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
               MainTexture.clBevelLight, MainTexture.clBevelShade);
-            DpiBitBlt(offscreen.Canvas.Handle, 8 + 16, y0 - 15 + (16 - 1),
-              xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
-              (lix - 1) * xSizeSmall, ySizeSmall, SRCCOPY);
+            DpiBitCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
+              xSizeSmall, ySizeSmall, SmallImp.Canvas,
+              (lix - 1) * xSizeSmall, ySizeSmall);
           end
         end;
@@ -815 +816 @@
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
           ClientHeight - 29, s);
-        BitBltCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
-          xScreen - 10, ClientHeight - 27, SRCCOPY);
+        DpiBitCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
+          xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDot, Templates, 0, 0, 114, 211, 17, 17,
           MainTexture.clBevelShade, Tribe[ScienceNation].Color);
-        DpiBitBlt(Canvas.Handle, xScreen - 10, ClientHeight - 27, 17, 17,
-          ScienceNationDot.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, xScreen - 10, ClientHeight - 27, 17, 17,
+          ScienceNationDot.Canvas, 0, 0);
       end;
     end

branches/highdpi/LocalPlayer/TechTree.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Messg, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics,
-  Controls, Forms, ButtonBase, ButtonB, DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Controls, Forms, ButtonB, DrawDlg;
 
 type
@@ -30 +30 @@
   TechTreeDlg: TTechTreeDlg;
 
+
 implementation
 
@@ -77 +78 @@
   X, w: Integer;
 begin
-  with Canvas do
-  begin
+  with Canvas do begin
     // black border
     brush.color := $000000;
@@ -107 +107 @@
         -BlackBorder - yOffset, Paper);
   end;
-  DpiBitBlt(Canvas.Handle, max(BlackBorder, BlackBorder + xOffset),
+  DpiBitCanvas(Canvas, max(BlackBorder, BlackBorder + xOffset),
     max(BlackBorder, BlackBorder + yOffset),
     min(Image.width, min(Image.width + xOffset,
@@ -113 +113 @@
     ), min(Image.height, min(Image.height + yOffset,
     min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
-    yOffset))), Image.Canvas.Handle, max(0, -xOffset),
-    max(0, -yOffset), SRCCOPY);
+    yOffset))), Image.Canvas, max(0, -xOffset),
+    max(0, -yOffset));
 end;
 
 procedure TTechTreeDlg.FormShow(Sender: TObject);
 var
-  X, Y, ad, TexWidth, TexHeight: Integer;
+  X, Y, ad: Integer;
   s: string;
-  SrcPixel, DstPixel: TPixelPointer;
-begin
-  if Image = nil then
-  begin
+const
+  TransparentColor = $7F007F;
+begin
+  if Image = nil then begin
     Image := TDpiBitmap.Create;
     Image.PixelFormat := pf24bit;
     LoadGraphicFile(Image, HomeDir + 'Help' + DirectorySeparator + 'AdvTree.png', gfNoGamma);
 
-    with Image.Canvas do
-    begin
+    with Image.Canvas do begin
       // write advance names
       Font.Assign(UniFont[ftSmall]);
@@ -146 +145 @@
             TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
-              := $7F007F;
+              := TransparentColor;
           end
         end;
@@ -161 +160 @@
     end;
 
-    // texturize background
-    Image.BeginUpdate;
-    TexWidth := Paper.Width;
-    TexHeight := Paper.Height;
-    DstPixel.Init(Image);
-    SrcPixel.Init(Paper);
-    for Y := 0 to Image.Height - 1 do begin
-      for X := 0 to Image.Width - 1 do begin
-        if (DstPixel.Pixel^.ARGB and $FFFFFF) = $7F007F then begin // transparent
-          SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
-          DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
-          DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
-          DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
-        end;
-        DstPixel.NextPixel;
-      end;
-      DstPixel.NextLine;
-    end;
-    Image.EndUpdate;
+    Texturize(Image, Paper, TransparentColor);
   end;
 
@@ -204 +185 @@
     xDown := X;
     yDown := Y;
-  end
+  end;
 end;
 
@@ -234 +215 @@
 
     SmartInvalidate;
-  end
+  end;
 end;
 
@@ -246 +227 @@
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close();
+  Close;
 end;
 

branches/highdpi/LocalPlayer/Term.lfm

@@ -1 +1 @@
 object MainScreen: TMainScreen
   Left = 231
-  Height = 480
+  Height = 600
   Top = 190
-  Width = 800
+  Width = 1000
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   Caption = 'C-evo'
-  ClientHeight = 480
-  ClientWidth = 800
+  ClientHeight = 600
+  ClientWidth = 1000
   Color = clBtnFace
-  Constraints.MinHeight = 480
-  Constraints.MinWidth = 800
+  Constraints.MinHeight = 600
+  Constraints.MinWidth = 1000
+  DesignTimePPI = 120
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -16
   Font.Name = 'MS Sans Serif'
   KeyPreview = True
@@ -30 +31 @@
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '2.0.6.0'
   WindowState = wsMaximized
   object UnitBtn: TButtonB
     Tag = 14
-    Left = 208
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 260
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -46 +47 @@
   object MapBtn0: TButtonC
     Tag = 51
-    Left = 16
-    Height = 12
-    Top = 304
-    Width = 12
+    Left = 20
+    Height = 15
+    Top = 380
+    Width = 15
     Visible = False
     Down = False
@@ -58 +59 @@
   object MapBtn1: TButtonC
     Tag = 291
-    Left = 16
-    Height = 12
-    Top = 320
-    Width = 12
+    Left = 20
+    Height = 15
+    Top = 400
+    Width = 15
     Visible = False
     Down = False
@@ -70 +71 @@
   object MapBtn4: TButtonC
     Tag = 1028
-    Left = 16
-    Height = 12
-    Top = 368
-    Width = 12
+    Left = 20
+    Height = 15
+    Top = 460
+    Width = 15
     Visible = False
     Down = False
@@ -82 +83 @@
   object MapBtn5: TButtonC
     Tag = 1328
-    Left = 16
-    Height = 12
-    Top = 384
-    Width = 12
+    Left = 20
+    Height = 15
+    Top = 480
+    Width = 15
     Visible = False
     Down = False
@@ -94 +95 @@
   object MapBtn6: TButtonC
     Tag = 1541
-    Left = 16
-    Height = 12
-    Top = 400
-    Width = 12
+    Left = 20
+    Height = 15
+    Top = 500
+    Width = 15
     Visible = False
     Down = False
@@ -106 +107 @@
   object TerrainBtn: TButtonB
     Tag = 28
-    Left = 240
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 300
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -118 +119 @@
   object UnitInfoBtn: TButtonB
     Tag = 15
-    Left = 176
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 220
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -129 +130 @@
   end
   object EOT: TEOTButton
-    Left = 712
-    Height = 48
-    Top = 368
-    Width = 48
+    Left = 890
+    Height = 60
+    Top = 460
+    Width = 60
     Visible = False
     Down = False
@@ -141 +142 @@
   object MenuArea: TArea
     Left = 2
-    Height = 36
+    Height = 45
     Top = 1
-    Width = 36
+    Width = 45
   end
   object TreasuryArea: TArea
-    Left = 208
-    Height = 36
+    Left = 260
+    Height = 45
     Top = 1
-    Width = 164
+    Width = 205
   end
   object ResearchArea: TArea
-    Left = 384
-    Height = 36
+    Left = 480
+    Height = 45
     Top = 1
-    Width = 240
+    Width = 300
   end
   object ManagementArea: TArea
-    Left = 704
-    Height = 40
-    Top = 312
-    Width = 56
+    Left = 880
+    Height = 50
+    Top = 390
+    Width = 70
   end
   object MovieSpeed1Btn: TButtonB
     Tag = 256
-    Left = 384
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 480
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -177 +178 @@
   object MovieSpeed2Btn: TButtonB
     Tag = 512
-    Left = 416
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 520
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -189 +190 @@
   object MovieSpeed3Btn: TButtonB
     Tag = 768
-    Left = 448
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 560
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -201 +202 @@
   object MovieSpeed4Btn: TButtonB
     Tag = 1024
-    Left = 480
-    Height = 25
-    Top = 384
-    Width = 25
+    Left = 600
+    Height = 31
+    Top = 480
+    Width = 31
     Visible = False
     Down = False
@@ -215 +216 @@
     Interval = 50
     OnTimer = Timer1Timer
-    left = 8
-    top = 48
+    left = 10
+    top = 60
   end
   object GamePopup: TPopupMenu
     AutoPopup = False
-    left = 40
-    top = 48
+    left = 50
+    top = 60
     object mHelp: TMenuItem
       Tag = 7
@@ -452 +453 @@
           RadioItem = True
           OnClick = mNormalTilesClick
+        end
+        object mBigTiles: TMenuItem
+          Caption = '90px'
+          RadioItem = True
+          OnClick = mBigTilesClick
         end
       end
@@ -580 +586 @@
   object UnitPopup: TPopupMenu
     AutoPopup = False
-    left = 104
-    top = 48
+    left = 130
+    top = 60
     object mdisband: TMenuItem
       Tag = 72
@@ -663 +669 @@
   object StatPopup: TPopupMenu
     AutoPopup = False
-    left = 72
-    top = 48
+    left = 90
+    top = 60
     object mUnitStat: TMenuItem
       Tag = 9
@@ -719 +725 @@
   end
   object EditPopup: TPopupMenu
-    left = 168
-    top = 48
+    left = 210
+    top = 60
     object mCreateUnit: TMenuItem
       Tag = 47
@@ -726 +732 @@
   end
   object TerrainPopup: TPopupMenu
-    left = 136
-    top = 48
+    left = 170
+    top = 60
     object mtrans: TMenuItem
       Tag = 273

branches/highdpi/LocalPlayer/Term.pas

@@ -5 +5 @@
 
 uses
-{$IFDEF Windows}
+  UDpiControls, {$IFDEF Windows}
   Windows,
 {$ENDIF}
@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
-  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  UDpiControls;
+  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area;
 
 const
@@ -27 +26 @@
 
   TMainScreen = class(TDrawDlg)
+    mBigTiles: TMenuItem;
     Timer1: TTimer;
     GamePopup: TPopupMenu;
@@ -219 +219 @@
     procedure mSmallTilesClick(Sender: TObject);
     procedure mNormalTilesClick(Sender: TObject);
+    procedure mBigTilesClick(Sender: TObject);
     procedure GrWallBtnDownChanged(Sender: TObject);
     procedure BareBtnDownChanged(Sender: TObject);
@@ -234 +235 @@
     Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
       HaveStrategyAdvice, FirstMovieTurn: boolean;
+    function ChooseUnusedTribe: integer;
+    procedure GetTribeList;
+    procedure InitModule;
+    procedure InitTurn(NewPlayer: integer);
     procedure ScrollBarUpdate(Sender: TObject);
     procedure ArrangeMidPanel;
@@ -271 +276 @@
     procedure SetTileSize(x, y: integer);
     procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
     procedure SmartRectInvalidate(Left, Top, Rigth, Bottom: integer);
+    procedure LoadSettings;
     procedure SaveSettings;
     procedure OnScroll(var m: TMessage); message WM_VSCROLL;
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
+    procedure SoundPreload(Check: integer);
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -391 +399 @@
     'CITY_WONDEREX', 'CITY_EMDELAY', 'CITY_FOUNDED', 'CITY_FOUNDED', '',
     'CITY_INVALIDTYPE');
+
+  // sound blocks for preload
+  sbStart = $01;
+  sbWonder = $02;
+  sbScience = $04;
+  sbContact = $08;
+  sbTurn = $10;
+  sbAll = $FF;
 
 type
@@ -460 +476 @@
 procedure HelpOnTerrain(Loc, NewMode: integer);
 
+
 implementation
 
 uses
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego,
-  Battle, Rates, TechTree, Registry;
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
+  Battle, Rates, TechTree, Registry, Global;
 
 {$R *.lfm}
@@ -560 +577 @@
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        PixelPtr.Init(BigImp, 0, cut + iy * ySizeBig + y);
+        PixelPtr := PixelPointer(BigImp, 0, cut + iy * ySizeBig + y);
         for x := 0 to xSizeBig - 1 do
         begin
@@ -593 +610 @@
   SmallImp.BeginUpdate;
   for y := 0 to ny - 1 do begin
-    PixelPtr.Init(SmallImp, 0, y);
+    PixelPtr := PixelPointer(SmallImp, 0, y);
     for x := 0 to nx - 1 do
       for ch := 0 to 2 do begin
@@ -1292 +1309 @@
 end;
 
-procedure TMainScreen.Client(Command, NewPlayer: integer; var Data);
-
-  procedure GetTribeList;
-  var
-    SearchRec: TSearchRec;
-    Color: TColor;
-    Name: string;
-    ok: boolean;
-  begin
-    UnusedTribeFiles.Clear;
-    ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*.tribe.txt',
+procedure TMainScreen.SoundPreload(Check: integer);
+const
+  nStartBlock = 27;
+  StartBlock: array [0 .. nStartBlock - 1] of string = ('INVALID', 'TURNEND',
+    'DISBAND', 'CHEAT', 'MSG_DEFAULT', 'WARNING_DISORDER', 'WARNING_FAMINE',
+    'WARNING_LOWSUPPORT', 'WARNING_LOWFUNDS', 'MOVE_MOUNTAIN', 'MOVE_LOAD',
+    'MOVE_UNLOAD', 'MOVE_DIE', 'NOMOVE_TIME', 'NOMOVE_DOMAIN',
+    'NOMOVE_DEFAULT', 'CITY_SELLIMP', 'CITY_REBUILDIMP', 'CITY_BUYPROJECT',
+    'CITY_UTILIZE', 'NEWMODEL_0', 'NEWADVANCE_0', 'AGE_0', 'REVOLUTION',
+    'NEWGOV', 'CITY_INVALIDTYPE', 'MSG_GAMEOVER');
+
+  nWonderBlock = 6;
+  WonderBlock: array [0 .. nWonderBlock - 1] of string = ('WONDER_BUILT',
+    'WONDER_CAPTURED', 'WONDER_EXPIRED', 'WONDER_DESTROYED', 'MSG_COLDWAR',
+    'NEWADVANCE_GRLIB');
+
+  nScienceBlock = 17;
+  ScienceBlock: array [0 .. nScienceBlock - 1] of string = ('MOVE_PARACHUTE',
+    'MOVE_PLANESTART', 'MOVE_PLANELANDING', 'MOVE_COVERT', 'NEWMODEL_1',
+    'NEWMODEL_2', 'NEWMODEL_3', 'NEWADVANCE_1', 'NEWADVANCE_2',
+    'NEWADVANCE_3', 'AGE_1', 'AGE_2', 'AGE_3', 'SHIP_BUILT', 'SHIP_TRADED',
+    'SHIP_CAPTURED', 'SHIP_DESTROYED');
+
+  nContactBlock = 20;
+  ContactBlock: array [0 .. nContactBlock - 1] of string = ('NEWTREATY',
+    'CANCELTREATY', 'ACCEPTOFFER', 'MSG_WITHDRAW', 'MSG_BANKRUPT',
+    'CONTACT_0', 'CONTACT_1', 'CONTACT_2', 'CONTACT_3', 'CONTACT_4',
+    'CONTACT_5', 'CONTACT_5', 'CONTACT_6', 'NEGO_REJECTED', 'MOVE_CAPTURE',
+    'MOVE_EXPEL', 'NOMOVE_TREATY', 'NOMOVE_ZOC', 'NOMOVE_SUBMARINE',
+    'NOMOVE_STEALTH');
+
+var
+  i, cix, mix: integer;
+  need: boolean;
+  mi: TModelInfo;
+begin
+  if Check and sbStart and not SoundPreloadDone <> 0 then
+  begin
+    for i := 0 to nStartBlock - 1 do
+      PreparePlay(StartBlock[i]);
+    SoundPreloadDone := SoundPreloadDone or sbStart;
+  end;
+  if Check and sbWonder and not SoundPreloadDone <> 0 then
+  begin
+    need := false;
+    for i := 0 to 27 do
+      if MyRO.Wonder[i].CityID <> -1 then
+        need := true;
+    if need then
+    begin
+      for i := 0 to nWonderBlock - 1 do
+        PreparePlay(WonderBlock[i]);
+      SoundPreloadDone := SoundPreloadDone or sbWonder;
+    end;
+  end;
+  if (Check and sbScience and not SoundPreloadDone <> 0) and
+    (MyRO.Tech[adScience] >= tsApplicable) then
+  begin
+    for i := 0 to nScienceBlock - 1 do
+      PreparePlay(ScienceBlock[i]);
+    SoundPreloadDone := SoundPreloadDone or sbScience;
+  end;
+  if (Check and sbContact and not SoundPreloadDone <> 0) and
+    (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then
+  begin
+    for i := 0 to nContactBlock - 1 do
+      PreparePlay(ContactBlock[i]);
+    SoundPreloadDone := SoundPreloadDone or sbContact;
+  end;
+  if Check and sbTurn <> 0 then
+  begin
+    if MyRO.Happened and phShipComplete <> 0 then
+      PreparePlay('MSG_YOUWIN');
+    if MyData.ToldAlive <> MyRO.Alive then
+      PreparePlay('MSG_EXTINCT');
+    for cix := 0 to MyRO.nCity - 1 do
+      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 mix := 0 to MyRO.nModel - 1 do
+      with MyModel[mix] do
+        if Attack > 0 then
+        begin
+          MakeModelInfo(me, mix, MyModel[mix], mi);
+          PreparePlay(AttackSound(ModelCode(mi)));
+        end;
+  end;
+end;
+
+procedure TMainScreen.GetTribeList;
+var
+  SearchRec: TSearchRec;
+  Color: TColor;
+  Name: string;
+  ok: boolean;
+begin
+  UnusedTribeFiles.Clear;
+  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*.tribe.txt',
+    faArchive + faReadOnly, SearchRec) = 0;
+  if not ok then
+  begin
+    FindClose(SearchRec);
+    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*.tribe.txt'),
       faArchive + faReadOnly, SearchRec) = 0;
-    if not ok then
-    begin
-      FindClose(SearchRec);
-      ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*.tribe.txt'),
-        faArchive + faReadOnly, SearchRec) = 0;
+  end;
+  if ok then
+    repeat
+      SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - 10);
+      if GetTribeInfo(SearchRec.Name, Name, Color) then
+        UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
+    until FindNext(SearchRec) <> 0;
+  FindClose(SearchRec);
+end;
+
+function TMainScreen.ChooseUnusedTribe: integer;
+var
+  i, j, ColorDistance, BestColorDistance, TestColorDistance,
+    CountBest: integer;
+begin
+  assert(UnusedTribeFiles.Count > 0);
+  result := -1;
+  BestColorDistance := -1;
+  for j := 0 to UnusedTribeFiles.Count - 1 do
+  begin
+    ColorDistance := 250; // consider differences more than this infinite
+    for i := 0 to nPl - 1 do
+      if Tribe[i] <> nil then
+      begin
+        TestColorDistance := abs(integer(UnusedTribeFiles.Objects[j])
+          shr 16 and $FF - Tribe[i].Color shr 16 and $FF) +
+          abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and
+          $FF - Tribe[i].Color shr 8 and $FF) * 3 +
+          abs(integer(UnusedTribeFiles.Objects[j]) and
+          $FF - Tribe[i].Color and $FF) * 2;
+        if TestColorDistance < ColorDistance then
+          ColorDistance := TestColorDistance
+      end;
+    if ColorDistance > BestColorDistance then
+    begin
+      CountBest := 0;
+      BestColorDistance := ColorDistance
     end;
-    if ok then
-      repeat
-        SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - 10);
-        if GetTribeInfo(SearchRec.Name, Name, Color) then
-          UnusedTribeFiles.AddObject(SearchRec.Name, TObject(Color));
-      until FindNext(SearchRec) <> 0;
-    FindClose(SearchRec);
-  end;
-
-  function ChooseUnusedTribe: integer;
-  var
-    i, j, ColorDistance, BestColorDistance, TestColorDistance,
-      CountBest: integer;
-  begin
-    assert(UnusedTribeFiles.Count > 0);
-    result := -1;
-    BestColorDistance := -1;
-    for j := 0 to UnusedTribeFiles.Count - 1 do
-    begin
-      ColorDistance := 250; // consider differences more than this infinite
-      for i := 0 to nPl - 1 do
-        if Tribe[i] <> nil then
-        begin
-          TestColorDistance := abs(integer(UnusedTribeFiles.Objects[j])
-            shr 16 and $FF - Tribe[i].Color shr 16 and $FF) +
-            abs(integer(UnusedTribeFiles.Objects[j]) shr 8 and
-            $FF - Tribe[i].Color shr 8 and $FF) * 3 +
-            abs(integer(UnusedTribeFiles.Objects[j]) and
-            $FF - Tribe[i].Color and $FF) * 2;
-          if TestColorDistance < ColorDistance then
-            ColorDistance := TestColorDistance
+    if ColorDistance = BestColorDistance then
+    begin
+      inc(CountBest);
+      if DelphiRandom(CountBest) = 0 then
+        result := j
+    end
+  end;
+end;
+
+procedure TMainScreen.ShowEnemyShipChange(ShowShipChange: TShowShipChange);
+var
+  i, TestCost, MostCost: integer;
+  Ship1Plus, Ship2Plus: boolean;
+begin
+  with ShowShipChange, MessgExDlg do
+  begin
+    case Reason of
+      scrProduction:
+        begin
+          OpenSound := 'SHIP_BUILT';
+          MessgText := Tribe[Ship1Owner].TPhrase('SHIPBUILT');
+          IconKind := mikShip;
+          IconIndex := Ship1Owner;
         end;
-      if ColorDistance > BestColorDistance then
-      begin
-        CountBest := 0;
-        BestColorDistance := ColorDistance
+
+      scrDestruction:
+        begin
+          OpenSound := 'SHIP_DESTROYED';
+          MessgText := Tribe[Ship1Owner].TPhrase('SHIPDESTROYED');
+          IconKind := mikImp;
+        end;
+
+      scrTrade:
+        begin
+          OpenSound := 'SHIP_TRADED';
+          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;
+          end;
+          if Ship1Plus and Ship2Plus then
+            MessgText := Tribe[Ship1Owner].TPhrase('SHIPBITRADE1') + ' ' +
+              Tribe[Ship2Owner].TPhrase('SHIPBITRADE2')
+          else if Ship1Plus then
+            MessgText := Tribe[Ship1Owner].TPhrase('SHIPUNITRADE1') + ' ' +
+              Tribe[Ship2Owner].TPhrase('SHIPUNITRADE2')
+          else // if Ship2Plus then
+            MessgText := Tribe[Ship2Owner].TPhrase('SHIPUNITRADE1') + ' ' +
+              Tribe[Ship1Owner].TPhrase('SHIPUNITRADE2');
+          IconKind := mikImp;
+        end;
+
+      scrCapture:
+        begin
+          OpenSound := 'SHIP_CAPTURED';
+          MessgText := Tribe[Ship2Owner].TPhrase('SHIPCAPTURE1') + ' ' +
+            Tribe[Ship1Owner].TPhrase('SHIPCAPTURE2');
+          IconKind := mikShip;
+          IconIndex := Ship2Owner;
+        end
+    end;
+
+    if IconKind = mikImp then
+    begin
+      MostCost := 0;
+      for i := 0 to nShipPart - 1 do
+      begin
+        TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
+        if TestCost > MostCost then
+        begin
+          MostCost := TestCost;
+          IconIndex := imShipComp + i
+        end
       end;
-      if ColorDistance = BestColorDistance then
-      begin
-        inc(CountBest);
-        if DelphiRandom(CountBest) = 0 then
-          result := j
-      end
     end;
-  end;
-
-  procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
-  var
-    i, TestCost, MostCost: integer;
-    Ship1Plus, Ship2Plus: boolean;
-  begin
-    with ShowShipChange, MessgExDlg do
-    begin
-      case Reason of
-        scrProduction:
-          begin
-            OpenSound := 'SHIP_BUILT';
-            MessgText := Tribe[Ship1Owner].TPhrase('SHIPBUILT');
-            IconKind := mikShip;
-            IconIndex := Ship1Owner;
-          end;
-
-        scrDestruction:
-          begin
-            OpenSound := 'SHIP_DESTROYED';
-            MessgText := Tribe[Ship1Owner].TPhrase('SHIPDESTROYED');
-            IconKind := mikImp;
-          end;
-
-        scrTrade:
-          begin
-            OpenSound := 'SHIP_TRADED';
-            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;
-            end;
-            if Ship1Plus and Ship2Plus then
-              MessgText := Tribe[Ship1Owner].TPhrase('SHIPBITRADE1') + ' ' +
-                Tribe[Ship2Owner].TPhrase('SHIPBITRADE2')
-            else if Ship1Plus then
-              MessgText := Tribe[Ship1Owner].TPhrase('SHIPUNITRADE1') + ' ' +
-                Tribe[Ship2Owner].TPhrase('SHIPUNITRADE2')
-            else // if Ship2Plus then
-              MessgText := Tribe[Ship2Owner].TPhrase('SHIPUNITRADE1') + ' ' +
-                Tribe[Ship1Owner].TPhrase('SHIPUNITRADE2');
-            IconKind := mikImp;
-          end;
-
-        scrCapture:
-          begin
-            OpenSound := 'SHIP_CAPTURED';
-            MessgText := Tribe[Ship2Owner].TPhrase('SHIPCAPTURE1') + ' ' +
-              Tribe[Ship1Owner].TPhrase('SHIPCAPTURE2');
-            IconKind := mikShip;
-            IconIndex := Ship2Owner;
-          end
-      end;
-
-      if IconKind = mikImp then
-      begin
-        MostCost := 0;
-        for i := 0 to nShipPart - 1 do
-        begin
-          TestCost := abs(Ship1Change[i]) * Imp[imShipComp + i].Cost;
-          if TestCost > MostCost then
-          begin
-            MostCost := TestCost;
-            IconIndex := imShipComp + i
-          end
-        end;
-      end;
-
-      Kind := mkOk;
-      ShowModal;
-    end;
-  end;
-
-  procedure InitModule;
-  var
-    x, y, 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
-      else
-      begin
-        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
+
+    Kind := mkOk;
+    ShowModal;
+  end;
+end;
+
+procedure TMainScreen.InitModule;
+var
+  x, y, 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
+    else
+    begin
+      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
+            else
+              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
               else
                 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
-                else
-                  AdvIcon[i] := 86 + Domain;
-        for j := 28 to nImp - 1 do
-          if Imp[j].Preq = i then
-            AdvIcon[i] := j;
-        for j := 28 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 27 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;
-      end;
-    AdvIcon[adConscription] := 86 + dGround;
-
-    UnusedTribeFiles := tstringlist.Create;
-    UnusedTribeFiles.Sorted := true;
-    TribeNames := tstringlist.Create;
-
-    for x := 0 to 11 do
-      for y := 0 to 1 do
-        MiniColors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y];
-    IsoEngine.Init(InitEnemyModel);
-    if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24))
-    then
-      ApplyTileSize(48, 24);
-    // non-default tile size is missing a file, switch to default
-    MainMap := TIsoMap.Create;
-    MainMap.SetOutput(offscreen);
-
-    HGrStdUnits := LoadGraphicSet('StdUnits.png');
-    SmallImp := TDpiBitmap.Create;
-    SmallImp.PixelFormat := pf24bit;
-    InitSmallImp;
-    SoundPreloadDone := 0;
-    StartRunning := false;
-    StayOnTop_Ensured := false;
-
-    sb := TPVScrollbar.Create(Self);
-    sb.OnUpdate := ScrollBarUpdate;
-  end; { InitModule }
-
-// sound blocks for preload
+      for j := 28 to nImp - 1 do
+        if Imp[j].Preq = i then
+          AdvIcon[i] := j;
+      for j := 28 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 27 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;
+    end;
+  AdvIcon[adConscription] := 86 + dGround;
+
+  UnusedTribeFiles := tstringlist.Create;
+  UnusedTribeFiles.Sorted := true;
+  TribeNames := tstringlist.Create;
+
+  for x := 0 to 11 do
+    for y := 0 to 1 do
+      MiniColors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y];
+  IsoEngine.Init(InitEnemyModel);
+  if not IsoEngine.ApplyTileSize(xxt, yyt) and ((xxt <> 48) or (yyt <> 24) or (xxt <> 72))
+  then
+    ApplyTileSize(48, 24);
+  // non-default tile size is missing a file, switch to default
+  MainMap := TIsoMap.Create;
+  MainMap.SetOutput(offscreen);
+
+  HGrStdUnits := LoadGraphicSet('StdUnits.png');
+  SmallImp := TDpiBitmap.Create;
+  SmallImp.PixelFormat := pf24bit;
+  InitSmallImp;
+  SoundPreloadDone := 0;
+  StartRunning := false;
+  StayOnTop_Ensured := false;
+
+  sb := TPVScrollbar.Create(Self);
+  sb.OnUpdate := ScrollBarUpdate;
+end; { InitModule }
+
+procedure TMainScreen.InitTurn(NewPlayer: integer);
 const
-  sbStart = $01;
-  sbWonder = $02;
-  sbScience = $04;
-  sbContact = $08;
-  sbTurn = $10;
-  sbAll = $FF;
-
-  procedure SoundPreload(Check: integer);
-  const
-    nStartBlock = 27;
-    StartBlock: array [0 .. nStartBlock - 1] of string = ('INVALID', 'TURNEND',
-      'DISBAND', 'CHEAT', 'MSG_DEFAULT', 'WARNING_DISORDER', 'WARNING_FAMINE',
-      'WARNING_LOWSUPPORT', 'WARNING_LOWFUNDS', 'MOVE_MOUNTAIN', 'MOVE_LOAD',
-      'MOVE_UNLOAD', 'MOVE_DIE', 'NOMOVE_TIME', 'NOMOVE_DOMAIN',
-      'NOMOVE_DEFAULT', 'CITY_SELLIMP', 'CITY_REBUILDIMP', 'CITY_BUYPROJECT',
-      'CITY_UTILIZE', 'NEWMODEL_0', 'NEWADVANCE_0', 'AGE_0', 'REVOLUTION',
-      'NEWGOV', 'CITY_INVALIDTYPE', 'MSG_GAMEOVER');
-
-    nWonderBlock = 6;
-    WonderBlock: array [0 .. nWonderBlock - 1] of string = ('WONDER_BUILT',
-      'WONDER_CAPTURED', 'WONDER_EXPIRED', 'WONDER_DESTROYED', 'MSG_COLDWAR',
-      'NEWADVANCE_GRLIB');
-
-    nScienceBlock = 17;
-    ScienceBlock: array [0 .. nScienceBlock - 1] of string = ('MOVE_PARACHUTE',
-      'MOVE_PLANESTART', 'MOVE_PLANELANDING', 'MOVE_COVERT', 'NEWMODEL_1',
-      'NEWMODEL_2', 'NEWMODEL_3', 'NEWADVANCE_1', 'NEWADVANCE_2',
-      'NEWADVANCE_3', 'AGE_1', 'AGE_2', 'AGE_3', 'SHIP_BUILT', 'SHIP_TRADED',
-      'SHIP_CAPTURED', 'SHIP_DESTROYED');
-
-    nContactBlock = 20;
-    ContactBlock: array [0 .. nContactBlock - 1] of string = ('NEWTREATY',
-      'CANCELTREATY', 'ACCEPTOFFER', 'MSG_WITHDRAW', 'MSG_BANKRUPT',
-      'CONTACT_0', 'CONTACT_1', 'CONTACT_2', 'CONTACT_3', 'CONTACT_4',
-      'CONTACT_5', 'CONTACT_5', 'CONTACT_6', 'NEGO_REJECTED', 'MOVE_CAPTURE',
-      'MOVE_EXPEL', 'NOMOVE_TREATY', 'NOMOVE_ZOC', 'NOMOVE_SUBMARINE',
-      'NOMOVE_STEALTH');
-
-  var
-    i, cix, mix: integer;
-    need: boolean;
-    mi: TModelInfo;
-  begin
-    if Check and sbStart and not SoundPreloadDone <> 0 then
-    begin
-      for i := 0 to nStartBlock - 1 do
-        PreparePlay(StartBlock[i]);
-      SoundPreloadDone := SoundPreloadDone or sbStart;
-    end;
-    if Check and sbWonder and not SoundPreloadDone <> 0 then
-    begin
-      need := false;
-      for i := 0 to 27 do
-        if MyRO.Wonder[i].CityID <> -1 then
-          need := true;
-      if need then
-      begin
-        for i := 0 to nWonderBlock - 1 do
-          PreparePlay(WonderBlock[i]);
-        SoundPreloadDone := SoundPreloadDone or sbWonder;
-      end;
-    end;
-    if (Check and sbScience and not SoundPreloadDone <> 0) and
-      (MyRO.Tech[adScience] >= tsApplicable) then
-    begin
-      for i := 0 to nScienceBlock - 1 do
-        PreparePlay(ScienceBlock[i]);
-      SoundPreloadDone := SoundPreloadDone or sbScience;
-    end;
-    if (Check and sbContact and not SoundPreloadDone <> 0) and
-      (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then
-    begin
-      for i := 0 to nContactBlock - 1 do
-        PreparePlay(ContactBlock[i]);
-      SoundPreloadDone := SoundPreloadDone or sbContact;
-    end;
-    if Check and sbTurn <> 0 then
-    begin
-      if MyRO.Happened and phShipComplete <> 0 then
-        PreparePlay('MSG_YOUWIN');
-      if MyData.ToldAlive <> MyRO.Alive then
-        PreparePlay('MSG_EXTINCT');
-      for cix := 0 to MyRO.nCity - 1 do
-        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 mix := 0 to MyRO.nModel - 1 do
-        with MyModel[mix] do
-          if Attack > 0 then
-          begin
-            MakeModelInfo(me, mix, MyModel[mix], mi);
-            PreparePlay(AttackSound(ModelCode(mi)));
-          end
-    end
-  end;
-
-  procedure InitTurn(p: integer);
-  const
-    nAdvBookIcon = 16;
-    AdvBookIcon: array [0 .. nAdvBookIcon - 1] of record Adv,
-      Icon: integer end = ((Adv: adPolyTheism; Icon: woZeus),
-      (Adv: adBronzeWorking; Icon: woColossus), (Adv: adMapMaking;
-      Icon: woLighthouse), (Adv: adPoetry; Icon: imTheater), (Adv: adMonotheism;
-      Icon: woMich), (Adv: adPhilosophy; Icon: woLeo), (Adv: adTheoryOfGravity;
-      Icon: woNewton), (Adv: adSteel; Icon: woEiffel), (Adv: adDemocracy;
-      Icon: woLiberty), (Adv: adAutomobile; Icon: imHighways),
-      (Adv: adSanitation; Icon: imSewer), (Adv: adElectronics; Icon: woHoover),
-      (Adv: adNuclearFission; Icon: woManhattan), (Adv: adRecycling;
-      Icon: imRecycling), (Adv: adComputers; Icon: imResLab),
-      (Adv: adSpaceFlight; Icon: woMIR));
-  var
-    Domain, p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1, Dist,
-      NewAgeCenterTo, Bankrupt, ShipMore, Winners, NewGovAvailable, dx,
-      dy: integer;
-    MoveAdviceData: TMoveAdviceData;
-    Picture: TModelPictureInfo;
-    s, Item, Item2: string;
-    UpdatePanel, OwnWonder, ok, Stop, ShowCityList, WondersOnly,
-      AllowCityScreen: boolean;
-  begin
-    if IsMultiPlayerGame and (p <> me) then
-    begin
-      UnitInfoBtn.Visible := false;
-      UnitBtn.Visible := false;
-      TerrainBtn.Visible := false;
-      EOT.Visible := false;
-    end;
-    if IsMultiPlayerGame and (p <> 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;
-      SetMainTextureByAge(-1);
-      with Panel.Canvas do
-      begin
-        Brush.Color := $000000;
-        FillRect(Rect(0, 0, Panel.width, Panel.height));
-        Brush.Style := bsClear;
-      end;
-      with TopBar.Canvas do
-      begin
-        Brush.Color := $000000;
-        FillRect(Rect(0, 0, TopBar.width, TopBar.height));
-        Brush.Style := bsClear;
-      end;
-      Invalidate;
-
-      s := TurnToString(G.RO[0].Turn);
-      if supervising then
-        SimpleMessage(Format(Phrases.Lookup('SUPERTURN'), [s]))
-      else
-        SimpleMessage(Format(Tribe[NewPlayer].TPhrase('TURN'), [s]));
-    end;
+  nAdvBookIcon = 16;
+  AdvBookIcon: array [0 .. nAdvBookIcon - 1] of record Adv,
+    Icon: integer end = ((Adv: adPolyTheism; Icon: woZeus),
+    (Adv: adBronzeWorking; Icon: woColossus), (Adv: adMapMaking;
+    Icon: woLighthouse), (Adv: adPoetry; Icon: imTheater), (Adv: adMonotheism;
+    Icon: woMich), (Adv: adPhilosophy; Icon: woLeo), (Adv: adTheoryOfGravity;
+    Icon: woNewton), (Adv: adSteel; Icon: woEiffel), (Adv: adDemocracy;
+    Icon: woLiberty), (Adv: adAutomobile; Icon: imHighways),
+    (Adv: adSanitation; Icon: imSewer), (Adv: adElectronics; Icon: woHoover),
+    (Adv: adNuclearFission; Icon: woManhattan), (Adv: adRecycling;
+    Icon: imRecycling), (Adv: adComputers; Icon: imResLab),
+    (Adv: adSpaceFlight; Icon: woMIR));
+var
+  p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
+    NewAgeCenterTo, Winners, NewGovAvailable, dx,
+    dy: integer;
+  MoveAdviceData: TMoveAdviceData;
+  Picture: TModelPictureInfo;
+  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
+    (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 := true;
-
-    ItsMeAgain(p);
-    MyData := G.RO[p].Data;
-    if not supervising then
-      SoundPreload(sbAll);
-    if (me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
-      Invalidate; // colorize empty space
-
-    if not supervising then
-    begin
-
-      { if MyRO.Happened and phGameEnd<>0 then
-        begin
-        Age:=3;
-        SetMainTextureByAge(-1);
+        Controls[i].Visible := false;
+    me := -1;
+    SetMainTextureByAge(-1);
+    with Panel.Canvas do
+    begin
+      Brush.Color := $000000;
+      FillRect(Rect(0, 0, Panel.width, Panel.height));
+      Brush.Style := bsClear;
+    end;
+    with TopBar.Canvas do
+    begin
+      Brush.Color := $000000;
+      FillRect(Rect(0, 0, TopBar.width, TopBar.height));
+      Brush.Style := bsClear;
+    end;
+    Invalidate;
+
+    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;
+
+  ItsMeAgain(NewPlayer);
+  MyData := G.RO[NewPlayer].Data;
+  if not supervising then
+    SoundPreload(sbAll);
+  if (me = 0) and ((MyRO.Turn = 0) or (ClientMode = cResume)) then
+    Invalidate; // colorize empty space
+
+  if not supervising then
+  begin
+
+    { if MyRO.Happened and phGameEnd<>0 then
+      begin
+      Age:=3;
+      SetMainTextureByAge(-1);
+      end
+      else }
+    begin
+      Age := GetAge(me);
+      if SetMainTextureByAge(Age) then
+        EOT.Invalidate; // has visible background parts in its bounds
+    end;
+    // age:=MyRO.Turn mod 4; //!!!
+    if ClientMode = cMovieTurn then
+      EOT.ButtonIndex := eotCancel
+    else if ClientMode < scContact then
+      EOT.ButtonIndex := eotGray
+    else
+      EOT.ButtonIndex := eotBackToNego;
+  end
+  else
+  begin
+    Age := 0;
+    SetMainTextureByAge(-1);
+    if ClientMode = cMovieTurn then
+      EOT.ButtonIndex := eotCancel
+    else
+      EOT.ButtonIndex := eotBlinkOn;
+  end;
+  InitCityMark(MainTexture);
+  CityDlg.CheckAge;
+  NatStatDlg.CheckAge;
+  UnitStatDlg.CheckAge;
+  HelpDlg.Difficulty := G.Difficulty[me];
+
+  UnFocus := -1;
+  MarkCityLoc := -1;
+  BlinkON := false;
+  BlinkTime := -1;
+  Tracking := false;
+  TurnComplete := false;
+
+  if (ToldSlavery < 0) or
+    ((ToldSlavery = 1) <> (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) then
+  begin
+    if MyRO.Wonder[woPyramids].EffectiveOwner >= 0 then
+      ToldSlavery := 1
+    else
+      ToldSlavery := 0;
+    for p1 := 0 to nPl - 1 do
+      if (Tribe[p1] <> nil) and (Tribe[p1].mixSlaves >= 0) then
+        with Picture do
+        begin // replace unit picture
+          mix := Tribe[p1].mixSlaves;
+          if ToldSlavery = 1 then
+            pix := pixSlaves
+          else
+            pix := pixNoSlaves;
+          Hash := 0;
+          GrName := 'StdUnits.png';
+          Tribe[p1].SetModelPicture(Picture, true);
         end
-        else }
-      begin
-        Age := GetAge(me);
-        if SetMainTextureByAge(Age) then
-          EOT.Invalidate; // has visible background parts in its bounds
+  end;
+
+  if not supervising and (ClientMode = cTurn) then
+  begin
+    for cix := 0 to MyRO.nCity - 1 do
+      if (MyCity[cix].Loc >= 0) and
+        ((MyRO.Turn = 0) or (MyCity[cix].Flags and chFounded <> 0)) then
+        MyCity[cix].Status := MyCity[cix].Status and
+          not csResourceWeightsMask or (3 shl 4);
+    // new city, set to maximum growth
+  end;
+  if (ClientMode = cTurn) or (ClientMode = cContinue) then
+    CityOptimizer_BeginOfTurn; // maybe peace was made or has ended
+  SumCities(TaxSum, ScienceSum);
+
+  if ClientMode = cMovieTurn then
+  begin
+    UnitInfoBtn.Visible := false;
+    UnitBtn.Visible := false;
+    TerrainBtn.Visible := false;
+    EOT.Hint := Phrases.Lookup('BTN_STOP');
+    EOT.Visible := true;
+  end
+  else if ClientMode < scContact then
+  begin
+    UnitInfoBtn.Visible := UnFocus >= 0;
+    UnitBtn.Visible := UnFocus >= 0;
+    CheckTerrainBtnVisible;
+    TurnComplete := supervising;
+    EOT.Hint := Phrases.Lookup('BTN_ENDTURN');
+    EOT.Visible := Server(sTurn - sExecute, me, 0, nil^) >= rExecuted;
+  end
+  else
+  begin
+    UnitInfoBtn.Visible := false;
+    UnitBtn.Visible := false;
+    TerrainBtn.Visible := false;
+    EOT.Hint := Phrases.Lookup('BTN_NEGO');
+    EOT.Visible := true;
+  end;
+  SetTroopLoc(-1);
+  MapValid := false;
+  NewAgeCenterTo := 0;
+  if ((MyRO.Turn = 0) and not supervising or IsMultiPlayerGame or
+    (ClientMode = cResume)) and (MyRO.nCity > 0) then
+  begin
+    Loc1 := MyCity[0].Loc;
+    if (ClientMode = cTurn) and (MyRO.Turn = 0) then
+    begin // move city out of center to not be covered by welcome screen
+      dx := MapWidth div (xxt * 5);
+      if dx > 5 then
+        dx := 5;
+      dy := MapHeight div (yyt * 5);
+      if dy > 5 then
+        dy := 5;
+      if Loc1 >= G.lx * G.ly div 2 then
+      begin
+        NewAgeCenterTo := -1;
+        Loc1 := dLoc(Loc1, -dx, -dy)
+      end
+      else
+      begin
+        NewAgeCenterTo := 1;
+        Loc1 := dLoc(Loc1, -dx, dy);
+      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;
+
+  if ClientMode <> cResume then
+  begin
+    PaintAll;
+    if (MyRO.Happened and phChangeGov <> 0) and (MyRO.NatBuilt[imPalace] > 0)
+    then
+      ImpImage(Panel.Canvas, ClientWidth - xPalace, yPalace, imPalace,
+        gAnarchy { , GameMode<>cMovie } );
+    // 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;
-      // age:=MyRO.Turn mod 4; //!!!
-      if ClientMode = cMovieTurn then
-        EOT.ButtonIndex := eotCancel
-      else if ClientMode < scContact then
-        EOT.ButtonIndex := eotGray
-      else
-        EOT.ButtonIndex := eotBackToNego;
-    end
-    else
-    begin
-      Age := 0;
-      SetMainTextureByAge(-1);
-      if ClientMode = cMovieTurn then
-        EOT.ButtonIndex := eotCancel
-      else
-        EOT.ButtonIndex := eotBlinkOn;
-    end;
-    InitCityMark(MainTexture);
-    CityDlg.CheckAge;
-    NatStatDlg.CheckAge;
-    UnitStatDlg.CheckAge;
-    HelpDlg.Difficulty := G.Difficulty[me];
-
-    UnFocus := -1;
-    MarkCityLoc := -1;
-    BlinkON := false;
-    BlinkTime := -1;
-    Tracking := false;
-    TurnComplete := false;
-
-    if (ToldSlavery < 0) or
-      ((ToldSlavery = 1) <> (MyRO.Wonder[woPyramids].EffectiveOwner >= 0)) then
-    begin
-      if MyRO.Wonder[woPyramids].EffectiveOwner >= 0 then
-        ToldSlavery := 1
-      else
-        ToldSlavery := 0;
-      for p1 := 0 to nPl - 1 do
-        if (Tribe[p1] <> nil) and (Tribe[p1].mixSlaves >= 0) then
-          with Picture do
-          begin // replace unit picture
-            mix := Tribe[p1].mixSlaves;
-            if ToldSlavery = 1 then
-              pix := pixSlaves
-            else
-              pix := pixNoSlaves;
-            Hash := 0;
-            GrName := 'StdUnits.png';
-            Tribe[p1].SetModelPicture(Picture, true);
+
+    if MyRO.Happened and phGameEnd <> 0 then
+      with MessgExDlg do
+      begin // game ended
+        if MyRO.Happened and phExtinct <> 0 then
+        begin
+          OpenSound := 'MSG_GAMEOVER';
+          MessgText := Tribe[me].TPhrase('GAMEOVER');
+          IconKind := mikBigIcon;
+          IconIndex := 8;
+        end
+        else if MyRO.Happened and phShipComplete <> 0 then
+        begin
+          Winners := 0;
+          for p1 := 0 to nPl - 1 do
+            if 1 shl p1 and MyRO.Alive <> 0 then
+            begin
+              Winners := Winners or 1 shl p1;
+              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
+          begin
+            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')
+                else
+                  s := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
+                    [s, Tribe[p1].TPhrase('SHORTNAME')]);
+
+            OpenSound := 'MSG_YOUWIN';
+            MessgText := Tribe[me].TPhrase('MYSPACESHIP');
+            if s <> '' then
+              MessgText := MessgText + '\' +
+                Format(Phrases.Lookup('SHAREDWIN'), [s]);
+            IconKind := mikBigIcon;
+            IconIndex := 9;
           end
-    end;
-
-    if not supervising and (ClientMode = cTurn) then
-    begin
-      for cix := 0 to MyRO.nCity - 1 do
-        if (MyCity[cix].Loc >= 0) and
-          ((MyRO.Turn = 0) or (MyCity[cix].Flags and chFounded <> 0)) then
-          MyCity[cix].Status := MyCity[cix].Status and
-            not csResourceWeightsMask or (3 shl 4);
-      // new city, set to maximum growth
-    end;
-    if (ClientMode = cTurn) or (ClientMode = cContinue) then
-      CityOptimizer_BeginOfTurn; // maybe peace was made or has ended
-    SumCities(TaxSum, ScienceSum);
-
-    if ClientMode = cMovieTurn then
-    begin
-      UnitInfoBtn.Visible := false;
-      UnitBtn.Visible := false;
-      TerrainBtn.Visible := false;
-      EOT.Hint := Phrases.Lookup('BTN_STOP');
-      EOT.Visible := true;
-    end
-    else if ClientMode < scContact then
-    begin
-      UnitInfoBtn.Visible := UnFocus >= 0;
-      UnitBtn.Visible := UnFocus >= 0;
-      CheckTerrainBtnVisible;
-      TurnComplete := supervising;
-      EOT.Hint := Phrases.Lookup('BTN_ENDTURN');
-      EOT.Visible := Server(sTurn - sExecute, me, 0, nil^) >= rExecuted;
-    end
-    else
-    begin
-      UnitInfoBtn.Visible := false;
-      UnitBtn.Visible := false;
-      TerrainBtn.Visible := false;
-      EOT.Hint := Phrases.Lookup('BTN_NEGO');
-      EOT.Visible := true;
-    end;
-    SetTroopLoc(-1);
-    MapValid := false;
-    NewAgeCenterTo := 0;
-    if ((MyRO.Turn = 0) and not supervising or IsMultiPlayerGame or
-      (ClientMode = cResume)) and (MyRO.nCity > 0) then
-    begin
-      Loc1 := MyCity[0].Loc;
-      if (ClientMode = cTurn) and (MyRO.Turn = 0) then
-      begin // move city out of center to not be covered by welcome screen
-        dx := MapWidth div (xxt * 5);
-        if dx > 5 then
-          dx := 5;
-        dy := MapHeight div (yyt * 5);
-        if dy > 5 then
-          dy := 5;
-        if Loc1 >= G.lx * G.ly div 2 then
-        begin
-          NewAgeCenterTo := -1;
-          Loc1 := dLoc(Loc1, -dx, -dy)
-        end
-        else
-        begin
-          NewAgeCenterTo := 1;
-          Loc1 := dLoc(Loc1, -dx, dy);
-        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;
-
-    if ClientMode <> cResume then
-    begin
-      PaintAll;
-      if (MyRO.Happened and phChangeGov <> 0) and (MyRO.NatBuilt[imPalace] > 0)
-      then
-        ImpImage(Panel.Canvas, ClientWidth - xPalace, yPalace, imPalace,
-          gAnarchy { , GameMode<>cMovie } );
-      // 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;
-
-      if MyRO.Happened and phGameEnd <> 0 then
-        with MessgExDlg do
-        begin // game ended
-          if MyRO.Happened and phExtinct <> 0 then
-          begin
-            OpenSound := 'MSG_GAMEOVER';
-            MessgText := Tribe[me].TPhrase('GAMEOVER');
-            IconKind := mikBigIcon;
-            IconIndex := 8;
-          end
-          else if MyRO.Happened and phShipComplete <> 0 then
-          begin
-            Winners := 0;
-            for p1 := 0 to nPl - 1 do
-              if 1 shl p1 and MyRO.Alive <> 0 then
-              begin
-                Winners := Winners or 1 shl p1;
-                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
-            begin
-              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')
-                  else
-                    s := Format(Phrases.Lookup('SHAREDWIN_CONCAT'),
-                      [s, Tribe[p1].TPhrase('SHORTNAME')]);
-
-              OpenSound := 'MSG_YOUWIN';
-              MessgText := Tribe[me].TPhrase('MYSPACESHIP');
-              if s <> '' then
-                MessgText := MessgText + '\' +
-                  Format(Phrases.Lookup('SHAREDWIN'), [s]);
-              IconKind := mikBigIcon;
-              IconIndex := 9;
-            end
-            else
-            begin
-              assert(me = 0);
-              OpenSound := 'MSG_GAMEOVER';
-              MessgText := '';
-              for p1 := 0 to nPl - 1 do
-                if Winners and (1 shl p1) <> 0 then
-                  MessgText := MessgText + Tribe[p1].TPhrase('SPACESHIP1');
-              MessgText := MessgText + '\' + Phrases.Lookup('SPACESHIP2');
-              IconKind := mikEnemyShipComplete;
-            end
-          end
-          else { if MyRO.Happened and fTimeUp<>0 then }
+          else
           begin
             assert(me = 0);
             OpenSound := 'MSG_GAMEOVER';
-            if not supervising then
-              MessgText := Tribe[me].TPhrase('TIMEUP')
-            else
-              MessgText := Phrases.Lookup('TIMEUPSUPER');
-            IconKind := mikImp;
-            IconIndex := 22;
-          end;
-          Kind := mkOk;
-          ShowModal;
-          if MyRO.Happened and phExtinct = 0 then
-          begin
-            p1 := 0;
-            while (p1 < nPl - 1) and (Winners and (1 shl p1) = 0) do
-              inc(p1);
-            if MyRO.Happened and phShipComplete = 0 then
-              DiaDlg.ShowNewContent_Charts(wmModal);
-          end;
-          TurnComplete := true;
-          exit;
+            MessgText := '';
+            for p1 := 0 to nPl - 1 do
+              if Winners and (1 shl p1) <> 0 then
+                MessgText := MessgText + Tribe[p1].TPhrase('SPACESHIP1');
+            MessgText := MessgText + '\' + Phrases.Lookup('SPACESHIP2');
+            IconKind := mikEnemyShipComplete;
+          end
+        end
+        else { if MyRO.Happened and fTimeUp<>0 then }
+        begin
+          assert(me = 0);
+          OpenSound := 'MSG_GAMEOVER';
+          if not supervising then
+            MessgText := Tribe[me].TPhrase('TIMEUP')
+          else
+            MessgText := Phrases.Lookup('TIMEUPSUPER');
+          IconKind := mikImp;
+          IconIndex := 22;
         end;
-      if not supervising and (1 shl me and MyRO.Alive = 0) then
-      begin
+        Kind := mkOk;
+        ShowModal;
+        if MyRO.Happened and phExtinct = 0 then
+        begin
+          p1 := 0;
+          while (p1 < nPl - 1) and (Winners and (1 shl p1) = 0) do
+            inc(p1);
+          if MyRO.Happened and phShipComplete = 0 then
+            DiaDlg.ShowNewContent_Charts(wmModal);
+        end;
         TurnComplete := true;
         exit;
       end;
-
-      if (ClientMode = cContinue) and
-        (DipMem[me].SentCommand and $FF0F = scContact) then
-        // contact was refused
-        if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
-          ContactRefused(DipMem[me].pContact, 'FRREJECTED')
-        else
-          SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),
-            'NEGO_REJECTED');
-
-      if not supervising and (Age > MyData.ToldAge) and
-        ((Age > 0) or (ClientMode <> cMovieTurn)) then
-        with MessgExDlg do
-        begin
-          if Age = 0 then
+    if not supervising and (1 shl me and MyRO.Alive = 0) then
+    begin
+      TurnComplete := true;
+      exit;
+    end;
+
+    if (ClientMode = cContinue) and
+      (DipMem[me].SentCommand and $FF0F = scContact) then
+      // contact was refused
+      if MyRO.Treaty[DipMem[me].pContact] >= trPeace then
+        ContactRefused(DipMem[me].pContact, 'FRREJECTED')
+      else
+        SoundMessage(Tribe[DipMem[me].pContact].TPhrase('FRREJECTED'),
+          'NEGO_REJECTED');
+
+    if not supervising and (Age > MyData.ToldAge) and
+      ((Age > 0) or (ClientMode <> cMovieTurn)) then
+      with MessgExDlg do
+      begin
+        if Age = 0 then
+        begin
+          if Phrases2FallenBackToEnglish then
           begin
-            if Phrases2FallenBackToEnglish then
-            begin
-              s := Tribe[me].TPhrase('AGE0');
-              MessgText :=
-                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].TPhrase('AGE0');
+            MessgText :=
+              Format(s, [TurnToString(MyRO.Turn), CityName(MyCity[0].ID)])
           end
           else
           begin
-            s := Tribe[me].TPhrase('AGE' + char(48 + Age));
+            s := Tribe[me].TString(Phrases2.Lookup('AGE0'));
             MessgText := Format(s, [TurnToString(MyRO.Turn)]);
-          end;
-          IconKind := mikAge;
-          IconIndex := Age;
-          { if age=0 then } Kind := mkOk
-          { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
-          CenterTo := NewAgeCenterTo;
-          OpenSound := 'AGE_' + char(48 + Age);
-          ShowModal;
-          MyData.ToldAge := Age;
-          if Age > 0 then
-            MyData.ToldTech[AgePreq[Age]] := MyRO.Tech[AgePreq[Age]];
-        end;
-
-      if MyData.ToldAlive <> MyRO.Alive then
-      begin
-        for p1 := 0 to nPl - 1 do
-          if (MyData.ToldAlive - MyRO.Alive) and (1 shl p1) <> 0 then
-            with MessgExDlg do
-            begin
-              OpenSound := 'MSG_EXTINCT';
-              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;
-              IconKind := mikImp;
-              IconIndex := 21;
-              ShowModal;
-            end;
-        if (ClientMode <> cMovieTurn) and not supervising then
-          DiaDlg.ShowNewContent_Charts(wmModal);
-      end;
-
-      // tell changes of own credibility
-      if not supervising then
-      begin
-        if RoughCredibility(MyRO.Credibility) <>
-          RoughCredibility(MyData.ToldOwnCredibility) then
-        begin
-          if RoughCredibility(MyRO.Credibility) >
-            RoughCredibility(MyData.ToldOwnCredibility) then
-            s := Phrases.Lookup('CREDUP')
-          else
-            s := Phrases.Lookup('CREDDOWN');
-          TribeMessage(me, Format(s, [Phrases.Lookup('CREDIBILITY',
-            RoughCredibility(MyRO.Credibility))]), '');
-        end;
-        MyData.ToldOwnCredibility := MyRO.Credibility;
-      end;
-
-      for i := 0 to 27 do
-      begin
-        OwnWonder := false;
-        for cix := 0 to MyRO.nCity - 1 do
-          if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[i].CityID)
-          then
-            OwnWonder := true;
-        if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
-        begin
-          if MyRO.Wonder[i].CityID = -2 then
-            with MessgExDlg do
-            begin { tell about destroyed wonders }
-              OpenSound := 'WONDER_DESTROYED';
-              MessgText := Format(Phrases.Lookup('WONDERDEST'),
-                [Phrases.Lookup('IMPROVEMENTS', i)]);
-              Kind := mkOkHelp;
-              HelpKind := hkImp;
-              HelpNo := i;
-              IconKind := mikImp;
-              IconIndex := i;
-              ShowModal;
-            end
-          else
-          begin
-            if i = woManhattan then
-              if MyRO.Wonder[i].EffectiveOwner > me then
-                MyData.ColdWarStart := MyRO.Turn - 1
-              else
-                MyData.ColdWarStart := MyRO.Turn;
-            if not OwnWonder then
-              with MessgExDlg do
-              begin { tell about newly built wonders }
-                if i = woManhattan then
-                begin
-                  OpenSound := 'MSG_COLDWAR';
-                  s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
-                end
-                else if MyRO.Wonder[i].EffectiveOwner >= 0 then
-                begin
-                  OpenSound := 'WONDER_BUILT';
-                  s := Tribe[MyRO.Wonder[i].EffectiveOwner]
-                    .TPhrase('WONDERBUILT')
-                end
-                else
-                begin
-                  OpenSound := 'MSG_DEFAULT';
-                  s := Phrases.Lookup('WONDERBUILTEXP');
-                  // already expired when built
-                end;
-                MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
-                  CityName(MyRO.Wonder[i].CityID)]);
-                Kind := mkOkHelp;
-                HelpKind := hkImp;
-                HelpNo := i;
-                IconKind := mikImp;
-                IconIndex := i;
-                ShowModal;
-              end
           end
         end
-        else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
-          .EffectiveOwner) and (MyRO.Wonder[i].CityID > -2) then
-          if MyRO.Wonder[i].EffectiveOwner < 0 then
+        else
+        begin
+          s := Tribe[me].TPhrase('AGE' + char(48 + Age));
+          MessgText := Format(s, [TurnToString(MyRO.Turn)]);
+        end;
+        IconKind := mikAge;
+        IconIndex := Age;
+        { if age=0 then } Kind := mkOk
+        { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
+        CenterTo := NewAgeCenterTo;
+        OpenSound := 'AGE_' + char(48 + Age);
+        ShowModal;
+        MyData.ToldAge := Age;
+        if Age > 0 then
+          MyData.ToldTech[AgePreq[Age]] := MyRO.Tech[AgePreq[Age]];
+      end;
+
+    if MyData.ToldAlive <> MyRO.Alive then
+    begin
+      for p1 := 0 to nPl - 1 do
+        if (MyData.ToldAlive - MyRO.Alive) and (1 shl p1) <> 0 then
+          with MessgExDlg do
           begin
-            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)]);
-                Kind := mkOkHelp;
-                HelpKind := hkImp;
-                HelpNo := i;
-                IconKind := mikImp;
-                IconIndex := i;
-                ShowModal;
+            OpenSound := 'MSG_EXTINCT';
+            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;
+            IconKind := mikImp;
+            IconIndex := 21;
+            ShowModal;
+          end;
+      if (ClientMode <> cMovieTurn) and not supervising then
+        DiaDlg.ShowNewContent_Charts(wmModal);
+    end;
+
+    // tell changes of own credibility
+    if not supervising then
+    begin
+      if RoughCredibility(MyRO.Credibility) <>
+        RoughCredibility(MyData.ToldOwnCredibility) then
+      begin
+        if RoughCredibility(MyRO.Credibility) >
+          RoughCredibility(MyData.ToldOwnCredibility) then
+          s := Phrases.Lookup('CREDUP')
+        else
+          s := Phrases.Lookup('CREDDOWN');
+        TribeMessage(me, Format(s, [Phrases.Lookup('CREDIBILITY',
+          RoughCredibility(MyRO.Credibility))]), '');
+      end;
+      MyData.ToldOwnCredibility := MyRO.Credibility;
+    end;
+
+    for i := 0 to 27 do
+    begin
+      OwnWonder := false;
+      for cix := 0 to MyRO.nCity - 1 do
+        if (MyCity[cix].Loc >= 0) and (MyCity[cix].ID = MyRO.Wonder[i].CityID)
+        then
+          OwnWonder := true;
+      if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
+      begin
+        if MyRO.Wonder[i].CityID = -2 then
+          with MessgExDlg do
+          begin { tell about destroyed wonders }
+            OpenSound := 'WONDER_DESTROYED';
+            MessgText := Format(Phrases.Lookup('WONDERDEST'),
+              [Phrases.Lookup('IMPROVEMENTS', i)]);
+            Kind := mkOkHelp;
+            HelpKind := hkImp;
+            HelpNo := i;
+            IconKind := mikImp;
+            IconIndex := i;
+            ShowModal;
+          end
+        else
+        begin
+          if i = woManhattan then
+            if MyRO.Wonder[i].EffectiveOwner > me then
+              MyData.ColdWarStart := MyRO.Turn - 1
+            else
+              MyData.ColdWarStart := MyRO.Turn;
+          if not OwnWonder then
+            with MessgExDlg do
+            begin { tell about newly built wonders }
+              if i = woManhattan then
+              begin
+                OpenSound := 'MSG_COLDWAR';
+                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
               end
-          end
-          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');
+              else if MyRO.Wonder[i].EffectiveOwner >= 0 then
+              begin
+                OpenSound := 'WONDER_BUILT';
+                s := Tribe[MyRO.Wonder[i].EffectiveOwner]
+                  .TPhrase('WONDERBUILT')
+              end
+              else
+              begin
+                OpenSound := 'MSG_DEFAULT';
+                s := Phrases.Lookup('WONDERBUILTEXP');
+                // already expired when built
+              end;
               MessgText := Format(s, [Phrases.Lookup('IMPROVEMENTS', i),
                 CityName(MyRO.Wonder[i].CityID)]);
@@ -2091 +2061 @@
               IconIndex := i;
               ShowModal;
-            end;
-      end;
-
-      if MyRO.Turn = MyData.ColdWarStart + ColdWarTurns then
-      begin
-        SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
-        MyData.ColdWarStart := -ColdWarTurns - 1
-      end;
-
-      TellNewModels;
-    end; // ClientMode<>cResume
-    MyData.ToldAlive := MyRO.Alive;
-    move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
-
-    NewGovAvailable := -1;
-    if ClientMode <> cResume then
-    begin // tell about new techs
-      for ad := 0 to nAdv - 1 do
-        if (MyRO.TestFlags and tfAllTechs = 0) and
-          ((MyRO.Tech[ad] >= tsApplicable) <> (MyData.ToldTech[ad] >=
-          tsApplicable)) or (ad in FutureTech) and
-          (MyRO.Tech[ad] <> MyData.ToldTech[ad]) then
+            end
+        end
+      end
+      else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
+        .EffectiveOwner) and (MyRO.Wonder[i].CityID > -2) then
+        if MyRO.Wonder[i].EffectiveOwner < 0 then
+        begin
+          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)]);
+              Kind := mkOkHelp;
+              HelpKind := hkImp;
+              HelpNo := i;
+              IconKind := mikImp;
+              IconIndex := i;
+              ShowModal;
+            end
+        end
+        else if (MyData.ToldWonders[i].EffectiveOwner >= 0) and not OwnWonder
+        then
           with MessgExDlg do
-          begin
-            Item := 'RESEARCH_GENERAL';
-            if GameMode <> cMovie then
-              OpenSound := 'NEWADVANCE_' + char(48 + Age);
-            Item2 := Phrases.Lookup('ADVANCES', ad);
-            if ad in FutureTech then
-              Item2 := Item2 + ' ' + IntToStr(MyRO.Tech[ad]);
-            MessgText := Format(Phrases.Lookup(Item), [Item2]);
+          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)]);
             Kind := mkOkHelp;
-            HelpKind := hkAdv;
-            HelpNo := ad;
-            IconKind := mikBook;
-            IconIndex := -1;
-            for i := 0 to nAdvBookIcon - 1 do
-              if AdvBookIcon[i].Adv = ad then
-                IconIndex := AdvBookIcon[i].Icon;
+            HelpKind := hkImp;
+            HelpNo := i;
+            IconKind := mikImp;
+            IconIndex := i;
             ShowModal;
-            MyData.ToldTech[ad] := MyRO.Tech[ad];
-            for i := gMonarchy to nGov - 1 do
-              if GovPreq[i] = ad then
-                NewGovAvailable := i;
           end;
     end;
 
-    ShowCityList := false;
-    if ClientMode = cTurn then
-    begin
-      if (MyRO.Happened and phTech <> 0) and (MyData.FarTech <> adNexus) then
-        ChooseResearch;
-
-      UpdatePanel := false;
-      if MyRO.Happened and phChangeGov <> 0 then
-      begin
-        ModalSelectDlg.ShowNewContent(wmModal, kGov);
-        Play('NEWGOV');
-        Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
-        CityOptimizer_BeginOfTurn;
-        UpdatePanel := true;
-      end;
-    end; // ClientMode=cTurn
-
-    if not supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
-    then
+    if MyRO.Turn = MyData.ColdWarStart + ColdWarTurns then
+    begin
+      SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
+      MyData.ColdWarStart := -ColdWarTurns - 1
+    end;
+
+    TellNewModels;
+  end; // ClientMode<>cResume
+  MyData.ToldAlive := MyRO.Alive;
+  move(MyRO.Wonder, MyData.ToldWonders, SizeOf(MyData.ToldWonders));
+
+  NewGovAvailable := -1;
+  if ClientMode <> cResume then
+  begin // tell about new techs
+    for ad := 0 to nAdv - 1 do
+      if (MyRO.TestFlags and tfAllTechs = 0) and
+        ((MyRO.Tech[ad] >= tsApplicable) <> (MyData.ToldTech[ad] >=
+        tsApplicable)) or (ad in FutureTech) and
+        (MyRO.Tech[ad] <> MyData.ToldTech[ad]) then
+        with MessgExDlg do
+        begin
+          Item := 'RESEARCH_GENERAL';
+          if GameMode <> cMovie then
+            OpenSound := 'NEWADVANCE_' + char(48 + Age);
+          Item2 := Phrases.Lookup('ADVANCES', ad);
+          if ad in FutureTech then
+            Item2 := Item2 + ' ' + IntToStr(MyRO.Tech[ad]);
+          MessgText := Format(Phrases.Lookup(Item), [Item2]);
+          Kind := mkOkHelp;
+          HelpKind := hkAdv;
+          HelpNo := ad;
+          IconKind := mikBook;
+          IconIndex := -1;
+          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;
+        end;
+  end;
+
+  ShowCityList := false;
+  if ClientMode = cTurn then
+  begin
+    if (MyRO.Happened and phTech <> 0) and (MyData.FarTech <> adNexus) then
+      ChooseResearch;
+
+    UpdatePanel := false;
+    if MyRO.Happened and phChangeGov <> 0 then
+    begin
+      ModalSelectDlg.ShowNewContent(wmModal, kGov);
+      Play('NEWGOV');
+      Server(sSetGovernment, me, ModalSelectDlg.result, nil^);
+      CityOptimizer_BeginOfTurn;
+      UpdatePanel := true;
+    end;
+  end; // ClientMode=cTurn
+
+  if not supervising and ((ClientMode = cTurn) or (ClientMode = cMovieTurn))
+  then
+    for cix := 0 to MyRO.nCity - 1 do
+      with MyCity[cix] do
+        Status := Status and not csToldBombard;
+
+  if ((ClientMode = cTurn) or (ClientMode = cMovieTurn)) and
+    (MyRO.Government <> gAnarchy) then
+  begin
+    // tell what happened in cities
+    for WondersOnly := true downto false do
       for cix := 0 to MyRO.nCity - 1 do
         with MyCity[cix] do
-          Status := Status and not csToldBombard;
-
-    if ((ClientMode = cTurn) or (ClientMode = cMovieTurn)) and
-      (MyRO.Government <> gAnarchy) then
-    begin
-      // tell what happened in cities
-      for WondersOnly := true downto false do
-        for cix := 0 to MyRO.nCity - 1 do
-          with MyCity[cix] do
-            if (MyRO.Turn > 0) and (Loc >= 0) and (Flags and chCaptured = 0) and
-              (WondersOnly = (Flags and chProduction <> 0) and
-              (Project0 and cpImp <> 0) and (Project0 and cpIndex < 28)) then
+          if (MyRO.Turn > 0) and (Loc >= 0) and (Flags and chCaptured = 0) and
+            (WondersOnly = (Flags and chProduction <> 0) and
+            (Project0 and cpImp <> 0) and (Project0 and cpIndex < 28)) then
+          begin
+            if WondersOnly then
+              with MessgExDlg do
+              begin { tell about newly built wonder }
+                OpenSound := 'WONDER_BUILT';
+                s := Tribe[me].TPhrase('WONDERBUILTOWN');
+                MessgText :=
+                  Format(s, [Phrases.Lookup('IMPROVEMENTS',
+                  Project0 and cpIndex), CityName(ID)]);
+                Kind := mkOkHelp;
+                HelpKind := hkImp;
+                HelpNo := Project0 and cpIndex;
+                IconKind := mikImp;
+                IconIndex := Project0 and cpIndex;
+                ShowModal;
+              end;
+            if not supervising and (ClientMode = cTurn) then
             begin
-              if WondersOnly then
-                with MessgExDlg do
-                begin { tell about newly built wonder }
-                  OpenSound := 'WONDER_BUILT';
-                  s := Tribe[me].TPhrase('WONDERBUILTOWN');
-                  MessgText :=
-                    Format(s, [Phrases.Lookup('IMPROVEMENTS',
-                    Project0 and cpIndex), CityName(ID)]);
-                  Kind := mkOkHelp;
-                  HelpKind := hkImp;
-                  HelpNo := Project0 and cpIndex;
-                  IconKind := mikImp;
-                  IconIndex := Project0 and cpIndex;
-                  ShowModal;
-                end;
-              if not supervising and (ClientMode = cTurn) then
+              AllowCityScreen := true;
+              if (Status and 7 <> 0) and
+                (Project and (cpImp + cpIndex) = cpImp + imTrGoods) then
+                if (MyData.ImpOrder[Status and 7 - 1, 0] >= 0) then
+                begin
+                  if AutoBuild(cix, MyData.ImpOrder[Status and 7 - 1]) then
+                    AllowCityScreen := false
+                  else if Flags and chProduction <> 0 then
+                    Flags := (Flags and not chProduction) or chAllImpsMade
+                end
+                else
+                  Flags := Flags or chTypeDel;
+              if (Size >= NeedAqueductSize) and
+                (MyRO.Tech[Imp[imAqueduct].Preq] < tsApplicable) or
+                (Size >= NeedSewerSize) and
+                (MyRO.Tech[Imp[imSewer].Preq] < tsApplicable) then
+                Flags := Flags and not chNoGrowthWarning;
+              // don't remind of unknown building
+              if Flags and chNoSettlerProd = 0 then
+                Status := Status and not csToldDelay
+              else if Status and csToldDelay = 0 then
+                Status := Status or csToldDelay
+              else
+                Flags := Flags and not chNoSettlerProd;
+              if mRepScreens.Checked then
               begin
-                AllowCityScreen := true;
-                if (Status and 7 <> 0) and
-                  (Project and (cpImp + cpIndex) = cpImp + imTrGoods) then
-                  if (MyData.ImpOrder[Status and 7 - 1, 0] >= 0) then
+                if (Flags and CityRepMask <> 0) and AllowCityScreen then
+                begin { show what happened in cities }
+                  SetTroopLoc(MyCity[cix].Loc);
+                  MarkCityLoc := MyCity[cix].Loc;
+                  PanelPaint;
+                  CityDlg.CloseAction := None;
+                  CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
+                    Flags and CityRepMask);
+                  UpdatePanel := true;
+                end
+              end
+              else { if mRepList.Checked then }
+              begin
+                if Flags and CityRepMask <> 0 then
+                  ShowCityList := true
+              end
+            end
+          end; { city loop }
+  end; // ClientMode=cTurn
+
+  if ClientMode = cTurn then
+  begin
+    if NewGovAvailable >= 0 then
+      with MessgExDlg do
+      begin
+        MessgText := Format(Phrases.Lookup('AUTOREVOLUTION'),
+          [Phrases.Lookup('GOVERNMENT', NewGovAvailable)]);
+        Kind := mkYesNo;
+        IconKind := mikPureIcon;
+        IconIndex := 6 + NewGovAvailable;
+        ShowModal;
+        if ModalResult = mrOK then
+        begin
+          Play('REVOLUTION');
+          Server(sRevolution, me, 0, nil^);
+        end
+      end;
+  end; // ClientMode=cTurn
+
+  if (ClientMode = cTurn) or (ClientMode = cMovieTurn) then
+  begin
+    if MyRO.Happened and phGliderLost <> 0 then
+      ContextMessage(Phrases.Lookup('GLIDERLOST'), 'MSG_DEFAULT',
+        hkModel, 200);
+    if MyRO.Happened and phPlaneLost <> 0 then
+      ContextMessage(Phrases.Lookup('PLANELOST'), 'MSG_DEFAULT',
+        hkFeature, mcFuel);
+    if MyRO.Happened and phPeaceEvacuation <> 0 then
+      for p1 := 0 to nPl - 1 do
+        if 1 shl p1 and MyData.PeaceEvaHappened <> 0 then
+          SoundMessageEx(Tribe[p1].TPhrase('WITHDRAW'), 'MSG_DEFAULT');
+    if MyRO.Happened and phPeaceViolation <> 0 then
+      for p1 := 0 to nPl - 1 do
+        if (1 shl p1 and MyRO.Alive <> 0) and (MyRO.EvaStart[p1] = MyRO.Turn)
+        then
+          SoundMessageEx(Format(Tribe[p1].TPhrase('VIOLATION'),
+            [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
+    TellNewContacts;
+  end;
+
+  if ClientMode = cMovieTurn then
+    Update
+  else if ClientMode = cTurn then
+  begin
+    if UpdatePanel then
+      UpdateViews;
+    DpiApplication.ProcessMessages;
+
+    if not supervising then
+      for uix := 0 to MyRO.nUn - 1 do
+        with MyUn[uix] do
+          if Loc >= 0 then
+          begin
+            if Flags and unWithdrawn <> 0 then
+              Status := 0;
+            if Health = 100 then
+              Status := Status and not usRecover;
+            if (Master >= 0) or UnitExhausted(uix) then
+              Status := Status and not usWaiting
+            else
+              Status := Status or usWaiting;
+            CheckToldNoReturn(uix);
+            if Status and usGoto <> 0 then
+            begin { continue multi-turn goto }
+              SetUnFocus(uix);
+              SetTroopLoc(Loc);
+              FocusOnLoc(TroopLoc, flRepaintPanel or flImmUpdate);
+              if Status shr 16 = $7FFF then
+                MoveResult := GetMoveAdvice(UnFocus, maNextCity,
+                  MoveAdviceData)
+              else
+                MoveResult := GetMoveAdvice(UnFocus, Status shr 16,
+                  MoveAdviceData);
+              if MoveResult >= rExecuted then
+              begin // !!! Shinkansen
+                MoveResult := eOK;
+                ok := true;
+                for i := 0 to MoveAdviceData.nStep - 1 do
+                begin
+                  Loc1 := dLoc(Loc, MoveAdviceData.dx[i],
+                    MoveAdviceData.dy[i]);
+                  if (MyMap[Loc1] and (fCity or fOwned) = fCity)
+                  // don't capture cities during auto move
+                    or (MyMap[Loc1] and (fUnit or fOwned) = fUnit) then
+                  // don't attack during auto move
                   begin
-                    if AutoBuild(cix, MyData.ImpOrder[Status and 7 - 1]) then
-                      AllowCityScreen := false
-                    else if Flags and chProduction <> 0 then
-                      Flags := (Flags and not chProduction) or chAllImpsMade
+                    ok := false;
+                    Break
                   end
                   else
-                    Flags := Flags or chTypeDel;
-                if (Size >= NeedAqueductSize) and
-                  (MyRO.Tech[Imp[imAqueduct].Preq] < tsApplicable) or
-                  (Size >= NeedSewerSize) and
-                  (MyRO.Tech[Imp[imSewer].Preq] < tsApplicable) then
-                  Flags := Flags and not chNoGrowthWarning;
-                // don't remind of unknown building
-                if Flags and chNoSettlerProd = 0 then
-                  Status := Status and not csToldDelay
-                else if Status and csToldDelay = 0 then
-                  Status := Status or csToldDelay
-                else
-                  Flags := Flags and not chNoSettlerProd;
-                if mRepScreens.Checked then
-                begin
-                  if (Flags and CityRepMask <> 0) and AllowCityScreen then
-                  begin { show what happened in cities }
-                    SetTroopLoc(MyCity[cix].Loc);
-                    MarkCityLoc := MyCity[cix].Loc;
-                    PanelPaint;
-                    CityDlg.CloseAction := None;
-                    CityDlg.ShowNewContent(wmModal, MyCity[cix].Loc,
-                      Flags and CityRepMask);
-                    UpdatePanel := true;
-                  end
-                end
-                else { if mRepList.Checked then }
-                begin
-                  if Flags and CityRepMask <> 0 then
-                    ShowCityList := true
-                end
-              end
-            end; { city loop }
-    end; // ClientMode=cTurn
-
-    if ClientMode = cTurn then
-    begin
-      if NewGovAvailable >= 0 then
-        with MessgExDlg do
-        begin
-          MessgText := Format(Phrases.Lookup('AUTOREVOLUTION'),
-            [Phrases.Lookup('GOVERNMENT', NewGovAvailable)]);
-          Kind := mkYesNo;
-          IconKind := mikPureIcon;
-          IconIndex := 6 + NewGovAvailable;
-          ShowModal;
-          if ModalResult = mrOK then
-          begin
-            Play('REVOLUTION');
-            Server(sRevolution, me, 0, nil^);
-          end
-        end;
-    end; // ClientMode=cTurn
-
-    if (ClientMode = cTurn) or (ClientMode = cMovieTurn) then
-    begin
-      if MyRO.Happened and phGliderLost <> 0 then
-        ContextMessage(Phrases.Lookup('GLIDERLOST'), 'MSG_DEFAULT',
-          hkModel, 200);
-      if MyRO.Happened and phPlaneLost <> 0 then
-        ContextMessage(Phrases.Lookup('PLANELOST'), 'MSG_DEFAULT',
-          hkFeature, mcFuel);
-      if MyRO.Happened and phPeaceEvacuation <> 0 then
-        for p1 := 0 to nPl - 1 do
-          if 1 shl p1 and MyData.PeaceEvaHappened <> 0 then
-            SoundMessageEx(Tribe[p1].TPhrase('WITHDRAW'), 'MSG_DEFAULT');
-      if MyRO.Happened and phPeaceViolation <> 0 then
-        for p1 := 0 to nPl - 1 do
-          if (1 shl p1 and MyRO.Alive <> 0) and (MyRO.EvaStart[p1] = MyRO.Turn)
-          then
-            SoundMessageEx(Format(Tribe[p1].TPhrase('VIOLATION'),
-              [TurnToString(MyRO.Turn + PeaceEvaTurns - 1)]), 'MSG_WITHDRAW');
-      TellNewContacts;
-    end;
-
-    if ClientMode = cMovieTurn then
-      Update
-    else if ClientMode = cTurn then
-    begin
-      if UpdatePanel then
-        UpdateViews;
-      Application.ProcessMessages;
-
-      if not supervising then
-        for uix := 0 to MyRO.nUn - 1 do
-          with MyUn[uix] do
-            if Loc >= 0 then
-            begin
-              if Flags and unWithdrawn <> 0 then
-                Status := 0;
-              if Health = 100 then
-                Status := Status and not usRecover;
-              if (Master >= 0) or UnitExhausted(uix) then
-                Status := Status and not usWaiting
-              else
-                Status := Status or usWaiting;
-              CheckToldNoReturn(uix);
-              if Status and usGoto <> 0 then
-              begin { continue multi-turn goto }
-                SetUnFocus(uix);
-                SetTroopLoc(Loc);
-                FocusOnLoc(TroopLoc, flRepaintPanel or flImmUpdate);
-                if Status shr 16 = $7FFF then
-                  MoveResult := GetMoveAdvice(UnFocus, maNextCity,
-                    MoveAdviceData)
-                else
-                  MoveResult := GetMoveAdvice(UnFocus, Status shr 16,
-                    MoveAdviceData);
-                if MoveResult >= rExecuted then
-                begin // !!! Shinkansen
-                  MoveResult := eOK;
-                  ok := true;
-                  for i := 0 to MoveAdviceData.nStep - 1 do
                   begin
-                    Loc1 := dLoc(Loc, MoveAdviceData.dx[i],
-                      MoveAdviceData.dy[i]);
-                    if (MyMap[Loc1] and (fCity or fOwned) = fCity)
-                    // don't capture cities during auto move
-                      or (MyMap[Loc1] and (fUnit or fOwned) = fUnit) then
-                    // don't attack during auto move
+                    if (Loc1 = MoveAdviceData.ToLoc) or
+                      (MoveAdviceData.ToLoc = maNextCity) and
+                      (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);
+                    if (MoveResult < rExecuted) or (MoveResult = eEnemySpotted)
+                    then
                     begin
                       ok := false;
                       Break
-                    end
-                    else
-                    begin
-                      if (Loc1 = MoveAdviceData.ToLoc) or
-                        (MoveAdviceData.ToLoc = maNextCity) and
-                        (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);
-                      if (MoveResult < rExecuted) or (MoveResult = eEnemySpotted)
-                      then
-                      begin
-                        ok := false;
-                        Break
-                      end;
-                    end
-                  end;
-                  Stop := not ok or (Loc = MoveAdviceData.ToLoc) or
-                    (MoveAdviceData.ToLoc = maNextCity) and
-                    (MyMap[Loc] and fCity <> 0)
-                end
+                    end;
+                  end
+                end;
+                Stop := not ok or (Loc = MoveAdviceData.ToLoc) or
+                  (MoveAdviceData.ToLoc = maNextCity) and
+                  (MyMap[Loc] and fCity <> 0)
+              end
+              else
+              begin
+                MoveResult := eOK;
+                Stop := true;
+              end;
+
+              if MoveResult <> eDied then
+                if Stop then
+                  Status := Status and ($FFFF - usGoto)
                 else
-                begin
-                  MoveResult := eOK;
-                  Stop := true;
-                end;
-
-                if MoveResult <> eDied then
-                  if Stop then
-                    Status := Status and ($FFFF - usGoto)
-                  else
-                    Status := Status and not usWaiting;
-              end;
-
-              if Status and (usEnhance or usGoto) = usEnhance then
-              // continue terrain enhancement
-              begin
-                MoveResult := ProcessEnhancement(uix, MyData.EnhancementJobs);
-                if MoveResult <> eDied then
-                  if MoveResult = eJobDone then
-                    Status := Status and not usEnhance
-                  else
-                    Status := Status and not usWaiting;
-              end
+                  Status := Status and not usWaiting;
             end;
-    end; // ClientMode=cTurn
-
-    HaveStrategyAdvice := false;
-    // (GameMode<>cMovie) and not supervising
-    // and AdvisorDlg.HaveStrategyAdvice;
-    GoOnPhase := true;
-    if supervising or (GameMode = cMovie) then
-    begin
+
+            if Status and (usEnhance or usGoto) = usEnhance then
+            // continue terrain enhancement
+            begin
+              MoveResult := ProcessEnhancement(uix, MyData.EnhancementJobs);
+              if MoveResult <> eDied then
+                if MoveResult = eJobDone then
+                  Status := Status and not usEnhance
+                else
+                  Status := Status and not usWaiting;
+            end
+          end;
+  end; // ClientMode=cTurn
+
+  HaveStrategyAdvice := false;
+  // (GameMode<>cMovie) and not supervising
+  // and AdvisorDlg.HaveStrategyAdvice;
+  GoOnPhase := true;
+  if supervising or (GameMode = cMovie) then
+  begin
+    SetTroopLoc(-1);
+    PaintAll
+  end { supervisor }
+  { else if (ClientMode=cTurn) and (MyRO.Turn=0) then
+    begin
+    SetUnFocus(0);
+    ZoomToCity(MyCity[0].Loc)
+    end }
+  else
+  begin
+    if ClientMode >= scContact then
+      SetUnFocus(-1)
+    else
+      NextUnit(-1, false);
+    if UnFocus < 0 then
+    begin
+      UnStartLoc := -1;
+      if IsMultiPlayerGame or (ClientMode = cResume) then
+        if MyRO.nCity > 0 then
+          FocusOnLoc(MyCity[0].Loc)
+        else
+          FocusOnLoc(G.lx * G.ly div 2);
       SetTroopLoc(-1);
-      PaintAll
-    end { supervisor }
-    { else if (ClientMode=cTurn) and (MyRO.Turn=0) then
-      begin
-      SetUnFocus(0);
-      ZoomToCity(MyCity[0].Loc)
-      end }
-    else
-    begin
-      if ClientMode >= scContact then
-        SetUnFocus(-1)
-      else
-        NextUnit(-1, false);
-      if UnFocus < 0 then
-      begin
-        UnStartLoc := -1;
-        if IsMultiPlayerGame or (ClientMode = cResume) then
-          if MyRO.nCity > 0 then
-            FocusOnLoc(MyCity[0].Loc)
-          else
-            FocusOnLoc(G.lx * G.ly div 2);
-        SetTroopLoc(-1);
-        PanelPaint
-      end;
-      if ShowCityList then
-        ListDlg.ShowNewContent(wmPersistent, kCityEvents);
+      PanelPaint
     end;
-  end; { InitTurn }
-
+    if ShowCityList then
+      ListDlg.ShowNewContent(wmPersistent, kCityEvents);
+  end;
+end;
+
+procedure TMainScreen.Client(Command, NewPlayer: integer; var Data);
 var
   i, j, p1, mix, ToLoc, AnimationSpeed, ShowMoveDomain, cix, ecix: integer;
@@ -2416 +2423 @@
   mi: TModelInfo;
   SkipTurn, IsAlpine, IsTreatyDeal: boolean;
-
-begin { >>>client }
+begin
   case Command of
     cTurn, cResume, cContinue, cMovieTurn, scContact, scDipStart .. scDipBreak:
@@ -2629 +2635 @@
               assert(TribeNames.Count > 0);
               ModalSelectDlg.ShowNewContent(wmModal, kTribe);
-              Application.ProcessMessages;
+              DpiApplication.ProcessMessages;
               TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.result];
               UnusedTribeFiles.Delete(ModalSelectDlg.result);
@@ -2746 +2752 @@
           begin
             if AILogo[pLogo] <> nil then
-              DpiBitBlt(Canvas.Handle, (xRightPanel + 10) - (16 + 64),
-                ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle,
-                0, 0, SRCCOPY);
+              DpiBitCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
+                ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas,
+                0, 0);
           end
         end
@@ -2776 +2782 @@
 
         if Jump[pTurn] > 0 then
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         if Jump[pTurn] > 0 then
           if G.RO[NewPlayer].Happened and phGameEnd <> 0 then
@@ -2825 +2831 @@
         end;
         InitTurn(NewPlayer);
-        Application.ProcessMessages;
+        DpiApplication.ProcessMessages;
         if MovieSpeed = 4 then
         begin
           Sleep(75);
           // this break will ensure speed of fast forward does not depend on cpu speed
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         end
       end;
@@ -2991 +2997 @@
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         if Command = cShowCityChanged then
         begin
@@ -3055 +3061 @@
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
@@ -3236 +3242 @@
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
@@ -3389 +3395 @@
       end
   end
-end; { <<<client }
+end;
 
 { *** main part *** }
@@ -3405 +3411 @@
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
-  DefaultOptionChecked: integer;
-  Reg: TRegistry;
   i, j: integer;
 begin
+  MainFormKeyDown := FormKeyDown;
   BaseWin.CreateOffscreen(Offscreen);
 
@@ -3434 +3439 @@
   SaveOption[20] := mAlFastMoves.Tag;
   SaveOption[21] := mAlNoMoves.Tag;
-  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
-    1 shl 18 + 1 shl 19;
-
-  Reg := TRegistry.Create;
-  with Reg do
-  try
-    OpenKey(AppRegistryKey, false);
-    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
-      else xxt := 48;
-    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
-      else yyt := 24;
-    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
-      else OptionChecked := DefaultOptionChecked;
-    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
-      else MapOptionChecked := 1 shl moCityNames;
-    if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
-      else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
-          not chCaptured);
-    if OptionChecked and (7 shl 16) = 0 then
-      OptionChecked := OptionChecked or (1 shl 16);
-      // old regver with no scrolling
-  finally
-    Free;
-  end;
-
-  if 1 shl 13 and OptionChecked <> 0 then
-    SoundMode := smOff
-  else if 1 shl 15 and OptionChecked <> 0 then
-    SoundMode := smOnAlt
-  else
-    SoundMode := smOn;
-
-  Screen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
-  Screen.Cursors[crFlatHand] := LoadCursor(HInstance, 'FLATHAND');
+
+  LoadSettings;
+
+  DpiScreen.Cursors[crImpDrag] := LoadCursor(HInstance, 'DRAG');
+  DpiScreen.Cursors[crFlatHand] := LoadCursor(HInstance, 'FLATHAND');
 
   // tag-controlled language
@@ -3537 +3513 @@
 procedure TMainScreen.FormDestroy(Sender: TObject);
 var
-  i: integer;
-begin
+  I: Integer;
+begin
+  MainFormKeyDown := nil;
   FreeAndNil(sb);
   FreeAndNil(TopBar);
@@ -3544 +3521 @@
   FreeAndNil(Buffer);
   FreeAndNil(Panel);
-  for i := 0 to nPl - 1 do
+  for I := 0 to nPl - 1 do
     if AILogo[i] <> nil then
-      FreeAndNil(AILogo[i]);
+      FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
 end;
@@ -4034 +4011 @@
     exit;
 
-  NoMap.BitBlt(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap, xMidPanel,
+  NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap, xMidPanel,
     overlap, 0, 0, SRCCOPY);
-  NoMap.BitBlt(Panel, -xMap - MapOffset + xRightPanel,
+  NoMap.BitBltBitmap(Panel, -xMap - MapOffset + xRightPanel,
     -yMap + MapHeight - overlap, Panel.width - xRightPanel, overlap,
     xRightPanel, 0, SRCCOPY);
@@ -4042 +4019 @@
   begin
     if xMap < 0 then
-      DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight, width + xMap,
-        height + yMap, Buffer.Canvas.Handle, -xMap, -yMap, SRCCOPY)
+      DpiBitCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
+        height + yMap, Buffer.Canvas, -xMap, -yMap)
     else
-      DpiBitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight, width,
-        height + yMap, Buffer.Canvas.Handle, 0, -yMap, SRCCOPY)
+      DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
+        height + yMap, Buffer.Canvas, 0, -yMap)
   end
   else
   begin
     if xMap < 0 then
-      DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight + yMap, width + xMap,
-        height, Buffer.Canvas.Handle, -xMap, 0, SRCCOPY)
+      DpiBitCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
+        height, Buffer.Canvas, -xMap, 0)
     else
-      DpiBitBlt(Canvas.Handle, xMap + MapOffset, TopBarHeight + yMap, width,
-        height, Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+      DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
+        height, Buffer.Canvas, 0, 0);
   end
 end;
@@ -4098 +4075 @@
   end;
   Mini.BeginUpdate;
-  MiniPixel.Init(Mini);
-  PrevMiniPixel.Init(Mini);
+  MiniPixel := PixelPointer(Mini);
+  PrevMiniPixel := PixelPointer(Mini);
   for y := 0 to G.ly - 1 do
   begin
@@ -4179 +4156 @@
 function ScrollDC(Canvas: TDpiCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
 begin
-  BitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
-    Canvas, lprcScroll.Left, lprcScroll.Top, SRCCOPY);
+  Result := DpiBitCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+    Canvas, lprcScroll.Left, lprcScroll.Top);
 end;
 {$ENDIF}
@@ -4325 +4302 @@
 procedure TMainScreen.CopyMiniToPanel;
 begin
-  DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-    Mini.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+    Mini.Canvas, 0, 0);
   if MarkCityLoc >= 0 then
     Sprite(Panel, HGrSystem, xMini - 2 + (4 * G.lx + 2 * (MarkCityLoc mod G.lx)
@@ -4414 +4391 @@
           ClientWidth - xPalace + xSizeBig + 1, yPalace + ySizeBig + 1,
           $FFFFFF, $B0B0B0);
-        DpiBitBlt(Panel.Canvas.Handle, ClientWidth - xPalace, yPalace, xSizeBig,
-          ySizeBig, GrExt[HGrSystem2].Data.Canvas.Handle, 70, 123, SRCCOPY);
+        DpiBitCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
+          ySizeBig, GrExt[HGrSystem2].Data.Canvas, 70, 123);
       end
       else if MyRO.NatBuilt[imPalace] > 0 then
@@ -5094 +5071 @@
     else
     begin
-      if Application.Active and not mScrollOff.Checked then
+      if DpiApplication.Active and not mScrollOff.Checked then
       begin
         if mScrollFast.Checked then
@@ -5272 +5249 @@
       PaintLoc(MouseLoc, 2);
       MiniPaint;
-      DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-        Mini.Canvas.Handle, 0, 0, SRCCOPY);
+      DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+        Mini.Canvas, 0, 0);
       if ywmax <= 0 then
         Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
@@ -6031 +6008 @@
 var
   ToLoc, xFromLoc, yFromLoc, xToLoc, yToLoc, xFrom, yFrom, xTo, yTo, xMin, yMin,
-    xRange, yRange, xw1, Step, xMoving, yMoving, yl, SliceCount: integer;
+    xRange, yRange, xw1, Step, xMoving, yMoving, SliceCount: integer;
   UnitInfo: TUnitInfo;
   Ticks0, Ticks: TDateTime;
@@ -6096 +6073 @@
     for Step := 0 to abs(Step1 - Step0) do
     begin
-      DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange,
-        offscreen.Canvas.Handle, xMin, yMin, SRCCOPY);
+      DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange,
+        offscreen.Canvas, xMin, yMin);
       if Step1 <> Step0 then
       begin
@@ -6123 +6100 @@
         begin
           if not idle or (GameMode = cMovie) then
-            Application.ProcessMessages;
+            DpiApplication.ProcessMessages;
           {$IFDEF LINUX}
           // TODO: Force animation under linux
-          Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
           {$ENDIF}
           Sleep(1);
@@ -6138 +6115 @@
   if Restore then
   begin
-    DpiBitBlt(Buffer.Canvas.Handle, 0, 0, xRange, yRange, offscreen.Canvas.Handle,
-      xMin, yMin, SRCCOPY);
+    DpiBitCanvas(Buffer.Canvas, 0, 0, xRange, yRange, offscreen.Canvas, xMin, yMin);
     PaintBufferToScreen(xMin, yMin, xRange, yRange);
   end;
@@ -6884 +6860 @@
   end
   else if Sender = mWebsite then
-    OpenURL('http://c-evo.org')
+    OpenURL(CevoHomepage)
   else if Sender = mRandomMap then
   begin
@@ -7322 +7298 @@
     mSmallTiles.Checked := xxt = 33;
     mNormalTiles.Checked := xxt = 48;
+    mBigTiles.Checked := xxt = 72;
   end
   else if Popup = StatPopup then
@@ -7489 +7466 @@
   InitPopup(Popup);
   if FullScreen then
-    Popup.Popup(Left + TDpiControl(Sender).Left, Top + TDpiControl(Sender).Top)
+    Popup.Popup(Left + TControl(Sender).Left, Top + TControl(Sender).Top)
   else
-    Popup.Popup(Left + TDpiControl(Sender).Left + 4, Top + TDpiControl(Sender).Top +
+    Popup.Popup(Left + TControl(Sender).Left + 4, Top + TControl(Sender).Top +
       GetSystemMetrics(SM_CYCAPTION) + 4);
 end;
@@ -7553 +7530 @@
           yw := ywmax;
       end;
-      DpiBitBlt(Buffer.Canvas.Handle, 0, 0, G.lx * 2, G.ly, Mini.Canvas.Handle, 0,
-        0, SRCCOPY);
+      DpiBitCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, Mini.Canvas, 0, 0);
       if ywmax <= 0 then
         Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
@@ -7563 +7539 @@
           x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
           2, MainTexture.clMark, MainTexture.clMark);
-      DpiBitBlt(Panel.Canvas.Handle, xMini + 2, yMini + 2, G.lx * 2, G.ly,
-        Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+      DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+        Buffer.Canvas, 0, 0);
       MainOffscreenPaint;
       RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -7573 +7549 @@
   end
   else
-    Tracking := false
+    Tracking := false;
 end;
 
@@ -7715 +7691 @@
       Brush.Style := bsClear;
     end;
-  DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
-    offscreen.Canvas.Handle, 0, 0, SRCCOPY);
-  DpiBitBlt(Canvas.Handle, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas.Handle,
-    0, 0, SRCCOPY);
+  DpiBitCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+    offscreen.Canvas, 0, 0);
+  DpiBitCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
+    0, 0);
   if xMidPanel > MapOffset then
-    DpiBitBlt(Canvas.Handle, xMidPanel, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas.Handle,
-      xMidPanel - MapOffset, MapHeight - overlap, SRCCOPY)
+    DpiBitCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - xMidPanel, overlap, offscreen.Canvas,
+      xMidPanel - MapOffset, MapHeight - overlap)
   else
-    DpiBitBlt(Canvas.Handle, MapOffset, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas.Handle, 0,
-      MapHeight - overlap, SRCCOPY);
+    DpiBitCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
+      ClientWidth div 2 - MapOffset, overlap, offscreen.Canvas, 0,
+      MapHeight - overlap);
   if xRightPanel < MapOffset + MapWidth then
-    DpiBitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
-      xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas.Handle,
-      ClientWidth div 2 - MapOffset, MapHeight - overlap, SRCCOPY)
+    DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+      xRightPanel - ClientWidth div 2, overlap, offscreen.Canvas,
+      ClientWidth div 2 - MapOffset, MapHeight - overlap)
   else
-    DpiBitBlt(Canvas.Handle, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
+    DpiBitCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
       MapOffset + MapWidth - ClientWidth div 2, overlap,
-      offscreen.Canvas.Handle, ClientWidth div 2 - MapOffset,
-      MapHeight - overlap, SRCCOPY);
-  DpiBitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
-    overlap, Panel.Canvas.Handle, 0, 0, SRCCOPY);
-  DpiBitBlt(Canvas.Handle, xRightPanel, TopBarHeight + MapHeight - overlap,
-    Panel.width - xRightPanel, overlap, Panel.Canvas.Handle, xRightPanel,
-    0, SRCCOPY);
-  DpiBitBlt(Canvas.Handle, 0, TopBarHeight + MapHeight, Panel.width,
-    PanelHeight - overlap, Panel.Canvas.Handle, 0, overlap, SRCCOPY);
+      offscreen.Canvas, ClientWidth div 2 - MapOffset,
+      MapHeight - overlap);
+  DpiBitCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
+    overlap, Panel.Canvas, 0, 0);
+  DpiBitCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
+    Panel.width - xRightPanel, overlap, Panel.Canvas, xRightPanel, 0);
+  DpiBitCanvas(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
-    DpiBitBlt(Canvas.Handle, xRightPanel + 10 - (16 + 64),
-      ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle, 0,
-      0, SRCCOPY);
+    DpiBitCanvas(Canvas, xRightPanel + 10 - (16 + 64),
+      ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas, 0, 0);
 end;
 
@@ -7774 +7748 @@
   InvalidateRgn(Handle, r0, false);
   DeleteObject(r0);
+end;
+
+procedure TMainScreen.LoadSettings;
+var
+  Reg: TRegistry;
+  DefaultOptionChecked: Integer;
+begin
+  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
+    1 shl 18 + 1 shl 19;
+  Reg := TRegistry.Create;
+  with Reg do try
+    OpenKey(AppRegistryKey, False);
+    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
+      else xxt := 48;
+    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
+      else yyt := 24;
+    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
+      else OptionChecked := DefaultOptionChecked;
+    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
+      else MapOptionChecked := 1 shl moCityNames;
+    if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
+      else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
+          not chCaptured);
+    if OptionChecked and (7 shl 16) = 0 then
+      OptionChecked := OptionChecked or (1 shl 16);
+      // old regver with no scrolling
+  finally
+    Free;
+  end;
+
+  if 1 shl 13 and OptionChecked <> 0 then
+    SoundMode := smOff
+  else if 1 shl 15 and OptionChecked <> 0 then
+    SoundMode := smOnAlt
+  else
+    SoundMode := smOn;
 end;
 
@@ -7989 +7999 @@
 begin
   SetTileSize(48, 24);
+end;
+
+procedure TMainScreen.mBigTilesClick(Sender: TObject);
+begin
+  SetTileSize(72, 36);
 end;
 

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ButtonC;
@@ -83 +83 @@
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
-  LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png', gfNoGamma);
 end;
 
@@ -97 +97 @@
   begin
     AgePrepared := MainTextureAge;
-    Dpibitblt(Back.Canvas.Handle, 0, 0, wCommon, hOwnModel,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hOwnModel) div 2, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, wCommon, 0, wCommon, hEnemyModel,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyModel) div 2, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, 2 * wCommon, 0, wCommon, hEnemyUnit,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyUnit) div 2, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyCityDefense) div 2, SRCCOPY);
-    Dpibitblt(Back.Canvas.Handle, 4 * wCommon, 0, wCommon, hEnemyCity,
-      MainTexture.Image.Canvas.Handle, (wMainTexture - wCommon) div 2,
-      (hMainTexture - hEnemyCity) div 2, SRCCOPY);
+    DpiBitCanvas(Back.Canvas, 0, 0, wCommon, hOwnModel,
+      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hOwnModel) div 2);
+    DpiBitCanvas(Back.Canvas, wCommon, 0, wCommon, hEnemyModel,
+      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyModel) div 2);
+    DpiBitCanvas(Back.Canvas, 2 * wCommon, 0, wCommon, hEnemyUnit,
+      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyUnit) div 2);
+    DpiBitCanvas(Back.Canvas, 3 * wCommon, 0, wCommon, hEnemyCityDefense,
+      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyCityDefense) div 2);
+    DpiBitCanvas(Back.Canvas, 4 * wCommon, 0, wCommon, hEnemyCity,
+      MainTexture.Image.Canvas, (wMainTexture - wCommon) div 2,
+      (hMainTexture - hEnemyCity) div 2);
     ImageOp_B(Back, Template, 0, 0, 0, 0, 5 * wCommon, hMax);
   end
@@ -387 +387 @@
     dkOwnModel:
       begin
-        Dpibitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hOwnModel,
-          Back.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hOwnModel,
+          Back.Canvas, 0, 0);
         yView := 13;
         yTotal := 92;
@@ -394 +394 @@
     dkEnemyModel:
       begin
-        Dpibitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyModel,
-          Back.Canvas.Handle, wCommon, 0, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyModel,
+          Back.Canvas, wCommon, 0);
         yView := 13;
         yTotal := 92;
@@ -401 +401 @@
     dkEnemyUnit, dkOwnUnit:
       begin
-        Dpibitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyUnit,
-          Back.Canvas.Handle, 2 * wCommon, 0, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyUnit,
+          Back.Canvas, 2 * wCommon, 0);
         yView := 13;
         yTotal := 123;
@@ -408 +408 @@
     dkEnemyCityDefense:
       begin
-        Dpibitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyCityDefense,
-          Back.Canvas.Handle, 3 * wCommon, 0, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCityDefense,
+          Back.Canvas, 3 * wCommon, 0);
         yView := 171;
         yTotal := 231;
@@ -415 +415 @@
     dkEnemyCity:
       begin
-        Dpibitblt(offscreen.Canvas.Handle, 0, 0, wCommon, hEnemyCity,
-          Back.Canvas.Handle, 4 * wCommon, 0, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, 0, 0, wCommon, hEnemyCity,
+          Back.Canvas, 4 * wCommon, 0);
       end;
   end;
@@ -445 +445 @@
           yImp + ySizeSmall, MainTexture.clBevelLight,
           MainTexture.clBevelShade);
-        Dpibitblt(offscreen.Canvas.Handle, x, yImp, xSizeSmall, ySizeSmall,
-          SmallImp.Canvas.Handle, j mod 7 * xSizeSmall,
-          (j + SystemIconLines * 7) div 7 * ySizeSmall, SRCCOPY);
+        DpiBitCanvas(offscreen.Canvas, x, yImp, xSizeSmall, ySizeSmall,
+          SmallImp.Canvas, j mod 7 * xSizeSmall,
+          (j + SystemIconLines * 7) div 7 * ySizeSmall);
         inc(x, xSizeSmall + 4)
       end;
@@ -564 +564 @@
                     * (yyt * 3 + 1));
               end;
-          Dpibitblt(offscreen.Canvas.Handle, xView, yView + 16, 64, 32,
-            Buffer.Canvas.Handle, 1, 0, SRCCOPY);
+          DpiBitCanvas(offscreen.Canvas, xView, yView + 16, 64, 32,
+            Buffer.Canvas, 1, 0);
 
           // show unit, experience and health

branches/highdpi/LocalPlayer/Wonders.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  UDpiControls, ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB;
 
@@ -38 +38 @@
 
 uses
-  Term, ClientTools, Help, Tribes, UDpiControls;
+  Term, ClientTools, Help, Tribes, UPixelPointer;
 
 {$R *.lfm}
@@ -104 +104 @@
   Ch: Integer;
   Line: array [0..1] of TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+  CenterNative: TPoint;
+begin
+  Width := ScaleToVcl(180);
+  Height := ScaleToVcl(128);
+  CenterNative := ScalePointtoVcl(Center);
   Offscreen.BeginUpdate;
-  Line[0].Init(Offscreen);
-  Line[1].Init(Offscreen);
-  for Y := 0 to 127 do begin
-    for X := 0 to 179 do begin
-      r := X * X * (32 * 32) + Y * Y * (45 * 45);
-      ax := ((1 shl 16 div 32) * 45) * Y;
-      if (r < 8 * 128 * 180 * 180) and
-        ((r >= 32 * 64 * 90 * 90) and (ax < amax2 * X) and
+  Line[0] := PixelPointer(Offscreen);
+  Line[1] := PixelPointer(Offscreen);
+  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));
+      ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
+      if (r < ScaleToVcl(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
         for i := 0 to 1 do
           for ch := 0 to 2 do begin
-            Line[0].SetXY(Center.X + X, Center.Y + Y);
-            Line[1].SetXY(Center.X + X, Center.Y - 1 - Y);
+            Line[0].SetXY(CenterNative.X + X, CenterNative.Y + Y);
+            Line[1].SetXY(CenterNative.X + X, CenterNative.Y - 1 - Y);
             c := Line[i].Pixel^.Planes[ch] - darken;
             if c < 0 then Line[i].Pixel^.Planes[ch] := 0
               else Line[i].Pixel^.Planes[ch] := c;
-            Line[0].SetXY(Center.X - 1 - X, Center.Y + Y);
-            Line[1].SetXY(Center.X - 1 - X, Center.Y - 1 - Y);
+            Line[0].SetXY(CenterNative.X - 1 - X, CenterNative.Y + Y);
+            Line[1].SetXY(CenterNative.X - 1 - X, CenterNative.Y - 1 - Y);
             c := Line[i].Pixel^.Planes[ch] - darken;
             if c < 0 then Line[i].Pixel^.Planes[ch] := 0
@@ -144 +150 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src.Init(BigImp, x0Src, y0Src);
-  Dst.Init(Offscreen, x0Dst, y0Dst);
-  for Y := 0 to ySizeBig - 1 do begin
-    for X := 0 to xSizeBig - 1 do begin
+
+  Src := PixelPointer(BigImp, ScaleToVcl(x0Src), ScaleToVcl(y0Src));
+  Dst := PixelPointer(Offscreen, ScaleToVcl(x0Dst), ScaleToVcl(y0Dst));
+  for Y := 0 to ScaleToVcl(ySizeBig) - 1 do begin
+    for X := 0 to ScaleToVcl(xSizeBig) - 1 do begin
       Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
         15 + (255 - Src.Pixel^.R) * 9) div 128;
@@ -238 +245 @@
     begin
       case MyRO.Wonder[I].CityID of
-        - 1: // not built yet
+        -1: // not built yet
           begin
             Fill(Offscreen.Canvas, Center.X - xSizeBig div 2 + RingPosition[I].X - 3,
@@ -249 +256 @@
           begin
             HaveWonder := True;
-            DpiBitBlt(Offscreen.Canvas.Handle,
+            DpiBitCanvas(Offscreen.Canvas,
               Center.X - xSizeBig div 2 + RingPosition[I].X,
               Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig,
-              ySizeBig, BigImp.Canvas.Handle, 0, (SystemIconLines + 3) *
-              ySizeBig, SRCCOPY);
+              ySizeBig, BigImp.Canvas, 0, (SystemIconLines + 3) *
+              ySizeBig);
           end;
       else
         begin
           HaveWonder := True;
-          DpiBitBlt(Offscreen.Canvas.Handle,
+          DpiBitCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig, ySizeBig,
-            BigImp.Canvas.Handle, (I mod 7) * xSizeBig,
-            (I div 7 + SystemIconLines) * ySizeBig, SRCCOPY);
+            BigImp.Canvas, (I mod 7) * xSizeBig,
+            (I div 7 + SystemIconLines) * ySizeBig);
         end;
       end;