Changeset 210 for branches

branches/highdpi/Back.lfm

-              r178
+              r210
 object Background: TBackground
   Left = 581
   Height = 258
+  Height = 172
   Top = 638
   Width = 303
+  Width = 202
   BorderIcons = []
   BorderStyle = bsNone
   Caption = 'C-evo'
   Color = clBlack
-  DesignTimePPI = 144
   Font.Color = clWindowText
   Font.Height = -20
+  Font.Height = -13
   Font.Name = 'MS Sans Serif'
   OnClose = FormClose
 …
   OnPaint = FormPaint
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
+  LCLVersion = '1.6.2.0'
   WindowState = wsMaximized
 end

branches/highdpi/Back.pas

-              r193
+              r210
 uses
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Forms, Controls, UDpiControls;
+  UDpiControls, LCLIntf, LCLType, SysUtils, Classes, Graphics, Forms, Controls;
 type
 …
   { TBackground }
   TBackground = class(TForm)
+  TBackground = class(TDpiForm)
     procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
 …
   private
     Img: TDpiBitmap;
+  public
+    procedure UpdateInterface;
   end;
 …
 procedure TBackground.FormShow(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+procedure TBackground.FormDestroy(Sender: TObject);
+begin
+  if Assigned(Img) then FreeAndNil(Img);
+end;
+procedure TBackground.FormPaint(Sender: TObject);
+begin
+  if Assigned(Img) then
+    DpiBitCanvas(Canvas, DpiScreen.Width - Img.Width - (DpiScreen.Width - 800) *
+div 8, (DpiScreen.Height - 600) div 3, Img.Width, Img.Height,
+      Img.Canvas, 0, 0);
+end;
+procedure TBackground.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+end;
+procedure TBackground.UpdateInterface;
 var
   FileName: string;
 begin
   if FullScreen then begin
+    WindowState := wsMaximized;
     if not Assigned(Img) then begin
       FileName := HomeDir + 'Graphics' + DirectorySeparator + 'Background.png';
+      FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';
       if FileExists(FileName) then begin
         Img := TDpiBitmap.Create;
 …
 end;
-procedure TBackground.FormDestroy(Sender: TObject);
-begin
-  if Assigned(Img) then FreeAndNil(Img);
-end;
-procedure TBackground.FormPaint(Sender: TObject);
-begin
-  if Assigned(Img) then
-    DpiBitBlt(Canvas.Handle, DpiScreen.Width - Img.Width - (DpiScreen.Width - 800) *
-div 8, (DpiScreen.Height - 600) div 3, Img.Width, Img.Height,
-      Img.Canvas.Handle, 0, 0, SRCCOPY);
-end;
-procedure TBackground.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-end;
 end.

branches/highdpi/CityProcessing.pas

-              r38
+              r210
   TileInfo: TTileInfo;
 begin
+  BestDist := MaxInt;
 {$IFOPT O-}assert(1 shl p and InvalidTreatyMap = 0); {$ENDIF}
   Best := 0;
 …
               result := Loc1;
               Best := Resources;
               BestDist := Dist
             end
           end
         end
       end;
   end
+              BestDist := Dist;
+            end;
+          end;
+        end;
+      end;
+  end;
 end;

branches/highdpi/Database.pas

-              r144
+              r210
 const
   // additional test flags
   FastContact = false; { extra small world with railroad everywhere }
+  //{$DEFINE FastContact} { extra small world with railroad everywhere }
   neumax = 4096;
 …
     end;
     if (RealMap[Loc] xor Cardinal(OldTile)) and fTerrain <> 0 then
       result := true
+      result := true;
   end;
 end;
 …
     begin
       z0 := 6 * y div ly;
       ZPlus := 6 * y / ly - z0
+      ZPlus := 6 * y / ly - z0;
     end
     else
     begin
       z0 := 6 * (ly - 1 - y) div ly;
       ZPlus := 6 * (ly - 1 - y) / ly - z0
+      ZPlus := 6 * (ly - 1 - y) / ly - z0;
     end;
     p0 := 1;
 …
       begin
         RndLow := i;
         Break
       end;
       p0 := p0 - p
+        Break;
+      end;
+      p0 := p0 - p;
     end;
   end;
 …
             Cost := 0;
           if Q.Put(Loc1, T + Cost shl 8 + 1) then
             From[Loc1] := Loc
         end
       end
+            From[Loc1] := Loc;
+        end;
+      end;
     end;
     Loc1 := Loc;
 …
         else if RealMap[Loc] and fTerrain >= fGrass then
           RealMap[Loc] := RealMap[Loc] or fRiver;
       end
+      end;
     end
     else
       result := 0;
     Q.Free
+    Q.Free;
   end;
 …
             CityLoc[c, nCityLoc[c]] := Loc;
             inc(nCityLoc[c])
           end
         end
+          end;
+        end;
       end;
       Loc := (Loc + 1) * primitive mod (MapSize + 1) - 1;
 …
       IrrLoc[j] := IrrLoc[nIrrLoc - 1];
       dec(nIrrLoc);
       dec(i)
+      dec(i);
     end;
   end;
 …
             StartLoc2[p1] := Loc1;
         end;
       end
+      end;
     end;
 end; { StartPositions }
 …
   i, p, p1, uix, Loc1: integer;
 begin
+  if FastContact then { Railroad everywhere }
+  {$IFDEF FastContact}
+    { Railroad everywhere }
     for Loc1 := 0 to MapSize - 1 do
       if RealMap[Loc1] and fTerrain >= fGrass then
         RealMap[Loc1] := RealMap[Loc1] or fRR;
+  {$ENDIF}
   { !!!for Loc1:=0 to MapSize-1 do
 …
   StartPositions;
   InitGame;
 end; { InitRandomGame }
+end;
 procedure InitMapGame(Human: integer);
 …
   PredefinedStartPositions(Human);
   InitGame;
 end; { InitMapGame }
+end;
 procedure ReleaseGame;
 …
       FreeMem(RW[p1].MapObservedLast);
       FreeMem(RW[p1].Map);
     end
+    end;
 end;
 …
       begin
         result := eNoPreq;
         exit
+        exit;
       end;
     end;
 …
     begin
       result := eInvalid;
       exit
+      exit;
     end; // no city found here
 …
           Det := TestDet;
           Cost := TestCost;
         end
       end
     end
+        end;
+      end;
+    end;
   end;
 end;
 …
                 UnitReport.ReportFlags := UnitReport.ReportFlags or urfDeployed;
           end;
         end
+        end;
       end;
     end;
 …
           end
           else
             AddFlags := AddFlags or Map[Loc] and (fStealthUnit or fHiddenUnit)
         end
+            AddFlags := AddFlags or Map[Loc] and (fStealthUnit or fHiddenUnit);
+        end;
     end; // if Mode>moLoading_Fast
 …
     ObserveLevel[Loc] := ObserveLevel[Loc] and not(3 shl (2 * pTell)) or
       Cardinal(Level) shl (2 * pTell);
   end
+  end;
 end; // DiscoverTile
 …
               result := DiscoverTile(Loc1, p, pTell, Level, EnableContact)
                 or result;
           end
+          end;
       end
       else
 …
         if Level > OldLevel then
           result := DiscoverTile(Loc1, p, p, Level, EnableContact) or result;
       end
+      end;
   end;
 end;
 …
               result := DiscoverTile(Loc1, p, pTell, Level, EnableContact)
                 or result;
           end
+          end;
       end
       else
 …
         if Level > OldLevel then
           result := DiscoverTile(Loc1, p, p, Level, EnableContact) or result;
       end
+      end;
     end;
     AdjacentFlags := AdjacentFlags shr 1;
 …
             RW[pTell].EnemyCity[ecix].Loc := -1;
             RW[pTell].Map[Loc] := RW[pTell].Map[Loc] and not fCity
           end
         end
       end
+          end;
+        end;
+      end;
     end;
 end;
 …
         RWemix[p, Occupant[Loc], unx.mix];
       inc(result);
     end
   end
+    end;
+  end;
 end;
 …
             ClearFlags := ClearFlags or fOwnZoCUnit;
           RW[p].Map[Loc] := RW[p].Map[Loc] and not ClearFlags or AddFlags;
         end
       end
     end
+        end;
+      end;
+    end;
 end;
 …
             Tile1^ := Tile1^ or fInEnemyZoC;
             Break
           end
         end
       end;
     end
   end
+          end;
+        end;
+      end;
+    end;
+  end;
 end;
 …
           if (Loc1 >= 0) and (Loc1 < MapSize) then
             RW[p].Map[Loc1] := RW[p].Map[Loc1] or fInEnemyZoC
         end
       end
     end
+        end;
+      end;
+    end;
 end;
 …
   for Loc := 0 to MapSize - 1 do
     if PeacePlayer[RW[p].Territory[Loc]] then
       RW[p].Map[Loc] := RW[p].Map[Loc] or fPeace
+      RW[p].Map[Loc] := RW[p].Map[Loc] or fPeace;
 end;
 …
   p1: integer;
 begin
   assert(p >= 0); // no player's territory indicated by p=nPl
   dec(TerritoryCount[RealMap[Loc] shr 27]);
   inc(TerritoryCount[p]);
+  Assert(p >= 0); // no player's territory indicated by p=nPl
+  Dec(TerritoryCount[RealMap[Loc] shr 27]);
+  Inc(TerritoryCount[p]);
   RealMap[Loc] := RealMap[Loc] and not($F shl 27) or Cardinal(p) shl 27;
   if p = $F then
 …
         else
           RW[p1].Map[Loc] := RW[p1].Map[Loc] and not fPeace;
       end
+      end;
 end;
 …
           ChangeTerritory(Loc, NewOwner);
         inc(i);
       end
   end
+      end;
+  end;
 end;
 …
             then
               StolenDist[Loc1] := NewDist;
           end
         end
+          end;
+        end;
     end;
   end;
 …
             Country[Loc1] := FormerCountry[Loc];
             Dist[Loc1] := NewDist;
           end
         end
       end
+          end;
+        end;
+      end;
   end;
 …
     if RW[p].Model[mix].Flags and mdZOC <> 0 then
       ZoCMap[Loc] := 1;
   end
+  end;
 end;
 procedure CountLost(p, mix, Enemy: integer);
 begin
   inc(RW[p].Model[mix].Lost);
+  Inc(RW[p].Model[mix].Lost);
   TellAboutModel(Enemy, p, mix);
   inc(Destroyed[Enemy, p, mix]);
+  Inc(Destroyed[Enemy, p, mix]);
 end;
 …
     if Enemy >= 0 then
       CountLost(p, mix, Enemy);
   end
 end; { RemoveUnit }
+  end;
+end;
 procedure RemoveUnit_UpdateMap(p, uix: integer);
 var
   Loc0: integer;
+  Loc0: Integer;
 begin
   Loc0 := RW[p].Un[uix].Loc;
 …
     ChangeTerritory(Loc, p)
   end;
 end; { FoundCity }
+end;
 procedure StealCity(p, cix: integer; SaveUnits: boolean);
 …
         else
           RemoveUnit(p, uix1); // destroy supported units
 end; // StealCity
+end;
 procedure DestroyCity(p, cix: integer; SaveUnits: boolean);
 …
     RealMap[Loc] := RealMap[Loc] and not fCity;
     Loc := -1
   end
 end; // DestroyCity
+  end;
+end;
 procedure ChangeCityOwner(pOld, cixOld, pNew: integer);
 …
     ChangeTerritory(Loc, pNew);
   end;
 end; // ChangeCityOwner
+end;
 procedure CompleteJob(p, Loc, Job: integer);
 …
       if RW[pAbout].Un[uix].Loc >= 0 then
         inc(UnCount[RW[pAbout].Un[uix].mix]);
   end
+  end;
 end;
 …
       begin
       end; }
   end
+  end;
 end;
 …
     rTarget.ResearchTech := rSender.ResearchTech;
     rTarget.ResearchDone := rSender.ResearchDone;
     result := true
+    result := true;
   end;
   for i := 0 to nAdv - 1 do
 …
     begin
       rTarget.Tech[i] := rSender.Tech[i];
       result := true
     end
+      result := true;
+    end;
 end;
 …
     for mix := 0 to rTarget.nModelCounted - 1 do
       TellAboutModel(pTarget, pAbout, mix);
     result := true
   end
+    result := true;
+  end;
 end;
 …
     MakeModelInfo(pTarget, i, RW[pTarget].Model[i], miTarget);
     if IsSameModel(miSender, miTarget) then
       ok := false
+      ok := false;
   end;
   if ok then
 …
     inc(Researched[pTarget]);
     TellAboutModel(pSender, pTarget, RW[pTarget].nModel - 1);
   end
+  end;
 end;
 …
             RecalcPeaceMap(pSender);
             RecalcPeaceMap(pTarget);
           end
         end
+          end;
+        end;
       end;
     opShipParts: // + number + part type shl 16
 …
               RW[pSender].Ship[pTarget].Parts[i] := GShip[pTarget].Parts[i];
               RW[pTarget].Ship[pTarget].Parts[i] := GShip[pTarget].Parts[i];
             end
           end
+            end;
+          end;
         end
         else
 …
           dec(RW[pSender].Money, Price - opMoney);
           inc(RW[pTarget].Money, Price - opMoney);
         end
+        end;
       end
       else
 …
           SeeTech(pTarget, Price - opTech);
           RW[pSender].EnemyReport[pTarget].Tech[Price - opTech] := tsSeen;
         end
+        end;
       end
       else
 …
       RecalcMapZoC(p);
       RecalcMapZoC(pWith);
     end
+    end;
   end;
   if OldTreaty in [trPeace, trAlliance] then
 …
     RecalcPeaceMap(p);
     RecalcPeaceMap(pWith);
   end
+  end;
 end;
 …
               if CopyMilReport(pCity, p, p1) then
                 result := result or (2 shl (2 * p1));
           end
+          end;
       end;
   end;
 …
               if RW[p2].EnemyReport[p1].Tech[AgePreq[i]] < tsApplicable then
                 RW[p2].EnemyReport[p1].Tech[AgePreq[i]] := tsCheat;
       end
+      end;
     end;
 …
           GiveCivilReport(p, p1);
           GiveMilReport(p, p1);
         end
       end
+        end;
+      end;
   end;
 end;

branches/highdpi/Direct.pas

-              r143
+              r210
 uses
   Messg,
+  UDpiControls, Messg,
   LCLIntf, LCLType, {$IFDEF Linux}LMessages, {$ENDIF}Messages, SysUtils, Classes,
 …
           ShowModal;
           if ModalResult = mrOK then
             OpenURL('http://c-evo.org/_sg/contact/cevobug.html');
+            OpenURL(CevoContactBug);
         end
     *)
 …
   if Brains.Count = 3 then
   begin
     Application.MessageBox(PChar(Phrases.Lookup('NOAI')), 'C-evo', 0);
+    DpiApplication.MessageBox(PChar(Phrases.Lookup('NOAI')), 'C-evo', 0);
     Close;
     exit
+    exit;
   end;
   Quick := false;
 …
       begin
         SimpleMessage(Phrases.Lookup('LOADERR'));
+        Close
+      end
+    end
+  end;
+  if not Quick then
+  begin
+        Close;
+      end;
+    end;
+  end;
+  if not Quick then begin
     background.Show;
     StartDlg.Show
   end
+    StartDlg.Show;
+  end;
 end;
 …
 procedure TDirectDlg.OnAIException(var Msg: TMessage);
 begin
   Application.MessageBox(PChar(Format(Phrases.Lookup('AIEXCEPTION'),
+  DpiApplication.MessageBox(PChar(Format(Phrases.Lookup('AIEXCEPTION'),
     [Brains[Msg.WParam].Name])), 'C-evo', 0);
 end;
 …
     PaintProgressBar(Canvas, 6, ClientWidth div 2 - 64, 40, State, 128 - State,
 , MainTexture);
   end
+  end;
 end;

branches/highdpi/GameServer.pas

-              r178
+              r210
 uses
+  Protocol, Database, dynlibs, Platform, dateutils, fgl, FileUtil, Graphics,
+  UDpiControls;
+  UDpiControls, Protocol, Database, dynlibs, Platform, dateutils, fgl, LazFileUtils, Graphics;
 const
 …
 function PreviewMap(lm: integer): pointer;
 implementation
 uses
+  Directories, CityProcessing, UnitProcessing, CmdList,
+  LCLIntf, LCLType, LMessages, Classes, SysUtils;
+  Directories, CityProcessing, UnitProcessing, CmdList, LCLIntf, LCLType,
+  LMessages, Classes, SysUtils;
+resourcestring
+  SNoAiFound = 'No AI libraries found in directory %s';
 var
 …
   BrainBeginner := nil;
   if FindFirst(HomeDir + 'AI' + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
+  if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
   repeat
     BasePath := HomeDir + 'AI' + DirectorySeparator + f.Name;
+    BasePath := GetAiDir + DirectorySeparator + f.Name;
     if (f.Name <> '.') and (f.Name <> '..') and DirectoryExists(BasePath) then begin
       NewBrain := Brains.AddNew;
 …
   if Brains.GetKindCount(btAI) = 0 then
     raise Exception.Create(Format('No AI libraries found in directory %s', [HomeDir + 'AI']));
+    raise Exception.Create(Format(SNoAiFound, [GetAiDir]));
 end;
 …
   end;
   CreateMap(true);
   result := @RealMap;
+  Result := @RealMap;
 end;
 …
   s: string[255];
 begin
   MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
+  MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
     fmCreate or fmShareExclusive);
   MapFile.Position := 0;
 …
   MapFile := nil;
   try
     MapFile := TFileStream.Create(DataDir + 'Maps' + DirectorySeparator + FileName,
+    MapFile := TFileStream.Create(GetMapsDir + DirectorySeparator + FileName,
       fmOpenRead or fmShareExclusive);
     MapFile.Position := 0;
 …
   LogFileName := FileName;
   MapFileName := Map;
+  if FastContact then
+  begin
+  {$IFDEF FastContact}
     lx := 24;
     ly := 42;
+  end
+  else
+  begin
+  {$ELSE}
     lx := Newlx;
     ly := Newly
   end;
+    ly := Newly;
+  {$ENDIF}
   MapSize := lx * ly;
   if MapFileName <> '' then
 …
   end;
-const
-  Dirx: array [0 .. 7] of integer = (1, 2, 1, 0, -1, -2, -1, 0);
-  Diry: array [0 .. 7] of integer = (-1, 0, 1, 2, 1, 0, -1, -2);
 var
   d, i, j, p1, p2, pt0, pt1, uix1, cix1, Loc0, Loc1, dx, dy, NewCap, MinCap,
 …
     StopTurn, FutureMCost, NewProject, OldImp, mix, V8, V21, AStr, DStr,
     ABaseDamage, DBaseDamage: integer;
   CityReport, AltCityReport: TCityReport;
+  CityReport: TCityReport;
   FormerCLState: TCmdListState;
-  EndTime: int64;
   Adjacent: TVicinity8Loc;
   Radius: TVicinity21Loc;
 …
 constructor TBrain.Create;
 begin
+  Picture := nil;
+  Picture := TDpiBitmap.Create;
+  Picture.SetSize(64, 64);
 end;
 destructor TBrain.Destroy;
 begin
   if Assigned(Picture) then Picture.Free;
+  FreeAndNil(Picture);
   inherited Destroy;
 end;

branches/highdpi/Inp.pas

-              r193
+              r210
 uses
   ScreenTools, Messg,
+  UDpiControls, ScreenTools, Messg,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, DrawDlg,
   ButtonA, StdCtrls, UDpiControls;
+  ButtonA, StdCtrls;
 type

branches/highdpi/Install/deb/debian/control

r178	r210
8	8	Package: c-evo
9	9	Architecture: any
10		Depends: ${shlibs:Depends}, ${misc:Depends},
	10	Depends: ${shlibs:Depends}, ${misc:Depends}, sox, libsox-fmt-mp3
11	11	Description: Empire building game
12	12	HomePage: https://app.zdechov.net/c-evo

branches/highdpi/Install/win/C-evo.iss

-              r160
+              r210
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon="{app}\{#MyAppExeName}"
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 …
 Name: "ai\seti"; Description: "SETI"; Types: full; Check: not Is64BitInstallMode;
 Name: "ai\shah"; Description: "Shah"; Types: full; Check: not Is64BitInstallMode;
+Name: "ai_template"; Description: "AI template"; Types: full
 [Files]
 …
 Source: "{#MyAppSubDir}\Language.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
 Source: "{#MyAppSubDir}\Language2.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main
+Source: "{#MyAppSubDir}\AI Template\*.*"; DestDir: "{app}\AI Template"; Flags: ignoreversion recursesubdirs; Components: ai_template
 Source: "{#MyAppSubDir}\AI\StdAI\lib\x86_64-win64-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win64.dll"; Flags: ignoreversion; Components: ai\stdai
 Source: "{#MyAppSubDir}\AI\StdAI\lib\i386-win32-Release\StdAI.dll"; DestDir: "{app}\AI\StdAI"; DestName: "StdAI-win32.dll"; Flags: ignoreversion; Components: ai\stdai

branches/highdpi/Integrated.lpi

-              r193
+              r210
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <XPManifest>
-        <DpiAware Value="True"/>
-      </XPManifest>
       <Icon Value="0"/>
       <Resources Count="2">
 …
       </Item3>
     </RequiredPackages>
     <Units Count="40">
+    <Units Count="41">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
 …
         <ComponentName Value="Background"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
       </Unit11>
       <Unit12>
 …
         <ComponentName Value="LocaleDlg"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit38>
       <Unit39>
 …
         <IsPartOfProject Value="True"/>
       </Unit39>
+      <Unit40>
+        <Filename Value="Global.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit40>
     </Units>
   </ProjectOptions>
 …
     <Linking>
       <Debugging>
+        <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>
       </Debugging>
 …
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="4">
+    <Exceptions Count="3">
       <Item1>
         <Name Value="EAbort"/>
 …
         <Name Value="EFOpenError"/>
       </Item3>
-      <Item4>
-        <Name Value="EReadError"/>
-      </Item4>
     </Exceptions>
   </Debugging>

branches/highdpi/Integrated.lpr

-              r180
+              r210
 uses
+  Forms, Interfaces, SysUtils,
+  Protocol in 'Protocol.pas',
+  CmdList in 'CmdList.pas',
+  Database in 'Database.pas',
+  GameServer in 'GameServer.pas',
+  CityProcessing in 'CityProcessing.pas',
+  UnitProcessing in 'UnitProcessing.pas',
+  Direct in 'Direct.pas' {DirectDlg} ,
+  Start in 'Start.pas' {StartDlg} ,
+  Messg in 'Messg.pas' {MessgDlg} ,
+  Inp in 'Inp.pas' {InputDlg} ,
+  Back in 'Back.pas' {Background} ,
+  Log in 'Log.pas' {LogDlg} ,
+  PVSB in 'LocalPlayer\PVSB.pas',
+  LocalPlayer in 'LocalPlayer\LocalPlayer.pas',
+  ClientTools in 'LocalPlayer\ClientTools.pas',
+  Diplomacy in 'LocalPlayer\Diplomacy.pas',
+  Tribes in 'LocalPlayer\Tribes.pas',
+  IsoEngine in 'LocalPlayer\IsoEngine.pas',
+  Term in 'LocalPlayer\Term.pas' {MainScreen} ,
+  MessgEx in 'LocalPlayer\MessgEx.pas' {MessgExDlg} ,
+  Help in 'LocalPlayer\Help.pas' {HelpDlg} ,
+  Select in 'LocalPlayer\Select.pas' {ListDlg} ,
+  CityScreen in 'LocalPlayer\CityScreen.pas' {CityDlg} ,
+  UnitStat in 'LocalPlayer\UnitStat.pas' {UnitStatDlg} ,
+  Draft in 'LocalPlayer\Draft.pas' {DraftDlg} ,
+  NatStat in 'LocalPlayer\NatStat.pas' {NatStatDlg} ,
+  Diagram in 'LocalPlayer\Diagram.pas' {DiaDlg} ,
+  Wonders in 'LocalPlayer\Wonders.pas' {WonderDlg} ,
+  Nego in 'LocalPlayer\Nego.pas' {NegoDlg} ,
+  CityType in 'LocalPlayer\CityType.pas' {CityTypeDlg} ,
+  Enhance in 'LocalPlayer\Enhance.pas' {EnhanceDlg} ,
+  NoTerm in 'NoTerm.pas' {NoTermDlg} ,
+  Battle in 'LocalPlayer\Battle.pas' {BattleDlg} ,
+  Rates in 'LocalPlayer\Rates.pas' {RatesDlg} ,
+  TechTree in 'LocalPlayer\TechTree.pas' {TechTreeDlg},
+  ScreenTools, Directories, UDpiControls;
+  UDpiControls, Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
+  Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
+  NoTerm, ScreenTools, Directories;
 {$if declared(UseHeapTrace)}
 …
   DpiApplication.Initialize;
   DpiApplication.Title := 'c-evo';
   Directories.InitUnit;
+  Directories.UnitInit;
   ScreenTools.UnitInit;
   DpiApplication.CreateForm(TDirectDlg, DirectDlg);

branches/highdpi/Language.txt

r178	r210
942	942	Hurry\Production
943	943	Maximize\Production
	944
	945	#SETTINGS
	946	Full screen

branches/highdpi/LocalPlayer/Battle.pas

-              r193
+              r210
 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
 …
     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]);
 …
   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]);
 …
   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]);
 …
   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)
 …
     end; }
   NoMap.PaintUnit(1, 0, UnitInfo, 0);
   DpiBitBlt(ca.Handle, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas.Handle,
 , 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);
+  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, SRCCOPY);
+  DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }

branches/highdpi/LocalPlayer/CityScreen.pas

-              r193
+              r210
 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;
 …
 uses
   Select, Messg, MessgEx, Help, Tribes, Directories, Math;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, UPixelPointer, Sound;
 {$R *.lfm}
 …
   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;
 …
     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;
 …
   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];
 …
   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);
 …
   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
 …
   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
 …
     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
 …
 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;
 …
   RedTex.clTextShade := $0000FF;
+  Dpibitblt(offscreen.Canvas.Handle, 0, 0, 640, 480, Back.Canvas.Handle, 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
 …
     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
 …
     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
 …
     else
       xGr := 141;
     Dpibitblt(offscreen.Canvas.Handle, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
 , 30, GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea - 192 + 5 + i * d, ymArea - 96 - 29,
+, 30, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea - 192 + 4 + i * d, ymArea - 96 - 30, 27,
 , xGr, 171);
 …
   begin
     xGr := 1 + 112;
     Dpibitblt(offscreen.Canvas.Handle, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
 , GrExt[HGrSystem].Mask.Canvas.Handle, xGr, 171, SRCAND); { shadow }
+    DpiBitCanvas(offscreen.Canvas, xmArea + 192 - 27 + 1 - i * d, 29 + 1, 27,
+, GrExt[HGrSystem].Mask.Canvas, xGr, 171, SRCAND); { shadow }
     Sprite(offscreen, HGrSystem, xmArea + 192 - 27 - i * d, 29, 27, 30,
       xGr, 171);
 …
   // 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),
 …
   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
 …
       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
 …
       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

-              r179
+              r210
 uses
   Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ExtCtrls;
 …
   CityTypeDlg: TCityTypeDlg;
 implementation
+uses
+  Help, UDpiControls;
+uses Help;
 {$R *.lfm}
 …
         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,
+, 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,
 …
       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;
 …
         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;
 …
     begin
       dragiix := MyData.ImpOrder[ctype, i];
       Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
 …
     begin
       dragiix := Pooliix[i];
       Screen.Cursor := crImpDrag;
+      DpiScreen.Cursor := crImpDrag;
       SmartUpdateContent
     end;
 …
     SmartUpdateContent
   end;
   Screen.Cursor := crDefault
+  DpiScreen.Cursor := crDefault
 end;

branches/highdpi/LocalPlayer/ClientTools.pas

r70	r210
695	695	initialization
696	696
697		assert(nImp < 128);
	697	Assert(nImp < 128);
698	698	CalculateAdvValues;
699	699

branches/highdpi/LocalPlayer/Diagram.pas

-              r193
+              r210
 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

-              r193
+              r210
 uses
+  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonA,
 …
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'MiliRes.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png', gfNoGamma);
 end;
 …
   // 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,
 , 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,
+);
   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

-              r179
+              r210
 uses
   ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
+  UDpiControls, ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
 …
   EnhanceDlg: TEnhanceDlg;
 implementation
+uses
+  Help, UDpiControls;
+uses Help;
 {$R *.lfm}
 …
   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,
 + 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,
++ Controls[i].Tag div 7 * 9);
 end;

branches/highdpi/LocalPlayer/Help.lfm

-              r193
+              r210
 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
 …
   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
 …
   end
   object BackBtn: TButtonB
     Left = 63
     Height = 38
     Top = 9
     Width = 38
+    Left = 42
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False
 …
   end
   object TopBtn: TButtonB
     Left = 20
     Height = 38
     Top = 9
     Width = 38
+    Left = 13
+    Top = 6
+    Width = 25
+    Height = 25
     Down = False
     Permanent = False
 …
   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

-              r193
+              r210
 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
 …
   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;
 …
     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;
 …
   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;
 …
 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;
 …
 begin
   inherited;
+  HistItems := THistItems.Create;
   CaptionLeft := BackBtn.Left + BackBtn.Width;
   CaptionRight := SearchBtn.Left;
 …
   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;
 …
   hJOBHELP := HelpText.Gethandle('JOBHELP');
   CaptionFont := TDpiFont.Create;
+  CaptionFont := Font.Create;
   CaptionFont.Assign(UniFont[ftNormal]);
   CaptionFont.Style := CaptionFont.Style + [fsItalic, fsBold];
 …
   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);
 …
   FreeAndNil(HelpText);
   // FreeAndNil(CaptionFont);
+  FreeAndNil(HistItems);
 end;
 …
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
 begin
   if sb.ProcessMouseWheel(WheelDelta) then begin
+  if ScrollBar.ProcessMouseWheel(WheelDelta) then begin
     PaintBox1MouseMove(nil, [], MousePos.X - Left,
       MousePos.Y - Top);
 …
 begin
   { TODO: Handled by MouseWheel event
   if sb.Process(m) then begin
+  if ScrollBar.Process(m) then begin
     Sel := -1;
     SmartUpdateContent(true)
 …
 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
 …
 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;
 …
     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
 …
       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,
 , SRCCOPY);
+    DpiBitCanvas(ca, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas, 1,
+);
     BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
       y - 3, s[1]);
 …
     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
 …
         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);
 …
       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
 …
 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
 …
   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
 …
   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;
 …
   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
 …
           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, SRCCOPY);
+          DpiBitCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+, 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
 …
 + 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,
 * xSizeSmall, 1 * ySizeSmall, SRCCOPY)
+                DpiBitCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
+* 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;
 …
                 $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 *
 ) div 7 * ySizeSmall, SRCCOPY)
+) div 7 * ySizeSmall)
               else
                 Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
 …
 + (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,
 + j * 15, 85);
 …
               ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
 + 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;
 …
             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);
 …
 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,
 …
   end;
   procedure AddImp(i: integer);
+  procedure AddImprovement(i: integer);
   begin
     MainText.AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
 …
   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);
 …
   begin
     if MainText.Count > 1 then
       MainText.LF;
+      MainText.LineFeed;
     FindStdModelPicture(SpecialModelPictureCode[i], pix, Name);
     MainText.AddLine(Name, pkModel, pix, hkModel + hkCrossLink, i)
 …
       begin
         AddLine('', pkLogo);
         LF;
+        LineFeed;
       end
       else if Item = 'TECHFORMULA' then
 …
         for i := 1 to 3 do
         begin
           LF;
+          LineFeed;
           AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + i), pkTer, 3 * 12 + i);
         end
 …
   end;
   procedure DecodeItem(s: string; var Category, Index: integer);
+  procedure DecodeItem(s: string; var Category, Index: Integer);
   var
+    i: integer;
+  begin
+    if (length(s) > 0) and (s[1] = ':') then
+    begin
+    i: Integer;
+  begin
+    if (Length(s) > 0) and (s[1] = ':') then begin
       Category := hkMisc;
       Index := 0;
       for i := 3 to length(s) do
         Index := Index * 10 + ord(s[i]) - 48;
+        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;
 …
         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
 …
         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;
 …
             Picpix := 0;
           MainText.AddLine('', pkIllu, Picpix);
           MainText.LF;
           MainText.LF;
+          MainText.LineFeed;
+          MainText.LineFeed;
         end
         else
 …
           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;
 …
               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
 …
                     begin
                       CurrentFormat := pkTer;
                       Picpix := LinkIndex
+                      Picpix := LinkIndex;
                     end;
                   hkFeature:
 …
               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
 …
             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;
 …
         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);
 …
   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);
 …
   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);
 …
         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
 …
         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'),
 …
   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;
 …
         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 -
 …
   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 -
 …
         MainText.Delete(Headline)
       else
         MainText.LF;
+        MainText.LineFeed;
     MainText.AddLine(HelpText.Lookup(Item), pkSection);
     Headline := MainText.Count - 1;
 …
 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:
 …
                 AddLine(HelpText.Lookup('HELPTITLE_QUICKSTART'), pkSpecialIcon,
 , { 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,
 * SystemIconLines + imCourt, hkImp, 200);
                 LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'), pkBigIcon,
 * SystemIconLines + imStockEx, hkImp, 201);
                 LF;
+                LineFeed;
                 AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'), pkBigIcon,
 * 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);
 …
               begin
                 AddItem('CREDITS');
                 LF;
+                LineFeed;
                 AddGraphicCredits;
                 NextSection('CRED_CAPSOUND');
 …
                 Caption := HelpText.Lookup('HELPTITLE_JOBLIST');
                 AddJobList;
                 LF;
+                LineFeed;
                 AddItem('TERIMPEXCLUDE');
                 LF;
+                LineFeed;
                 AddItem('TERIMPCITY');
               end;
 …
                 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
 …
                   if i < nGov then
                   begin
                     LF;
                     LF;
+                    LineFeed;
+                    LineFeed;
                   end
                 end
 …
                 Caption := HelpText.Lookup('HELPTITLE_SEARCHRESULTS');
                 AddTextual(Format(HelpText.Lookup('MATCHES'), [SearchContent]));
                 MainText.AddStrings(SearchResult);
               end
+                MainText.AppendList(SearchResult);
+              end;
           end; // case no
         end;
 …
           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);
 …
                   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')
 …
           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
 …
             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
 …
           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);
 …
           // 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
 …
                 i, hkImp, i);
           List.Sort;
           AddStrings(List);
           List.Free
+          AppendList(List);
+          List.Free;
         end
         else if no = 201 then
 …
               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
 …
         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);
 …
           if (no < 28) and not Phrases2FallenBackToEnglish then
           begin
             LF;
+            LineFeed;
             if Imp[no].Expiration >= 0 then
               AddTextual(Phrases2.Lookup('HELP_WONDERMORALE1'))
 …
                 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
 …
           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,
 …
           // AddLine(HelpText.Lookup('HELPTITLE_TERLIST'),pkSection);
           for i := 0 to nTerrainHelp - 1 do
             AddTer(TerrainHelp[i]);
+            AddTerrain(TerrainHelp[i]);
         end
         else
 …
           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'),
 …
             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,
 …
               if no = fSwamp + 12 then
               begin
                 LF;
+                LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', TransTerrain + 24)]), pkTer,
 …
               else if i = fGrass then
               begin
                 LF;
+                LineFeed;
                 AddLine(Format(HelpText.Lookup('TRAFO'),
                   [Phrases.Lookup('TERRAIN', fGrass + 12)]), pkTer, fGrass + 12,
 …
             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,
 * 12 + special);
+                if Special > 1 then
+                  LineFeed;
+                AddLine(Phrases.Lookup('TERRAIN', 3 * 12 + Special), pkTer,
+* 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] +
 …
             if no = 3 * 12 then
             begin
               LF;
+              LineFeed;
               AddTextual(HelpText.Lookup('RARE'));
             end;
 …
             begin
               NextSection('SEEALSO');
               AddImp(woGardens);
+              AddImprovement(woGardens);
               CheckSeeAlso := true
             end
 …
           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
+:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'), pkSection);
+:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'), pkSection);
+:
+                AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'), pkSection);
+            if Special > 0 then
+            begin
+              LineFeed;
+              LineFeed;
+            end;
+            case Special of
+: AddLine(HelpText.Lookup('HELPTITLE_FEATURE1LIST'), pkSection);
+: AddLine(HelpText.Lookup('HELPTITLE_FEATURE2LIST'), pkSection);
+: AddLine(HelpText.Lookup('HELPTITLE_FEATURE3LIST'), pkSection);
             end;
             List.Clear;
 …
                 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
 …
           if Feature[no].Preq <> preNone then
           begin
             LF;
+            LineFeed;
             if Feature[no].Preq = preSun then
               AddPreqImp(woSun) // sun tsu feature
 …
           end;
           NextSection('SEEALSO');
           CheckSeeAlso := true
+          CheckSeeAlso := True;
         end;
 …
             if i <> 2 then
               AddModelText(i);
           LF;
+          LineFeed;
           AddItem('MODELNOTE');
         end;
 …
         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;
 …
   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
 …
   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;
 …
 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
 : OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
 : OpenURL('http://c-evo.org');
 : OpenURL('http://c-evo.org/_sg/contact');
+: OpenDocument(HomeDir + AITemplateFileName);
+: OpenURL(CevoHomepage);
+: OpenURL(CevoContact);
         end
       else
 …
 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;
 …
 end;
 function THelpDlg.TextIndex(Item: string): integer;
 begin
   result := HelpText.Gethandle(Item)
+function THelpDlg.TextIndex(Item: string): Integer;
+begin
+  Result := HelpText.Gethandle(Item)
 end;
 …
   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);
 …
         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;
 …
   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
 …
             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
 …
       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
 …
       SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i);
       include(mADVHELP, i);
     end
+    end;
   end;
   for i := 0 to nSpecialModel - 1 do
 …
       SearchResult.AddLine(HelpText.Lookup('HELPTITLE_MODELLIST'), pkNormal, 0,
         hkModel + hkCrossLink, 0);
       bSPECIALMODEL := true;
       Break
+      bSPECIALMODEL := True;
+      Break;
     end;
   end;
 …
   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
 …
         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
 …
       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;
 …
           s := s + ' ' + HelpText.Lookup('HELPSPEC_ADV');
         SearchResult.AddLine(s, pkNormal, 0, hkAdv + hkCrossLink, i)
       end
+      end;
     end
     else if h = hIMPHELP then
 …
         end;
         SearchResult.AddLine(s, pkNormal, 0, hkImp + hkCrossLink, i)
       end
+      end;
     end
     else if h = hFEATUREHELP then
 …
           s := s + ' ' + HelpText.Lookup('HELPSPEC_FEATURE');
         SearchResult.AddLine(s, pkNormal, 0, hkFeature + hkCrossLink, i);
       end
+      end;
     end
     else if h = hGOVHELP then
 …
     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

-              r179
+              r210
 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
 …
     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);
 …
     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;
 …
   // sprites indexes
   spDeadLands = 2 * TerrainIconCols + 6;
+  spRow2 = 2 * TerrainIconCols + 6;
   spBlink1 = 1 * TerrainIconCols + 8;
   spBlink2 = 2 * TerrainIconCols + 8;
 …
   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
 …
   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
 …
   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),
 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 …
     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;
 …
     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;
 …
       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;
 …
       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
 …
     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, 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;
 …
   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
 …
   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;
 …
   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
 …
 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
 …
     Width := Width - (FLeft - x);
     xSrc := xSrc + (FLeft - x);
     x := FLeft
+    x := FLeft;
   end;
   if y < FTop then
 …
     Height := Height - (FTop - y);
     ySrc := ySrc + (FTop - y);
     y := FTop
+    y := FTop;
   end;
   if x + Width >= FRight then
 …
     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;
 …
     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;
 …
         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);
 …
       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 }
 …
     exit;
   BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y, xxt, yyt,
+  BitBltBitmap(GrExt[HGrTerrain].Data, x + xxt div 2, y, xxt, yyt,
 + (Conn shr 6 + Conn and 1 shl 2) * (xxt * 2 + 1),
 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
   BitBlt(GrExt[HGrTerrain].Data, x + xxt, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(GrExt[HGrTerrain].Data, x + xxt, y + yyt div 2, xxt, yyt,
 + (Conn and 7) * (xxt * 2 + 1) + xxt,
 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
   BitBlt(GrExt[HGrTerrain].Data, x + xxt div 2, y + yyt, xxt, yyt,
+  BitBltBitmap(GrExt[HGrTerrain].Data, x + xxt div 2, y + yyt, xxt, yyt,
 + (Conn shr 2 and 7) * (xxt * 2 + 1) + xxt,
 + yyt + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
   BitBlt(GrExt[HGrTerrain].Data, x, y + yyt div 2, xxt, yyt,
+  BitBltBitmap(GrExt[HGrTerrain].Data, x, y + yyt div 2, xxt, yyt,
 + (Conn shr 4 and 7) * (xxt * 2 + 1),
 + yyt * 2 + (16 + Tile and fTerrain) * (yyt * 3 + 1), SRCPAINT);
   Conn := Connection4(Loc, fTerrain, fUNKNOWN); { dither to black }
   if Conn and 1 <> 0 then
     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,
 + 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),
 + 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),
 + yyt + 15 * (yyt * 3 + 1), SRCAND);
 end;
 …
   end
   else if Tile and fDeadLands <> 0 then
     TSprite(x, y, spDeadLands);
+    TSprite(x, y, spRow2);
   if ShowObjects then
 …
     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
 …
       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;
 …
         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,
 + 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,
++ 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
 …
               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,
 + 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
 …
     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
 …
 + 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
 …
   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
 …
                   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
 …
                 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,
 + 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

-              r155
+              r210
 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,
 …
     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

-              r193
+              r210
 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;
 …
 uses
   ClientTools, BaseWin, Term, Help, UnitStat, Tribes,
   IsoEngine, Diagram;
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
+  IsoEngine, Diagram, Sound;
 {$R *.lfm}
 …
       Ticks0 := NowPrecise;
       repeat
         Application.ProcessMessages;
+        DpiApplication.ProcessMessages;
         Sleep(1);
         Ticks := NowPrecise;
 …
     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);
 …
   // 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
 …
   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;
 …
       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;
 …
         if UnitsInLine > LostUnitsPerLine then
           UnitsInLine := LostUnitsPerLine;
       end
+      end;
     end;
 end;
 …
       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)
 …
           GlowFrame(Buffer, GlowRange, GlowRange, xSizeBig, ySizeBig,
             Tribe[p1].Color);
         DpiBitBlt(Canvas.Handle, ClientWidth div 2 - (28 + GlowRange),
+        DpiBitCanvas(Canvas, ClientWidth div 2 - (28 + GlowRange),
 - GlowRange, xSizeBig + 2 * GlowRange, ySizeBig + 2 * GlowRange,
           Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+          Buffer.Canvas, 0, 0);
       end
       else
 …
         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;
 …
         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,
 + Tribe[IconIndex].facepix mod 10 * 65,
 + Tribe[IconIndex].facepix div 10 * 49, SRCCOPY)
++ Tribe[IconIndex].facepix div 10 * 49)
       end;
     mikPureIcon:
 …
     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:
 …
   if OpenSound <> '' then
     PostMessage(Handle, WM_PLAYSOUND, 0, 0);
 end; { FormPaint }
+end;
 procedure TMessgExDlg.Button1Click(Sender: TObject);
 …
 procedure TMessgExDlg.Button3Click(Sender: TObject);
 begin
   ModalResult := mrCancel
+  ModalResult := mrCancel;
 end;
 procedure TMessgExDlg.RemoveBtnClick(Sender: TObject);
 begin
   ModalResult := mrNo
+  ModalResult := mrNo;
 end;
 …
       ModalResult := mrCancel
     else if Button2.Visible then
       ModalResult := mrIgnore
+      ModalResult := mrIgnore;
 end;
 …
     Kind := mkOk;
     ShowModal;
   end
+  end;
 end;
 …
     Kind := QueryKind;
     ShowModal;
     result := ModalResult
   end
+    result := ModalResult;
+  end;
 end;
 …
     HelpNo := ContextNo;
     ShowModal;
   end
+  end;
 end;
 …
 end;
 initialization

branches/highdpi/LocalPlayer/NatStat.pas

-              r179
+              r210
 uses
+  Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ButtonC, Menus, EOTButton;
 …
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Nation.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Nation.png', gfNoGamma);
 end;
 …
   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
 …
   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

-              r178
+              r210
 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
 …
 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

-              r178
+              r210
 uses
   {$IFDEF WINDOWS}
+  UDpiControls, {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
   StdCtrls, Math, UDpiControls;
+  StdCtrls, Math;
 type
 …
     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
 …
 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

-              r193
+              r210
 uses
   Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
+  UDpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
 …
   RatesDlg: TRatesDlg;
 implementation
 uses
   ClientTools, Term, Tribes, UDpiControls;
+  ClientTools, Term, Tribes;
 {$R *.lfm}
 …
     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
 …
     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

-              r193
+              r210
 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;
 …
       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;
 …
                   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,
 …
 + (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,
 , SRCAND);
                 Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
 …
 + 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;
 …
         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

-              r193
+              r210
 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
 …
   TechTreeDlg: TTechTreeDlg;
 implementation
 …
   X, w: Integer;
 begin
+  with Canvas do
+  begin
+  with Canvas do begin
     // black border
     brush.color := $000000;
 …
         -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,
 …
     ), 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]);
 …
             TextOut(xStart + X * xPitch + 2, yStart + Y * yPitch, s);
             Pixels[xStart + X * xPitch + 10, yStart + Y * yPitch - 1]
               := $7F007F;
+              := TransparentColor;
           end
         end;
 …
     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;
 …
     xDown := X;
     yDown := Y;
   end
+  end;
 end;
 …
     SmartInvalidate;
   end
+  end;
 end;
 …
 procedure TTechTreeDlg.CloseBtnClick(Sender: TObject);
 begin
   Close();
+  Close;
 end;

branches/highdpi/LocalPlayer/Term.lfm

-              r90
+              r210
 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
 …
   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
 …
   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
 …
   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
 …
   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
 …
   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
 …
   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
 …
   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
 …
   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
 …
   end
   object EOT: TEOTButton
     Left = 712
     Height = 48
     Top = 368
     Width = 48
+    Left = 890
+    Height = 60
+    Top = 460
+    Width = 60
     Visible = False
     Down = False
 …
   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
 …
   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
 …
   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
 …
   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
 …
     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
 …
           RadioItem = True
           OnClick = mNormalTilesClick
+        end
+        object mBigTiles: TMenuItem
+          Caption = '90px'
+          RadioItem = True
+          OnClick = mBigTilesClick
         end
       end
 …
   object UnitPopup: TPopupMenu
     AutoPopup = False
     left = 104
     top = 48
+    left = 130
+    top = 60
     object mdisband: TMenuItem
       Tag = 72
 …
   object StatPopup: TPopupMenu
     AutoPopup = False
     left = 72
     top = 48
+    left = 90
+    top = 60
     object mUnitStat: TMenuItem
       Tag = 9
 …
   end
   object EditPopup: TPopupMenu
     left = 168
     top = 48
+    left = 210
+    top = 60
     object mCreateUnit: TMenuItem
       Tag = 47
 …
   end
   object TerrainPopup: TPopupMenu
     left = 136
     top = 48
+    left = 170
+    top = 60
     object mtrans: TMenuItem
       Tag = 273

branches/highdpi/LocalPlayer/Term.pas

-              r193
+              r210
 uses
 {$IFDEF Windows}
+  UDpiControls, {$IFDEF Windows}
   Windows,
 {$ENDIF}
 …
   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
 …
   TMainScreen = class(TDrawDlg)
+    mBigTiles: TMenuItem;
     Timer1: TTimer;
     GamePopup: TPopupMenu;
 …
     procedure mSmallTilesClick(Sender: TObject);
     procedure mNormalTilesClick(Sender: TObject);
+    procedure mBigTilesClick(Sender: TObject);
     procedure GrWallBtnDownChanged(Sender: TObject);
     procedure BareBtnDownChanged(Sender: TObject);
 …
     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;
 …
     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;
 …
     '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
 …
 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}
 …
         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
 …
   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
 …
 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)]);
 …
               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;
 …
   mi: TModelInfo;
   SkipTurn, IsAlpine, IsTreatyDeal: boolean;
+begin { >>>client }
+begin
   case Command of
     cTurn, cResume, cContinue, cMovieTurn, scContact, scDipStart .. scDipBreak:
 …
               assert(TribeNames.Count > 0);
               ModalSelectDlg.ShowNewContent(wmModal, kTribe);
               Application.ProcessMessages;
+              DpiApplication.ProcessMessages;
               TribeInfo.FileName := UnusedTribeFiles[ModalSelectDlg.result];
               UnusedTribeFiles.Delete(ModalSelectDlg.result);
 …
           begin
             if AILogo[pLogo] <> nil then
               DpiBitBlt(Canvas.Handle, (xRightPanel + 10) - (16 + 64),
                 ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas.Handle,
 , 0, SRCCOPY);
+              DpiBitCanvas(Canvas, (xRightPanel + 10) - (16 + 64),
+                ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas,
+, 0);
           end
         end
 …
         if Jump[pTurn] > 0 then
           Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         if Jump[pTurn] > 0 then
           if G.RO[NewPlayer].Happened and phGameEnd <> 0 then
 …
         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;
 …
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
           Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         if Command = cShowCityChanged then
         begin
 …
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
           Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
 …
         assert(NewPlayer = me);
         if not idle or (GameMode = cMovie) then
           Application.ProcessMessages;
+          DpiApplication.ProcessMessages;
         with TShowMove(Data) do
         begin
 …
       end
   end
 end; { <<<client }
+end;
 { *** main part *** }
 …
 procedure TMainScreen.FormCreate(Sender: TObject);
 var
-  DefaultOptionChecked: integer;
-  Reg: TRegistry;
   i, j: integer;
 begin
+  MainFormKeyDown := FormKeyDown;
   BaseWin.CreateOffscreen(Offscreen);
 …
   SaveOption[20] := mAlFastMoves.Tag;
   SaveOption[21] := mAlNoMoves.Tag;
+  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
+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
 …
 procedure TMainScreen.FormDestroy(Sender: TObject);
 var
+  i: integer;
+begin
+  I: Integer;
+begin
+  MainFormKeyDown := nil;
   FreeAndNil(sb);
   FreeAndNil(TopBar);
 …
   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;
 …
     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);
 …
   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;
 …
   end;
   Mini.BeginUpdate;
   MiniPixel.Init(Mini);
   PrevMiniPixel.Init(Mini);
+  MiniPixel := PixelPointer(Mini);
+  PrevMiniPixel := PixelPointer(Mini);
   for y := 0 to G.ly - 1 do
   begin
 …
 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}
 …
 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)
 …
           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
 …
     else
     begin
       if Application.Active and not mScrollOff.Checked then
+      if DpiApplication.Active and not mScrollOff.Checked then
       begin
         if mScrollFast.Checked then
 …
       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),
 …
 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;
 …
     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
 …
         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);
 …
   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;
 …
   end
   else if Sender = mWebsite then
     OpenURL('http://c-evo.org')
+    OpenURL(CevoHomepage)
   else if Sender = mRandomMap then
   begin
 …
     mSmallTiles.Checked := xxt = 33;
     mNormalTiles.Checked := xxt = 48;
+    mBigTiles.Checked := xxt = 72;
   end
   else if Popup = StatPopup then
 …
   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;
 …
           yw := ywmax;
       end;
+      DpiBitBlt(Buffer.Canvas.Handle, 0, 0, G.lx * 2, G.ly, Mini.Canvas.Handle, 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,
 …
           x - xMini - 2 + MapWidth div (xxt * 2) - 1, yw + MapHeight div yyt -
 , 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,
 …
   end
   else
     Tracking := false
+    Tracking := false;
 end;
 …
       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, SRCCOPY);
+  DpiBitCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+    offscreen.Canvas, 0, 0);
+  DpiBitCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
+, 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,
+, 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,
+, SRCCOPY);
+    DpiBitCanvas(Canvas, xRightPanel + 10 - (16 + 64),
+      ClientHeight - PanelHeight, 64, 64, AILogo[pLogo].Canvas, 0, 0);
 end;
 …
   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 +
+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;
 …
 begin
   SetTileSize(48, 24);
+end;
+procedure TMainScreen.mBigTilesClick(Sender: TObject);
+begin
+  SetTileSize(72, 36);
 end;

branches/highdpi/LocalPlayer/UnitStat.pas

-              r193
+              r210
 uses
   Protocol, ClientTools, Term, ScreenTools, BaseWin, UDpiControls,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, ButtonC;
 …
   Template := TDpiBitmap.Create;
   Template.PixelFormat := pf24bit;
   LoadGraphicFile(Template, HomeDir + 'Graphics' + DirectorySeparator + 'Unit.png', gfNoGamma);
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'Unit.png', gfNoGamma);
 end;
 …
   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
 …
     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;
 …
     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;
 …
     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;
 …
     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;
 …
     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;
 …
           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;
 …
                     * (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

-              r179
+              r210
 uses
   ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  UDpiControls, ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB;
 …
 uses
   Term, ClientTools, Help, Tribes, UDpiControls;
+  Term, ClientTools, Help, Tribes, UPixelPointer;
 {$R *.lfm}
 …
   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
 …
   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) *
 + (255 - Src.Pixel^.R) * 9) div 128;
 …
     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,
 …
           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;

branches/highdpi/Locale.lfm

-              r193
+              r210
 object LocaleDlg: TLocaleDlg
+  ClientHeight = 456
+  Left = 766
+  Height = 448
+  Top = 240
+  Width = 483
+  BorderStyle = bsNone
+  Caption = 'LocaleDlg'
+  ClientHeight = 448
   ClientWidth = 483
-  Top = 240
-  Left = 754
-  Width = 483
-  Height = 456
-  Caption = 'LocaleDlg'
-  Enabled = True
-  ShowHint = False
-  Font.Color = clDefault
-  Font.PixelsPerInch = 144
-  Align = alNone
-  Color = clDefault
-  OnPaint = FormPaint
-  HorzScrollBar.Visible = False
-  VertScrollBar.Visible = False
   DesignTimePPI = 144
   FormStyle = fsStayOnTop
-  BorderStyle = bsNone
-  BorderIcons = []
-  LCLVersion = '2.0.2.0'
-  OnShow = FormShow
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnPaint = FormPaint
+  OnShow = FormShow
+  LCLVersion = '2.0.2.0'
   object List: TDpiListBox
     Tag = 15360
     ClientHeight = 360
     ClientWidth = 424
+    Left = 24
+    Height = 336
     Top = 16
-    Left = 24
     Width = 424
     Height = 360
     Visible = True
     Enabled = True
     ShowHint = False
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderStyle = bsNone
+    Color = clBlack
+    ExtendedSelect = False
     Font.Color = 4176863
+    Font.Height = -15
     Font.Name = 'Times New Roman'
     Font.Style = [fsBold]
+    Font.PixelsPerInch = 144
+    Font.Height = -15
+    Align = alNone
+    Color = clBlack
+    IntegralHeight = True
+    ItemHeight = 0
+    ParentFont = False
+    ScrollWidth = 424
+    TabOrder = 0
+    TabStop = False
+    TopIndex = -1
   end
   object OKBtn: TButtonA
     ClientHeight = 25
     ClientWidth = 100
+    Left = 272
+    Height = 25
     Top = 400
-    Left = 272
     Width = 100
-    Height = 25
-    Visible = True
-    Enabled = True
-    ShowHint = False
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clDefault
-    OnClick = OKBtnClick
     Down = False
     Permanent = False
+    OnClick = OKBtnClick
   end
   object CancelBtn: TButtonA
     ClientHeight = 25
     ClientWidth = 100
+    Left = 96
+    Height = 25
     Top = 400
-    Left = 96
     Width = 100
-    Height = 25
-    Visible = True
-    Enabled = True
-    ShowHint = False
-    Font.Color = clDefault
-    Font.PixelsPerInch = 144
-    Align = alNone
-    Color = clDefault
-    OnClick = CancelBtnClick
     Down = False
     Permanent = False
+    OnClick = CancelBtnClick
+  end
+  object ButtonFullscreen: TButtonC
+    Left = 24
+    Height = 18
+    Top = 368
+    Width = 18
+    Down = False
+    Permanent = False
+    OnClick = ButtonFullscreenClick
+    ButtonIndex = 0
   end
 end

branches/highdpi/Locale.pas

-              r178
+              r210
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg, UDpiControls;
+  UDpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  ScreenTools, Messg, ButtonA, Registry, fgl, Directories, DrawDlg, ButtonC;
 type
 …
   TLocaleDlg = class(TDrawDlg)
+    ButtonFullscreen: TButtonC;
     List: TDpiListBox;
     OKBtn: TButtonA;
     CancelBtn: TButtonA;
+    procedure ButtonFullscreenClick(Sender: TObject);
     procedure CancelBtnClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
 …
   OkBtn.Graphic := GrExt[HGrSystem].Data;
   CancelBtn.Graphic := GrExt[HGrSystem].Data;
+  ButtonFullscreen.Graphic := GrExt[HGrSystem].Data;
+  if FullScreen then ButtonFullscreen.ButtonIndex := 3
+    else ButtonFullscreen.ButtonIndex := 2;
 end;
 procedure TLocaleDlg.CancelBtnClick(Sender: TObject);
 begin
+  ModalResult := mrOk;
+  ModalResult := mrCancel;
+end;
+procedure TLocaleDlg.ButtonFullscreenClick(Sender: TObject);
+begin
+  FullScreen := not FullScreen;
+  ButtonFullscreen.ButtonIndex := ButtonFullscreen.ButtonIndex xor 1;
 end;
 …
 procedure TLocaleDlg.FormPaint(Sender: TObject);
+var
+  S: string;
 begin
   PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
 …
   BtnFrame(Canvas, OKBtn.BoundsRect, MainTexture);
   BtnFrame(Canvas, CancelBtn.BoundsRect, MainTexture);
+  RFrame(Canvas, ButtonFullscreen.Left - 1, ButtonFullscreen.Top - 1,
+    ButtonFullscreen.Left + 12, ButtonFullscreen.Top + 12, MainTexture.clBevelShade,
+    MainTexture.clBevelLight);
+  s := Phrases.Lookup('SETTINGS', 0);
+  LoweredTextOut(Canvas, -2, MainTexture, ButtonFullscreen.Left + 32,
+    ButtonFullscreen.Top - 4, s);
 end;
 …
 begin
   LocaleCode := Languages[List.ItemIndex].ShortName;
   ModalResult := mrCancel;
+  ModalResult := mrOk;
 end;

branches/highdpi/Localization/cs/Language.txt

r178	r210
942	942	Uspíšit\produkci
943	943	Maximální\produkce
	944
	945	#SETTINGS
	946	Celá obrazovka

branches/highdpi/Localization/de/Language.txt

r178	r210
960	960	beschleunigte\Produktion
961	961	maximale\Produktion
	962
	963	#SETTINGS
	964	Full screen

branches/highdpi/Localization/it/Language.txt

r178	r210
932	932	Favorisci\produzione
933	933	Massimizza\produzione
	934
	935	#SETTINGS
	936	Full screen

branches/highdpi/Localization/ru/Language.txt

r178	r210
968	968	Максимум\Производства
969	969
	970	#SETTINGS
	971	Full screen

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

r178	r210
960	960	Éú²ú×î´ó»¯
961	961
	962	#SETTINGS
	963	Full screen

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

r178	r210
960	960	¥Í²£³Ì¤j¤Æ
961	961
	962	#SETTINGS
	963	Full screen

branches/highdpi/Log.pas

-              r178
+              r210
 uses
   LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   StdCtrls, Menus, UDpiControls;
+  UDpiControls, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  StdCtrls, Menus;
 type
   TLogDlg = class(TForm)
+  TLogDlg = class(TDpiForm)
     LogPopup: TPopupMenu;
     mLog0: TMenuItem;
 …
 var
   LogDlg: TLogDlg;
 implementation

branches/highdpi/Messg.pas

-              r178
+              r210
 implementation
+uses
+  Sound;
 {$R *.lfm}
 …
   if OpenSound <> '' then
     PostMessage(Handle, WM_PLAYSOUND, 0, 0);
 end; { FormPaint }
+end;
 procedure TMessgDlg.Button1Click(Sender: TObject);
 …
 begin
   if Key = #13 then
     ModalResult := mrOK
+    ModalResult := mrOK;
     // else if (Key=#27) and (Button2.Visible) then ModalResult:=mrCancel
 end;
 …
     Kind := mkOK;
     ShowModal;
   end
+  end;
 end;
 …
     Kind := mkOK;
     ShowModal;
   end
+  end;
 end;

branches/highdpi/NoTerm.pas

-              r193
+              r210
 uses
   ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
   SysUtils, Classes, Graphics, Controls, Forms, ButtonB, DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
+  SysUtils, Classes, Graphics, Controls, Forms, ButtonB, DrawDlg;
 type
 …
   RisedTextOut(State.Canvas, 0, 0, Format(Phrases.Lookup('AIT_ROUND'), [Round])
     + ' ' + TurnToString(G.RO[me].Turn));
+  DpiBitBlt(Canvas.Handle, 64, 287 + 138, 192, 20, State.Canvas.Handle, 0,
+, SRCCOPY);
+  DpiBitCanvas(Canvas, 64, 287 + 138, 192, 20, State.Canvas, 0, 0);
 end;
 …
         begin
           Invalidate;
           Update;
+          Update
         end
         else
 …
           ToldAlive := G.RO[me].Alive;
         end;
         Application.ProcessMessages;
+        DpiApplication.ProcessMessages;
         if Mode = Quit then
           EndPlaying
 …
         yBrain[i] - 16, 64, 64, 0, 0);
       if 1 shl i and G.RO[me].Alive = 0 then
         DpiBitBlt(Canvas.Handle, xBrain[i], yBrain[i] - 16, 64, 64,
           Shade.Canvas.Handle, 0, 0, SRCAND);
+        DpiBitCanvas(Canvas, xBrain[i], yBrain[i] - 16, 64, 64,
+          Shade.Canvas, 0, 0, SRCAND);
       Sprite(Canvas, HGrSystem, xBrain[i] + 30 - 14, yBrain[i] + 53, 14,
 , 1, 316);
 …
   begin
     FormsCreated := true;
     Application.CreateForm(TNoTermDlg, NoTermDlg);
+    DpiApplication.CreateForm(TNoTermDlg, NoTermDlg);
   end;
   NoTermDlg.Client(Command, Player, Data);

branches/highdpi/Packages/CevoComponents/Area.pas

-              r178
+              r210
 uses
   Classes, Graphics, Controls, UDpiControls;
+  UDpiControls, Classes, Graphics, Controls;
 type
 …
 procedure Register;
 begin
   RegisterComponents('Samples', [TArea]);
+  RegisterComponents('C-evo', [TArea]);
 end;
 …
       begin
         Brush.Color := $FF0000;
         FrameRect(Rect(0, 0, width, height));
+        FrameRect(Rect(0, 0, Width, Height));
       end;
 end;

branches/highdpi/Packages/CevoComponents/BaseWin.pas

-              r193
+              r210
 uses
   ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  DrawDlg;
 type
 …
   TitleHeight := WideFrame;
   ModalFrameIndent := 45;
   UserLeft := (Screen.Width - Width) div 2;
   UserTop := (Screen.Height - Height) div 2;
+  UserLeft := (DpiScreen.Width - Width) div 2;
+  UserTop := (DpiScreen.Height - Height) div 2;
 end;
 …
 procedure TBufferedDrawDlg.VPaint;
 begin
+  DpiBitBlt(Canvas.Handle, 0, 0, ClientWidth, ClientHeight,
+    Offscreen.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(Canvas, 0, 0, ClientWidth, ClientHeight, Offscreen.Canvas, 0, 0);
 end;
 …
   SaveOnShow, SaveOnPaint: TNotifyEvent;
 begin
   Top := Screen.Height;
+  Top := DpiScreen.Height;
   SaveOnShow := OnShow;
   OnShow := nil;
 …
     end;
   DpiBitBlt(Canvas.Handle, SideFrame, TitleHeight, ClientWidth - 2 * SideFrame,
     InnerBottom - TitleHeight, Offscreen.Canvas.Handle, 0, 0, SRCCOPY);
+  DpiBitCanvas(Canvas, SideFrame, TitleHeight, ClientWidth - 2 * SideFrame,
+    InnerBottom - TitleHeight, Offscreen.Canvas, 0, 0);
 end;

branches/highdpi/Packages/CevoComponents/ButtonA.pas

-              r178
+              r210
 uses
+  ButtonBase,
+  Classes, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools;
 type
 …
   private
     FCaption: string;
     procedure SetCaption(x: string);
     procedure SetFont(const x: TDpiFont);
+    procedure SetCaption(Text: string);
+    procedure SetFont(const Font: TDpiFont);
   published
     property Visible;
 …
 procedure Register;
 implementation
 procedure Register;
 begin
   RegisterComponents('Samples', [TButtonA]);
+  RegisterComponents('C-evo', [TButtonA]);
 end;
 …
 begin
   with Canvas do
+    if FGraphic <> nil then begin
+      DpiBitBlt(Canvas.Handle, 0, 0, 100, 25, Graphic.Canvas.Handle, 195,
++ 26 * Byte(Down), SRCCOPY);
+    if FGraphic <> nil then
+    begin
+      DpiBitCanvas(Canvas, 0, 0, 100, 25, Graphic.Canvas, 195,
++ 26 * Byte(Down));
       Canvas.Brush.Style := bsClear;
       TextOut(50 - (TextWidth(FCaption) + 1) div 2, 12 - TextHeight(FCaption)
+      Textout(50 - (TextWidth(FCaption) + 1) div 2, 12 - textheight(FCaption)
         div 2, FCaption);
+    end else begin
+    end
+    else
+    begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 100, 25))
     end
+    end;
 end;
 procedure TButtonA.SetCaption(x: string);
+procedure TButtonA.SetCaption(Text: string);
 begin
+  if x <> FCaption then
+  begin
+    FCaption := x;
+    Invalidate
+  end
+  if Text <> FCaption then begin
+    FCaption := Text;
+    Invalidate;
+  end;
 end;
 procedure TButtonA.SetFont(const x: TDpiFont);
+procedure TButtonA.SetFont(const Font: TDpiFont);
 begin
   Canvas.Font.Assign(x);
+  Canvas.Font.Assign(Font);
   Canvas.Font.Color := $000000;
 end;

branches/highdpi/Packages/CevoComponents/ButtonB.pas

-              r179
+              r210
 uses
   ButtonBase, Classes, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType;
 type
 …
     FMask: TDpiBitmap;
     FIndex: integer;
     procedure SetIndex(x: integer);
+    procedure SetIndex(Text: integer);
   public
     property Mask: TDpiBitmap read FMask write FMask;
 …
 procedure Register;
 implementation
+uses
+  ScreenTools;
 procedure Register;
 begin
   RegisterComponents('Samples', [TButtonB]);
+  RegisterComponents('C-evo', [TButtonB]);
 end;
 …
 begin
   inherited Create(aOwner);
   ShowHint := true;
+  ShowHint := True;
   SetBounds(0, 0, 25, 25);
 end;
 …
 begin
   with Canvas do
+    if FGraphic <> nil then
+    begin
+      DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FGraphic.Canvas.Handle, 169,
++ 26 * Byte(FDown), SRCCOPY);
+      if FIndex >= 0 then
+      begin
+        DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FMask.Canvas.Handle,
+    if FGraphic <> nil then begin
+      DpiBitCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas, 169,
++ 26 * Byte(FDown));
+      if FIndex >= 0 then begin
+        DpiBitCanvas(Canvas, 0, 0, 25, 25, FMask.Canvas,
 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCAND);
         DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FGraphic.Canvas.Handle,
+        DpiBitCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas,
 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCPAINT);
       end
+    end
+    else
+    begin
+    end else begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 25, 25))
     end
+      FrameRect(Rect(0, 0, 25, 25));
+    end;
 end;
 procedure TButtonB.SetIndex(x: integer);
+procedure TButtonB.SetIndex(Text: integer);
 begin
+  if x <> FIndex then
+  begin
+    FIndex := x;
+    Invalidate
+  end
+  if Text <> FIndex then begin
+    FIndex := Text;
+    Invalidate;
+  end;
 end;

branches/highdpi/Packages/CevoComponents/ButtonBase.pas

-              r179
+              r210
 uses
   Classes, Graphics, Controls, UDpiControls;
+  UDpiControls, Classes, Graphics, Controls;
 type
-  { TButtonBase }
   TButtonBase = class(TDpiGraphicControl)
   protected
 …
   private
     Active: boolean;
-    procedure SetGraphic(AValue: TDpiBitmap);
   public
     constructor Create(aOwner: TComponent); override;
     property Graphic: TDpiBitmap read FGraphic write SetGraphic;
+    property Graphic: TDpiBitmap read FGraphic write FGraphic;
     // property DownSound: string read FDownSound write FDownSound;
     // property UpSound: string read FUpSound write FUpSound;
 …
 end;
-procedure TButtonBase.SetGraphic(AValue: TDpiBitmap);
-begin
-  if FGraphic = AValue then Exit;
-  FGraphic := AValue;
-end;
 procedure TButtonBase.SetDown(x: boolean);
 begin

branches/highdpi/Packages/CevoComponents/ButtonC.pas

-              r179
+              r210
 uses
   ButtonBase, Classes, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools;
 type
 …
   private
     FIndex: Integer;
     procedure SetIndex(x: Integer);
+    procedure SetIndex(Text: Integer);
   published
     property Visible;
 …
 procedure Register;
 implementation
 procedure Register;
 begin
   RegisterComponents('Samples', [TButtonC]);
+  RegisterComponents('C-evo', [TButtonC]);
 end;
 …
   with Canvas do
     if FGraphic <> nil then
       DpiBitBlt(Canvas.Handle, 0, 0, 12, 12, FGraphic.Canvas.Handle,
 + 13 * Byte(FDown), 159 + 13 * FIndex, SRCCOPY)
+      DpiBitCanvas(Canvas, 0, 0, 12, 12, FGraphic.Canvas,
++ 13 * Byte(FDown), 159 + 13 * FIndex)
     else
     begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 12, 12))
     end
+    end;
 end;
 procedure TButtonC.SetIndex(x: integer);
+procedure TButtonC.SetIndex(Text: integer);
 begin
   if x <> FIndex then
+  if Text <> FIndex then
   begin
     FIndex := x;
+    FIndex := Text;
     Invalidate;
   end;

branches/highdpi/Packages/CevoComponents/ButtonN.pas

-              r180
+              r210
 uses
   Classes, Graphics, Controls, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, Classes, Graphics, Controls, LCLIntf, LCLType, ScreenTools;
 type
   TButtonN = class(TGraphicControl)
+  TButtonN = class(TDpiGraphicControl)
     constructor Create(aOwner: TComponent); override;
   private
 …
 procedure Register;
 begin
   RegisterComponents('Samples', [TButtonN]);
+  RegisterComponents('C-evo', [TButtonN]);
 end;
 …
     if FGraphic <> nil then
     begin
       DpiBitBlt(Canvas.Handle, 1, 1, 40, 40, FBackGraphic.Canvas.Handle,
 + 80 * BackIndex + 40 * byte(FPossible and FLit), 176, SRCCOPY);
+      DpiBitCanvas(Canvas, 1, 1, 40, 40, FBackGraphic.Canvas,
++ 80 * BackIndex + 40 * byte(FPossible and FLit), 176);
       if FPossible then
       begin
         DpiBitBlt(Canvas.Handle, 3, 3, 36, 36, FMask.Canvas.Handle,
+        DpiBitCanvas(Canvas, 3, 3, 36, 36, FMask.Canvas,
 + 37 * (FIndex mod 3), 21 + 37 * (FIndex div 3), SRCAND);
         DpiBitBlt(Canvas.Handle, 3, 3, 36, 36, FGraphic.Canvas.Handle,
+        DpiBitCanvas(Canvas, 3, 3, 36, 36, FGraphic.Canvas,
 + 37 * (FIndex mod 3), 21 + 37 * (FIndex div 3), SRCPAINT);
       end
+      end;
     end;
     MoveTo(0, 41);
 …
     LineTo(41, 41);
     LineTo(0, 41);
   end
+  end;
 end;
 …
 begin
   if FPossible and (Button = mbLeft) and (@ChangeProc <> nil) then
     ChangeProc(Self)
+    ChangeProc(Self);
 end;
 …
     else
       Hint := '';
     Invalidate
   end
+    Invalidate;
+  end;
 end;
 …
   begin
     FLit := x;
     Invalidate
   end
+    Invalidate;
+  end;
 end;
 …
     else
       BackIndex := 0;
     Invalidate
   end
+    Invalidate;
+  end;
 end;
 …
     if FPossible then
       Hint := x;
   end
+  end;
 end;

branches/highdpi/Packages/CevoComponents/CevoComponents.lpk

-              r178
+              r210
       </Other>
     </CompilerOptions>
+    <Files Count="13">
+    <Description Value="C-evo components"/>
+    <Version Major="1" Minor="2"/>
+    <Files Count="14">
       <Item1>
         <Filename Value="Area.pas"/>
 …
       <Item13>
         <Filename Value="BaseWin.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="BaseWin"/>
       </Item13>
+      <Item14>
+        <Filename Value="UPixelPointer.pas"/>
+        <UnitName Value="UPixelPointer"/>
+      </Item14>
     </Files>
     <RequiredPkgs Count="3">
       <Item1>
         <PackageName Value="DpiControls"/>
+        <DefaultFilename Value="..\DpiControls\DpiControls.lpk" Prefer="True"/>
       </Item1>
       <Item2>

branches/highdpi/Packages/CevoComponents/CevoComponents.pas

-              r178
+              r210
 uses
   Area, ButtonA, ButtonB, ButtonC, ButtonN, EOTButton, ButtonBase, DrawDlg,
   Sound, BaseWin, LazarusPackageIntf;
+  Sound, BaseWin, UPixelPointer, LazarusPackageIntf;
 implementation
 …
   RegisterUnit('EOTButton', @EOTButton.Register);
   RegisterUnit('DrawDlg', @DrawDlg.Register);
+  RegisterUnit('BaseWin', @BaseWin.Register);
 end;

branches/highdpi/Packages/CevoComponents/Directories.pas

-              r178
+              r210
 var
+  HomeDir, DataDir: string;
+  HomeDir: string;
+  DataDir: string;
   LocaleCode: string = '';
   LocaleCodeAuto: string = '';
 function LocalizedFilePath(const Path: string): string;
+procedure InitUnit;
+procedure UnitInit;
+function GetSavedDir(Home: Boolean = False): string;
+function GetMapsDir(Home: Boolean = False): string;
+function GetGraphicsDir: string;
+function GetSoundsDir: string;
+function GetAiDir: string;
 …
   if Lang = '' then begin
       for i := 1 to Paramcount - 1 do
         if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
           (ParamStrUTF8(i) = '--lang') then
+    for i := 1 to Paramcount - 1 do
+      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
+        (ParamStrUTF8(i) = '--lang') then
           Lang := ParamStrUTF8(i + 1);
   end;
   if Lang = '' then begin
+    T := '';
     LazGetLanguageIDs(Lang, T);
     Lang := Copy(Lang, 1, 2);
 …
   if LocaleCode <> 'en' then begin
     Result := HomeDir + 'Localization' + DirectorySeparator + LocaleCodeDir + DirectorySeparator + Path;
     if not FileExists(Result) then
+    if not DirectoryExists(Result) and not FileExists(Result) then
       Result := HomeDir + Path;
   end else Result := HomeDir + Path;
 end;
 procedure InitUnit;
+procedure UnitInit;
 var
   AppDataDir: string;
 …
   else
   begin
+    if not DirectoryExists(AppDataDir) then
+      CreateDir(AppDataDir);
+    if not DirectoryExists(AppDataDir) then CreateDir(AppDataDir);
     DataDir := AppDataDir;
   end;
+  if not DirectoryExists(DataDir + 'Saved') then
+    CreateDir(DataDir + 'Saved');
+  if not DirectoryExists(DataDir + 'Maps') then
+    CreateDir(DataDir + 'Maps');
+  if not DirectoryExists(GetSavedDir) then CreateDir(GetSavedDir);
+  if not DirectoryExists(GetMapsDir) then CreateDir(GetMapsDir);
   // Copy appdata if not done yet
   if FindFirst(HomeDir + 'Saved' + DirectorySeparator + '*.cevo', $21, src) = 0 then
+  if FindFirst(GetSavedDir(True) + DirectorySeparator + '*.cevo', $21, src) = 0 then
     repeat
       if (FindFirst(DataDir + 'Saved' + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(GetSavedDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
         CopyFile(PChar(HomeDir + 'Saved' + DirectorySeparator + src.Name),
           PChar(DataDir + 'Saved' + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(GetSavedDir(True) + DirectorySeparator + src.Name),
+          PChar(GetSavedDir(True) + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
 …
   // Copy appdata if not done yet
   if FindFirst(HomeDir + 'Maps' + DirectorySeparator + '*.*', $21, src) = 0 then
+  if FindFirst(GetMapsDir(True) + DirectorySeparator + '*.*', $21, src) = 0 then
     repeat
       if (FindFirst(DataDir + 'Maps' + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(GetMapsDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
         CopyFile(PChar(HomeDir + 'Maps' + DirectorySeparator + src.Name),
           PChar(DataDir + 'Maps' + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(GetMapsDir(True) + DirectorySeparator + src.Name),
+          PChar(GetMapsDir(True) + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
 …
 end;
+function GetSavedDir(Home: Boolean = False): string;
+begin
+  if Home then Result := HomeDir + 'Saved'
+    else Result := DataDir + 'Saved';
+end;
+function GetMapsDir(Home: Boolean = False): string;
+begin
+  if Home then Result := HomeDir + 'Maps'
+    else Result := DataDir + 'Maps';
+end;
+function GetGraphicsDir: string;
+begin
+  Result := HomeDir + 'Graphics';
+end;
+function GetSoundsDir: string;
+begin
+  Result := HomeDir + 'Sounds';
+end;
+function GetAiDir: string;
+begin
+  Result := HomeDir + 'AI';
+end;
 end.

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

-              r178
+              r210
 uses
   Classes, SysUtils, Forms, LCLIntf, LCLType, LMessages, Messages, Graphics,
   Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools, UDpiControls;
+  UDpiControls, Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF LINUX}LMessages,{$ENDIF}
+  Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools;
 type
 …
   public
     constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure SmartInvalidate; virtual;
+  private
+    MoveFormPos: TPoint;
+    MoveMousePos: TPoint;
+    MoveActive: Boolean;
+    procedure VisibleChangedHandler(Sender: TObject);
   protected
     TitleHeight: integer;
+    TitleHeight: Integer;
     // defines area to grip the window for moving (from top)
     procedure InitButtons;
     procedure OnEraseBkgnd(var m: TMessage); message WM_ERASEBKGND;
     procedure OnHitTest(var Msg: TMessage); message WM_NCHITTEST;
+    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+      override;
+    procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
+    procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
+    procedure MouseLeave; override;
   end;
 …
   inherited;
   TitleHeight := 0;
+  MoveActive := False;
+  AddHandlerOnVisibleChanged(VisibleChangedHandler);
+end;
+destructor TDrawDlg.Destroy;
+begin
+  RemoveHandlerOnVisibleChanged(VisibleChangedHandler);
+  inherited Destroy;
 end;
 …
 end;
+procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
+  Y: Integer);
+{$IFDEF LINUX}
+var
+  MousePosNew: TPoint;
+  NewFormPos: TPoint;
+{$ENDIF}
+begin
+  inherited;
+  {$IFDEF LINUX}
+  // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
+  NewFormPos := ScreenToClient(Mouse.CursorPos);
+  if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
+    (NewFormPos.Y >= 0) and (NewFormPos.Y < Height) then begin
+    MoveMousePos := ClientToScreen(Point(X, Y));
+    MoveFormPos := Point(Left, Top);
+    MousePosNew := Mouse.CursorPos;
+    // Activate move only if mouse position was not changed during inherited call
+    if (MousePosNew.X = MoveMousePos.X) and (MousePosNew.Y = MoveMousePos.Y) then begin
+      MoveActive := True;
+    end;
+  end else MoveActive := False;
+  {$ENDIF}
+end;
+procedure TDrawDlg.MouseMove(Shift: TShiftState; X, Y: Integer);
+var
+  MousePos: TPoint;
+begin
+  inherited;
+  if MoveActive then begin
+    MousePos := ClientToScreen(Point(X, Y));
+    SetBounds(MoveFormPos.X + MousePos.X - MoveMousePos.X,
+      MoveFormPos.Y + MousePos.Y - MoveMousePos.Y,
+      Width, Height);
+  end;
+end;
+procedure TDrawDlg.MouseUp(Button: TMouseButton; Shift: TShiftState; X,
+  Y: Integer);
+begin
+  MoveActive := False;
+  inherited;
+end;
+procedure TDrawDlg.MouseLeave;
+begin
+  MoveActive := False;
+  inherited;
+end;
+procedure TDrawDlg.VisibleChangedHandler(Sender: TObject);
+begin
+  MoveActive := False;
+end;
 procedure TDrawDlg.InitButtons;
 var
 …
   // ButtonDownSound, ButtonUpSound: string;
 begin
   // ButtonDownSound:=Sounds.Lookup('BUTTON_DOWN');
   // ButtonUpSound:=Sounds.Lookup('BUTTON_UP');
+  // ButtonDownSound := Sounds.Lookup('BUTTON_DOWN');
+  // ButtonUpSound := Sounds.Lookup('BUTTON_UP');
   for cix := 0 to ComponentCount - 1 do
     if Components[cix] is TButtonBase then
     begin
       TButtonBase(Components[cix]).Graphic := GrExt[HGrSystem].Data;
       // if ButtonDownSound<>'*' then
       // DownSound:=HomeDir+'Sounds' + DirectorySeparator + ButtonDownSound + '.wav';
       // if ButtonUpSound<>'*' then
       // UpSound:=HomeDir+'Sounds' + DirectorySeparator + ButtonUpSound + '.wav';
+      // if ButtonDownSound <> '*' then
+      // DownSound := GetSoundsDir + DirectorySeparator + ButtonDownSound + '.wav';
+      // if ButtonUpSound <> '*' then
+      // UpSound := GetSoundsDir + DirectorySeparator + ButtonUpSound + '.wav';
       if Components[cix] is TButtonA then
         TButtonA(Components[cix]).Font := UniFont[ftButton];
 …
   r0, r1: HRgn;
 begin
   r0 := CreateRectRgn(0, 0, ClientWidth, ClientHeight);
+  r0 := DpiCreateRectRgn(0, 0, ClientWidth, ClientHeight);
   for i := 0 to ControlCount - 1 do
     if not(Controls[i] is TArea) and Controls[i].Visible then
     begin
       with Controls[i].BoundsRect do
         r1 := CreateRectRgn(Left, Top, Right, Bottom);
+        r1 := DpiCreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);
 …
 procedure TBaseMessgDlg.FormCreate(Sender: TObject);
 begin
   Left := (Screen.Width - Width) div 2;
+  Left := (DpiScreen.Width - Width) div 2;
   Canvas.Font.Assign(UniFont[ftNormal]);
   Canvas.Brush.Style := bsClear;
   MessgText := '';
   TopSpace := 0;
   TitleHeight := Screen.Height;
+  TitleHeight := DpiScreen.Height;
   if csDesigning in ComponentState then Exit;
   InitButtons;
 …
 begin
   if csDesigning in ComponentState then Exit;
   PaintBackground(Self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
+  PaintBackground(self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
     ClientHeight - (6 + 2 * Border));
   for i := 0 to Border do
 …
 begin
   ClientHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
   Top := (Screen.Height - ClientHeight) div 2;
+  Top := (DpiScreen.Height - ClientHeight) div 2;
   for i := 0 to ControlCount - 1 do
     Controls[i].Top := ClientHeight - (34 + Border);

branches/highdpi/Packages/CevoComponents/EOTButton.pas

-              r180
+              r210
 uses
   ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType;
 const
 …
 type
+  // EndOfTurn button
   TEOTButton = class(TButtonBase)
   public
 …
 implementation
+uses
+  ScreenTools;
 procedure Register;
 begin
+  RegisterComponents('Samples', [TEOTButton]);
+end;
+procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, w, h, Color0,
+  Color2: integer);
+// Src is template
+// B channel = Color0 amp
+// G channel = background amp (old Dst content), 128=original brightness
+// R channel = Color2 amp
+type
+  TPixel = array [0 .. 2] of Byte;
+var
+  ix, iy, amp0, amp1, trans, Value: integer;
+  SrcLine, DstLine: ^TPixel;
+begin
+  Src.BeginUpdate;
+  Dst.BeginUpdate;
+  for iy := 0 to h - 1 do
+  begin
+    SrcLine := Src.ScanLine[ySrc + iy] + xSrc * (Src.RawImage.Description.BitsPerPixel shr 3);
+    DstLine := Dst.ScanLine[yDst + iy] + xDst * (Dst.RawImage.Description.BitsPerPixel shr 3);
+    for ix := 0 to w - 1 do
+    begin
+      trans := SrcLine[0] * 2; // green channel = transparency
+      amp0 := SrcLine[1] * 2;
+      amp1 := SrcLine[2] * 2;
+      if trans <> $FF then
+      begin
+        Value := (DstLine[0] * trans + (Color2 shr 16 and $FF) * amp1
+          + (Color0 shr 16 and $FF) * amp0) div $FF;
+        if Value < 256 then
+          DstLine[0] := Value
+        else
+          DstLine[0] := 255;
+        Value := (DstLine[1] * trans + (Color2 shr 8 and $FF) * amp1
+          + (Color0 shr 8 and $FF) * amp0) div $FF;
+        if Value < 256 then
+          DstLine[1] := Value
+        else
+          DstLine[1] := 255;
+        Value := (DstLine[2] * trans + (Color2 and $FF) * amp1 +
+          (Color0 and $FF) * amp0) div $FF;
+        if Value < 256 then
+          DstLine[2] := Value
+        else
+          DstLine[2] := 255;
+      end;
+      SrcLine := Pointer(SrcLine) + (Src.RawImage.Description.BitsPerPixel shr 3);
+      DstLine := Pointer(DstLine) + (Dst.RawImage.Description.BitsPerPixel shr 3);
+    end;
+  end;
+  Src.EndUpdate;
+  Dst.EndUpdate;
+  RegisterComponents('C-evo', [TEOTButton]);
 end;
 …
     begin
       // TODO: For some reason BitBlt is not working with gray background here
+      //DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 48, 48, Back.Canvas.Handle, 0,
+      //  0, SRCCOPY);
+      //DpiBitCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
       Buffer.Canvas.Draw(0, 0, Back);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
 …
         ImageOp_CBC(Buffer, Template, 8, 8, 1 + 32 * Byte(FIndex), 246, 32, 32,
           $000000, $FFFFFF);
       DpiBitBlt(Canvas.Handle, 0, 0, 48, 48, Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+      DpiBitCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
     end
     else
 …
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 48, 48))
     end
+    end;
 end;
 …
   begin
     FIndex := x;
     Invalidate
   end
+    Invalidate;
+  end;
 end;
 …
       Paint
     except
     end
   end
+    end;
+  end;
 end;
 procedure TEOTButton.SetBack(ca: TDpiCanvas; x, y: integer);
 begin
   DpiBitBlt(Back.Canvas.Handle, 0, 0, 48, 48, ca.Handle, x, y, SRCCOPY);
+  DpiBitCanvas(Back.Canvas, 0, 0, 48, 48, ca, x, y);
 end;

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

-              r193
+              r210
 uses
   {$IFDEF WINDOWS}
+  UDpiControls, {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}
   StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls,
   Forms, Menus, GraphType, UDpiControls;
+  StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
+  Forms, Menus, GraphType;
 type
 …
   end;
-  TColor32 = type cardinal;
-  TColor32Component = (ccBlue, ccGreen, ccRed, ccAlpha);
-  TPixel32 = packed record
-    case integer of
-: (B, G, R, A: byte);
-: (ARGB: TColor32);
-: (Planes: array[0..3] of byte);
-: (Components: array[TColor32Component] of byte);
-  end;
-  PPixel32 = ^TPixel32;
-  { TPixelPointer }
-  TPixelPointer = record
-    Base: PPixel32;
-    Pixel: PPixel32;
-    Line: PPixel32;
-    RelLine: PPixel32;
-    BytesPerPixel: integer;
-    BytesPerLine: integer;
-    procedure NextLine; inline; // Move pointer to start of new base line
-    procedure NextPixel; inline; // Move pointer to next pixel
-    procedure SetXY(X, Y: integer); inline; // Set pixel position relative to base
-    procedure SetX(X: integer); inline; // Set horizontal pixel position relative to base
-    procedure Init(Bitmap: TDpiRasterImage; BaseX: integer = 0; BaseY: integer = 0); inline;
-  end;
-  PPixelPointer = ^TPixelPointer;
 {$IFDEF WINDOWS}
 function ChangeResolution(x, y, bpp, freq: integer): boolean;
 {$ENDIF}
 procedure RestoreResolution;
-function Play(Item: string; Index: integer = -1): boolean;
-procedure PreparePlay(Item: string; Index: integer = -1);
 procedure EmptyMenu(MenuItems: TMenuItem; Keep: Integer = 0);
 function TurnToYear(Turn: integer): integer;
 …
 procedure Sprite(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
 procedure MakeBlue(dst: TDpiBitmap; x, y, w, h: integer);
 procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, w, h: integer);
+procedure MakeBlue(dst: TDpiBitmap; x, y, Width, Height: Integer);
+procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
 procedure ImageOp_BCC(dst, Src: TDpiBitmap;
+  xDst, yDst, xSrc, ySrc, w, h, Color1, Color2: integer);
+procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, w, h, Color0, Color1, Color2: integer);
+function BitBltCanvas(DestCanvas: TDpiCanvas; X, Y, Width, Height: integer;
+  SrcCanvas: TDpiCanvas; XSrc, YSrc: integer; Rop: DWORD): boolean;
+  xDst, yDst, xSrc, ySrc, Width, Height, Color1, Color2: Integer);
+procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
+  Color0, Color2: Integer);
+procedure ImageOp_CCC(bmp: TDpiBitmap; x, y, w, h, Color0, Color1, Color2: Integer);
+function DpiBitCanvas(DestCanvas: TDpiCanvas; X, Y, Width, Height: Integer;
+  SrcCanvas: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
+function DpiBitCanvas(Dest: TDpiCanvas; DestRect: TRect;
+  Src: TDpiCanvas; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
+function BitBltBitmap(Dest: TDpiBitmap; X, Y, Width, Height: Integer;
+  Src: TDpiBitmap; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean; overload;
+function BitBltBitmap(Dest: TDpiBitmap; DestRect: TRect;
+  Src: TDpiBitmap; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
 procedure SLine(ca: TDpiCanvas; x0, x1, y: integer; cl: TColor);
 procedure DLine(ca: TDpiCanvas; x0, x1, y: integer; cl0, cl1: TColor);
 …
 procedure InitOrnament;
 procedure InitCityMark(const T: TTexture);
+procedure Fill(ca: TDpiCanvas; Left, Top, Width, Height, xOffset, yOffset: integer);
+procedure Fill(ca: TDpiCanvas; Left, Top, Width, Height, xOffset, yOffset: integer); overload;
+procedure Fill(Canvas: TDpiCanvas; Rect: TRect; Offset: TPoint); overload;
 procedure FillLarge(ca: TDpiCanvas; x0, y0, x1, y1, xm: integer);
 procedure FillSeamless(ca: TDpiCanvas; Left, Top, Width, Height, xOffset, yOffset: integer;
 …
 procedure FillRectSeamless(ca: TDpiCanvas; x0, y0, x1, y1, xOffset, yOffset: integer;
   const Texture: TDpiBitmap);
 procedure PaintBackground(Form: TDpiForm; Left, Top, Width, Height: Integer);
+procedure PaintBackground(Form: TDpiForm; Left, Top, Width, Height: integer);
 procedure Corner(ca: TDpiCanvas; x, y, Kind: integer; const T: TTexture);
 procedure BiColorTextOut(ca: TDpiCanvas; clMain, clBack: TColor; x, y: integer; s: string);
 …
 function SetMainTextureByAge(Age: integer): boolean;
 procedure LoadPhrases;
+procedure Texturize(Dest, Texture: TDpiBitmap; TransparentColor: Integer);
+procedure DarkenImage(Bitmap: TDpiBitmap; Change: Integer);
 const
 …
   wOrna = 27;
   hOrna = 26; // ornament
-  // sound modes
-  smOff = 0;
-  smOn = 1;
-  smOnAlt = 2;
   // color matrix
 …
   TGrExtDescr = record { don't use dynamic strings here! }
     Name: string[31];
+    Data, Mask: TDpiBitmap;
+    pixUsed: array [byte] of byte;
+    Data: TDpiBitmap;
+    Mask: TDpiBitmap;
+    pixUsed: array [Byte] of Byte;
   end;
 …
       TGrExtDescr, but without pixUsed }
     Name: string[31];
+    Data, Mask: TBitmap;
+    Data: TDpiBitmap;
+    Mask: TDpiBitmap;
   end;
 …
 var
+  Phrases, Phrases2, Sounds: TStringTable;
+  nGrExt: integer;
+  Phrases: TStringTable;
+  Phrases2: TStringTable;
+  nGrExt: Integer;
   GrExt: array [0 .. nGrExtmax - 1] of ^TGrExtDescr;
+  HGrSystem, HGrSystem2, ClickFrameColor, SoundMode, MainTextureAge: integer;
+  HGrSystem: Integer;
+  HGrSystem2: Integer;
+  ClickFrameColor: Integer;
+  MainTextureAge: Integer;
   MainTexture: TTexture;
+  Templates, Colors, Paper, BigImp, LogoBuffer: TDpiBitmap;
+  FullScreen, GenerateNames, InitOrnamentDone, Phrases2FallenBackToEnglish: boolean;
+  Templates: TDpiBitmap;
+  Colors: TDpiBitmap;
+  Paper: TDpiBitmap;
+  BigImp: TDpiBitmap;
+  LogoBuffer: TDpiBitmap;
+  FullScreen: Boolean;
+  GenerateNames: Boolean;
+  InitOrnamentDone: Boolean;
+  Phrases2FallenBackToEnglish: Boolean;
   UniFont: array [TFontType] of TDpiFont;
+  AppRegistryKey: string = '\SOFTWARE\C-evo';
+  Gamma: Integer; // global gamma correction (cent)
+procedure LoadAssets;
 procedure UnitInit;
 procedure UnitDone;
+procedure InitGammaLookupTable;
 implementation
 uses
   Directories, Sound, Registry;
+  Directories, Sound, UPixelPointer;
 var
 …
   {$ENDIF}
+  Gamma: Integer; // global gamma correction (cent)
+  GammaLookupTable: array [0 .. 255] of Byte;
+  GammaLookupTable: array [0..255] of Byte;
 {$IFDEF WINDOWS}
 …
   ResolutionChanged := False;
   {$ENDIF}
-end;
-function Play(Item: string; Index: integer = -1): boolean;
-{$IFNDEF DEBUG}
-var
-  WavFileName: string;
-{$ENDIF}
-begin
-  Result := False;
-{$IFNDEF DEBUG}
-  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
-  begin
-    Result := True;
-    Exit;
-  end;
-  WavFileName := Sounds.Lookup(Item, Index);
-  Assert(WavFileName[1] <> '[');
-  Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
-  if Result then
-    // SndPlaySound(pchar(HomeDir+'Sounds' +DirectorySeparator+WavFileName+'.wav'),SND_ASYNC)
-    PlaySound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
-{$ENDIF}
-end;
-procedure PreparePlay(Item: string; Index: Integer = -1);
-{$IFNDEF DEBUG}
-var
-  WavFileName: string;
-{$ENDIF}
-begin
-{$IFNDEF DEBUG}
-  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
-    Exit;
-  WavFileName := Sounds.Lookup(Item, Index);
-  Assert(WavFileName[1] <> '[');
-  if (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*') then
-    PrepareSound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
-{$ENDIF}
 end;
 …
 begin
   Bitmap.BeginUpdate;
   PixelPtr.Init(Bitmap);
+  PixelPtr := PixelPointer(Bitmap);
   for Y := 0 to ScaleToVcl(Bitmap.Height) - 1 do begin
     for X := 0 to ScaleToVcl(Bitmap.Width) - 1 do begin
 …
 end;
 procedure CopyGray8BitTo24bitBitmap(Dst, Src: TDpiBitmap);
+procedure CopyGray8BitTo24bitBitmap(Dst, Src: TDpiRasterImage);
 var
   SrcPtr, DstPtr: TPixelPointer;
 …
 begin
   //Dst.SetSize(Src.Width, Src.Height);
   SrcPtr.Init(Src);
   DstPtr.Init(Dst);
+  SrcPtr := PixelPointer(Src);
+  DstPtr := PixelPointer(Dst);
   for Y := 0 to ScaleToVcl(Src.Height) - 1 do begin
     for X := 0 to ScaleToVcl(Src.Width) - 1 do begin
 …
 end;
-procedure ResizeBitmap(Bitmap: TDpiBitmap; const NewWidth, NewHeight: Integer);
-var
-  Buffer: TDpiBitmap;
-begin
-  Buffer := TDpiBitmap.Create;
-  try
-    Buffer.SetSize(NewWidth, NewHeight);
-    Buffer.Canvas.StretchDraw(Rect(0, 0, NewWidth, NewHeight), Bitmap);
-    Bitmap.SetSize(NewWidth, NewHeight);
-    Bitmap.Canvas.Draw(0, 0, Buffer);
-  finally
-    Buffer.Free;
-  end;
-end;
 function LoadGraphicFile(bmp: TDpiBitmap; Path: string; Options: Integer): Boolean;
 var
 …
     Path := Path + '.png';
   if ExtractFileExt(Path) = '.jpg' then begin
     jtex := TDpiJpegImage.Create;
+    jtex := tDpijpegimage.Create;
     try
       jtex.LoadFromFile(Path);
-      ResizeBitmap(jtex, ScaleToVcl(jtex.Width), ScaleToVcl(jtex.Height));
     except
       Result := False;
 …
     try
       Png.LoadFromFile(Path);
-      ResizeBitmap(Png, ScaleToVcl(Png.Width), ScaleToVcl(Png.Height));
     except
       Result := False;
 …
       end
       else
         Bmp.Canvas.Draw(0, 0, Png);
+        Bmp.Canvas.draw(0, 0, Png);
     end;
     Png.Free;
 …
     try
       bmp.LoadFromFile(Path);
-      ResizeBitmap(bmp, ScaleToVcl(bmp.Width), ScaleToVcl(bmp.Height));
     except
       Result := False;
 …
     Source := TDpiBitmap.Create;
     Source.PixelFormat := pf24bit;
     FileName := HomeDir + 'Graphics' + DirectorySeparator + Name;
+    FileName := GetGraphicsDir + DirectorySeparator + Name;
     if not LoadGraphicFile(Source, FileName) then begin
       Result := -1;
 …
     xmax := Source.Width - 1; // allows 4-byte access even for last pixel
+    if xmax > 970 then
+      xmax := 970;
+    // Why there was that limit?
+    //if xmax > 970 then
+    //  xmax := 970;
     GrExt[nGrExt].Data := Source;
 …
     GrExt[nGrExt].Data.BeginUpdate;
     GrExt[nGrExt].Mask.BeginUpdate;
     DataPixel.Init(GrExt[nGrExt].Data);
     MaskPixel.Init(GrExt[nGrExt].Mask);
+    DataPixel := PixelPointer(GrExt[nGrExt].Data);
+    MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
     for y := 0 to ScaleToVcl(Source.Height) - 1 do begin
       for x := 0 to ScaleToVcl(xmax) - 1 do begin
 …
 procedure Dump(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
   DpiBitBlt(dst.Canvas.Handle, xDst, yDst, Width, Height,
     GrExt[HGr].Data.Canvas.Handle, xGr, yGr, SRCCOPY);
 end;
 procedure MakeBlue(dst: TDpiBitmap; x, y, w, h: integer);
+  DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
+    GrExt[HGr].Data.Canvas, xGr, yGr);
+end;
+procedure MakeBlue(dst: TDpiBitmap; x, y, Width, Height: Integer);
 var
   XX, YY: integer;
 …
   X := ScaleToVcl(X);
   Y := ScaleToVcl(Y);
   W := ScaleToVcl(W);
   H := ScaleToVcl(H);
+  Width := ScaleToVcl(Width);
+  Height := ScaleToVcl(Height);
   Dst.BeginUpdate;
   PixelPtr.Init(Dst, X, Y);
   for yy := 0 to h - 1 do begin
     for xx := 0 to w - 1 do begin
+  PixelPtr := PixelPointer(Dst, X, Y);
+  for yy := 0 to Height - 1 do begin
+    for xx := 0 to Width - 1 do begin
       PixelPtr.Pixel^.B := PixelPtr.Pixel^.B div 2;
       PixelPtr.Pixel^.G := PixelPtr.Pixel^.G div 2;
 …
 end;
 procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, w, h: Integer);
+procedure ImageOp_B(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height: Integer);
 // Src is template
 // X channel = background amp (old Dst content), 128=original brightness
 …
   xSrc := ScaleToVcl(xSrc);
   ySrc := ScaleToVcl(ySrc);
   w := ScaleToVcl(w);
   h := ScaleToVcl(h);
+  Width := ScaleToVcl(Width);
+  Height := ScaleToVcl(Height);
   //Assert(Src.PixelFormat = pf8bit);
   Assert(dst.PixelFormat = pf24bit);
   if xDst < 0 then begin
     w := w + xDst;
+    Width := Width + xDst;
     xSrc := xSrc - xDst;
     xDst := 0;
   end;
   if yDst < 0 then begin
     h := h + yDst;
+    Height := Height + yDst;
     ySrc := ySrc - yDst;
     yDst := 0;
   end;
   if xDst + w > ScaleToVcl(dst.Width) then
     w := ScaleToVcl(dst.Width) - xDst;
   if yDst + h > ScaleToVcl(dst.Height) then
     h := ScaleToVcl(dst.Height) - yDst;
   if (w < 0) or (h < 0) then
+  if xDst + Width > ScaleToVcl(dst.Width) then
+    Width := ScaleToVcl(dst.Width) - xDst;
+  if yDst + Height > ScaleToVcl(dst.Height) then
+    Height := ScaleToVcl(dst.Height) - yDst;
+  if (Width < 0) or (Height < 0) then
     exit;
   dst.BeginUpdate;
   Src.BeginUpdate;
   PixelDst.Init(Dst, xDst, yDst);
   PixelSrc.Init(Src, xSrc, ySrc);
   for Y := 0 to h - 1 do begin
     for X := 0 to w - 1 do  begin
+  PixelDst := PixelPointer(Dst, xDst, yDst);
+  PixelSrc := PixelPointer(Src, xSrc, ySrc);
+  for Y := 0 to Height - 1 do begin
+    for X := 0 to Width - 1 do  begin
       Brightness := PixelSrc.Pixel^.B; // One byte for 8-bit color
       test := (PixelDst.Pixel^.R * Brightness) shr 7;
 …
 end;
 procedure ImageOp_BCC(dst, Src: TDpiBitmap;
   xDst, yDst, xSrc, ySrc, w, h, Color1, Color2: integer);
+procedure ImageOp_BCC(dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
+  Color1, Color2: Integer);
 // Src is template
 // B channel = background amp (old Dst content), 128=original brightness
 …
 // R channel = Color2 amp, 128=original brightness
 var
+  ix, iy, amp1, amp2, trans, Value: integer;
+  SrcPixel, DstPixel: TPixelPointer;
+  ix, iy, amp1, amp2, trans, Value: Integer;
+  SrcPixel: TPixelPointer;
+  DstPixel: TPixelPointer;
 begin
   xDst := ScaleToVcl(xDst);
 …
   xSrc := ScaleToVcl(xSrc);
   ySrc := ScaleToVcl(ySrc);
   w := ScaleToVcl(w);
   h := ScaleToVcl(h);
+  Width := ScaleToVcl(Width);
+  Height := ScaleToVcl(Height);
   if xDst < 0 then begin
     w := w + xDst;
+    Width := Width + xDst;
     xSrc := xSrc - xDst;
     xDst := 0;
   end;
   if yDst < 0 then begin
     h := h + yDst;
+    Height := Height + yDst;
     ySrc := ySrc - yDst;
     yDst := 0;
   end;
   if xDst + w > ScaleToVcl(dst.Width) then
     w := ScaleToVcl(dst.Width) - xDst;
   if yDst + h > ScaleToVcl(dst.Height) then
     h := ScaleToVcl(dst.Height) - yDst;
   if (w < 0) or (h < 0) then
+  if xDst + Width > ScaleToVcl(dst.Width) then
+    Width := ScaleToVcl(dst.Width) - xDst;
+  if yDst + Height > ScaleToVcl(dst.Height) then
+    Height := ScaleToVcl(dst.Height) - yDst;
+  if (Width < 0) or (Height < 0) then
     exit;
   Src.BeginUpdate;
   dst.BeginUpdate;
   SrcPixel.Init(Src, xSrc, ySrc);
   DstPixel.Init(Dst, xDst, yDst);
   for iy := 0 to h - 1 do begin
     for ix := 0 to w - 1 do begin
+  SrcPixel := PixelPointer(Src, xSrc, ySrc);
+  DstPixel := PixelPointer(Dst, xDst, yDst);
+  for iy := 0 to Height - 1 do begin
+    for ix := 0 to Width - 1 do begin
       trans := SrcPixel.Pixel^.B * 2; // green channel = transparency
       amp1 := SrcPixel.Pixel^.G * 2;
 …
         Value := (DstPixel.Pixel^.B * trans + ((Color2 shr 16) and $FF) *
           amp2 + ((Color1 shr 16) and $FF) * amp1) div $FF;
+        if Value < 256 then
+          DstPixel.Pixel^.B := Value
+        else
+          DstPixel.Pixel^.B := 255;
+        DstPixel.Pixel^.B := Min(Value, 255);
         Value := (DstPixel.Pixel^.G * trans + ((Color2 shr 8) and $FF) *
           amp2 + ((Color1 shr 8) and $FF) * amp1) div $FF;
+        if Value < 256 then
+          DstPixel.Pixel^.G := Value
+        else
+          DstPixel.Pixel^.G := 255;
+        DstPixel.Pixel^.G := Min(Value, 255);
         Value := (DstPixel.Pixel^.R * trans + (Color2 and $FF) *
           amp2 + (Color1 and $FF) * amp1) div $FF;
+        if Value < 256 then
+          DstPixel.Pixel^.R := Value
+        else
+          DstPixel.Pixel^.R := 255;
+        DstPixel.Pixel^.R := Min(Value, 255);
+      end;
+      SrcPixel.NextPixel;
+      DstPixel.NextPixel;
+    end;
+    SrcPixel.NextLine;
+    DstPixel.NextLine;
+  end;
+  Src.EndUpdate;
+  dst.EndUpdate;
+end;
+procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, Width, Height,
+  Color0, Color2: Integer);
+// Src is template
+// B channel = Color0 amp
+// G channel = background amp (old Dst content), 128=original brightness
+// R channel = Color2 amp
+var
+  ix, iy, amp0, amp1, trans, Value: integer;
+  SrcPixel: TPixelPointer;
+  DstPixel: TPixelPointer;
+begin
+  xDst := ScaleToVcl(xDst);
+  yDst := ScaleToVcl(yDst);
+  xSrc := ScaleToVcl(xSrc);
+  ySrc := ScaleToVcl(ySrc);
+  Width := ScaleToVcl(Width);
+  Height := ScaleToVcl(Height);
+  Src.BeginUpdate;
+  Dst.BeginUpdate;
+  SrcPixel := PixelPointer(Src, xSrc, ySrc);
+  DstPixel := PixelPointer(Dst, xDst, yDst);
+  for iy := 0 to Height - 1 do begin
+    for ix := 0 to Width - 1 do begin
+      trans := SrcPixel.Pixel^.B * 2; // green channel = transparency
+      amp0 := SrcPixel.Pixel^.G * 2;
+      amp1 := SrcPixel.Pixel^.R * 2;
+      if trans <> $FF then begin
+        Value := (DstPixel.Pixel^.B * trans + (Color2 shr 16 and $FF) * amp1 +
+          (Color0 shr 16 and $FF) * amp0) div $FF;
+        DstPixel.Pixel^.B := Min(Value, 255);
+        Value := (DstPixel.Pixel^.G * trans + (Color2 shr 8 and $FF) * amp1 +
+          (Color0 shr 8 and $FF) * amp0) div $FF;
+        DstPixel.Pixel^.G := Min(Value, 255);
+        Value := (DstPixel.Pixel^.R * trans + (Color2 and $FF) * amp1 +
+          (Color0 and $FF) * amp0) div $FF;
+        DstPixel.Pixel^.R := Min(Value, 255);
       end;
       SrcPixel.NextPixel;
 …
   end;
   Src.EndUpdate;
   dst.EndUpdate;
+  Dst.EndUpdate;
 end;
 …
   assert(bmp.PixelFormat = pf24bit);
   h := y + h;
   PixelPtr.Init(Bmp, x, y);
+  PixelPtr := PixelPointer(Bmp, x, y);
   while y < h do begin
     for i := 0 to w - 1 do begin
 …
 procedure Sprite(Canvas: TDpiCanvas; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
   DpiBitBlt(Canvas.Handle, xDst, yDst, Width, Height,
     GrExt[HGr].Mask.Canvas.Handle, xGr, yGr, SRCAND);
   DpiBitBlt(Canvas.Handle, xDst, yDst, Width, Height,
     GrExt[HGr].Data.Canvas.Handle, xGr, yGr, SRCPAINT);
+  DpiBitCanvas(Canvas, xDst, yDst, Width, Height,
+    GrExt[HGr].Mask.Canvas, xGr, yGr, SRCAND);
+  DpiBitCanvas(Canvas, xDst, yDst, Width, Height,
+    GrExt[HGr].Data.Canvas, xGr, yGr, SRCPAINT);
 end;
 procedure Sprite(dst: TDpiBitmap; HGr, xDst, yDst, Width, Height, xGr, yGr: integer);
 begin
+  DpiBitBlt(dst.Canvas.Handle, xDst, yDst, Width, Height,
+    GrExt[HGr].Mask.Canvas.Handle, xGr, yGr, SRCAND);
+  DpiBitBlt(dst.Canvas.Handle, xDst, yDst, Width, Height,
+    GrExt[HGr].Data.Canvas.Handle, xGr, yGr, SRCPAINT);
+end;
+function BitBltCanvas(DestCanvas: TDpiCanvas; X, Y, Width, Height: integer;
+  SrcCanvas: TDpiCanvas; XSrc, YSrc: integer; Rop: DWORD): boolean;
+begin
+  Assert(Rop = SRCCOPY);
+  DestCanvas.CopyRect(Rect(X, Y, X + Width, Y + Height), SrcCanvas,
+    Rect(XSrc, YSrc, XSrc + Width, YSrc + Height));
+  Result := True;
+  DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
+    GrExt[HGr].Mask.Canvas, xGr, yGr, SRCAND);
+  DpiBitCanvas(dst.Canvas, xDst, yDst, Width, Height,
+    GrExt[HGr].Data.Canvas, xGr, yGr, SRCPAINT);
+end;
+function DpiBitCanvas(DestCanvas: TDpiCanvas; X, Y, Width, Height: Integer;
+  SrcCanvas: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
+begin
+  Result := DpiBitBlt(DestCanvas.Handle, X, Y, Width, Height, SrcCanvas.Handle, XSrc, YSrc, Rop);
+end;
+function DpiBitCanvas(Dest: TDpiCanvas; DestRect: TRect; Src: TDpiCanvas;
+  SrcPos: TPoint; Rop: DWORD): Boolean;
+begin
+  Result := DpiBitCanvas(Dest, DestRect.Left, DestRect.Top, DestRect.Width, DestRect.Height,
+    Src, SrcPos.X, SrcPos.Y, Rop);
+end;
+function BitBltBitmap(Dest: TDpiBitmap; X, Y, Width, Height: Integer;
+  Src: TDpiBitmap; XSrc, YSrc: Integer; Rop: DWORD): Boolean;
+begin
+  Result := DpiBitCanvas(Dest.Canvas, X, Y, Width, Height, Src.Canvas, XSrc, YSrc, Rop);
+end;
+function BitBltBitmap(Dest: TDpiBitmap; DestRect: TRect; Src: TDpiBitmap;
+  SrcPos: TPoint; Rop: DWORD): Boolean;
+begin
+  Result := DpiBitCanvas(Dest.Canvas, DestRect, Src.Canvas, SrcPos, Rop);
 end;
 …
   end else
     Frame(ca, x - 1, y - 1, x + Width, y + Height, $000000, $000000);
+  DpiBitBlt(ca.Handle, x, y, Width, Height, Src.Canvas.Handle, xSrc, ySrc,
+    SRCCOPY);
+  DpiBitCanvas(ca, x, y, Width, Height, Src.Canvas, xSrc, ySrc);
 end;
 …
   Height := ScaleToVcl(Height);
   dst.BeginUpdate;
   DstPtr.Init(dst, x0, y0);
+  DstPtr := PixelPointer(dst, x0, y0);
   for y := -DpiGlowRange + 1 to Height - 1 + DpiGlowRange - 1 do begin
     for x := -DpiGlowRange + 1 to Width - 1 + DpiGlowRange - 1 do begin
 …
       if r = 0 then
         r := 1;
       if r < GlowRange then
+      if r < DpiGlowRange then
         for ch := 0 to 2 do
           DstPtr.Pixel^.Planes[2 - ch] :=
 …
           $FF * intensity div $FF shl 16;
       end;
   DpiBitBlt(GrExt[HGrSystem].Mask.Canvas.Handle, 77, 47, 10, 10,
     GrExt[HGrSystem].Mask.Canvas.Handle, 66, 47, SRCCOPY);
+  DpiBitCanvas(GrExt[HGrSystem].Mask.Canvas, 77, 47, 10, 10,
+    GrExt[HGrSystem].Mask.Canvas, 66, 47);
 end;
 …
   Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= wMainTexture) and
     (Top + yOffset >= 0) and (Top + yOffset + Height <= hMainTexture));
+  DpiBitBlt(ca.Handle, Left, Top, Width, Height, MainTexture.Image.Canvas.Handle,
+    Left + xOffset, Top + yOffset, SRCCOPY);
+  DpiBitCanvas(ca, Left, Top, Width, Height, MainTexture.Image.Canvas,
+    Left + xOffset, Top + yOffset);
+end;
+procedure Fill(Canvas: TDpiCanvas; Rect: TRect; Offset: TPoint);
+begin
+  Fill(Canvas, Rect.Left, Rect.Top, Rect.Width, Rect.Height, Offset.X, Offset.Y);
 end;
 …
 begin
   for I := 0 to (x1 - xm) div wMainTexture - 1 do
     DpiBitBlt(ca.Handle, xm + I * wMainTexture, y0, wMainTexture, y1 - y0,
       MainTexture.Image.Canvas.Handle, 0, hMainTexture div 2 + Band(I) *
       (y1 - y0), SRCCOPY);
   DpiBitBlt(ca.Handle, xm + ((x1 - xm) div wMainTexture) * wMainTexture, y0,
+    DpiBitCanvas(ca, xm + I * wMainTexture, y0, wMainTexture, y1 - y0,
+      MainTexture.Image.Canvas, 0, hMainTexture div 2 + Band(I) *
+      (y1 - y0));
+  DpiBitCanvas(ca, xm + ((x1 - xm) div wMainTexture) * wMainTexture, y0,
     x1 - (xm + ((x1 - xm) div wMainTexture) * wMainTexture), y1 - y0,
     MainTexture.Image.Canvas.Handle, 0, hMainTexture div 2 + Band(
     (x1 - xm) div wMainTexture) * (y1 - y0), SRCCOPY);
+    MainTexture.Image.Canvas, 0, hMainTexture div 2 + Band(
+    (x1 - xm) div wMainTexture) * (y1 - y0));
   for I := 0 to (xm - x0) div wMainTexture - 1 do
     DpiBitBlt(ca.Handle, xm - (I + 1) * wMainTexture, y0, wMainTexture, y1 - y0,
       MainTexture.Image.Canvas.Handle, 0, hMainTexture div 2 +
       Band(-I - 1) * (y1 - y0), SRCCOPY);
   DpiBitBlt(ca.Handle, x0, y0, xm - ((xm - x0) div wMainTexture) *
     wMainTexture - x0, y1 - y0, MainTexture.Image.Canvas.Handle,
+    DpiBitCanvas(ca, xm - (I + 1) * wMainTexture, y0, wMainTexture, y1 - y0,
+      MainTexture.Image.Canvas, 0, hMainTexture div 2 +
+      Band(-I - 1) * (y1 - y0));
+  DpiBitCanvas(ca, x0, y0, xm - ((xm - x0) div wMainTexture) *
+    wMainTexture - x0, y1 - y0, MainTexture.Image.Canvas,
     ((xm - x0) div wMainTexture + 1) * wMainTexture - (xm - x0),
     hMainTexture div 2 + Band(-(xm - x0) div wMainTexture - 1) * (y1 - y0), SRCCOPY);
+    hMainTexture div 2 + Band(-(xm - x0) div wMainTexture - 1) * (y1 - y0));
 end;
 …
       if x1cut < 0 then
         x1cut := 0;
       DpiBitBlt(ca.Handle, x * Texture.Width + x0cut - xOffset,
+      DpiBitCanvas(ca, x * Texture.Width + x0cut - xOffset,
         y * Texture.Height + y0cut - yOffset, Texture.Width - x0cut - x1cut,
+        Texture.Height - y0cut - y1cut, Texture.Canvas.Handle, x0cut,
+        y0cut, SRCCOPY);
+        Texture.Height - y0cut - y1cut, Texture.Canvas, x0cut, y0cut);
     end;
   end;
 …
 procedure Corner(ca: TDpiCanvas; x, y, Kind: Integer; const T: TTexture);
 begin
   { DpiBitBlt(ca.Handle,x,y,8,8,GrExt[T.HGr].Mask.Canvas.Handle,
+  { DpiBitCanvas(ca,x,y,8,8,GrExt[T.HGr].Mask.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCAND);
     DpiBitBlt(ca.Handle,x,y,8,8,GrExt[T.HGr].Data.Canvas.Handle,
+    DpiBitCanvas(ca,x,y,8,8,GrExt[T.HGr].Data.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCPAINT); }
 end;
 …
   procedure PaintIcon(x, y, Kind: Integer);
   begin
     DpiBitBlt(ca.Handle, x, y + 6, 10, 10, GrExt[HGrSystem].Mask.Canvas.Handle,
+    DpiBitCanvas(ca, x, y + 6, 10, 10, GrExt[HGrSystem].Mask.Canvas,
 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCAND);
     DpiBitBlt(ca.Handle, x, y + 6, 10, 10, GrExt[HGrSystem].Data.Canvas.Handle,
+    DpiBitCanvas(ca, x, y + 6, 10, 10, GrExt[HGrSystem].Data.Canvas,
 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCPAINT);
   end;
 …
       for i := 0 to val mod 10 - 1 do
       begin
         DpiBitBlt(Handle, xIcon + 4 + i * (14 * ld div sd), yIcon + 2 + 1, 14,
 , GrExt[HGrSystem].Mask.Canvas.Handle, 67 + Kind mod 8 * 15,
+        DpiBitCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 2 + 1, 14,
+, GrExt[HGrSystem].Mask.Canvas, 67 + Kind mod 8 * 15,
 + Kind div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
 …
       for i := 0 to val div 10 - 1 do
       begin
         DpiBitBlt(dst.Canvas.Handle, xIcon + 4 + (val mod 10) *
+        DpiBitCanvas(dst.Canvas, xIcon + 4 + (val mod 10) *
           (14 * ld div sd) + i * (14 * ld div sd), yIcon + 3, 14, 14,
           GrExt[HGrSystem].Mask.Canvas.Handle, 67 + 7 mod 8 * 15,
+          GrExt[HGrSystem].Mask.Canvas, 67 + 7 mod 8 * 15,
 + 7 div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val mod 10) *
 …
       for i := 0 to val div 10 - 1 do
       begin
         DpiBitBlt(Handle, xIcon + 4 + i * (14 * ld div sd), yIcon + 3, 14, 14,
           GrExt[HGrSystem].Mask.Canvas.Handle, 67 + Kind mod 8 * 15,
+        DpiBitCanvas(dst.Canvas, xIcon + 4 + i * (14 * ld div sd), yIcon + 3, 14, 14,
+          GrExt[HGrSystem].Mask.Canvas, 67 + Kind mod 8 * 15,
 + Kind div 8 * 15, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + i * (14 * ld div sd), yIcon + 2,
 …
       for i := 0 to val mod 10 - 1 do
       begin
         DpiBitBlt(dst.Canvas.Handle, xIcon + 4 + (val div 10) *
+        DpiBitCanvas(dst.Canvas, xIcon + 4 + (val div 10) *
           (14 * ld div sd) + i * (10 * ld div sd), yIcon + 7, 10, 10,
           GrExt[HGrSystem].Mask.Canvas.Handle, 66 + Kind mod 11 * 11,
+          GrExt[HGrSystem].Mask.Canvas, 66 + Kind mod 11 * 11,
 + Kind div 11 * 11, SRCAND);
         Sprite(dst, HGrSystem, xIcon + 3 + (val div 10) *
 …
   begin
     for i := 0 to pos div 8 - 1 do
       DpiBitBlt(Handle, x + i * 8, y, 8, 7,
         GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * Kind, SRCCOPY);
     DpiBitBlt(Handle, x + 8 * (pos div 8), y, pos - 8 * (pos div 8), 7,
       GrExt[HGrSystem].Data.Canvas.Handle, 104, 9 + 8 * Kind, SRCCOPY);
+      DpiBitCanvas(ca, x + i * 8, y, 8, 7,
+        GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * Kind);
+    DpiBitCanvas(ca, x + 8 * (pos div 8), y, pos - 8 * (pos div 8), 7,
+      GrExt[HGrSystem].Data.Canvas, 104, 9 + 8 * Kind);
     if Growth > 0 then
     begin
       for i := 0 to Growth div 8 - 1 do
         DpiBitBlt(Handle, x + pos + i * 8, y, 8, 7,
           GrExt[HGrSystem].Data.Canvas.Handle, 112, 9 + 8 * Kind, SRCCOPY);
       DpiBitBlt(Handle, x + pos + 8 * (Growth div 8), y,
         Growth - 8 * (Growth div 8), 7, GrExt[HGrSystem].Data.Canvas.Handle,
 , 9 + 8 * Kind, SRCCOPY);
+        DpiBitCanvas(ca, x + pos + i * 8, y, 8, 7,
+          GrExt[HGrSystem].Data.Canvas, 112, 9 + 8 * Kind);
+      DpiBitCanvas(ca, x + pos + 8 * (Growth div 8), y,
+        Growth - 8 * (Growth div 8), 7, GrExt[HGrSystem].Data.Canvas,
+, 9 + 8 * Kind);
     end
     else if Growth < 0 then
     begin
       for i := 0 to -Growth div 8 - 1 do
         DpiBitBlt(Handle, x + pos + i * 8, y, 8, 7,
           GrExt[HGrSystem].Data.Canvas.Handle, 104, 1, SRCCOPY);
       DpiBitBlt(Handle, x + pos + 8 * (-Growth div 8), y, -Growth -
+        DpiBitCanvas(ca, x + pos + i * 8, y, 8, 7,
+          GrExt[HGrSystem].Data.Canvas, 104, 1);
+      DpiBitCanvas(ca, x + pos + 8 * (-Growth div 8), y, -Growth -
 * (-Growth div 8), 7,
         GrExt[HGrSystem].Data.Canvas.Handle, 104, 1, SRCCOPY);
+        GrExt[HGrSystem].Data.Canvas, 104, 1);
     end;
     Brush.Color := $000000;
 …
 procedure PaintLogo(ca: TDpiCanvas; x, y, clLight, clShade: Integer);
 begin
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x,
+    y, SRCCOPY);
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, wLogo, hLogo, ca, x, y);
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 1, wLogo, hLogo,
     clLight, clShade);
+  DpiBitBlt(ca.Handle, x, y, wLogo, hLogo, LogoBuffer.Canvas.Handle, 0,
+, SRCCOPY);
+  DpiBitCanvas(ca, x, y, wLogo, hLogo, LogoBuffer.Canvas, 0, 0);
 end;
 …
     with MainTexture do begin
       MainTextureAge := Age;
       LoadGraphicFile(Image, HomeDir + 'Graphics' + DirectorySeparator +
+      LoadGraphicFile(Image, GetGraphicsDir + DirectorySeparator +
         'Texture' + IntToStr(Age + 1) + '.jpg');
       clBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
 …
 end;
-{ TPixelPointer }
-procedure TPixelPointer.NextLine; inline;
-begin
-  Line := Pointer(Line) + BytesPerLine;
-  Pixel := Line;
-end;
-procedure TPixelPointer.NextPixel; inline;
-begin
-  Pixel := Pointer(Pixel) + BytesPerPixel;
-end;
-procedure TPixelPointer.SetXY(X, Y: Integer); inline;
-begin
-  Line := Pointer(Base) + Y * BytesPerLine;
-  SetX(X);
-end;
-procedure TPixelPointer.SetX(X: Integer); inline;
-begin
-  Pixel := Pointer(Line) + X * BytesPerPixel;
-end;
-procedure TPixelPointer.Init(Bitmap: TDpiRasterImage; BaseX: Integer = 0;
-  BaseY: integer = 0); inline;
-begin
-  BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
-  BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
-  Base := PPixel32(Bitmap.RawImage.Data + BaseX * BytesPerPixel + BaseY * BytesPerLine);
-  SetXY(0, 0);
-end;
 procedure LoadPhrases;
 begin
+  if Phrases = nil then
+    Phrases := TStringTable.Create;
+  if Phrases2 = nil then
+    Phrases2 := TStringTable.Create;
+  if Phrases = nil then Phrases := TStringTable.Create;
+  if Phrases2 = nil then Phrases2 := TStringTable.Create;
   Phrases2FallenBackToEnglish := False;
   if FileExists(LocalizedFilePath('Language.txt')) then
   begin
     Phrases.loadfromfile(LocalizedFilePath('Language.txt'));
+    Phrases.LoadFromFile(LocalizedFilePath('Language.txt'));
     if FileExists(LocalizedFilePath('Language2.txt')) then
       Phrases2.loadfromfile(LocalizedFilePath('Language2.txt'))
+      Phrases2.LoadFromFile(LocalizedFilePath('Language2.txt'))
     else
     begin
       Phrases2.loadfromfile(HomeDir + 'Language2.txt');
+      Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
       Phrases2FallenBackToEnglish := True;
     end;
 …
   else
   begin
+    Phrases.loadfromfile(HomeDir + 'Language.txt');
+    Phrases2.loadfromfile(HomeDir + 'Language2.txt');
+  end;
+  if Sounds = nil then
+    Sounds := TStringTable.Create;
+  if not Sounds.loadfromfile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.txt') then
+    Phrases.LoadFromFile(HomeDir + 'Language.txt');
+    Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
+  end;
+  if Sounds = nil then Sounds := TStringTable.Create;
+  if not Sounds.LoadFromFile(GetSoundsDir + DirectorySeparator + 'sound.txt') then
   begin
     FreeAndNil(Sounds);
   end;
+end;
+procedure Texturize(Dest, Texture: TDpiBitmap; TransparentColor: Integer);
+var
+  SrcPixel, DstPixel: TPixelPointer;
+  X, Y: Integer;
+  TexWidth, TexHeight: Integer;
+begin
+  // texturize background
+  Dest.BeginUpdate;
+  TexWidth := ScaleToVcl(Texture.Width);
+  TexHeight := ScaleToVcl(Texture.Height);
+  DstPixel := PixelPointer(Dest);
+  SrcPixel := PixelPointer(Texture);
+  for Y := 0 to ScaleToVcl(Dest.Height) - 1 do begin
+    for X := 0 to ScaleToVcl(Dest.Width) - 1 do begin
+      if (DstPixel.Pixel^.ARGB and $FFFFFF) = TransparentColor then begin
+        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;
+  Dest.EndUpdate;
+end;
+procedure DarkenImage(Bitmap: TDpiBitmap; Change: Integer);
+var
+  x, y: integer;
+  PicturePixel: TPixelPointer;
+begin
+  Bitmap.BeginUpdate;
+  PicturePixel := PixelPointer(Bitmap);
+  for y := 0 to ScaleToVcl(Bitmap.Height) - 1 do begin
+    for x := 0 to ScaleToVcl(Bitmap.Width) - 1 do begin
+      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - Change, 0);
+      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - Change, 0);
+      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - Change, 0);
+      PicturePixel.NextPixel;
+    end;
+    PicturePixel.NextLine;
+  end;
+  Bitmap.EndUpdate;
 end;
 …
   P: integer;
 begin
-  for Section := Low(TFontType) to High(TFontType) do
-    UniFont[Section] := TDpiFont.Create;
   Section := ftNormal;
   AssignFile(FontScript, LocalizedFilePath('Fonts.txt'));
   try
     Reset(fontscript);
     while not EOF(FontScript) do begin
+    Reset(FontScript);
+    while not Eof(FontScript) do begin
       ReadLn(FontScript, s);
       if s <> '' then
         if s[1] = '#' then begin
           s := TrimRight(s);
+          if s = '#SMALL' then
+            Section := ftSmall
+          else if s = '#TINY' then
+            Section := ftTiny
+          else if s = '#CAPTION' then
+            Section := ftCaption
+          else if s = '#BUTTON' then
+            Section := ftButton
+          else
+            Section := ftNormal;
+          if s = '#SMALL' then Section := ftSmall
+          else if s = '#TINY' then Section := ftTiny
+          else if s = '#CAPTION' then Section := ftCaption
+          else if s = '#BUTTON' then Section := ftButton
+          else Section := ftNormal;
         end else begin
           p := Pos(',', s);
           if p > 0 then begin
             UniFont[Section].Name := Trim(Copy(s, 1, p - 1));
+            UniFont[section].Name := Trim(Copy(s, 1, p - 1));
             Size := 0;
             for i := p + 1 to Length(s) do
 …
             // 0.8 constant is compensation for Lazarus as size of fonts against Delphi differs
             UniFont[section].Size :=
               Round(Size * Screen.PixelsPerInch / UniFont[section].PixelsPerInch);
+              Round(size * DpiScreen.PixelsPerInch / UniFont[section].PixelsPerInch * 0.8);
           end;
         end;
 …
 end;
+procedure LoadAssets;
+begin
+  LoadPhrases;
+  LoadFonts;
+  LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
+    'Templates.png', gfNoGamma);
+  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
+  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
+  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons.png');
+end;
 procedure UnitInit;
 var
+  Reg: TRegistry;
+begin
+  Reg := TRegistry.Create;
+  with Reg do
+    try
+      OpenKey(AppRegistryKey, True);
+      if ValueExists('Gamma') then
+        Gamma := ReadInteger('Gamma')
+      else
+      begin
+        Gamma := 100;
+        WriteInteger('Gamma', Gamma);
+      end;
+      if ValueExists('Locale') then
+        LocaleCode := ReadString('Locale')
+      else
+        LocaleCode := '';
+    finally
+      Free;
+    end;
+  if Gamma <> 100 then InitGammaLookupTable;
+  Section: TFontType;
+begin
+  Gamma := 100;
+  InitGammaLookupTable;
   {$IFDEF WINDOWS}
 …
   {$ENDIF}
-  LoadPhrases;
   LogoBuffer := TDpiBitmap.Create;
   LogoBuffer.PixelFormat := pf24bit;
   LogoBuffer.SetSize(wBBook, hBBook);
+  LoadFonts;
+  for Section := Low(TFontType) to High(TFontType) do
+    UniFont[Section] := TDpiFont.Create;
   nGrExt := 0;
 …
   Templates := TDpiBitmap.Create;
   Templates.PixelFormat := pf24bit;
-  LoadGraphicFile(Templates, HomeDir + 'Graphics' + DirectorySeparator +
-    'Templates.png', gfNoGamma);
   Colors := TDpiBitmap.Create;
   Colors.PixelFormat := pf24bit;
-  LoadGraphicFile(Colors, HomeDir + 'Graphics' + DirectorySeparator + 'Colors.png');
   Paper := TDpiBitmap.Create;
   Paper.PixelFormat := pf24bit;
-  LoadGraphicFile(Paper, HomeDir + 'Graphics' + DirectorySeparator + 'Paper.jpg');
   BigImp := TDpiBitmap.Create;
   BigImp.PixelFormat := pf24bit;
-  LoadGraphicFile(BigImp, HomeDir + 'Graphics' + DirectorySeparator + 'Icons.png');
   MainTexture.Image := TDpiBitmap.Create;
   MainTextureAge := -2;
 …
   InitOrnamentDone := False;
   GenerateNames := True;
+  LoadAssets;
 end;
 procedure UnitDone;
 var
-  Reg: TRegistry;
   I: integer;
 begin
-  Reg := TRegistry.Create;
-  with Reg do
-    try
-      OpenKey(AppRegistryKey, True);
-      WriteString('Locale', LocaleCode);
-      WriteInteger('Gamma', Gamma);
-    finally
-      Free;
-    end;
   RestoreResolution;
   for I := 0 to nGrExt - 1 do begin
 …
   FreeAndNil(Phrases);
   FreeAndNil(Phrases2);
-  if Sounds <> nil then
-    FreeAndNil(Sounds);
   FreeAndNil(LogoBuffer);
   FreeAndNil(BigImp);

branches/highdpi/Packages/CevoComponents/Sound.pas

-              r178
+              r210
 uses
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, fgl
+  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF};
+  UDpiControls, SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
+  StringTables, Directories
+  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
+  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
 type
+  TSoundPlayer = class(TForm)
+  TPlayStyle = (psAsync, psSync);
+  { TSoundPlayer }
+  TSoundPlayer = class(TDpiForm)
   private
     {$IFDEF WINDOWS}
+    PrevWndProc: WNDPROC;
     procedure OnMCI(var m: TMessage); message MM_MCINOTIFY;
+  public
+    constructor Create(AOwner: TComponent); override;
     {$ENDIF}
   end;
+function PrepareSound(FileName: string): integer;
+procedure PlaySound(FileName: string);
+implementation
+{$R *.lfm}
+type
+  { TSound }
   TSound = class
+  private
+    {$IFDEF LINUX}
+    PlayCommand: string;
+    SoundPlayerAsyncProcess: TAsyncProcess;
+    SoundPlayerSyncProcess: TProcess;
+    {$ENDIF}
+    function GetNonWindowsPlayCommand: string;
   public
     FDeviceID: word;
+    FDeviceID: Word;
     FFileName: string;
+    PlayStyle: TPlayStyle;
     constructor Create(const FileName: string);
     destructor Destroy; override;
 …
   end;
+function PrepareSound(FileName: string): Integer;
+procedure PlaySound(FileName: string);
+function Play(Item: string; Index: Integer = -1): Boolean;
+procedure PreparePlay(Item: string; Index: Integer = -1);
+const
+  // sound modes
+  smOff = 0;
+  smOn = 1;
+  smOnAlt = 2;
+var
+  Sounds: TStringTable;
+  SoundMode: Integer;
+  SoundPlayer: TSoundPlayer;
+  SoundList: TFPGObjectList<TSound>;
+  PlayingSound: TSound;
+implementation
+{$R *.lfm}
+resourcestring
+  SUnableToPlay = 'PlayStyle=%s: Unable to play %s Message:%s';
+  SPlayCommandNotWork = 'The play command %s does not work on your system';
 constructor TSound.Create(const FileName: string);
 …
 {$ENDIF}
 begin
+  PlayStyle := psAsync;
+  FFileName := FileName;
   {$IFDEF WINDOWS}
   FDeviceID := 0;
+  FFileName := FileName;
+  if FileExists(FFileName) then
+  begin
+  if FileExists(FFileName) then begin
     OpenParm.dwCallback := 0;
     OpenParm.lpstrDeviceType := 'WaveAudio';
     OpenParm.lpstrElementName := PChar(FFileName);
     mciSendCommand(0, MCI_Open, MCI_WAIT or MCI_OPEN_ELEMENT or
       MCI_OPEN_SHAREABLE, integer(@OpenParm));
+      MCI_OPEN_SHAREABLE, DWORD_PTR(@OpenParm));
     FDeviceID := OpenParm.wDeviceID;
   end
   {$ENDIF}
+  {$IFDEF LINUX}
+  PlayCommand := GetNonWindowsPlayCommand;
+  FDeviceID := 1;
+  {$ENDIF}
 end;
 …
     mciSendCommand(FDeviceID, MCI_CLOSE, MCI_WAIT, 0);
   {$ENDIF}
+  inherited Destroy;
+end;
+  {$IFDEF LINUX}
+  FreeAndNil(SoundPlayerSyncProcess);
+  FreeAndNil(SoundPlayerAsyncProcess);
+  {$ENDIF}
+  inherited;
+end;
+function TSound.GetNonWindowsPlayCommand: string;
+begin
+  Result := '';
+  // Try play
+  if (FindDefaultExecutablePath('play') <> '') then
+    Result := 'play';
+  // Try aplay
+  if (result = '') then
+    if (FindDefaultExecutablePath('aplay') <> '') then
+      Result := 'aplay -q';
+  // Try paplay
+  if (Result = '') then
+    if (FindDefaultExecutablePath('paplay') <> '') then
+      Result := 'paplay';
+  // Try mplayer
+  if (Result = '') then
+    if (FindDefaultExecutablePath('mplayer') <> '') then
+      Result := 'mplayer -really-quiet';
+  // Try CMus
+  if (Result = '') then
+    if (FindDefaultExecutablePath('CMus') <> '') then
+      Result := 'CMus';
+  // Try pacat
+  if (Result = '') then
+    if (FindDefaultExecutablePath('pacat') <> '') then
+      Result := 'pacat -p';
+  // Try ffplay
+  if (Result = '') then
+    if (FindDefaultExecutablePath('ffplay') <> '') then
+      result := 'ffplay -autoexit -nodisp';
+  // Try cvlc
+  if (Result = '') then
+    if (FindDefaultExecutablePath('cvlc') <> '') then
+      result := 'cvlc -q --play-and-exit';
+  // Try canberra-gtk-play
+  if (Result = '') then
+    if (FindDefaultExecutablePath('canberra-gtk-play') <> '') then
+      Result := 'canberra-gtk-play -c never -f';
+  // Try Macintosh command?
+  if (Result = '') then
+    if (FindDefaultExecutablePath('afplay') <> '') then
+      Result := 'afplay';
+end;
 procedure TSound.Play(HWND: DWORD);
 …
 var
   PlayParm: TMCI_Play_Parms;
+{$ENDIF}
+{$IFDEF LINUX}
+var
+  L: TStringList;
+  I: Integer;
 {$ENDIF}
 begin
 …
   end
   {$ENDIF}
+  {$IFDEF LINUX}
+  // How to play in Linux? Use generic Linux commands
+  // Use asyncprocess to play sound as SND_ASYNC
+  // proceed if we managed to find a valid command
+  if PlayCommand <> '' then begin
+    L := TStringList.Create;
+    try
+      L.Delimiter := ' ';
+      L.DelimitedText := PlayCommand;
+      if PlayStyle = psASync then begin
+        if SoundPlayerAsyncProcess = nil then
+          SoundPlayerAsyncProcess := TAsyncProcess.Create(nil);
+        SoundPlayerAsyncProcess.CurrentDirectory := ExtractFileDir(FFilename);
+        SoundPlayerAsyncProcess.Executable := FindDefaultExecutablePath(L[0]);
+        SoundPlayerAsyncProcess.Parameters.Clear;
+        for I := 1 to L.Count - 1 do
+          SoundPlayerAsyncProcess.Parameters.Add(L[I]);
+        SoundPlayerAsyncProcess.Parameters.Add(FFilename);
+        try
+          SoundPlayerAsyncProcess.Execute;
+        except
+          On E: Exception do
+            E.CreateFmt(SUnableToPlay, ['paASync', FFilename, E.Message]);
+        end;
+        PlayingSound := nil;
+      end else begin
+        if SoundPlayerSyncProcess = nil then
+          SoundPlayerSyncProcess := TProcess.Create(nil);
+        SoundPlayerSyncProcess.CurrentDirectory := ExtractFileDir(FFilename);
+        SoundPlayerSyncProcess.Executable := FindDefaultExecutablePath(L[0]);
+        SoundPlayersyncProcess.Parameters.Clear;
+        for I := 1 to L.Count - 1 do
+          SoundPlayerSyncProcess.Parameters.Add(L[I]);
+        SoundPlayerSyncProcess.Parameters.Add(FFilename);
+        try
+          SoundPlayerSyncProcess.Execute;
+          SoundPlayersyncProcess.WaitOnExit;
+        except
+          On E: Exception do
+            E.CreateFmt(SUnableToPlay, ['paSync', FFilename, E.Message]);
+        end;
+        PlayingSound := nil;
+      end;
+    finally
+      L.Free;
+    end;
+  end
+  else
+    raise Exception.CreateFmt(SPlayCommandNotWork, [PlayCommand]);
+  {$ENDIF}
 end;
 …
   mciSendCommand(FDeviceID, MCI_STOP, 0, 0);
   {$ENDIF}
+  {$IFDEF LINUX}
+  if SoundPlayerSyncProcess <> nil then SoundPlayerSyncProcess.Terminate(1);
+  if SoundPlayerAsyncProcess <> nil then SoundPlayerAsyncProcess.Terminate(1);
+  {$ENDIF}
 end;
 …
 end;
-var
-  SoundPlayer: TSoundPlayer;
-  SoundList: TFPGObjectList<TSound>;
-  PlayingSound: TSound;
 {$IFDEF WINDOWS}
+function WndCallback(Ahwnd: HWND; uMsg: UINT; wParam: WParam; lParam: LParam):LRESULT; stdcall;
+var
+  Message: TMessage;
+begin
+  if (uMsg = MM_MCINOTIFY) then begin
+    Message.msg := uMsg;
+    Message.wParam := wParam;
+    Message.lParam := lParam;
+    SoundPlayer.OnMCI(Message);
+  end;
+  Result := CallWindowProc(SoundPlayer.PrevWndProc, Ahwnd, uMsg, WParam, LParam);
+end;
 procedure TSoundPlayer.OnMCI(var m: TMessage);
 begin
   if (m.wParam = MCI_Notify_Successful) and (PlayingSound <> nil) then
+  if (m.wParam = MCI_NOTIFY_SUCCESSFUL) and (PlayingSound <> nil) then
   begin
     PlayingSound.Reset;
 …
   end;
 end;
+constructor TSoundPlayer.Create(AOwner: TComponent);
+begin
+  inherited;
+  // MM_MCINOTIFY is not handled by LCL, fallback to low lever handling
+  // https://wiki.lazarus.freepascal.org/Win32/64_Interface#Processing_non-user_messages_in_your_window
+  PrevWndProc := Windows.WNDPROC(SetWindowLongPtr(Self.Handle, GWL_WNDPROC, PtrInt(@WndCallback)));
+end;
 {$ENDIF}
 function PrepareSound(FileName: string): integer;
+function PrepareSound(FileName: string): Integer;
 begin
   Result := 0;
   while (result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
     inc(result);
   if result = SoundList.Count then begin
     // first time this sound is played
+  while (Result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
+    Inc(Result);
+  if Result = SoundList.Count then begin
+    // First time this sound is played
     SoundList.Add(TSound.Create(FileName));
     Result := SoundList.Count - 1;
 …
 procedure PlaySound(FileName: string);
 begin
+  if PlayingSound <> nil then
+    exit;
+  if PlayingSound <> nil then Exit;
   if SoundPlayer = nil then
     Application.CreateForm(TSoundPlayer, SoundPlayer);
+    DpiApplication.CreateForm(TSoundPlayer, SoundPlayer);
   PlayingSound := SoundList[PrepareSound(FileName)];
   if PlayingSound.FDeviceID = 0 then
 …
 end;
+function Play(Item: string; Index: Integer = -1): Boolean;
+var
+  WavFileName: string;
+begin
+  Result := False;
+  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
+  begin
+    Result := True;
+    Exit;
+  end;
+  WavFileName := Sounds.Lookup(Item, Index);
+  Assert(WavFileName[1] <> '[');
+  Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
+  if Result then
+    // SndPlaySound(pchar(GetSoundsDir + DirectorySeparator + WavFileName + '.wav'), SND_ASYNC)
+    PlaySound(GetSoundsDir + DirectorySeparator + WavFileName);
+end;
+procedure PreparePlay(Item: string; Index: Integer = -1);
+var
+  WavFileName: string;
+begin
+  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
+    Exit;
+  WavFileName := Sounds.Lookup(Item, Index);
+  Assert(WavFileName[1] <> '[');
+  if (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*') then
+    PrepareSound(GetSoundsDir + DirectorySeparator + WavFileName);
+end;
 procedure UnitInit;
 begin
 …
   end;
   FreeAndNil(SoundList);
+  if Sounds <> nil then
+    FreeAndNil(Sounds);
 end;

branches/highdpi/Packages/CevoComponents/StringTables.pas

-              r178
+              r210
     destructor Destroy; override;
     function LoadFromFile(const FileName: String): boolean;
     function GetHandle(const Item: AnsiString): integer;
+    function GetHandle(const Item: string): integer;
     function LookupByHandle(Handle: integer; Index: integer = -1): string;
     function Lookup(const Item: string; Index: integer = -1): string;
 …
 end;
 function TStringTable.GetHandle(const Item: AnsiString): integer;
+function TStringTable.GetHandle(const Item: string): integer;
 var
   I: Integer;

branches/highdpi/Packages/CevoComponents/UPixelPointer.pas

-              r209
+              r210
 unit PixelPointer;
+unit UPixelPointer;
 interface
 uses
   Classes, SysUtils, Graphics;
+  UDpiControls, Classes, SysUtils, Graphics;
 type
 …
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
-    procedure Init(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0); inline;
   end;
   PPixelPointer = ^TPixelPointer;
+  function PixelPointer(Bitmap: TDpiRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
 …
 end;
 procedure TPixelPointer.Init(Bitmap: TRasterImage; BaseX: Integer = 0;
   BaseY: Integer = 0); inline;
+function PixelPointer(Bitmap: TDpiRasterImage; BaseX: Integer;
+  BaseY: Integer): TPixelPointer;
 begin
+  BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
+  BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Base := PPixel32(Bitmap.RawImage.Data + BaseX * BytesPerPixel + BaseY * BytesPerLine);
+  SetXY(0, 0);
+  Result.BytesPerLine := Bitmap.RawImage.Description.BytesPerLine;
+  Result.BytesPerPixel := Bitmap.RawImage.Description.BitsPerPixel shr 3;
+  Result.Base := PPixel32(Bitmap.RawImage.Data + BaseX * Result.BytesPerPixel +
+    BaseY * Result.BytesPerLine);
+  Result.SetXY(0, 0);
 end;

branches/highdpi/Packages/DpiControls/UDpiControls.pas

-              r193
+              r210
     FParent: TDpiWinControl;
     function GetAlign: TAlign;
+    function GetAnchors: TAnchors;
     function GetBoundsRect: TRect;
     function GetClientHeight: Integer;
 …
     function GetShowHint: Boolean;
     function GetVisible: Boolean;
+    function IsAnchorsStored: Boolean;
     procedure SetAlign(AValue: TAlign);
+    procedure SetAnchors(AValue: TAnchors);
     procedure SetBoundsRect(AValue: TRect);
     procedure SetClientHeight(AValue: Integer);
 …
       X, Y: Integer); virtual;
     procedure MouseMove(Shift: TShiftState; X, Y: Integer); virtual;
+    procedure MouseLeave; virtual;
   public
+    function ScreenToClient(const APoint: TPoint): TPoint; virtual;
+    function ClientToScreen(const APoint: TPoint): TPoint; virtual;
+    procedure AddHandlerOnVisibleChanged(const OnVisibleChangedEvent: TNotifyEvent;
+                                         AsFirst: boolean = false);
+    procedure RemoveHandlerOnVisibleChanged(const OnVisibleChangedEvent: TNotifyEvent);
     procedure ScreenChanged; virtual;
     procedure SetBounds(ALeft, ATop, AWidth, AHeight: Integer); virtual;
 …
     property BoundsRect: TRect read GetBoundsRect write SetBoundsRect;
     property Visible: Boolean read GetVisible write SetVisible;
+    property Anchors: TAnchors read GetAnchors write SetAnchors stored IsAnchorsStored default [akLeft, akTop];
   published
     property ClientHeight: Integer read GetClientHeight write SetClientHeight;
 …
     function GetDpi: Integer; virtual;
   public
+    constructor Create;
+    VclGraphicClass: TGraphicClass;
+    constructor Create; virtual;
     procedure LoadFromFile(const Filename: string); virtual;
+    procedure SaveToFile(const Filename: string); virtual;
     property Width: Integer read GetWidth write SetWidth;
     property Height: Integer read GetHeight write SetHeight;
 …
   private
     FFont: TDpiFont;
+    FVclCanvas: TCanvas;
     function GetBrush: TBrush;
     function GetHandle: HDC;
 …
     procedure SetPen(AValue: TPen);
     procedure SetPixel(X, Y: Integer; AValue: TColor);
+    procedure SetVclCanvas(AValue: TCanvas);
   protected
     function GetVclCanvas: TCanvas; virtual;
   public
     VclCanvas: TCanvas;
+    property VclCanvas: TCanvas read FVclCanvas write SetVclCanvas;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual;
     procedure FrameRect(Rect: TRect);
 …
     function GetVclForm: TForm; virtual;
     procedure UpdateVclControl; override;
+    procedure AfterConstruction; override;
   public
     VclForm: TForm;
 …
     procedure BringToFront;
     constructor Create(TheOwner: TComponent); override;
+    constructor CreateNew(AOwner: TComponent; Num: Integer = 0); virtual;
     destructor Destroy; override;
   published
 …
     property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
     property Visible;
+    property Anchors;
   end;
 …
     procedure EndUpdate;
     procedure SetSize(AWidth, AHeight: Integer);
     constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
     procedure Assign(Source: TPersistent); override;
 …
   TDpiScreen = class
   private
+    // TScreen
     FDpi: Integer;
     FActiveForm: TDpiForm;
+    FForms: TDpiForms;
+    procedure AddForm(AForm: TDpiForm);
     function GetActiveForm: TDpiForm;
+    function GetCursor: TCursor;
+    function GetCursors(Index: Integer): HCURSOR;
     function GetFormCount: Integer;
+    function GetForms(Index: Integer): TDpiForm;
     function GetHeight: Integer;
     function GetWidth: Integer;
     procedure SetActiveForm(AValue: TDpiForm);
+    procedure SetCursor(AValue: TCursor);
+    procedure SetCursors(Index: Integer; AValue: HCURSOR);
     procedure SetDpi(AValue: Integer);
     procedure UpdateForms;
   public
-    Forms: TDpiForms;
     constructor Create;
     destructor Destroy; override;
     property FormCount: Integer read GetFormCount;
+    property Forms[Index: Integer]: TDpiForm read GetForms;
     property ActiveForm: TDpiForm read GetActiveForm write SetActiveForm;
+    property Cursor: TCursor read GetCursor write SetCursor;
+    property Cursors[Index: Integer]: HCURSOR read GetCursors write SetCursors;
   published
     property Dpi: Integer read FDpi write SetDpi;
+    property PixelsPerInch: Integer read FDpi;
     property Width: Integer read GetWidth;
     property Height: Integer read GetHeight;
 …
   public
     VclJpeg: TJPEGImage;
     procedure LoadFromFile(const Filename: string); override;
+    constructor Create; override;
   end;
 …
   public
     VclPng: TPortableNetworkGraphic;
     procedure LoadFromFile(const Filename: string); override;
+    constructor Create; override;
   end;
 …
     FMainForm: TDpiForm;
     FCreatingForm: TDpiForm;
+    function GetActive: Boolean;
     function GetShowMainForm: Boolean;
     function GetTitle: string;
 …
     function GetVclApplication: TApplication; virtual;
   public
+    constructor Create(AOwner: TComponent); override;
     procedure Run;
     procedure Initialize;
 …
     procedure UpdateMainForm(AForm: TDpiForm);
     procedure CreateForm(InstanceClass: TComponentClass; out Reference);
+    function MessageBox(Text, Caption: PChar; Flags: Longint = MB_OK): Integer;
     property MainForm: TDpiForm read GetMainForm write SetMainForm;
     property ShowMainForm: Boolean read GetShowMainForm write SetShowMainForm default True;
     property Title: string read GetTitle write SetTitle;
+    property Active: Boolean read GetActive;
   end;
 …
 end;
+function TDpiApplication.GetActive: Boolean;
+begin
+  Result := Application.Active;
+end;
 function TDpiApplication.GetMainForm: TDpiForm;
 begin
 …
 begin
   Result := Application;
+end;
+function DpiFindApplicationComponent(const ComponentName: string): TComponent;
+// Note: this function is used by TReader to auto rename forms to unique names.
+begin
+  Result := DpiApplication.FindComponent(ComponentName);
+end;
+constructor TDpiApplication.Create(AOwner: TComponent);
+begin
+  RegisterFindGlobalComponentProc(@DpiFindApplicationComponent);
+  inherited;
 end;
 …
 end;
+function TDpiApplication.MessageBox(Text, Caption: PChar; Flags: Longint
+  ): Integer;
+begin
+  Result := Application.MessageBox(Text, Caption, Flags);
+end;
 { TDpiJpegImage }
 …
 end;
+procedure TDpiJpegImage.LoadFromFile(const Filename: string);
+var
+  Bitmap: TJPEGImage;
+begin
+  Bitmap := TJPEGImage.Create;
+  Bitmap.LoadFromFile(FileName);
+  Width := ScaleFromVcl(Bitmap.Width);
+  Height := ScaleFromVcl(Bitmap.Height);
+  if Self is TDpiBitmap then
+    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), Bitmap)
+    else raise Exception.Create('Unsupported class ' + Self.ClassName);
+  Bitmap.Free;
+constructor TDpiJpegImage.Create;
+begin
+  inherited;
+  VclGraphicClass := TJPEGImage;
 end;
 …
 end;
+procedure TDpiPortableNetworkGraphic.LoadFromFile(const Filename: string);
+var
+  Bitmap: TPortableNetworkGraphic;
+begin
+  Bitmap := TPortableNetworkGraphic.Create;
+  Bitmap.LoadFromFile(FileName);
+  Width := ScaleFromVcl(Bitmap.Width);
+  Height := ScaleFromVcl(Bitmap.Height);
+  if Self is TDpiBitmap then
+    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), Bitmap)
+    else raise Exception.Create('Unsupported class ' + Self.ClassName);
+  Bitmap.Free;
+constructor TDpiPortableNetworkGraphic.Create;
+begin
+  inherited;
+  VclGraphicClass := TPortableNetworkGraphic;
 end;
 …
 procedure TDpiGraphic.LoadFromFile(const Filename: string);
 var
   Bitmap: TBitmap;
 begin
   Bitmap := TBitmap.Create;
+  Bitmap: TGraphic;
+begin
+  Bitmap := VclGraphicClass.Create;
   Bitmap.LoadFromFile(FileName);
   Width := ScaleFromVcl(Bitmap.Width);
   Height := ScaleFromVcl(Bitmap.Height);
+  Width := Bitmap.Width;
+  Height := Bitmap.Height;
   if Self is TDpiBitmap then
+    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), Bitmap)
+    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0,
+    TBitmap(GetVclGraphic).Width, TBitmap(GetVclGraphic).Height), Bitmap)
     else raise Exception.Create('Unsupported class ' + Self.ClassName);
+  Bitmap.Free;
+end;
+procedure TDpiGraphic.SaveToFile(const Filename: string);
+var
+  Bitmap: TGraphic;
+begin
+  Bitmap := VclGraphicClass.Create;
+  Bitmap.Width := Width;
+  Bitmap.Height := Height;
+  if Self is TDpiBitmap then begin
+    if Bitmap is TRasterImage then
+      (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetVclGraphic))
+      else raise Exception.Create('Expected TRasterImage but got ' + Bitmap.ClassName);
+  end else raise Exception.Create('Unsupported class ' + Self.ClassName);
+  Bitmap.SaveToFile(FileName);
   Bitmap.Free;
 end;
 …
 begin
   inherited;
+  VclGraphicClass := TBitmap;
 end;
 …
+  }
   GetVclCanvas.Pixels[ScaleToVcl(X), ScaleToVcl(Y)] := AValue;
+end;
+procedure TDpiCanvas.SetVclCanvas(AValue: TCanvas);
+begin
+  if FVclCanvas = AValue then Exit;
+  FVclCanvas := AValue;
+  FFont.VclFont := FVclCanvas.Font;
 end;
 …
   if FSize = AValue then Exit;
   FSize := AValue;
+  GetVclFont.Size := AValue;
   DoChange;
 end;
 …
 end;
+procedure TDpiScreen.SetCursor(AValue: TCursor);
+begin
+  Screen.Cursor := AValue;
+end;
+procedure TDpiScreen.SetCursors(Index: Integer; AValue: HCURSOR);
+begin
+  Screen.Cursors[Index] := AValue;
+end;
 function TDpiScreen.GetHeight: Integer;
 begin
 …
 function TDpiScreen.GetFormCount: Integer;
 begin
+  Result := Forms.Count;
+  Result := FForms.Count;
+end;
+function TDpiScreen.GetForms(Index: Integer): TDpiForm;
+begin
+  Result := FForms[Index];
+end;
+procedure TDpiScreen.AddForm(AForm: TDpiForm);
+begin
+  if AForm is TDpiForm then begin
+    FForms.Add(AForm);
+    //DpiApplication.UpdateVisible;
+  end;
 end;
 …
 begin
   Result := FActiveForm;
+end;
+function TDpiScreen.GetCursor: TCursor;
+begin
+  Result := Screen.Cursor;
+end;
+function TDpiScreen.GetCursors(Index: Integer): HCURSOR;
+begin
+  Result := Screen.Cursors[Index];
 end;
 …
   I: Integer;
 begin
   for I := 0 to Forms.Count - 1 do
     Forms[I].ScreenChanged;
+  for I := 0 to FForms.Count - 1 do
+    FForms[I].ScreenChanged;
 end;
 constructor TDpiScreen.Create;
 begin
   Forms := TDpiForms.Create;
   Forms.FreeObjects := False;
+  FForms := TDpiForms.Create;
+  FForms.FreeObjects := False;
   Dpi := 150;
 end;
 …
 destructor TDpiScreen.Destroy;
 begin
   FreeAndNil(Forms);
+  FreeAndNil(FForms);
   inherited Destroy;
 end;
 …
 procedure TDpiControl.MouseMove(Shift: TShiftState; X, Y: Integer);
 begin
+end;
+procedure TDpiControl.MouseLeave;
+begin
+end;
+function TDpiControl.ScreenToClient(const APoint: TPoint): TPoint;
+begin
+  Result := ScalePointFromVcl(GetVclControl.ScreenToClient(ScalePointToVcl(APoint)));
+end;
+function TDpiControl.ClientToScreen(const APoint: TPoint): TPoint;
+begin
+  Result := ScalePointFromVcl(GetVclControl.ClientToScreen(ScalePointToVcl(APoint)));
+end;
+procedure TDpiControl.AddHandlerOnVisibleChanged(
+  const OnVisibleChangedEvent: TNotifyEvent; AsFirst: boolean);
+begin
+  GetVclControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
+end;
+procedure TDpiControl.RemoveHandlerOnVisibleChanged(
+  const OnVisibleChangedEvent: TNotifyEvent);
+begin
+  GetVclControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
 end;
 …
 end;
+function TDpiControl.GetAnchors: TAnchors;
+begin
+  Result := GetVclControl.Anchors;
+end;
 function TDpiControl.GetClientHeight: Integer;
 begin
 …
 end;
+function TDpiControl.IsAnchorsStored: Boolean;
+begin
+end;
 procedure TDpiControl.SetAlign(AValue: TAlign);
 begin
   GetVclControl.Align := AValue;
+end;
+procedure TDpiControl.SetAnchors(AValue: TAnchors);
+begin
+  GetVclControl.Anchors := AValue;
 end;
 …
 end;
+procedure TDpiForm.AfterConstruction;
+begin
+  inherited;
+  DoOnCreate;
+end;
 function TDpiForm.ShowModal: Integer;
 begin
 …
 // Init the component with an IDE resource
 constructor TDpiForm.Create(TheOwner: TComponent);
+begin
+  inherited;
+var
+  C: TComponent;
+begin
+  //inherited;
   //DebugLn(['TDpiForm.Create ', DbgSName(TheOwner)]);
   GlobalNameSpace.BeginWrite;
   try
+    CreateNew(TheOwner, 1); // this calls BeginFormUpdate, which is ended in AfterConstruction
+    // Self
+    C := FindGlobalComponent('TListDlg');
     if (ClassType <> TDpiForm) and not (csDesigning in ComponentState) then begin
       if not InitResourceComponent(Self, TDataModule) then begin
 …
   ScreenChanged;
   UpdateVclControl;
+  DoOnCreate;
+end;
+constructor TDpiForm.CreateNew(AOwner: TComponent; Num: Integer);
+begin
+  inherited Create(AOwner);
+  DpiScreen.AddForm(Self);
 end;

branches/highdpi/Platform.pas

-              r17
+              r210
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
   {$IFDEF Linux}BaseUnix, UnixUtil, Unix,{$ENDIF}
+  {$IFDEF Linux}Unix,{$ENDIF}
   Classes, SysUtils, DateUtils, SyncObjs;
 function NowPrecise: TDateTime;
-function GetLogicalProcessorCount: Integer;
 implementation
 …
 end;
-function GetLogicalProcessorCount: Integer;
-{$IFDEF Windows}
-var
-  SystemInfo: _SYSTEM_INFO;
-  {$ENDIF}
-begin
-  {$IFDEF Windows}
-  GetSystemInfo(SystemInfo);
-  Result := SystemInfo.dwNumberOfProcessors;
-  {$ENDIF}
-end;
 initialization

branches/highdpi/Protocol.pas

-              r148
+              r210
 // cost values accumulate if prerequisite is future tech / are maximized if not
 nUpgrade = 15;
+upgrade:
+array [0 .. nDomains - 1, 0 .. nUpgrade - 1] of record
+upgrade: array [0 .. nDomains - 1, 0 .. nUpgrade - 1] of record
   Preq: Integer;
   Strength: Integer;

branches/highdpi/Start.lfm

-              r193
+              r210
   BorderStyle = bsNone
   BorderIcons = []
   LCLVersion = '2.0.2.0'
+  LCLVersion = '2.0.8.0'
   OnShow = FormShow
   OnHide = FormHide
 …
     Width = 100
     Height = 25
-    Visible = True
     Enabled = True
     ShowHint = False
 …
     Color = clBtnFace
     OnClick = StartBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = Down1BtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = Up1BtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 25
     Height = 25
-    Visible = False
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = RenameBtnClick
+    Visible = False
     Down = False
     Permanent = False
 …
     Width = 25
     Height = 25
-    Visible = False
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = DeleteBtnClick
+    Visible = False
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = False
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = Down2BtnClick
+    Visible = False
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = False
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = Up2BtnClick
+    Visible = False
     Down = False
     Permanent = False
 …
     Width = 25
     Height = 25
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = QuitBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = CustomizeBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = AutoDiffUpBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = AutoDiffDownBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = AutoEnemyUpBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 12
     Height = 12
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = AutoEnemyDownBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Width = 25
     Height = 25
-    Visible = True
     Enabled = True
     ShowHint = True
 …
     Color = clBtnFace
     OnClick = ReplayBtnClick
+    Visible = True
     Down = False
     Permanent = False
 …
     Tag = 15360
     ClientHeight = 238
     ClientWidth = 265
+    ClientWidth = 266
     Top = 64
     Left = 45
     Width = 266
     Height = 238
-    Visible = False
     Enabled = True
     ShowHint = False
 …
     Color = clBlack
     OnClick = ListClick
+    TabOrder = 0
+    TabStop = True
+    TopIndex = -1
+    ScrollWidth = 266
+    ParentFont = False
+    ItemHeight = 0
+    IntegralHeight = True
+    ExtendedSelect = False
+    BorderStyle = bsSingle
+    Visible = False
   end
   object PopupMenu1: TPopupMenu
     left = 112
     top = 232
+    left = 8
+    top = 8
   end
 end

branches/highdpi/Start.pas

-              r193
+              r210
 uses
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Math,
+  UDpiControls, GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
+  Menus, Registry, DrawDlg, fgl, Protocol, UDpiControls;
+const
+  // main actions
+  nMainActions = 5;
+  maConfig = 0;
+  maManual = 1;
+  maCredits = 2;
+  maAIDev = 3;
+  maWeb = 4;
+  Menus, Registry, DrawDlg, fgl, Protocol;
 type
 …
   );
+  TStartTab = (
+    tbMain,
+    tbMap,
+    tbNew,
+    tbPrevious
+  );
+  TStartTab = (tbMain, tbMap, tbNew, tbPrevious);
+  TMainAction = (maConfig, maManual, maCredits, maAIDev, maWeb, maNone);
+  TMainActionSet = set of TMainAction;
   TMapArray = array[0 .. lxmax * lymax - 1] of Byte;
+  TMiniMode = (mmNone, mmPicture, mmMultiPlayer);
+  { TMiniMap }
+  TMiniMap = class
+  const
+    MaxWidthMapLogo = 96;
+    MaxHeightMapLogo = 96;
+  var
+    Bitmap: TDpiBitmap; { game world sample preview }
+    Size: TPoint;
+    Colors: array [0 .. 11, 0 .. 1] of TColor;
+    Mode: TMiniMode;
+    procedure LoadFromLogFile(FileName: string; var LastTurn: Integer);
+    procedure LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
+    procedure PaintRandom(Brightness, StartLandMass, WorldSize: Integer);
+    procedure PaintFile(SaveMap: TMapArray);
+    constructor Create;
+    destructor Destroy; override;
+  end;
   { TStartDlg }
 …
     procedure FormShow(Sender: TObject);
     procedure FormHide(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure BrainClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
+    procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
     procedure Up1BtnClick(Sender: TObject);
     procedure Down1BtnClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure ListClick(Sender: TObject);
     procedure RenameBtnClick(Sender: TObject);
 …
     procedure Down2BtnClick(Sender: TObject);
     procedure QuitBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CustomizeBtnClick(Sender: TObject);
     procedure AutoDiffUpBtnClick(Sender: TObject);
     procedure AutoDiffDownBtnClick(Sender: TObject);
-    procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
     procedure AutoEnemyUpBtnClick(Sender: TObject);
     procedure AutoEnemyDownBtnClick(Sender: TObject);
 …
     AutoDiff: Integer;
     MultiControl: Integer;
-    MiniWidth: Integer;
-    MiniHeight: Integer;
-    SelectedAction: Integer;
     Page: TStartPage;
     ShowTab: TStartTab;
 …
     ListIndex: array [TStartTab] of Integer;
     MapFileName: string;
     FormerGames, Maps: TStringList;
     LogoBuffer, Mini: TDpiBitmap; { game world sample preview }
     MiniColors: array [0 .. 11, 0 .. 1] of TColor;
+    FormerGames: TStringList;
+    Maps: TStringList;
+    LogoBuffer: TDpiBitmap;
     // BookDate: string;
     PlayerSlots: TPlayerSlots;
+    MiniMode: (mmNone, mmPicture, mmMultiPlayer);
+    ActionsOffered: set of 0 .. nMainActions - 1;
+    TurnValid, Tracking: boolean;
+    ActionsOffered: TMainActionSet;
+    SelectedAction: TMainAction;
+    TurnValid: Boolean;
+    Tracking: Boolean;
     DefaultAI: string;
+    MiniMap: TMiniMap;
     procedure DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
     procedure InitPopup(PlayerIndex: Integer);
     procedure OfferBrain(Brain: TBrain; FixedLines: Integer);
-    procedure PaintFileMini(SaveMap: TMapArray);
     procedure PaintInfo;
     procedure ChangePage(NewPage: TStartPage);
     procedure ChangeTab(NewTab: TStartTab);
-    procedure PaintRandomMini(Brightness: integer);
     procedure UnlistBackupFile(FileName: string);
     procedure SmartInvalidate(x0, y0, x1, y1: integer;
       invalidateTab0: boolean = false); overload;
     procedure LoadConfig;
+    procedure SaveConfig;
+    procedure LoadAiBrainsPictures;
+    procedure UpdateInterface;
   end;
 …
   StartDlg: TStartDlg;
 implementation
 uses
   Directories, Direct, ScreenTools, Inp, Back, Locale;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Locale, UPixelPointer;
 {$R *.lfm}
 const
-  CevoExt = '.cevo';
-  CevoMapExt = '.cevo map';
   // predefined world size
   // attention: lx*ly+1 must be prime!
   { nWorldSize=8;
+  { MaxWorldSize=8;
     lxpre: array[0..nWorldSize-1] of integer =(30,40,50,60,70,90,110,130);
     lypre: array[0..nWorldSize-1] of integer =(46,52,60,70,84,94,110,130);
     DefaultWorldTiles=4200; }
+  nWorldSize = 6;
+  lxpre: array [0 .. nWorldSize - 1] of integer = (30, 40, 50, 60, 75, 100);
+  lypre: array [0 .. nWorldSize - 1] of integer = (46, 52, 60, 70, 82, 96);
+  MaxWorldSize = 6;
+  WorldSizes: array [0 .. MaxWorldSize - 1] of TPoint = ((X: 30; Y: 46),
+    (X: 40; Y: 52), (X: 50; Y: 60), (X: 60; Y: 70), (X: 75; Y: 82),
+    (X: 100; Y: 96));
   DefaultWorldTiles = 4150;
   DefaultWorldSize = 3;
 …
   TabHeight = 40;
-  MaxWidthMapLogo = 96;
-  MaxHeightMapLogo = 96;
   InitAlive: array [1 .. nPl] of integer = (1, 1 + 2, 1 + 2 + 32,
 + 2 + 8 + 128, 1 + 2 + 8 + 32 + 128, 1 + 2 + 8 + 16 + 64 + 128,
 …
   EnemyAutoDiff: array [1 .. 5] of integer = (4, 3, 2, 1, 1);
+{ TMiniMap }
+constructor TMiniMap.Create;
+var
+  X, Y: Integer;
+begin
+  Bitmap := TDpiBitmap.Create;
+  for X := 0 to 11 do
+    for Y := 0 to 1 do
+      Colors[x, y] := GrExt[HGrSystem].Data.Canvas.Pixels[66 + x, 67 + y];
+end;
+destructor TMiniMap.Destroy;
+begin
+  FreeAndNil(Bitmap);
+  inherited Destroy;
+end;
+procedure TMiniMap.LoadFromLogFile(FileName: string; var LastTurn: Integer);
+var
+  SaveMap: TMapArray;
+  y: Integer;
+  Dummy: Integer;
+  FileLandMass: integer;
+  LogFile: file;
+  s: string[255];
+  MapRow: array [0 .. lxmax - 1] of Cardinal;
+begin
+  AssignFile(LogFile, FileName);
+  try
+    Reset(LogFile, 4);
+    BlockRead(LogFile, s[1], 2); { file id }
+    BlockRead(LogFile, Dummy, 1); { format id }
+    if Dummy >= $000E01 then
+      BlockRead(LogFile, Dummy, 1); { item stored since 0.14.1 }
+    BlockRead(LogFile, Size.X, 1);
+    BlockRead(LogFile, Size.Y, 1);
+    BlockRead(LogFile, FileLandMass, 1);
+    if FileLandMass = 0 then
+      for y := 0 to Size.Y - 1 do
+        BlockRead(LogFile, MapRow, Size.X);
+    BlockRead(LogFile, Dummy, 1);
+    BlockRead(LogFile, Dummy, 1);
+    BlockRead(LogFile, LastTurn, 1);
+    BlockRead(LogFile, SaveMap, 1);
+    if SaveMap[0] = $80 then
+      Mode := mmMultiPlayer
+    else
+      Mode := mmPicture;
+    if Mode = mmPicture then
+      BlockRead(LogFile, SaveMap[4], (Size.X * Size.Y - 1) div 4);
+    CloseFile(LogFile);
+  except
+    CloseFile(LogFile);
+    LastTurn := 0;
+    Size := WorldSizes[DefaultWorldSize];
+    Mode := mmNone;
+  end;
+  PaintFile(SaveMap);
+end;
+procedure TMiniMap.LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
+var
+  x, y, lxFile, lyFile: integer;
+  MapFile: file;
+  s: string[255];
+  MapRow: array [0 .. lxmax - 1] of Cardinal;
+  ImageFileName: string;
+begin
+  ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + '.png';
+  Mode := mmPicture;
+  if LoadGraphicFile(Bitmap, ImageFileName, gfNoError) then
+  begin
+    if Bitmap.width div 2 > MaxWidthMapLogo then
+      Bitmap.width := MaxWidthMapLogo * 2;
+    if Bitmap.height > MaxHeightMapLogo then
+      Bitmap.height := MaxHeightMapLogo;
+    Size.X := Bitmap.width div 2;
+    Size.Y := Bitmap.height;
+  end
+  else
+  begin
+    Mode := mmNone;
+    Size.X := MaxWidthMapLogo;
+    Size.Y := MaxHeightMapLogo;
+  end;
+  AssignFile(MapFile, FileName);
+  try
+    Reset(MapFile, 4);
+    BlockRead(MapFile, s[1], 2); { file id }
+    BlockRead(MapFile, x, 1); { format id }
+    BlockRead(MapFile, x, 1); // MaxTurn
+    BlockRead(MapFile, lxFile, 1);
+    BlockRead(MapFile, lyFile, 1);
+    nMapLandTiles := 0;
+    nMapStartPositions := 0;
+    for y := 0 to lyFile - 1 do begin
+      BlockRead(MapFile, MapRow, lxFile);
+      for x := 0 to lxFile - 1 do
+      begin
+        if (MapRow[x] and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
+          fForest, fHills] then
+          inc(nMapLandTiles);
+        if MapRow[x] and (fPrefStartPos or fStartPos) <> 0 then
+          inc(nMapStartPositions);
+      end
+    end;
+    if nMapStartPositions > nPl then
+      nMapStartPositions := nPl;
+    CloseFile(MapFile);
+  except
+    CloseFile(MapFile);
+  end;
+end;
+procedure TMiniMap.PaintRandom(Brightness, StartLandMass, WorldSize: Integer);
+var
+  i, x, y, xm, cm: Integer;
+  MiniPixel: TPixelPointer;
+  Map: ^TTileList;
+begin
+  Map := PreviewMap(StartLandMass);
+  Size := WorldSizes[WorldSize];
+  Bitmap.PixelFormat := pf24bit;
+  Bitmap.SetSize(Size.X * 2, Size.Y);
+  Bitmap.BeginUpdate;
+  MiniPixel := PixelPointer(Bitmap);
+  for y := 0 to ScaleToVcl(Size.Y) - 1 do begin
+    for x := 0 to ScaleToVcl(Size.X) - 1 do begin
+      for i := 0 to 1 do begin
+        xm := (x * 2 + i + y and 1) mod (ScaleToVcl(Size.X) * 2);
+        MiniPixel.SetX(xm);
+        cm := Colors
+          [Map[ScaleFromVcl(x) * lxmax div Size.X + lxmax *
+          ((ScaleFromVcl(y) * (lymax - 1) + Size.Y div 2) div (Size.Y - 1))] and
+          fTerrain, i];
+        MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
+        MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
+        MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+      end;
+    end;
+    MiniPixel.NextLine;
+  end;
+  Bitmap.EndUpdate;
+end;
+procedure TMiniMap.PaintFile(SaveMap: TMapArray);
+var
+  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
+  MiniPixel: TPixelPointer;
+  PrevMiniPixel: TPixelPointer;
+begin
+  OwnColor := GrExt[HGrSystem].Data.Canvas.Pixels[95, 67];
+  EnemyColor := GrExt[HGrSystem].Data.Canvas.Pixels[96, 67];
+  Bitmap.PixelFormat := pf24bit;
+  Bitmap.SetSize(Size.X * 2, Size.Y);
+  if Mode = mmPicture then begin
+    Bitmap.BeginUpdate;
+    MiniPixel := PixelPointer(Bitmap);
+    PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+    for y := 0 to ScaleToVcl(Size.Y) - 1 do begin
+      for x := 0 to ScaleToVcl(Size.X) - 1 do begin
+        for i := 0 to 1 do begin
+          xm := (x * 2 + i + y and 1) mod (ScaleToVcl(Size.X) * 2);
+          MiniPixel.SetX(xm);
+          Tile := SaveMap[ScaleFromVcl(x) + Size.X * ScaleFromVcl(y)];
+          if Tile and fTerrain = fUNKNOWN then
+            cm := $000000
+          else if Tile and smCity <> 0 then
+          begin
+            if Tile and smOwned <> 0 then
+              cm := OwnColor
+            else
+              cm := EnemyColor;
+            if y > 0 then begin
+              // 2x2 city dot covers two lines
+              PrevMiniPixel.SetX(xm);
+              PrevMiniPixel.Pixel^.B := cm shr 16;
+              PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
+              PrevMiniPixel.Pixel^.R := cm and $FF;
+            end;
+          end
+          else if (i = 0) and (Tile and smUnit <> 0) then
+            if Tile and smOwned <> 0 then
+              cm := OwnColor
+            else cm := EnemyColor
+          else
+            cm := Colors[Tile and fTerrain, i];
+          MiniPixel.Pixel^.B := (cm shr 16) and $ff;
+          MiniPixel.Pixel^.G := (cm shr 8) and $ff;
+          MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+        end;
+      end;
+      MiniPixel.NextLine;
+      PrevMiniPixel.NextLine;
+    end;
+    Bitmap.EndUpdate;
+  end;
+end;
+{ TStartDlg }
 procedure TStartDlg.FormCreate(Sender: TObject);
 var
+  x, y, i: Integer;
+  r0, r1: HRgn;
+  Location: TPoint;
+  x, i: Integer;
+  PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
-  PlayerSlot: TPlayerSlot;
 begin
   PlayerSlots := TPlayerSlots.Create;
 …
   end;
   LoadConfig;
+  ActionsOffered := [maManual, maCredits, maWeb];
   Include(ActionsOffered, maConfig);
   if FileExists(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html') then
+  LoadAssets;
+  ActionsOffered := [maConfig, maManual, maCredits, maWeb];
+  if FileExists(HomeDir + AITemplateFileName) then
     Include(ActionsOffered, maAIDev);
 …
   DirectDlg.Top := (DpiScreen.Height - DirectDlg.Height) div 2;
+  if FullScreen then
+  begin
+    Location := Point((DpiScreen.Width - 800) * 3 div 8,
+      DpiScreen.Height - Height - (DpiScreen.Height - 600) div 3);
+    Left := Location.X;
+    Top := Location.Y;
+    r0 := DpiCreateRectRgn(0, 0, Width, Height);
+    r1 := DpiCreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    DeleteObject(r1);
+    r1 := DpiCreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
+      QuitBtn.top + QuitBtn.Height);
+    CombineRgn(r0, r0, r1, RGN_OR);
+    DeleteObject(r1);
+    SetWindowRgn(Handle, r0, False);
+    DeleteObject(r0); // causes crash with Windows 95
+  end
+  else
+  begin
+    Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
+  end;
+  UpdateInterface;
   Canvas.Font.Assign(UniFont[ftNormal]);
 …
   PlayerSlots.Count := nPlOffered;
   for i := 0 to PlayerSlots.Count - 1 do
   with TPlayerSlot(PlayerSlots[i]) do begin
+  with PlayerSlots[i] do begin
     DiffUpBtn := TButtonC.Create(self);
     DiffUpBtn.Graphic := GrExt[HGrSystem].Data;
 …
     CustomizeBtn.ButtonIndex := 2;
+  Brains[0].Picture := TDpiBitmap.Create;
+  Brains[0].Picture.SetSize(64, 64);
+  DpiBitBlt(Brains[0].Picture.Canvas.Handle, 0, 0, 64, 64,
+    GrExt[HGrSystem2].Data.Canvas.Handle, 1, 111, SRCCOPY);
+  Brains[1].Picture := TDpiBitmap.Create;
+  Brains[1].Picture.SetSize(64, 64);
+  DpiBitBlt(Brains[1].Picture.Canvas.Handle, 0, 0, 64, 64,
+    GrExt[HGrSystem2].Data.Canvas.Handle, 66, 111, SRCCOPY);
+  Brains[2].Picture := TDpiBitmap.Create;
+  Brains[2].Picture.SetSize(64, 64);
+  DpiBitBlt(Brains[2].Picture.Canvas.Handle, 0, 0, 64, 64,
+    GrExt[HGrSystem2].Data.Canvas.Handle, 131, 111, SRCCOPY);
+  Brains[3].Picture := TDpiBitmap.Create;
+  Brains[3].Picture.SetSize(64, 64);
+  DpiBitBlt(Brains[3].Picture.Canvas.Handle, 0, 0, 64, 64,
+    GrExt[HGrSystem2].Data.Canvas.Handle, 131, 46, SRCCOPY);
+  AIBrains := TBrains.Create(False);
+  Brains.GetByKind(btAI, AIBrains);
+  for i := 0 to AIBrains.Count - 1 do
+  with AIBrains[I] do
+  begin
+    AIBrains[i].Picture := TDpiBitmap.Create;
+    if not LoadGraphicFile(AIBrains[i].Picture, HomeDir + 'AI' + DirectorySeparator +
+      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
+      AIBrains[i].Picture.SetSize(64, 64);
+      with AIBrains[i].Picture.Canvas do begin
+        Brush.Color := $904830;
+        FillRect(Rect(0, 0, 64, 64));
+        Font.Assign(UniFont[ftTiny]);
+        Font.Style := [];
+        Font.Color := $5FDBFF;
+        Textout(32 - TextWidth(FileName) div 2,
+- TextHeight(FileName) div 2, FileName);
+      end;
+    end;
+  end;
+  AIBrains.Free;
+  BitBltBitmap(BrainNoTerm.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 1, 111);
+  BitBltBitmap(BrainSuperVirtual.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 66, 111);
+  BitBltBitmap(BrainTerm.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 131, 111);
+  BitBltBitmap(BrainRandom.Picture, 0, 0, 64, 64, GrExt[HGrSystem2].Data, 131, 46);
+  LoadAiBrainsPictures;
   EmptyPicture := TDpiBitmap.Create;
 …
   LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  Mini := TDpiBitmap.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];
+  MiniMap := TMiniMap.Create;
   InitButtons;
 …
 procedure TStartDlg.FormDestroy(Sender: TObject);
 begin
+  SaveConfig;
   FreeAndNil(FormerGames);
   FreeAndNil(Maps);
-  FreeAndNil(Mini);
   FreeAndNil(EmptyPicture);
   FreeAndNil(LogoBuffer);
   FreeAndNil(PlayerSlots);
+  FreeAndNil(MiniMap);
 end;
 …
       DeleteObject(r1);
     end;
+  if not invalidateTab0 then
+  begin
+  if not invalidateTab0 then begin
     r1 := DpiCreateRectRgn(0, 0, 6 + 36, 3 + 38); // tab 0 icon
     CombineRgn(r0, r0, r1, RGN_DIFF);
 …
         WriteInteger('Diff' + IntToStr(I), 2);
     end;
-    WriteInteger('MultiControl', 0);
     OpenKey(AppRegistryKey, True);
+    if ValueExists('Gamma') then Gamma := ReadInteger('Gamma')
+      else Gamma := 100;
+    if Gamma <> 100 then InitGammaLookupTable;
+    if ValueExists('Locale') then LocaleCode := ReadString('Locale')
+      else LocaleCode := '';
     if ValueExists('WorldSize') then WorldSize := Reg.ReadInteger('WorldSize')
       else WorldSize := DefaultWorldSize;
 …
     if ValueExists('ResolutionFreq') then
       ResolutionFreq := ReadInteger('ResolutionFreq');
+    if ValueExists('MultiControl') then
+      MultiControl := ReadInteger('MultiControl')
+      else MultiControl := 0;
     {$IFDEF WINDOWS}
     if ScreenMode = 2 then
 …
 end;
+procedure TStartDlg.SaveConfig;
+var
+  Reg: TRegistry;
+begin
+  Reg := TRegistry.Create;
+  with Reg do try
+    OpenKey(AppRegistryKey, True);
+    WriteInteger('WorldSize', WorldSize);
+    WriteInteger('LandMass', StartLandMass);
+    WriteString('Locale', LocaleCode);
+    WriteInteger('Gamma', Gamma);
+    if FullScreen then WriteInteger('ScreenMode', 1)
+      else WriteInteger('ScreenMode', 0);
+    WriteInteger('MultiControl', MultiControl);
+  finally
+    Free;
+  end;
+end;
+procedure TStartDlg.LoadAiBrainsPictures;
+var
+  AIBrains: TBrains;
+  I: Integer;
+begin
+  AIBrains := TBrains.Create(False);
+  Brains.GetByKind(btAI, AIBrains);
+  for i := 0 to AIBrains.Count - 1 do
+  with AIBrains[I] do begin
+    if not LoadGraphicFile(AIBrains[i].Picture, GetAiDir + DirectorySeparator +
+      FileName + DirectorySeparator + FileName + '.png', gfNoError) then begin
+      with AIBrains[i].Picture.Canvas do begin
+        Brush.Color := $904830;
+        FillRect(Rect(0, 0, 64, 64));
+        Font.Assign(UniFont[ftTiny]);
+        Font.Style := [];
+        Font.Color := $5FDBFF;
+        Textout(32 - TextWidth(FileName) div 2,
+- TextHeight(FileName) div 2, FileName);
+      end;
+    end;
+  end;
+  AIBrains.Free;
+end;
+procedure TStartDlg.UpdateInterface;
+var
+  r0, r1: HRgn;
+  Location: TPoint;
+begin
+  if FullScreen then begin
+    Location := Point((DpiScreen.Width - 800) * 3 div 8,
+      DpiScreen.Height - Height - (DpiScreen.Height - 600) div 3);
+    Left := Location.X;
+    Top := Location.Y;
+    r0 := DpiCreateRectRgn(0, 0, Width, Height);
+    r1 := DpiCreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    DeleteObject(r1);
+    r1 := DpiCreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
+      QuitBtn.top + QuitBtn.Height);
+    CombineRgn(r0, r0, r1, RGN_OR);
+    DeleteObject(r1);
+    SetWindowRgn(Handle, r0, False);
+    DeleteObject(r0); // causes crash with Windows 95
+  end else begin
+    Left := (DpiScreen.Width - Width) div 2;
+    Top := (DpiScreen.Height - Height) div 2;
+  end;
+end;
 procedure TStartDlg.DrawAction(y, IconIndex: integer; HeaderItem, TextItem: string);
 begin
 …
   BiColorTextOut(Canvas, Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText],
     $000000, xAction, y + 21, Phrases2.Lookup(TextItem));
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
+    xActionIcon - 2, y - 2, SRCCOPY);
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, 50, 50, Canvas,
+    xActionIcon - 2, y - 2);
   GlowFrame(LogoBuffer, 8, 8, 34, 34, $202020);
   DpiBitBlt(Canvas.Handle, xActionIcon - 2, y - 2, 50, 50,
     LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
   DpiBitBlt(Canvas.Handle, xActionIcon, y, 40, 40, BigImp.Canvas.Handle,
     (IconIndex mod 7) * xSizeBig + 8, (IconIndex div 7) * ySizeBig, SRCCOPY);
+  DpiBitCanvas(Canvas, xActionIcon - 2, y - 2, 50, 50,
+    LogoBuffer.Canvas, 0, 0);
+  DpiBitCanvas(Canvas, xActionIcon, y, 40, 40, BigImp.Canvas,
+    (IconIndex mod 7) * xSizeBig + 8, (IconIndex div 7) * ySizeBig);
   RFrame(Canvas, xActionIcon - 1, y - 1, xActionIcon + 40, y + 40,
     $000000, $000000);
 …
   s: string;
   Tab2: TStartTab;
+  MainAction: TMainAction;
 begin
   PaintBackground(self, 3, 3, TabOffset + 4 * TabSize - 4, TabHeight - 3);
 …
       TabOffset + (Integer(Tab) + 1) * TabSize + 2, TabHeight, MainTexture.clBevelShade,
       MainTexture.clBevelShade); // Tab shadow
+  BitBltCanvas(LogoBuffer.Canvas, 0, 0, 36, 36, Canvas, 6,
++ 2 * integer(Tab <> tbMain), SRCCOPY);
+  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+  LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+  DpiBitCanvas(LogoBuffer.Canvas, 0, 0, 36, 36, Canvas, 6,
++ 2 * integer(Tab <> tbMain));
   ImageOp_BCC(LogoBuffer, Templates, 0, 0, 145, 38, 36, 27, $BFBF20, $4040DF);
 …
   ImageOp_BCC(LogoBuffer, Templates, 10, 27, 155, 38 + 27, 26, 9, $BFBF20,
     $4040DF); // logo part 2
+  DpiBitBlt(Canvas.Handle, 6, 3 + 2 * integer(Tab <> tbMain), 36, 36,
+    LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+  if Page = pgMain then
+  begin
+    if SelectedAction >= 0 then // mark selected action
+  DpiBitCanvas(Canvas, 6, 3 + 2 * integer(Tab <> tbMain), 36, 36,
+    LogoBuffer.Canvas, 0, 0);
+  if Page = pgMain then begin
+    if SelectedAction <> maNone then // mark selected action
       for i := 0 to (ClientWidth - 2 * ActionSideBorder) div wBuffer + 1 do
       begin
 …
           w := wBuffer;
         h := ActionPitch;
         if yAction + SelectedAction * ActionPitch - 8 + h > ClientHeight - ActionBottomBorder
+        if yAction + Integer(SelectedAction) * ActionPitch - 8 + h > ClientHeight - ActionBottomBorder
         then
           h := ClientHeight - ActionBottomBorder -
+            (yAction + SelectedAction * ActionPitch - 8);
+        //BitBltCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
+        //  ActionSideBorder + i * wBuffer, yAction + SelectedAction * ActionPitch
+        //  - 8, SRCCOPY);
+        BitBlt(LogoBuffer.Canvas.Handle, 0, 0, w, h, Canvas.Handle,
+          ActionSideBorder + i * wBuffer, yAction + SelectedAction * ActionPitch
+          - 8, SRCCOPY);
+            (yAction + Integer(SelectedAction) * ActionPitch - 8);
+        // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+        LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+        DpiBitCanvas(LogoBuffer.Canvas, 0, 0, w, h, Canvas,
+          ActionSideBorder + i * wBuffer, yAction + Integer(SelectedAction) * ActionPitch
+          - 8);
         MakeBlue(LogoBuffer, 0, 0, w, h);
         DpiBitBlt(Canvas.Handle, ActionSideBorder + i * wBuffer,
           yAction + SelectedAction * ActionPitch - 8, w, h,
           LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, ActionSideBorder + i * wBuffer,
+          yAction + Integer(SelectedAction) * ActionPitch - 8, w, h,
+          LogoBuffer.Canvas, 0, 0);
       end;
     y := yAction;
     for i := 0 to nMainActions - 1 do
+    for MainAction := Low(TMainActionSet) to High(TMainActionSet) do
     begin
+      if i in ActionsOffered then
+        case i of
+          maConfig:
+            DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
+          maManual:
+            DrawAction(y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
+          maCredits:
+            DrawAction(y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
+          maAIDev:
+            DrawAction(y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
+      if MainAction in ActionsOffered then
+        case MainAction of
+          maConfig: DrawAction(y, 25, 'ACTIONHEADER_CONFIG', 'ACTION_CONFIG');
+          maManual: DrawAction(y, 19, 'ACTIONHEADER_MANUAL', 'ACTION_MANUAL');
+          maCredits: DrawAction(y, 22, 'ACTIONHEADER_CREDITS', 'ACTION_CREDITS');
+          maAIDev: DrawAction(y, 24, 'ACTIONHEADER_AIDEV', 'ACTION_AIDEV');
           maWeb:
             begin
 …
                 Phrases2.Lookup('ACTIONHEADER_WEB'));
               Canvas.Font.Assign(UniFont[ftNormal]);
+              BitBltCanvas(LogoBuffer.Canvas, 0, 0, 91, 25, Canvas,
+                xActionIcon, y + 2, SRCCOPY);
+              // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
+              LogoBuffer.Canvas.FillRect(0, 0, LogoBuffer.Width, LogoBuffer.Height);
+              DpiBitCanvas(LogoBuffer.Canvas, 0, 0, 91, 25, Canvas,
+                xActionIcon, y + 2);
               ImageOp_BCC(LogoBuffer, Templates, 0, 0, 1, 400, 91, 25, 0,
                 Colors.Canvas.Pixels[clkAge0 - 1, cliDimmedText]);
               DpiBitBlt(Canvas.Handle, xActionIcon, y + 2, 91, 25,
                 LogoBuffer.Canvas.Handle, 0, 0, SRCCOPY);
+              DpiBitCanvas(Canvas, xActionIcon, y + 2, 91, 25,
+                LogoBuffer.Canvas, 0, 0);
             end;
         end;
       inc(y, ActionPitch);
+      Inc(y, ActionPitch);
     end;
   end
 …
         if (i < 13) or (i > 17) then
         begin
           DpiBitBlt(Canvas.Handle, 9 + i * 27, yLogo - 2, wOrna, hOrna,
             GrExt[HGrSystem2].Mask.Canvas.Handle, xOrna, yOrna, SRCAND);
           DpiBitBlt(Canvas.Handle, 9 + i * 27, yLogo - 2, wOrna, hOrna,
             GrExt[HGrSystem2].Data.Canvas.Handle, xOrna, yOrna, SRCPAINT);
+          DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
+            GrExt[HGrSystem2].Mask.Canvas, xOrna, yOrna, SRCAND);
+          DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
+            GrExt[HGrSystem2].Data.Canvas, xOrna, yOrna, SRCPAINT);
         end;
       PaintLogo(Canvas, 69 + 11 * 27, yLogo, MainTexture.clBevelLight,
 …
           if Assigned(PlayersBrain[I]) and (PlayersBrain[i].Kind in [btTerm, btRandom, btAI]) then
           begin
             DpiBitBlt(Canvas.Handle, xBrain[i] - 18, yBrain[i] + 19, 12, 14,
               GrExt[HGrSystem].Data.Canvas.Handle, 134 + (Difficulty[i] - 1) *
 , 28, SRCCOPY);
+            DpiBitCanvas(Canvas, xBrain[i] - 18, yBrain[i] + 19, 12, 14,
+              GrExt[HGrSystem].Data.Canvas, 134 + (Difficulty[i] - 1) *
+, 28);
             Frame(Canvas, xBrain[i] - 19, yBrain[i] + 18, xBrain[i] - 18 + 12,
               yBrain[i] + (19 + 14), $000000, $000000);
 …
                 PlayerSlots[I].MultiBtn.left + 12, PlayerSlots[I].MultiBtn.top + 12,
                 MainTexture.clBevelShade, MainTexture.clBevelLight);
               DpiBitBlt(Canvas.Handle, xBrain[i] - 31, yBrain[i], 13, 12,
                 GrExt[HGrSystem].Data.Canvas.Handle, 88, 47, SRCCOPY);
+              DpiBitCanvas(Canvas, xBrain[i] - 31, yBrain[i], 13, 12,
+                GrExt[HGrSystem].Data.Canvas, 88, 47);
             end;
           end;
 …
         if (i < 2) or (i > 6) then
         begin
           DpiBitBlt(Canvas.Handle, 9 + i * 27, yLogo - 2, wOrna, hOrna,
             GrExt[HGrSystem2].Mask.Canvas.Handle, xOrna, yOrna, SRCAND);
           DpiBitBlt(Canvas.Handle, 9 + i * 27, yLogo - 2, wOrna, hOrna,
             GrExt[HGrSystem2].Data.Canvas.Handle, xOrna, yOrna, SRCPAINT);
+          DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
+            GrExt[HGrSystem2].Mask.Canvas, xOrna, yOrna, SRCAND);
+          DpiBitCanvas(Canvas, 9 + i * 27, yLogo - 2, wOrna, hOrna,
+            GrExt[HGrSystem2].Data.Canvas, xOrna, yOrna, SRCPAINT);
         end;
       PaintLogo(Canvas, 69, yLogo, MainTexture.clBevelLight,
 …
       MainTexture.clBevelShade);
     RisedTextOut(Canvas, 344, y0Mini - 77, Phrases.Lookup('STARTCONTROLS', 5));
     s := IntToStr((lxpre[WorldSize] * lypre[WorldSize] * 20 +
+    s := IntToStr((WorldSizes[WorldSize].X * WorldSizes[WorldSize].Y * 20 +
       DefaultWorldTiles div 2) div DefaultWorldTiles * 5) + '%';
     RisedTextOut(Canvas, 514 - BiColorTextWidth(Canvas, s), y0Mini - 77, s);
 …
     BtnFrame(Canvas, ReplayBtn.BoundsRect, MainTexture);
   if not(Page in [pgMain, pgNoLoad]) then
   begin
     xMini := x0Mini - MiniWidth;
     yMini := y0Mini - MiniHeight div 2;
     Frame(Canvas, xMini, yMini, xMini + 3 + MiniWidth * 2,
       yMini + 3 + MiniHeight, MainTexture.clBevelLight,
+  if not (Page in [pgMain, pgNoLoad]) then
+  begin
+    xMini := x0Mini - MiniMap.Size.X;
+    yMini := y0Mini - MiniMap.Size.Y div 2;
+    Frame(Canvas, xMini, yMini, xMini + 3 + MiniMap.Size.X * 2,
+      yMini + 3 + MiniMap.Size.Y, MainTexture.clBevelLight,
       MainTexture.clBevelShade);
     Frame(Canvas, xMini + 1, yMini + 1, xMini + 2 + MiniWidth * 2,
       yMini + 2 + MiniHeight, MainTexture.clBevelShade,
+    Frame(Canvas, xMini + 1, yMini + 1, xMini + 2 + MiniMap.Size.X * 2,
+      yMini + 2 + MiniMap.Size.Y, MainTexture.clBevelShade,
       MainTexture.clBevelLight);
+  end;
+  s := '';
+  if MiniMode = mmPicture then
+  begin
+    DpiBitBlt(Canvas.Handle, xMini + 2, yMini + 2, MiniWidth * 2, MiniHeight,
+      Mini.Canvas.Handle, 0, 0, SRCCOPY);
+    if Page = pgStartRandom then
+      s := Phrases.Lookup('RANMAP')
+  end
+  else if MiniMode = mmMultiPlayer then
+    s := Phrases.Lookup('MPMAP')
+  else if Page = pgStartMap then
+    s := Copy(MapFileName, 1, Length(MapFileName) - 9)
+  else if Page = pgEditMap then
+    s := List.Items[List.ItemIndex]
+  else if Page = pgNoLoad then
+    s := Phrases.Lookup('NOGAMES');
+  if s <> '' then
+    RisedTextOut(Canvas, x0Mini + 2 - BiColorTextWidth(Canvas, s) div 2,
+      y0Mini - 8, s);
+    s := '';
+    if MiniMap.Mode = mmPicture then
+    begin
+      DpiBitCanvas(Canvas, xMini + 2, yMini + 2, MiniMap.Size.X * 2, MiniMap.Size.Y,
+        MiniMap.Bitmap.Canvas, 0, 0);
+      if Page = pgStartRandom then
+        s := Phrases.Lookup('RANMAP')
+    end
+    else if MiniMap.Mode = mmMultiPlayer then
+      s := Phrases.Lookup('MPMAP')
+    else if Page = pgStartMap then
+      s := Copy(MapFileName, 1, Length(MapFileName) - 9)
+    else if Page = pgEditMap then
+      s := List.Items[List.ItemIndex]
+    else if Page = pgNoLoad then
+      s := Phrases.Lookup('NOGAMES');
+    if s <> '' then
+      RisedTextOut(Canvas, x0Mini + 2 - BiColorTextWidth(Canvas, s) div 2,
+        y0Mini - 8, s);
+  end;
 end;
 procedure TStartDlg.FormShow(Sender: TObject);
-var
-  x, y: integer;
-  PicturePixel: TPixelPointer;
 begin
   SetMainTextureByAge(-1);
   List.Font.Color := MainTexture.clMark;
+  Fill(EmptyPicture.Canvas, 0, 0, 64, 64, (wMaintexture - 64) div 2,
+    (hMaintexture - 64) div 2);
+  // darken texture for empty slot
+  EmptyPicture.BeginUpdate;
+  PicturePixel.Init(EmptyPicture);
+  for y := 0 to ScaleToVcl(64) - 1 do begin
+    for x := 0 to ScaleToVcl(64) - 1 do begin
+      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - 28, 0);
+      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - 28, 0);
+      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - 28, 0);
+      PicturePixel.NextPixel;
+    end;
+    PicturePixel.NextLine;
+  end;
+  EmptyPicture.EndUpdate;
+  Fill(EmptyPicture.Canvas, Bounds(0, 0, 64, 64),
+    Point((wMaintexture - 64) div 2, (hMaintexture - 64) div 2));
+  DarkenImage(EmptyPicture, 28);
   Difficulty[0] := Diff0;
   SelectedAction := -1;
+  SelectedAction := maNone;
   if ShowTab = tbPrevious then
     PreviewMap(StartLandMass); // avoid delay on first TabX change
 …
 procedure TStartDlg.StartBtnClick(Sender: TObject);
 var
   I, GameCount, MapCount: integer;
+  I, GameCount, MapCount: Integer;
   FileName: string;
   Reg: TRegistry;
 …
       begin // load
         FileName := List.Items[List.ItemIndex];
         if LoadGame(DataDir + 'Saved' + DirectorySeparator, FileName + CevoExt, LoadTurn, false)
+        if LoadGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, LoadTurn, false)
         then
           UnlistBackupFile(FileName)
 …
           end;
           // save settings and AI assignment
+          // Save settings and AI assignment
           if Page = pgStartRandom then begin
+            WriteInteger('WorldSize', WorldSize);
+            WriteInteger('LandMass', StartLandMass);
+            SaveConfig;
             OpenKey(AppRegistryKey + '\AI', True);
             if AutoDiff < 0 then
 …
                 WriteInteger('Diff' + IntToStr(I), Difficulty[I]);
               end;
-            WriteInteger('MultiControl', MultiControl);
           end;
 …
         end;
         StartNewGame(DataDir + 'Saved' + DirectorySeparator, FileName + CevoExt, MapFileName,
           lxpre[WorldSize], lypre[WorldSize], StartLandMass, MaxTurn);
+        StartNewGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, MapFileName,
+          WorldSizes[WorldSize].X, WorldSizes[WorldSize].Y, StartLandMass, MaxTurn);
         UnlistBackupFile(FileName);
       end;
 …
         end;
         MapFileName := Format(Phrases.Lookup('MAP'), [MapCount]) + CevoMapExt;
+        EditMap(MapFileName, lxpre[WorldSize], lypre[WorldSize], StartLandMass);
+      end
+  end
+end;
+procedure TStartDlg.PaintRandomMini(Brightness: integer);
+var
+  i, x, y, xm, cm: integer;
+  MiniPixel: TPixelPointer;
+  Map: ^TTileList;
+begin
+  Map := PreviewMap(StartLandMass);
+  MiniWidth := lxpre[WorldSize];
+  MiniHeight := lypre[WorldSize];
+  Mini.PixelFormat := pf24bit;
+  Mini.SetSize(MiniWidth * 2, MiniHeight);
+  Mini.BeginUpdate;
+  MiniPixel.Init(Mini);
+  for y := 0 to ScaleToVcl(MiniHeight) - 1 do begin
+    for x := 0 to ScaleToVcl(MiniWidth) - 1 do begin
+      for i := 0 to 1 do begin
+        xm := (x * 2 + i + y and 1) mod (ScaleToVcl(MiniWidth) * 2);
+        MiniPixel.SetX(xm);
+        cm := MiniColors
+          [Map[x * lxmax div MiniWidth + lxmax *
+          ((y * (lymax - 1) + MiniHeight div 2) div (MiniHeight - 1))] and
+          fTerrain, i];
+        MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
+        MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
+        MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+      end;
+    end;
+    MiniPixel.NextLine;
+  end;
+  Mini.EndUpdate;
+end;
+procedure TStartDlg.PaintFileMini(SaveMap: TMapArray);
+var
+  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
+  MiniPixel, PrevMiniPixel: TPixelPointer;
+begin
+  OwnColor := GrExt[HGrSystem].Data.Canvas.Pixels[95, 67];
+  EnemyColor := GrExt[HGrSystem].Data.Canvas.Pixels[96, 67];
+  Mini.PixelFormat := pf24bit;
+  Mini.SetSize(MiniWidth * 2, MiniHeight);
+  if MiniMode = mmPicture then
+  begin
+    Mini.BeginUpdate;
+    MiniPixel.Init(Mini);
+    PrevMiniPixel.Init(Mini, 0, -1);
+    for y := 0 to MiniHeight - 1 do begin
+      for x := 0 to MiniWidth - 1 do begin
+        for i := 0 to 1 do begin
+          xm := (x * 2 + i + y and 1) mod (MiniWidth * 2);
+          MiniPixel.SetX(xm);
+          Tile := SaveMap[x + MiniWidth * y];
+          if Tile and fTerrain = fUNKNOWN then
+            cm := $000000
+          else if Tile and smCity <> 0 then
+          begin
+            if Tile and smOwned <> 0 then
+              cm := OwnColor
+            else
+              cm := EnemyColor;
+            if y > 0 then begin
+              // 2x2 city dot covers two lines
+              PrevMiniPixel.SetX(xm);
+              PrevMiniPixel.Pixel^.B := cm shr 16;
+              PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
+              PrevMiniPixel.Pixel^.R := cm and $FF;
+            end;
+          end
+          else if (i = 0) and (Tile and smUnit <> 0) then
+            if Tile and smOwned <> 0 then
+              cm := OwnColor
+            else
+              cm := EnemyColor
+          else
+            cm := MiniColors[Tile and fTerrain, i];
+          MiniPixel.Pixel^.B := cm shr 16;
+          MiniPixel.Pixel^.G:= cm shr 8 and $FF;
+          MiniPixel.Pixel^.R := cm and $FF;
+        end;
+      end;
+      MiniPixel.NextLine;
+      PrevMiniPixel.NextLine;
+    end;
+    Mini.EndUpdate;
+        EditMap(MapFileName, WorldSizes[WorldSize].X, WorldSizes[WorldSize].Y, StartLandMass);
+      end;
   end;
 end;
 procedure TStartDlg.PaintInfo;
-var
-  SaveMap: TMapArray;
-  x, y, Dummy, FileLandMass, lxFile, lyFile: integer;
-  LogFile, MapFile: file;
-  s: string[255];
-  MapRow: array [0 .. lxmax - 1] of Cardinal;
 begin
   case Page of
+    pgStartRandom:
+      begin
+        MiniMode := mmPicture;
+        PaintRandomMini(3);
+      end;
+    pgNoLoad:
+      begin
+        MiniWidth := lxpre[DefaultWorldSize];
+        MiniHeight := lypre[DefaultWorldSize];
+        MiniMode := mmNone;
+      end;
+    pgLoad:
+      begin
+        AssignFile(LogFile, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex]
+          + CevoExt);
+        try
+          Reset(LogFile, 4);
+          BlockRead(LogFile, s[1], 2); { file id }
+          BlockRead(LogFile, Dummy, 1); { format id }
+          if Dummy >= $000E01 then
+            BlockRead(LogFile, Dummy, 1); { item stored since 0.14.1 }
+          BlockRead(LogFile, MiniWidth, 1);
+          BlockRead(LogFile, MiniHeight, 1);
+          BlockRead(LogFile, FileLandMass, 1);
+          if FileLandMass = 0 then
+            for y := 0 to MiniHeight - 1 do
+              BlockRead(LogFile, MapRow, MiniWidth);
+          BlockRead(LogFile, Dummy, 1);
+          BlockRead(LogFile, Dummy, 1);
+          BlockRead(LogFile, LastTurn, 1);
+          BlockRead(LogFile, SaveMap, 1);
+          if SaveMap[0] = $80 then
+            MiniMode := mmMultiPlayer
+          else
+            MiniMode := mmPicture;
+          if MiniMode = mmPicture then
+            BlockRead(LogFile, SaveMap[4], (MiniWidth * MiniHeight - 1) div 4);
+          CloseFile(LogFile);
+        except
+          CloseFile(LogFile);
+          LastTurn := 0;
+          MiniWidth := lxpre[DefaultWorldSize];
+          MiniHeight := lypre[DefaultWorldSize];
+          MiniMode := mmNone;
+        end;
+    pgStartRandom: begin
+      MiniMap.Mode := mmPicture;
+      MiniMap.PaintRandom(3, StartLandMass, WorldSize);
+    end;
+    pgNoLoad: begin
+      MiniMap.Mode := mmNone;
+      MiniMap.Size := WorldSizes[DefaultWorldSize];
+    end;
+    pgLoad: begin
+        MiniMap.LoadFromLogFile(GetSavedDir + DirectorySeparator +
+          List.Items[List.ItemIndex] + CevoExt, LastTurn);
         // BookDate:=DateToStr(FileDateToDateTime(FileAge(FileName)));
+        PaintFileMini(SaveMap);
+        if not TurnValid then
+        begin
+        if not TurnValid then  begin
           LoadTurn := LastTurn;
           SmartInvalidate(xTurnSlider - 2, y0Mini + 61,
 …
         TurnValid := True;
       end;
+    pgEditRandom:
+      begin
+        MapFileName := '';
+        MiniMode := mmPicture;
+        PaintRandomMini(4);
+      end;
+    pgEditRandom: begin
+      MapFileName := '';
+      MiniMap.Mode := mmPicture;
+      MiniMap.PaintRandom(4, StartLandMass, WorldSize);
+    end;
     pgStartMap, pgEditMap:
       begin
-        MiniMode := mmPicture;
         if Page = pgEditMap then
           MapFileName := List.Items[List.ItemIndex] + CevoMapExt;
+        if LoadGraphicFile(Mini, DataDir + 'Maps' + DirectorySeparator + Copy(MapFileName, 1,
+          Length(MapFileName) - 9) + '.png', gfNoError) then
+        begin
+          if Mini.width div 2 > MaxWidthMapLogo then
+            Mini.width := MaxWidthMapLogo * 2;
+          if Mini.height > MaxHeightMapLogo then
+            Mini.height := MaxHeightMapLogo;
+          MiniWidth := Mini.width div 2;
+          MiniHeight := Mini.height;
+        end
+        else
+        begin
+          MiniMode := mmNone;
+          MiniWidth := MaxWidthMapLogo;
+          MiniHeight := MaxHeightMapLogo;
+        end;
+        AssignFile(MapFile, DataDir + 'Maps' + DirectorySeparator + MapFileName);
+        try
+          Reset(MapFile, 4);
+          BlockRead(MapFile, s[1], 2); { file id }
+          BlockRead(MapFile, x, 1); { format id }
+          BlockRead(MapFile, x, 1); // MaxTurn
+          BlockRead(MapFile, lxFile, 1);
+          BlockRead(MapFile, lyFile, 1);
+          nMapLandTiles := 0;
+          nMapStartPositions := 0;
+          for y := 0 to lyFile - 1 do
+          begin
+            BlockRead(MapFile, MapRow, lxFile);
+            for x := 0 to lxFile - 1 do
+            begin
+              if (MapRow[x] and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
+                fForest, fHills] then
+                inc(nMapLandTiles);
+              if MapRow[x] and (fPrefStartPos or fStartPos) <> 0 then
+                inc(nMapStartPositions);
+            end
+          end;
+          if nMapStartPositions > nPl then
+            nMapStartPositions := nPl;
+          CloseFile(MapFile);
+        except
+          CloseFile(MapFile);
+        end;
+        MiniMap.LoadFromMapFile(GetMapsDir + DirectorySeparator + MapFileName, nMapLandTiles, nMapStartPositions);
         if Page = pgEditMap then
           SmartInvalidate(x0Mini - 112, y0Mini + 61, x0Mini + 112, y0Mini + 91);
 …
 begin
   FormerGames.Clear;
   if FindFirst(DataDir + 'Saved' + DirectorySeparator + '*' + CevoExt, $21, F) = 0 then
+  if FindFirst(GetSavedDir + DirectorySeparator + '*' + CevoExt, $21, F) = 0 then
     repeat
       I := FormerGames.Count;
 …
 begin
   Maps.Clear;
   if FindFirst(DataDir + 'Maps' + DirectorySeparator + '*' + CevoMapExt, $21, f) = 0 then
+  if FindFirst(GetMapsDir + DirectorySeparator + '*' + CevoMapExt, $21, f) = 0 then
     repeat
       Maps.Add(Copy(f.Name, 1, Length(f.Name) - 9));
 …
   s: string;
   Reg: TRegistry;
   invalidateTab0: boolean;
 begin
   invalidateTab0 := (Page = pgMain) or (NewPage = pgMain);
+  InvalidateTab0: boolean;
+begin
+  InvalidateTab0 := (Page = pgMain) or (NewPage = pgMain);
   Page := NewPage;
   case Page of
 …
                       PlayersBrain[p1] := Brains[j];
               end;
-              MultiControl := Reg.ReadInteger('MultiControl');
             finally
               Free;
 …
     Controls[i].Visible := Controls[i].Tag and (256 shl Integer(Page)) <> 0;
   if Page = pgLoad then
     ReplayBtn.Visible := MiniMode <> mmMultiPlayer;
+    ReplayBtn.Visible := MiniMap.Mode <> mmMultiPlayer;
   List.Invalidate;
   SmartInvalidate(0, 0, ClientWidth, ClientHeight, invalidateTab0);
 …
           LocaleDlg := TLocaleDlg.Create(nil);
           if LocaleDlg.ShowModal = mrOk then begin
             LoadPhrases;
+            LoadAssets;
             Invalidate;
+            UpdateInterface;
+            Background.UpdateInterface;
           end;
           FreeAndNil(LocaleDlg);
 …
         DirectHelp(cStartCredits);
       maAIDev:
         OpenDocument(pchar(HomeDir + 'AI Template' + DirectorySeparator + 'AI development manual.html'));
+        OpenDocument(HomeDir + AITemplateFileName);
       maWeb:
         OpenURL('http://c-evo.org')
+        OpenURL(CevoHomepage);
     end;
   end
 …
 procedure TStartDlg.Up1BtnClick(Sender: TObject);
 begin
   if WorldSize < nWorldSize - 1 then
+  if WorldSize < MaxWorldSize - 1 then
   begin
     Inc(WorldSize);
 …
   PaintInfo;
   if Page = pgLoad then
     ReplayBtn.Visible := MiniMode <> mmMultiPlayer;
+    ReplayBtn.Visible := MiniMap.Mode <> mmMultiPlayer;
 end;
 …
         end;
       if Page = pgLoad then
         AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
         AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
       ok := true;
       try
         if Page = pgLoad then
           Rename(f, DataDir + 'Saved'+ DirectorySeparator + NewName + CevoExt)
+          Rename(f, GetSavedDir + DirectorySeparator + NewName + CevoExt)
         else
           Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + CevoMapExt);
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapExt);
       except
         // Play('INVALID');
 …
       if Page <> pgLoad then
         try // rename map picture
           AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex]
+          AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
             + '.png');
           Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.png');
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + '.png');
         except
         end;
 …
     begin
       if Page = pgLoad then
         AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
         AssignFile(f, DataDir + 'Maps' + DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
       Erase(f);
 …
           PaintInfo;
           if Page = pgLoad then
             ReplayBtn.Visible := MiniMode <> mmMultiPlayer;
+            ReplayBtn.Visible := MiniMap.Mode <> mmMultiPlayer;
         end;
       end;
 …
   x, y: integer);
 var
+  OldLoadTurn, NewSelectedAction: Integer;
+  OldLoadTurn: Integer;
+  NewSelectedAction: TMainAction;
 begin
   if Tracking then
 …
       (y >= yAction - 8) and (y < ClientHeight - ActionBottomBorder) then
     begin
       NewSelectedAction := (y - (yAction - 8)) div ActionPitch;
       if not(NewSelectedAction in ActionsOffered) then
         NewSelectedAction := -1;
+      NewSelectedAction := TMainAction((y - (yAction - 8)) div ActionPitch);
+      if not (NewSelectedAction in ActionsOffered) then
+        NewSelectedAction := maNone;
     end
     else
       NewSelectedAction := -1;
+      NewSelectedAction := maNone;
     if NewSelectedAction <> SelectedAction then
     begin
       if SelectedAction >= 0 then
         SmartInvalidate(ActionSideBorder, yAction + SelectedAction * ActionPitch
           - 8, ClientWidth - ActionSideBorder, yAction + (SelectedAction + 1) *
+      if SelectedAction <> maNone then
+        SmartInvalidate(ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch
+          - 8, ClientWidth - ActionSideBorder, yAction + (Integer(SelectedAction) + 1) *
           ActionPitch - 8);
       SelectedAction := NewSelectedAction;
       if SelectedAction >= 0 then
         SmartInvalidate(ActionSideBorder, yAction + SelectedAction * ActionPitch
           - 8, ClientWidth - ActionSideBorder, yAction + (SelectedAction + 1) *
+      if SelectedAction <> maNone then
+        SmartInvalidate(ActionSideBorder, yAction + Integer(SelectedAction) * ActionPitch
+          - 8, ClientWidth - ActionSideBorder, yAction + (Integer(SelectedAction) + 1) *
           ActionPitch - 8);
     end;
 …
 procedure TStartDlg.ReplayBtnClick(Sender: TObject);
 begin
   LoadGame(DataDir + 'Saved' + DirectorySeparator, List.Items[List.ItemIndex] + CevoExt,
+  LoadGame(GetSavedDir + DirectorySeparator, List.Items[List.ItemIndex] + CevoExt,
     LastTurn, True);
   SlotAvailable := -1;
 end;
 end.

branches/highdpi/readme.txt

r146	r210
1	1	C-evo 1.2.0 sources ported to Lazarus/FPC
2	2
3		* Used development environment: Lazarus ~~1.8.2~~ (https://www.lazarus-ide.org/)
	3	* Used development environment: Lazarus 2.0.8 (https://www.lazarus-ide.org/)
4	4	* Supported platforms: Windows and Linux
5	5	* Supported architectures: 32-bit and 64-bit x86

Context Navigation

Legend:

Download in other formats: