Changeset 349 for branches/highdpi/LocalPlayer/Term.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/Term.pas (modified) (144 diffs)

branches/highdpi/LocalPlayer/Term.pas

@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
-  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area;
+  Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
+  UGraphicSet, UMiniMap, IsoEngine;
 
 const
   WM_EOT = WM_USER;
 
-  pltsNormal = 0;
-  pltsBlink = 1;
-
 type
+  TPaintLocTempStyle = (pltsNormal, pltsBlink);
+
+  TSoundBlock = (sbStart, sbWonder, sbScience, sbContact, sbTurn);
+  TSoundBlocks = set of TSoundBlock;
 
   { TMainScreen }
@@ -224 +226 @@
     procedure MovieSpeedBtnClick(Sender: TObject);
   private
-    xw, yw, xwd, ywd, xwMini, ywMini, xMidPanel, xRightPanel, xTroop, xTerrain,
-      xMini, yMini, ywmax, ywcenter, TroopLoc, TrCnt, TrRow, TrPitch, MapWidth,
-      MapOffset, MapHeight, BlinkTime, BrushLoc, EditLoc, xMouse,
-      yMouse: integer;
+    xw: Integer; // Base map x
+    yw: Integer; // Base map y
+    xwd: Integer;
+    ywd: Integer;
+    xwMini: Integer;
+    ywMini: Integer;
+    xMidPanel: Integer;
+    xRightPanel: Integer;
+    xTroop: Integer;
+    xTerrain: Integer;
+    xMini: Integer;
+    yMini: Integer;
+    ywmax: Integer;
+    ywcenter: Integer;
+    TroopLoc: Integer;
+    TrCnt: Integer;
+    TrRow: Integer;
+    TrPitch: Integer;
+    MapWidth: Integer;
+    MapOffset: Integer;
+    MapHeight: Integer;
+    BlinkTime: Integer;
+    BrushLoc: Integer;
+    EditLoc: Integer;
+    xMouse: Integer;
+    yMouse: Integer;
     BrushType: Cardinal;
-    trix: array [0 .. 63] of integer;
+    trix: array [0 .. 63] of Integer;
     AILogo: array [0 .. nPl - 1] of TDpiBitmap;
-    Mini, Panel, TopBar: TDpiBitmap;
+    MiniMap: TMiniMap;
+    Panel: TDpiBitmap;
+    TopBar: TDpiBitmap;
     sb: TPVScrollbar;
-    Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
-      HaveStrategyAdvice, FirstMovieTurn: boolean;
+    Closable: Boolean;
+    RepaintOnResize: Boolean;
+    Tracking: Boolean;
+    TurnComplete: Boolean;
+    Edited: Boolean;
+    GoOnPhase: Boolean;
+    HaveStrategyAdvice: Boolean;
+    FirstMovieTurn: Boolean;
     PrevWindowState: TWindowState;
     CurrentWindowState: TWindowState;
+    MainMap: TIsoMap;
+    NoMap: TIsoMap;
+    NoMapPanel: TIsoMap;
     function ChooseUnusedTribe: integer;
     procedure GetTribeList;
     procedure InitModule;
+    procedure DoneModule;
     procedure InitTurn(NewPlayer: integer);
+    procedure SaveMenuItemsState;
     procedure ScrollBarUpdate(Sender: TObject);
     procedure ArrangeMidPanel;
     procedure MainOffscreenPaint;
-    procedure MiniPaint;
+    procedure MiniMapPaint;
     procedure PaintAll;
     procedure PaintAllMaps;
@@ -251 +288 @@
     procedure NextUnit(NearLoc: integer; AutoTurn: boolean);
     procedure Scroll(dx, dy: integer);
+    procedure SetMapPos(Loc: integer; MapPos: TPoint);
     procedure Centre(Loc: integer);
     procedure SetTroopLoc(Loc: integer);
@@ -256 +294 @@
     procedure PaintLoc(Loc: integer; Radius: integer = 0);
     procedure PaintLoc_BeforeMove(FromLoc: integer);
-    procedure PaintLocTemp(Loc: integer; Style: integer = pltsNormal);
+    procedure PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle = pltsNormal);
     procedure PaintBufferToScreen(xMap, yMap, width, height: integer);
     procedure PaintDestination;
@@ -275 +313 @@
     procedure SetDebugMap(p: integer);
     procedure SetViewpoint(p: integer);
-    function LocationOfScreenPixel(x, y: integer): integer;
-    procedure SetTileSize(x, y: integer);
+    function LocationOfScreenPixel(x, y: integer): Integer;
+    function GetCenterLoc: Integer;
+    procedure SetTileSizeCenter(TileSize: TTileSize);
+    procedure SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
     procedure RectInvalidate(Left, Top, Rigth, Bottom: integer);
     procedure ShowEnemyShipChange(ShowShipChange: TShowShipChange);
@@ -284 +324 @@
     procedure OnScroll(var Msg: TMessage); message WM_VSCROLL;
     procedure OnEOT(var Msg: TMessage); message WM_EOT;
-    procedure SoundPreload(Check: integer);
+    procedure SoundPreload(Check: TSoundBlocks);
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
+    procedure PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -311 +352 @@
     FileName: ShortString;
   end;
+
   TCityNameInfo = record
     ID: integer;
     NewName: ShortString;
   end;
+
   TModelNameInfo = record
     mix: integer;
     NewName: ShortString;
   end;
-  TPriceSet = Set of $00 .. $FF;
+
+  TPriceSet = set of $00 .. $FF;
 
 const
@@ -388 +432 @@
   // lines of system icons in icons.bmp before improvements
 
-  // save options apart from what's defined by SaveOption
-  soTellAI = 30;
-  soExtraMask = $40000000;
-
   nCityEventPriority = 16;
   CityEventPriority: array [0 .. nCityEventPriority - 1] of integer =
@@ -404 +444 @@
     '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
@@ -425 +457 @@
     EnhancementJobs: TEnhancementJobs;
     ImpOrder: array [0 .. nCityType - 1] of TImpOrder;
-    ToldWonders: array [0 .. 27] of TWonderInfo;
+    ToldWonders: array [0 .. nWonder - 1] of TWonderInfo;
     ToldTech: array [0 .. nAdv - 1] of ShortInt;
+  end;
+
+  TDipMem = record
+    pContact: Integer;
+    SentCommand: Integer;
+    FormerTreaty: Integer;
+    SentOffer: TOffer;
+    DeliveredPrices: TPriceSet;
+    ReceivedPrices: TPriceSet;
+  end;
+
+  TCurrentMoveInfo = record
+    AfterMovePaintRadius: Integer;
+    AfterAttackExpeller: Integer;
+    DoShow: Boolean;
+    IsAlly: Boolean;
   end;
 
@@ -433 +481 @@
   AdvIcon: array [0 .. nAdv - 1] of Integer;
   { icons displayed with the technologies }
-  xxt, yyt, // half of tile size x/y
   GameMode: Integer;
   ClientMode: Integer;
   Age: Integer;
   UnFocus: Integer;
-  OptionChecked: Integer;
-  MapOptionChecked: Integer;
+  OptionChecked: TSaveOptions;
+  MapOptionChecked: TMapOptions;
   nLostArmy: Integer;
   ScienceSum: Integer;
   TaxSum: Integer;
-  SoundPreloadDone: Integer;
+  SoundPreloadDone: TSoundBlocks;
   MarkCityLoc: Integer;
-  HGrTerrain: Integer;
-  HGrCities: Integer;
   MovieSpeed: Integer;
   CityRepMask: Cardinal;
@@ -461 +506 @@
   TribeOriginal: array [0 .. nPl - 1] of Boolean;
   LostArmy: array [0 .. nPl * nMmax - 1] of Integer;
-  DipMem: array [0 .. nPl - 1] of record
-    pContact: Integer;
-    SentCommand: Integer;
-    FormerTreaty: Integer;
-    SentOffer: TOffer;
-    DeliveredPrices: TPriceSet;
-    ReceivedPrices: TPriceSet;
-  end;
+  DipMem: array [0 .. nPl - 1] of TDipMem;
 
 function CityEventName(i: integer): string;
@@ -485 +523 @@
 
 uses
-  Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
+  Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
   Battle, Rates, TechTree, Registry, Global, UKeyBindings;
@@ -530 +568 @@
   flImmUpdate = $0002;
 
-  nSaveOption = 22;
-
 var
-  Jump: array [0 .. nPl - 1] of integer;
-  pTurn, pLogo, UnStartLoc, ToldSlavery: integer;
-  SmallScreen, GameOK, MapValid, skipped, idle: boolean;
-
-  SaveOption: array [0..nSaveOption - 1] of integer;
-  MiniColors: array [0..11, 0..1] of TColor;
-  MainMap: TIsoMap;
-  CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
-  DoShow, IsAlly: boolean;
-end;
+  Jump: array [0 .. nPl - 1] of Integer;
+  pTurn: Integer;
+  pLogo: Integer;
+  UnStartLoc: Integer;
+  ToldSlavery: Integer;
+  SmallScreen: Boolean;
+  GameOK: Boolean;
+  MapValid: Boolean;
+  Skipped: Boolean;
+  Idle: Boolean;
+
+  SaveOption: array of Integer;
+  CurrentMoveInfo: TCurrentMoveInfo;
 
 function CityEventName(i: integer): string;
@@ -757 +796 @@
   for emix := 0 to MyRO.nEnemyModel - 1 do
     with MyRO.EnemyModel[emix] do
-      if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+      if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
         InitEnemyModel(emix);
 end;
@@ -840 +879 @@
     while MyData.ToldModels < MyRO.nModel do
     begin { new Unit class available }
-      if (ModelPicture[MyData.ToldModels].HGr > 0) and
+      if Assigned(ModelPicture[MyData.ToldModels].HGr) and
         (MyModel[MyData.ToldModels].Kind <> mkSelfDeveloped) then
       begin // save picture of DevModel
         ModelPicture[MyData.ToldModels + 1] := ModelPicture[MyData.ToldModels];
         ModelName[MyData.ToldModels + 1] := ModelName[MyData.ToldModels];
-        ModelPicture[MyData.ToldModels].HGr := 0
-      end;
-      if ModelPicture[MyData.ToldModels].HGr = 0 then
+        ModelPicture[MyData.ToldModels].HGr := nil;
+      end;
+      if not Assigned(ModelPicture[MyData.ToldModels].HGr) then
         InitMyModel(MyData.ToldModels, true);
       { only run if no researched model }
@@ -878 +917 @@
           Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
             div 4, me, 0, ModelNameInfo);
-        end
+        end;
       end;
       if MyModel[MyData.ToldModels].Kind = mkSettler then
@@ -890 +929 @@
 end;
 
-procedure PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
+procedure TMainScreen.PaintZoomedTile(dst: TDpiBitmap; x, y, Loc: integer);
 
   procedure TSprite(xDst, yDst, xSrc, ySrc: integer);
   begin
-    Sprite(dst, HGrTerrain, x + xDst, y + yDst, xxt * 2, yyt * 3,
-      1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
+    with NoMapPanel do
+      Sprite(dst, HGrTerrain, x + xDst, y + yDst, xxt * 2, yyt * 3,
+        1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
   end;
 
   procedure TSprite4(xSrc, ySrc: integer);
   begin
-    Sprite(dst, HGrTerrain, x + xxt, y + yyt + 2, xxt * 2, yyt * 2 - 2,
-      1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
-    Sprite(dst, HGrTerrain, x + 4, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
-      5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-    Sprite(dst, HGrTerrain, x + xxt * 2, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
-      1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-    Sprite(dst, HGrTerrain, x + xxt, y + yyt * 3, xxt * 2, yyt * 2 - 2,
-      1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+    with NoMapPanel do begin
+      Sprite(dst, HGrTerrain, x + xxt, y + yyt + 2, xxt * 2, yyt * 2 - 2,
+        1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
+      Sprite(dst, HGrTerrain, x + 4, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+        5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+      Sprite(dst, HGrTerrain, x + xxt * 2, y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+        1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+      Sprite(dst, HGrTerrain, x + xxt, y + yyt * 3, xxt * 2, yyt * 2 - 2,
+        1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
+    end;
   end;
 
@@ -913 +955 @@
   cix, ySrc, Tile: integer;
 begin
-  Tile := MyMap[Loc];
-  if Tile and fCity <> 0 then
-  begin
-    if MyRO.Tech[adRailroad] >= tsApplicable then
-      Tile := Tile or fRR
+  with NoMapPanel do begin
+    Tile := MyMap[Loc];
+    if Tile and fCity <> 0 then
+    begin
+      if MyRO.Tech[adRailroad] >= tsApplicable then
+        Tile := Tile or fRR
+      else
+        Tile := Tile or fRoad;
+      if Tile and fOwned <> 0 then
+      begin
+        cix := MyRO.nCity - 1;
+        while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
+          dec(cix);
+        assert(cix >= 0);
+        if MyCity[cix].Built[imSupermarket] > 0 then
+          Tile := Tile or tiFarm
+        else
+          Tile := Tile or tiIrrigation;
+      end
+      else Tile := Tile or tiIrrigation;
+    end;
+
+    if Tile and fTerrain >= fForest then
+      TSprite4(2, 2)
     else
-      Tile := Tile or fRoad;
-    if Tile and fOwned <> 0 then
-    begin
-      cix := MyRO.nCity - 1;
-      while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-        dec(cix);
-      assert(cix >= 0);
-      if MyCity[cix].Built[imSupermarket] > 0 then
-        Tile := Tile or tiFarm
+      TSprite4(Tile and fTerrain, 0);
+    if Tile and fTerrain >= fForest then
+    begin
+      if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
+        ySrc := 18
       else
-        Tile := Tile or tiIrrigation;
-    end
-    else
-      Tile := Tile or tiIrrigation;
-  end;
-
-  if Tile and fTerrain >= fForest then
-    TSprite4(2, 2)
-  else
-    TSprite4(Tile and fTerrain, 0);
-  if Tile and fTerrain >= fForest then
-  begin
-    if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
-      ySrc := 18
-    else
-      ySrc := 3 + 2 * (Tile and fTerrain - fForest);
-    TSprite(xxt, 0, 6, ySrc);
-    TSprite(0, yyt, 3, ySrc);
-    TSprite((xxt * 2), yyt, 4, ySrc + 1);
-    TSprite(xxt, (yyt * 2), 1, ySrc + 1);
-  end;
-
-  // irrigation
-  case Tile and fTerImp of
-    tiIrrigation:
-      begin
+        ySrc := 3 + 2 * (Tile and fTerrain - fForest);
+      TSprite(xxt, 0, 6, ySrc);
+      TSprite(0, yyt, 3, ySrc);
+      TSprite((xxt * 2), yyt, 4, ySrc + 1);
+      TSprite(xxt, (yyt * 2), 1, ySrc + 1);
+    end;
+
+    // irrigation
+    case Tile and fTerImp of
+      tiIrrigation: begin
         TSprite(xxt, 0, 0, 12);
         TSprite(xxt * 2, yyt, 0, 12);
       end;
-    tiFarm:
-      begin
+      tiFarm: begin
         TSprite(xxt, 0, 1, 12);
         TSprite(xxt * 2, yyt, 1, 12);
-      end
-  end;
-
-  // river/canal/road/railroad
-  if Tile and fRiver <> 0 then
-  begin
-    TSprite(0, yyt, 2, 14);
-    TSprite(xxt, (yyt * 2), 2, 14);
-  end;
-  if Tile and fCanal <> 0 then
-  begin
-    TSprite(xxt, 0, 7, 11);
-    TSprite(xxt, 0, 3, 11);
-    TSprite(xxt * 2, yyt, 7, 11);
-    TSprite(xxt * 2, yyt, 3, 11);
-  end;
-  if Tile and fRR <> 0 then
-  begin
-    TSprite((xxt * 2), yyt, 1, 10);
-    TSprite((xxt * 2), yyt, 5, 10);
-    TSprite(xxt, (yyt * 2), 1, 10);
-    TSprite(xxt, (yyt * 2), 5, 10);
-  end
-  else if Tile and fRoad <> 0 then
-  begin
-    TSprite((xxt * 2), yyt, 8, 9);
-    TSprite((xxt * 2), yyt, 5, 9);
-    TSprite(xxt, (yyt * 2), 1, 9);
-    TSprite(xxt, (yyt * 2), 5, 9);
-  end;
-
-  if Tile and fPoll <> 0 then
-    TSprite(xxt, (yyt * 2), 6, 12);
-
-  // special
-  if Tile and (fTerrain or fSpecial) = fGrass or fSpecial1 then
-    TSprite4(2, 1)
-  else if Tile and fSpecial <> 0 then
-    if Tile and fTerrain < fForest then
-      TSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
-    else if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
-      TSprite(0, yyt, 8, 17 + Tile and fSpecial shr 5)
-    else
-      TSprite(0, yyt, 8, 2 + (Tile and fTerrain - fForest) * 2 + Tile and
-        fSpecial shr 5)
-  else if Tile and fDeadLands <> 0 then
-  begin
-    TSprite4(6, 2);
-    TSprite(xxt, yyt, 8, 12 + Tile shr 25 and 3);
-  end;
-
-  // other improvements
-  case Tile and fTerImp of
-    tiMine:
-      TSprite(xxt, 0, 2, 12);
-    tiFort:
-      begin
+      end;
+    end;
+
+    // river/canal/road/railroad
+    if Tile and fRiver <> 0 then begin
+      TSprite(0, yyt, 2, 14);
+      TSprite(xxt, (yyt * 2), 2, 14);
+    end;
+    if Tile and fCanal <> 0 then begin
+      TSprite(xxt, 0, 7, 11);
+      TSprite(xxt, 0, 3, 11);
+      TSprite(xxt * 2, yyt, 7, 11);
+      TSprite(xxt * 2, yyt, 3, 11);
+    end;
+    if Tile and fRR <> 0 then begin
+      TSprite((xxt * 2), yyt, 1, 10);
+      TSprite((xxt * 2), yyt, 5, 10);
+      TSprite(xxt, (yyt * 2), 1, 10);
+      TSprite(xxt, (yyt * 2), 5, 10);
+    end
+    else if Tile and fRoad <> 0 then begin
+      TSprite((xxt * 2), yyt, 8, 9);
+      TSprite((xxt * 2), yyt, 5, 9);
+      TSprite(xxt, (yyt * 2), 1, 9);
+      TSprite(xxt, (yyt * 2), 5, 9);
+    end;
+
+    if Tile and fPoll <> 0 then
+      TSprite(xxt, (yyt * 2), 6, 12);
+
+    // special
+    if Tile and (fTerrain or fSpecial) = fGrass or fSpecial1 then TSprite4(2, 1)
+    else if Tile and fSpecial <> 0 then
+      if Tile and fTerrain < fForest then
+        TSprite(0, yyt, Tile and fTerrain, Tile and fSpecial shr 5)
+      else if (Tile and fTerrain = fForest) and IsJungle(Loc div G.lx) then
+        TSprite(0, yyt, 8, 17 + Tile and fSpecial shr 5)
+      else
+        TSprite(0, yyt, 8, 2 + (Tile and fTerrain - fForest) * 2 + Tile and
+          fSpecial shr 5)
+    else if Tile and fDeadLands <> 0 then begin
+      TSprite4(6, 2);
+      TSprite(xxt, yyt, 8, 12 + Tile shr 25 and 3);
+    end;
+
+    // other improvements
+    case Tile and fTerImp of
+      tiMine: TSprite(xxt, 0, 2, 12);
+      tiFort: begin
         TSprite(xxt, 0, 7, 12);
         TSprite(xxt, 0, 3, 12);
       end;
-    tiBase:
-      TSprite(xxt, 0, 4, 12);
+     tiBase: TSprite(xxt, 0, 4, 12);
+    end;
   end;
 end;
@@ -1041 +1073 @@
       begin
         result := false;
-        exit
+        exit;
       end;
       ChosenResearch := ModalSelectDlg.result;
@@ -1048 +1080 @@
         DraftDlg.ShowNewContent(wmModal);
         if DraftDlg.ModalResult <> mrOK then
-          Tribe[me].ModelPicture[MyRO.nModel].HGr := 0
+          Tribe[me].ModelPicture[MyRO.nModel].HGr := nil
       end;
     until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
@@ -1232 +1264 @@
 procedure TMainScreen.SetMapOptions;
 begin
-  IsoEngine.Options := MapOptionChecked;
+  MiniMap.MapOptions := MapOptionChecked;
+  MapOptions := MapOptionChecked;
   if ClientMode = cEditMap then
-    IsoEngine.Options := IsoEngine.Options or (1 shl moEditMode);
+    MapOptions := MapOptions + [moEditMode];
   if mLocCodes.Checked then
-    IsoEngine.Options := IsoEngine.Options or (1 shl moLocCodes);
+    MapOptions := MapOptions + [moLocCodes];
 end;
 
@@ -1321 +1354 @@
 end;
 
-procedure TMainScreen.SoundPreload(Check: integer);
+procedure TMainScreen.SoundPreload(Check: TSoundBlocks);
 const
   nStartBlock = 27;
@@ -1357 +1390 @@
   mi: TModelInfo;
 begin
-  if Check and sbStart and not SoundPreloadDone <> 0 then
-  begin
+  if (sbStart in Check) and not (sbStart in SoundPreloadDone) 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
+    SoundPreloadDone := SoundPreloadDone + [sbStart];
+  end;
+  if (sbWonder in Check) and not (sbWonder in SoundPreloadDone) then begin
     need := false;
-    for i := 0 to 27 do
-      if MyRO.Wonder[i].CityID <> -1 then
+    for i := 0 to nWonder - 1 do
+      if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
         need := true;
-    if need then
-    begin
+    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
+      SoundPreloadDone := SoundPreloadDone + [sbWonder];
+    end;
+  end;
+  if ((sbScience in Check) and not (sbScience in SoundPreloadDone)) and
+    (MyRO.Tech[adScience] >= tsApplicable) then begin
     for i := 0 to nScienceBlock - 1 do
       PreparePlay(ScienceBlock[i]);
-    SoundPreloadDone := SoundPreloadDone or sbScience;
-  end;
-  if (Check and sbContact and not SoundPreloadDone <> 0) and
-    (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then
-  begin
+    SoundPreloadDone := SoundPreloadDone + [sbScience];
+  end;
+  if ((sbContact in Check) and not (sbContact in SoundPreloadDone)) and
+    (MyRO.nEnemyModel + MyRO.nEnemyCity > 0) then begin
     for i := 0 to nContactBlock - 1 do
       PreparePlay(ContactBlock[i]);
-    SoundPreloadDone := SoundPreloadDone or sbContact;
-  end;
-  if Check and sbTurn <> 0 then
-  begin
+    SoundPreloadDone := SoundPreloadDone + [sbContact];
+  end;
+  if sbTurn in Check then begin
     if MyRO.Happened and phShipComplete <> 0 then
       PreparePlay('MSG_YOUWIN');
@@ -1462 +1489 @@
           $FF - Tribe[i].Color and $FF) * 2;
         if TestColorDistance < ColorDistance then
-          ColorDistance := TestColorDistance
+          ColorDistance := TestColorDistance;
       end;
     if ColorDistance > BestColorDistance then
     begin
       CountBest := 0;
-      BestColorDistance := ColorDistance
+      BestColorDistance := ColorDistance;
     end;
     if ColorDistance = BestColorDistance then
@@ -1473 +1500 @@
       inc(CountBest);
       if DelphiRandom(CountBest) = 0 then
-        result := j
+        result := j;
     end;
   end;
@@ -1544 +1571 @@
         begin
           MostCost := TestCost;
-          IconIndex := imShipComp + i
+          IconIndex := imShipComp + i;
         end;
       end;
@@ -1556 +1583 @@
 procedure TMainScreen.InitModule;
 var
-  x, y, i, j, Domain: integer;
+  i, j, Domain: integer;
 begin
   { search icons for advances: }
@@ -1580 +1607 @@
               else
                 AdvIcon[i] := 86 + Domain;
-      for j := 28 to nImp - 1 do
+      for j := nWonder to nImp - 1 do
         if Imp[j].Preq = i then
           AdvIcon[i] := j;
-      for j := 28 to nImp - 1 do
+      for j := nWonder to nImp - 1 do
         if (Imp[j].Preq = i) and (Imp[j].Kind <> ikCommon) then
           AdvIcon[i] := j;
@@ -1589 +1616 @@
         if i = JobPreq[j] then
           AdvIcon[i] := 84;
-      for j := 0 to 27 do
+      for j := 0 to nWonder - 1 do
         if Imp[j].Preq = i then
           AdvIcon[i] := j;
@@ -1607 +1634 @@
   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);
 
@@ -1622 +1642 @@
   SmallImp.PixelFormat := pf24bit;
   InitSmallImp;
-  SoundPreloadDone := 0;
+  SoundPreloadDone := [];
   StartRunning := false;
   StayOnTop_Ensured := false;
@@ -1628 +1648 @@
   sb := TPVScrollbar.Create(Self);
   sb.OnUpdate := ScrollBarUpdate;
+end;
+
+procedure TMainScreen.DoneModule;
+begin
+  FreeAndNil(SmallImp);
+  FreeAndNil(UnusedTribeFiles);
+  FreeAndNil(TribeNames);
+  // AdvisorDlg.DeInit;
 end;
 
@@ -1644 +1672 @@
     Icon: imRecycling), (Adv: adComputers; Icon: imResLab),
     (Adv: adSpaceFlight; Icon: woMIR));
+  sbAll = [sbStart, sbWonder, sbScience, sbContact, sbTurn];
 var
   p1, i, ad, uix, cix, MoveOptions, MoveResult, Loc1,
@@ -1812 +1841 @@
     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
+    with MainMap do begin // move city out of center to not be covered by welcome screen
       dx := MapWidth div (xxt * 5);
       if dx > 5 then
@@ -2020 +2049 @@
     end;
 
-    for i := 0 to 27 do
+    for i := 0 to nWonder - 1 do
     begin
       OwnWonder := false;
@@ -2029 +2058 @@
       if MyRO.Wonder[i].CityID <> MyData.ToldWonders[i].CityID then
       begin
-        if MyRO.Wonder[i].CityID = -2 then
+        if MyRO.Wonder[i].CityID = WonderDestroyed then
           with MessgExDlg do
           begin { tell about destroyed wonders }
@@ -2081 +2110 @@
       end
       else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
-        .EffectiveOwner) and (MyRO.Wonder[i].CityID > -2) then
+        .EffectiveOwner) and (MyRO.Wonder[i].CityID > WonderDestroyed) then
         if MyRO.Wonder[i].EffectiveOwner < 0 then
         begin
@@ -2192 +2221 @@
           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
+            (Project0 and cpImp <> 0) and (Project0 and cpIndex < nWonder)) then
           begin
             if WondersOnly then
@@ -2509 +2538 @@
       end;
 
-    cReleaseModule:
-      begin
-        FreeAndNil(SmallImp);
-        FreeAndNil(UnusedTribeFiles);
-        FreeAndNil(TribeNames);
-        FreeAndNil(MainMap);
-        IsoEngine.Done;
-        // AdvisorDlg.DeInit;
-      end;
+    cReleaseModule: DoneModule;
 
     cHelpOnly, cStartHelp, cStartCredits:
@@ -2546 +2567 @@
         ClientMode := -1;
         SetMapOptions;
-        IsoEngine.pDebugMap := -1;
+        MainMap.pDebugMap := -1;
         idle := false;
         FillChar(Jump, SizeOf(Jump), 0);
@@ -2552 +2573 @@
           Jump[0] := 999999;
         GameMode := Command;
-        for i := 0 to nGrExt - 1 do
-          FillChar(GrExt[i].pixUsed, GrExt[i].Data.height div 49 * 10, 0);
-        IsoEngine.Reset;
+        GrExt.ResetPixUsed;
+        MainMap.Reset;
+        NoMap.Reset;
         Tribes.Init;
         GetTribeList;
@@ -2574 +2595 @@
                   inc(ToldAlive, 1 shl i);
               PeaceEvaHappened := 0;
-              for i := 0 to 27 do
+              for i := 0 to nWonder - 1 do
                 with ToldWonders[i] do
                 begin
@@ -2582 +2603 @@
               FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
               if G.Difficulty[p1] > 0 then
-                SoundPreload(sbStart);
+                SoundPreload([sbStart]);
             end;
 
@@ -2607 +2628 @@
         CityDlg.Reset;
 
-        Mini.SetSize(G.lx * 2, G.ly);
+        MiniMap.Size := Point(G.lx, G.ly);
         for i := 0 to nPl - 1 do
         begin
@@ -2791 +2812 @@
               ItsMeAgain(p1);
               for mix := 0 to MyRO.nModel - 1 do
-                if Tribe[me].ModelPicture[mix].HGr = 0 then
+                if not Assigned(Tribe[me].ModelPicture[mix].HGr) then
                   InitMyModel(mix, true);
             end;
@@ -2810 +2831 @@
           MyData := G.RO[NewPlayer].Data;
           SetTroopLoc(-1);
-          MiniPaint;
+          MiniMapPaint;
           InitAllEnemyModels; // necessary for correct replay
           if not EndTurn(true) then
@@ -2871 +2892 @@
         ClientMode := cEditMap;
         SetMapOptions;
-        IsoEngine.pDebugMap := -1;
+        MainMap.pDebugMap := -1;
         ItsMeAgain(0);
         MyData := nil;
@@ -3081 +3102 @@
         begin
           CurrentMoveInfo.DoShow := false;
-          if not idle and (Tribe[Owner].ModelPicture[mix].HGr = 0) then
+          if not idle and (not Assigned(Tribe[Owner].ModelPicture[mix].HGr)) then
             InitEnemyModel(emix);
 
@@ -3276 +3297 @@
           begin
             ToLoc := dLoc(FromLoc, dx, dy);
-            if Tribe[Owner].ModelPicture[mix].HGr = 0 then
+            if not Assigned(Tribe[Owner].ModelPicture[mix].HGr) then
               InitEnemyModel(emix);
 
@@ -3367 +3388 @@
     cRefreshDebugMap:
       begin
-        if integer(Data) = IsoEngine.pDebugMap then
+        if integer(Data) = MainMap.pDebugMap then
         begin
           MapValid := false;
@@ -3409 +3430 @@
             if TribeOriginal[NewPlayer] then
               Tribe[NewPlayer].ModelName[mix] := NewName;
-      end
-  end
+      end;
+  end;
 end;
 
@@ -3419 +3440 @@
   i, j: integer;
 begin
+  NoMap := TIsoMap.Create;
+  MainMap := TIsoMap.Create;
+  NoMapPanel := TIsoMap.Create;
+
   KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   UpdateKeyShortcuts;
@@ -3425 +3450 @@
   BaseWin.CreateOffscreen(Offscreen);
 
-   // define which menu settings to save
+  // define which menu settings to save
+  SetLength(SaveOption, 22);
   SaveOption[0] := mAlEffectiveMovesOnly.Tag;
   SaveOption[1] := mEnMoves.Tag;
@@ -3457 +3483 @@
   for i := 0 to ComponentCount - 1 do
     if Components[i].Tag and $FF <> 0 then
-      if Components[i] is TDpiMenuItem then
-      begin
+      if Components[i] is TDpiMenuItem then begin
         TDpiMenuItem(Components[i]).Caption := Phrases.Lookup('CONTROLS',
           -1 + Components[i].Tag and $FF);
-        for j := 0 to nSaveOption - 1 do
+        for j := 0 to Length(SaveOption) - 1 do
           if Components[i].Tag and $FF = SaveOption[j] then
-            TDpiMenuItem(Components[i]).Checked := ((1 shl j) and OptionChecked) <> 0;
-      end
-      else if Components[i] is TButtonBase then
-      begin
+            TDpiMenuItem(Components[i]).Checked := TSaveOption(j) in OptionChecked;
+      end else
+      if Components[i] is TButtonBase then begin
         TButtonBase(Components[i]).Hint := Phrases.Lookup('CONTROLS',
           -1 + Components[i].Tag and $FF);
@@ -3472 +3496 @@
           (TButtonC(Components[i]).ButtonIndex <> 1) then
           TButtonC(Components[i]).ButtonIndex :=
-            MapOptionChecked shr (Components[i].Tag shr 8) and 1 + 2
+            Integer(MapOptionChecked) shr (Components[i].Tag shr 8) and 1 + 2
       end;
 
@@ -3492 +3516 @@
   end;
 
-  Mini := TDpiBitmap.Create;
-  Mini.PixelFormat := pf24bit;
+  MiniMap := TMiniMap.Create;
   Panel := TDpiBitmap.Create;
   Panel.PixelFormat := pf24bit;
@@ -3504 +3527 @@
   Buffer := TDpiBitmap.Create;
   Buffer.PixelFormat := pf24bit;
-  if 2 * lxmax > 3 * xSizeBig then
-    Buffer.width := 2 * lxmax
-  else
-    Buffer.width := 3 * xSizeBig;
-  if lymax > 3 * ySizeBig then
-    Buffer.height := lymax
-  else
-    Buffer.height := 3 * ySizeBig;
+  if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax
+    else Buffer.width := 3 * xSizeBig;
+  if lymax > 3 * ySizeBig then Buffer.height := lymax
+    else Buffer.height := 3 * ySizeBig;
   Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
   for i := 0 to nPl - 1 do
@@ -3517 +3536 @@
   Canvas.Font.Assign(UniFont[ftSmall]);
   InitButtons;
-  EOT.Template := Templates;
+  EOT.Template := Templates.Data;
 end;
 
@@ -3528 +3547 @@
   FreeAndNil(sb);
   FreeAndNil(TopBar);
-  FreeAndNil(Mini);
+  FreeAndNil(MiniMap);
   FreeAndNil(Buffer);
   FreeAndNil(Panel);
@@ -3535 +3554 @@
       FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
+  FreeAndNil(MainMap);
+  FreeAndNil(NoMap);
+  FreeAndNil(NoMapPanel);
 end;
 
 procedure TMainScreen.FormMouseWheel(Sender: TObject; Shift: TShiftState;
   WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
-begin
-  if sb.ProcessMouseWheel(WheelDelta) then begin
-    PanelPaint;
-    Update;
+var
+  MouseLoc: Integer;
+begin
+  if (MousePos.Y > ClientHeight - MidPanelHeight) and
+    (MousePos.Y < ClientHeight) then begin
+    if sb.ProcessMouseWheel(WheelDelta) then begin
+      PanelPaint;
+      Update;
+    end;
+  end else begin
+    if (WheelDelta > 0) and (MainMap.TileSize < High(TTileSize)) then begin
+      MouseLoc := LocationOfScreenPixel(MousePos.X, MousePos.Y);
+      SetTileSize(Succ(MainMap.TileSize), MouseLoc, Point(MousePos.X, MousePos.Y));
+    end
+    else if (WheelDelta < 0) and (MainMap.TileSize > Low(TTileSize)) then begin
+      MouseLoc := LocationOfScreenPixel(MousePos.X, MousePos.Y);
+      SetTileSize(Pred(MainMap.TileSize), MouseLoc, Point(MousePos.X, MousePos.Y));
+    end;
   end;
 end;
@@ -3551 +3587 @@
 begin
   SmallScreen := ClientWidth < 1024;
-  MaxMapWidth := (G.lx * 2 - 3) * xxt;
-  // avoide the same tile being visible left and right
-  if ClientWidth <= MaxMapWidth then
-  begin
-    MapWidth := ClientWidth;
-    MapOffset := 0;
-  end
-  else
-  begin
-    MapWidth := MaxMapWidth;
-    MapOffset := (ClientWidth - MapWidth) div 2;
-  end;
-  MapHeight := ClientHeight - TopBarHeight - PanelHeight + overlap;
-  Panel.SetSize(ClientWidth, PanelHeight);
-  TopBar.SetSize(ClientWidth, TopBarHeight);
-  MiniFrame := (lxmax_xxx - G.ly) div 2;
-  xMidPanel := (G.lx + MiniFrame) * 2 + 1;
-  xRightPanel := ClientWidth - LeftPanelWidth - 10;
-  if ClientMode = cEditMap then
-    TrPitch := 2 * xxt
-  else
-    TrPitch := 66;
-  xMini := MiniFrame - 5;
-  yMini := (PanelHeight - 26 - lxmax_xxx) div 2 + MiniFrame;
-  ywmax := (G.ly - MapHeight div yyt + 1) and not 1;
-  ywcenter := -((MapHeight - yyt * (G.ly - 1)) div (4 * yyt)) * 2;
+  with MainMap do begin
+    MaxMapWidth := (G.lx * 2 - 3) * xxt;
+    // avoide the same tile being visible left and right
+    if ClientWidth <= MaxMapWidth then begin
+      MapWidth := ClientWidth;
+      MapOffset := 0;
+    end else begin
+      MapWidth := MaxMapWidth;
+      MapOffset := (ClientWidth - MapWidth) div 2;
+    end;
+    MapHeight := ClientHeight - TopBarHeight - PanelHeight + overlap;
+    Panel.SetSize(ClientWidth, PanelHeight);
+    TopBar.SetSize(ClientWidth, TopBarHeight);
+    MiniFrame := (lxmax_xxx - G.ly) div 2;
+    xMidPanel := (G.lx + MiniFrame) * 2 + 1;
+    xRightPanel := ClientWidth - LeftPanelWidth - 10;
+    if ClientMode = cEditMap then
+      TrPitch := 2 * xxt
+    else
+      TrPitch := 66;
+    xMini := MiniFrame - 5;
+    yMini := (PanelHeight - 26 - lxmax_xxx) div 2 + MiniFrame;
+    ywmax := (G.ly - MapHeight div yyt + 1) and not 1;
+    ywcenter := -((MapHeight - yyt * (G.ly - 1)) div (4 * yyt)) * 2;
+  end;
   // only for ywmax<=0
   if ywmax <= 0 then
@@ -3678 +3713 @@
     xTroop := xMidPanel + 15
   else
-  begin
+  with MainMap do begin
     if supervising then
       xTerrain := xMidPanel + 2 * xxt + 14
@@ -3947 +3982 @@
   xs, ys, xl, yl: integer;
 begin
-  xl := nx * xxt + xxt;
-  yl := ny * yyt + yyt * 2;
-  xs := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
-  // |xs+xl/2-MapWidth/2| -> min
-  while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
-    abs(2 * xs + xl - MapWidth) do
-    inc(xs, G.lx * (xxt * 2));
-  ys := (y0 - yw) * yyt - yyt;
-  if xs + xl > MapWidth then
-    xl := MapWidth - xs;
-  if ys + yl > MapHeight then
-    yl := MapHeight - ys;
-  if (xl <= 0) or (yl <= 0) then
-    exit;
-  if Options and prPaint <> 0 then
-  begin
-    if Options and prAutoBounds <> 0 then
-      MainMap.SetPaintBounds(xs, ys, xs + xl, ys + yl);
-    MainMap.Paint(xs, ys, x0 + G.lx * y0, nx, ny, -1, -1);
-  end;
-  if Options and prInvalidate <> 0 then
-    RectInvalidate(MapOffset + xs, TopBarHeight + ys, MapOffset + xs + xl,
-      TopBarHeight + ys + yl)
+  with MainMap do begin
+    xl := nx * xxt + xxt;
+    yl := ny * yyt + yyt * 2;
+    xs := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
+    // |xs+xl/2-MapWidth/2| -> min
+    while abs(2 * (xs + G.lx * (xxt * 2)) + xl - MapWidth) <
+      abs(2 * xs + xl - MapWidth) do
+        inc(xs, G.lx * (xxt * 2));
+    ys := (y0 - yw) * yyt - yyt;
+    if xs + xl > MapWidth then
+      xl := MapWidth - xs;
+    if ys + yl > MapHeight then
+      yl := MapHeight - ys;
+    if (xl <= 0) or (yl <= 0) then
+      exit;
+    if Options and prPaint <> 0 then begin
+      if Options and prAutoBounds <> 0 then
+        MainMap.SetPaintBounds(xs, ys, xs + xl, ys + yl);
+      MainMap.Paint(xs, ys, x0 + G.lx * y0, nx, ny, -1, -1);
+    end;
+    if Options and prInvalidate <> 0 then
+      RectInvalidate(MapOffset + xs, TopBarHeight + ys, MapOffset + xs + xl,
+        TopBarHeight + ys + yl)
+  end;
 end;
 
@@ -3976 +4012 @@
   yLoc, x0: integer;
 begin
-  if MapValid then
-  begin
+  if MapValid then begin
     yLoc := (Loc + G.lx * 1024) div G.lx - 1024;
     x0 := (Loc + (yLoc and 1 - 2 * Radius + G.lx * 1024) div 2) mod G.lx;
@@ -3984 +4019 @@
       prPaint or prAutoBounds or prInvalidate);
     Update;
-  end
-end;
-
-procedure TMainScreen.PaintLocTemp(Loc: integer; Style: integer);
+  end;
+end;
+
+procedure TMainScreen.PaintLocTemp(Loc: integer; Style: TPaintLocTempStyle);
 var
   y0, x0, xMap, yMap: integer;
 begin
-  if not MapValid then
-    exit;
-  Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
-  y0 := Loc div G.lx;
-  x0 := Loc mod G.lx;
-  xMap := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
-  // |xMap+xxt-MapWidth/2| -> min
-  while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
-    abs(2 * xMap + 2 * xxt - MapWidth) do
-    inc(xMap, G.lx * (xxt * 2));
-  yMap := (y0 - yw) * yyt - yyt;
-  NoMap.SetOutput(Buffer);
-  NoMap.SetPaintBounds(0, 0, 2 * xxt, 3 * yyt);
-  NoMap.Paint(0, 0, Loc, 1, 1, -1, -1, Style = pltsBlink);
-  PaintBufferToScreen(xMap, yMap, 2 * xxt, 3 * yyt);
+  with NoMap do begin
+    if not MapValid then
+      exit;
+    Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
+    y0 := Loc div G.lx;
+    x0 := Loc mod G.lx;
+    xMap := (x0 - xw) * (xxt * 2) + y0 and 1 * xxt - G.lx * (xxt * 2);
+    // |xMap+xxt-MapWidth/2| -> min
+    while abs(2 * (xMap + G.lx * (xxt * 2)) + 2 * xxt - MapWidth) <
+      abs(2 * xMap + 2 * xxt - MapWidth) do
+      inc(xMap, G.lx * (xxt * 2));
+    yMap := (y0 - yw) * yyt - yyt;
+    NoMap.SetOutput(Buffer);
+    NoMap.SetPaintBounds(0, 0, 2 * xxt, 3 * yyt);
+    NoMap.Paint(0, 0, Loc, 1, 1, -1, -1, Style = pltsBlink);
+    PaintBufferToScreen(xMap, yMap, 2 * xxt, 3 * yyt);
+  end;
 end;
 
@@ -4033 +4070 @@
     else
       DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
-        height + yMap, Buffer.Canvas, 0, -yMap)
+        height + yMap, Buffer.Canvas, 0, -yMap);
   end
   else
@@ -4043 +4080 @@
       DpiBitCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
         height, Buffer.Canvas, 0, 0);
-  end
+  end;
 end;
 
@@ -4071 +4108 @@
 end;
 
-procedure TMainScreen.MiniPaint;
-var
-  uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel: TPixelPointer;
-  MiniPixel: TPixelPointer;
-  TerrainTile: Cardinal;
-begin
-  cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
-  cmPolNone := GrExt[HGrSystem].Data.Canvas.Pixels[102, 67];
-  hw := MapWidth div (xxt * 2);
-  with Mini.Canvas do
-  begin
-    Brush.Color := $000000;
-    FillRect(Rect(0, 0, Mini.width, Mini.height));
-  end;
-  Mini.BeginUpdate;
-  MiniPixel := PixelPointer(Mini);
-  PrevMiniPixel := PixelPointer(Mini);
-  for y := 0 to ScaleToNative(G.ly) - 1 do
-  begin
-    for x := 0 to ScaleToNative(G.lx) - 1 do
-      if MyMap[ScaleFromNative(x) + G.lx * ScaleFromNative(y)] and fTerrain <> fUNKNOWN then
-      begin
-        Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
-        for i := 0 to 1 do
-        begin
-          xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
-            ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
-          MiniPixel.SetXY(xm, y);
-          TerrainTile := MyMap[Loc] and fTerrain;
-          if TerrainTile > 11 then TerrainTile := 0;
-          cm := MiniColors[TerrainTile, i];
-          if ClientMode = cEditMap then
-          begin
-            if MyMap[Loc] and (fPrefStartPos or fStartPos) <> 0 then
-              cm := $FFFFFF;
-          end
-          else if MyMap[Loc] and fCity <> 0 then
-          begin
-            cix := MyRO.nCity - 1;
-            while (cix >= 0) and (MyCity[cix].Loc <> Loc) do
-              dec(cix);
-            if cix >= 0 then
-              cm := Tribe[me].Color
-            else
-            begin
-              cix := MyRO.nEnemyCity - 1;
-              while (cix >= 0) and (MyRO.EnemyCity[cix].Loc <> Loc) do
-                dec(cix);
-              if cix >= 0 then
-                cm := Tribe[MyRO.EnemyCity[cix].Owner].Color
-            end;
-            cm := $808080 or cm shr 1; { increase brightness }
-            if y > 0 then begin
-              // 2x2 city dot covers two lines
-              PrevMiniPixel.SetXY(xm, y - 1);
-              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 (MyMap[Loc] and fUnit <> 0) then
-          begin
-            uix := MyRO.nUn - 1;
-            while (uix >= 0) and (MyUn[uix].Loc <> Loc) do
-              dec(uix);
-            if uix >= 0 then
-              cm := Tribe[me].Color
-            else
-            begin
-              uix := MyRO.nEnemyUn - 1;
-              while (uix >= 0) and (MyRO.EnemyUn[uix].Loc <> Loc) do
-                dec(uix);
-              if uix >= 0 then
-                cm := Tribe[MyRO.EnemyUn[uix].Owner].Color
-            end;
-            cm := $808080 or cm shr 1; { increase brightness }
-          end
-          else if MapOptionChecked and (1 shl moPolitical) <> 0 then
-          begin
-            if MyMap[Loc] and fTerrain < fGrass then
-              cm := cmPolOcean
-            else if MyRO.Territory[Loc] < 0 then
-              cm := cmPolNone
-            else
-              cm := Tribe[MyRO.Territory[Loc]].Color;
-          end;
-          MiniPixel.Pixel^.B := cm shr 16;
-          MiniPixel.Pixel^.G := cm shr 8 and $FF;
-          MiniPixel.Pixel^.R := cm and $FF;
-        end;
-      end;
-  end;
-  Mini.EndUpdate;
-end;
+{$IFDEF LINUX}
+// Can't do scrolling of DC under Linux, then fallback into BitBlt.
+function DpiScrollDC(Canvas: TDpiCanvas; dx: longint; dy: longint; const lprcScroll:TRect; const lprcClip:TRect; hrgnUpdate:HRGN; lprcUpdate: PRect):Boolean;
+begin
+  Result := DpiBitCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
+    Canvas, lprcScroll.Left, lprcScroll.Top);
+end;
+{$ENDIF}
 
 procedure TMainScreen.MainOffscreenPaint;
@@ -4180 +4130 @@
       Brush.Style := bsClear;
       OffscreenUser := self;
-      exit
+      exit;
     end;
 
@@ -4195 +4145 @@
   end;
 
-  if xw - xwd > G.lx div 2 then
-    xwd := xwd + G.lx
-  else if xwd - xw > G.lx div 2 then
-    xwd := xwd - G.lx;
-  if not MapValid or (xw - xwd > MapWidth div (xxt * 2)) or
-    (xwd - xw > MapWidth div (xxt * 2)) or (yw - ywd > MapHeight div yyt) or
-    (ywd - yw > MapHeight div yyt) then
-  begin
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-    ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
-      prPaint or prInvalidate)
-  end
-  else
-  begin
-    if (xwd = xw) and (ywd = yw) then
-      exit; { map window not moved }
-    offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-    rec := Rect(0, 0, MapWidth, MapHeight);
-    DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-      rec, rec, 0, nil);
-    for DoInvalidate := false to FastScrolling do
-    begin
-      if DoInvalidate then
-      begin
-        rec.Bottom := MapHeight - overlap;
-        DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
-          rec, 0, nil);
-        ProcessOptions := prInvalidate;
-      end
-      else
-        ProcessOptions := prPaint or prAutoBounds;
-      if yw < ywd then
-      begin
-        ProcessRect(xw, yw, MapWidth div xxt, ywd - yw - 1, ProcessOptions);
-        if xw < xwd then
-          ProcessRect(xw, ywd, (xwd - xw) * 2 - 1, MapHeight div yyt - ywd + yw,
+  with MainMap do begin
+    if xw - xwd > G.lx div 2 then
+      xwd := xwd + G.lx
+    else if xwd - xw > G.lx div 2 then
+      xwd := xwd - G.lx;
+    if not MapValid or (xw - xwd > MapWidth div (xxt * 2)) or
+      (xwd - xw > MapWidth div (xxt * 2)) or (yw - ywd > MapHeight div yyt) or
+      (ywd - yw > MapHeight div yyt) then
+    begin
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
+        prPaint or prInvalidate);
+    end else begin
+      if (xwd = xw) and (ywd = yw) then
+        exit; { map window not moved }
+      offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
+      rec := Rect(0, 0, MapWidth, MapHeight);
+{$IFDEF WINDOWS}
+      DpiScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+        rec, rec, 0, nil);
+{$ENDIF}
+{$IFDEF LINUX}
+      DpiScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+        rec, rec, 0, nil);
+{$ENDIF}
+      for DoInvalidate := false to FastScrolling do begin
+        if DoInvalidate then begin
+          rec.Bottom := MapHeight - overlap;
+{$IFDEF WINDOWS}
+          DpiScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+            rec, 0, nil);
+{$ENDIF}
+{$IFDEF LINUX}
+          DpiScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+            rec, rec, 0, nil);
+{$ENDIF}
+          ProcessOptions := prInvalidate;
+        end
+        else ProcessOptions := prPaint or prAutoBounds;
+        if yw < ywd then begin
+          ProcessRect(xw, yw, MapWidth div xxt, ywd - yw - 1, ProcessOptions);
+          if xw < xwd then
+            ProcessRect(xw, ywd, (xwd - xw) * 2 - 1, MapHeight div yyt - ywd + yw,
+              ProcessOptions)
+          else if xw > xwd then
+            ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, ywd,
+              (xw - xwd) * 2 + 1, MapHeight div yyt - ywd + yw, ProcessOptions)
+        end
+        else if yw > ywd then begin
+          if DoInvalidate then
+            RectInvalidate(MapOffset, TopBarHeight + MapHeight - overlap -
+              (yw - ywd) * yyt, MapOffset + MapWidth, TopBarHeight + MapHeight
+              - overlap)
+          else
+            ProcessRect(xw, (ywd + MapHeight div (yyt * 2) * 2), MapWidth div xxt,
+              yw - ywd + 1, ProcessOptions);
+          if xw < xwd then
+            ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt - yw + ywd -
+              2, ProcessOptions)
+          else if xw > xwd then
+            ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, yw,
+              (xw - xwd) * 2 + 1, MapHeight div yyt - yw + ywd - 2,
+              ProcessOptions);
+        end
+        else if xw < xwd then
+          ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt,
             ProcessOptions)
         else if xw > xwd then
-          ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, ywd,
-            (xw - xwd) * 2 + 1, MapHeight div yyt - ywd + yw, ProcessOptions)
-      end
-      else if yw > ywd then
-      begin
-        if DoInvalidate then
-          RectInvalidate(MapOffset, TopBarHeight + MapHeight - overlap -
-            (yw - ywd) * yyt, MapOffset + MapWidth, TopBarHeight + MapHeight
-            - overlap)
-        else
-          ProcessRect(xw, (ywd + MapHeight div (yyt * 2) * 2), MapWidth div xxt,
-            yw - ywd + 1, ProcessOptions);
-        if xw < xwd then
-          ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt - yw + ywd -
-            2, ProcessOptions)
-        else if xw > xwd then
           ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, yw,
-            (xw - xwd) * 2 + 1, MapHeight div yyt - yw + ywd - 2,
-            ProcessOptions)
-      end
-      else if xw < xwd then
-        ProcessRect(xw, yw, (xwd - xw) * 2 - 1, MapHeight div yyt,
-          ProcessOptions)
-      else if xw > xwd then
-        ProcessRect((xwd + MapWidth div (xxt * 2)) mod G.lx, yw,
-          (xw - xwd) * 2 + 1, MapHeight div yyt, ProcessOptions);
-    end;
-    if not FastScrolling then
-      RectInvalidate(MapOffset, TopBarHeight, MapOffset + MapWidth,
-        TopBarHeight + MapHeight - overlap);
-    RectInvalidate(xMidPanel, TopBarHeight + MapHeight - overlap, xRightPanel,
-      TopBarHeight + MapHeight)
+            (xw - xwd) * 2 + 1, MapHeight div yyt, ProcessOptions);
+      end;
+      if not FastScrolling then
+        RectInvalidate(MapOffset, TopBarHeight, MapOffset + MapWidth,
+          TopBarHeight + MapHeight - overlap);
+      RectInvalidate(xMidPanel, TopBarHeight + MapHeight - overlap, xRightPanel,
+        TopBarHeight + MapHeight);
+    end;
   end;
   // if (xwd<>xw) or (ywd<>yw) then
@@ -4273 +4230 @@
 end;
 
+procedure TMainScreen.MiniMapPaint;
+begin
+  with MainMap do
+    MiniMap.Paint(MyMap, MapWidth, ClientMode, xxt, xwMini);
+end;
+
 procedure TMainScreen.PaintAll;
 begin
@@ -4278 +4241 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   PanelPaint;
 end;
@@ -4287 +4250 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   CopyMiniToPanel;
   RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -4296 +4259 @@
 procedure TMainScreen.CopyMiniToPanel;
 begin
-  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)
-      + (G.lx - MapWidth div (xxt * 2)) - 2 * xwd) mod (2 * G.lx) +
-      MarkCityLoc div G.lx and 1, yMini - 3 + MarkCityLoc div G.lx, 10,
-      10, 77, 47)
-  else if ywmax <= 0 then
-    Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
-      xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + 2 + G.ly - 1,
-      MainTexture.clMark, MainTexture.clMark)
-  else
-    Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (xxt * 2),
-      yMini + 2 + yw, xMini + 1 + G.lx + MapWidth div (xxt * 2),
-      yMini + yw + MapHeight div yyt, MainTexture.clMark, MainTexture.clMark);
+  with MainMap do begin
+    DpiBitCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
+      MiniMap.Bitmap.Canvas, 0, 0);
+    if MarkCityLoc >= 0 then
+      Sprite(Panel, HGrSystem, xMini - 2 + (4 * G.lx + 2 * (MarkCityLoc mod G.lx)
+        + (G.lx - MapWidth div (xxt * 2)) - 2 * xwd) mod (2 * G.lx) +
+        MarkCityLoc div G.lx and 1, yMini - 3 + MarkCityLoc div G.lx, CityMark2.Width,
+        CityMark2.Height, CityMark2.Left, CityMark2.Top)
+    else if ywmax <= 0 then
+      Frame(Panel.Canvas,
+        xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2,
+        xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + 2 + G.ly - 1,
+        MainTexture.clMark, MainTexture.clMark)
+    else
+      Frame(Panel.Canvas,
+        xMini + 2 + G.lx - MapWidth div (xxt * 2), yMini + 2 + yw,
+        xMini + 1 + G.lx + MapWidth div (xxt * 2), yMini + yw + MapHeight div yyt,
+        MainTexture.clMark, MainTexture.clMark);
+  end;
 end;
 
@@ -4336 +4303 @@
   Prio: boolean;
 begin
+  if not Assigned(MyRO) then Exit;
   with Panel.Canvas do
   begin
@@ -4386 +4354 @@
           $FFFFFF, $B0B0B0);
         DpiBitCanvas(Panel.Canvas, ClientWidth - xPalace, yPalace, xSizeBig,
-          ySizeBig, GrExt[HGrSystem2].Data.Canvas, 70, 123);
+          ySizeBig, HGrSystem2.Data.Canvas, 70, 123);
       end
       else if MyRO.NatBuilt[imPalace] > 0 then
@@ -4497 +4465 @@
               end;
           end;
-          if xSrcBase >= 0 then
+          with MainMap do begin
+            if xSrcBase >= 0 then
+              Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
+                yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
+                1 + ySrcBase * (yyt * 3 + 1));
             Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
-              yyt * 3, 1 + xSrcBase * (xxt * 2 + 1),
-              1 + ySrcBase * (yyt * 3 + 1));
-          Sprite(Panel, HGrTerrain, xTroop + 2 + x, yTroop + 9 - yyt, xxt * 2,
-            yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
-          if BrushTypes[i] = BrushType then
-          begin
-            ScreenTools.Frame(Panel.Canvas, xTroop + 2 + x,
-              yTroop + 7 - yyt div 2, xTroop + 2 * xxt + x,
-              yTroop + 2 * yyt + 11, $000000, $000000);
-            ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x,
-              yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + x,
-              yTroop + 2 * yyt + 10, MainTexture.clMark, MainTexture.clMark);
-          end
+              yyt * 3, 1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
+            if BrushTypes[i] = BrushType then begin
+              ScreenTools.Frame(Panel.Canvas, xTroop + 2 + x,
+                yTroop + 7 - yyt div 2, xTroop + 2 * xxt + x,
+                yTroop + 2 * yyt + 11, $000000, $000000);
+              ScreenTools.Frame(Panel.Canvas, xTroop + 1 + x,
+                yTroop + 6 - yyt div 2, xTroop + 2 * xxt - 1 + x,
+                yTroop + 2 * yyt + 10, MainTexture.clMark, MainTexture.clMark);
+            end;
+          end;
         end;
         inc(Count)
@@ -4571 +4540 @@
       Brush.Style := bsClear;
       if UnFocus >= 0 then
-        with MyUn[UnFocus], MyModel[mix] do
+        with MyUn[UnFocus] do
+        with MyModel[mix] do
         begin { display info about selected unit }
           if Job = jCity then
@@ -4600 +4570 @@
             BiColorTextWidth(Panel.Canvas, s) div 2, PanelHeight - 23, s);
 
-          FrameImage(Panel.Canvas, GrExt[HGrSystem].Data,
+          FrameImage(Panel.Canvas, HGrSystem.Data,
             xMidPanel + 7 + xUnitText, yTroop + 15, 12, 14,
             121 + Exp div ExpCost * 13, 28);
@@ -4676 +4646 @@
                           xTroop + 63 + x, yTroop + 46, 8, MainTexture.clMark);
                       end;
-                      NoMap.SetOutput(Panel);
-                      NoMap.PaintUnit(xTroop + 2 + x, yTroop + 1, UnitInfo,
+                      NoMapPanel.SetOutput(Panel);
+                      NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1, UnitInfo,
                         unx.Status);
                       if (ClientMode < scContact) and
@@ -4694 +4664 @@
                           xTroop + x + 34 - BiColorTextWidth(Panel.Canvas, s)
                           div 2, yTroop - 16, s);
-                      end
+                      end;
                     end;
                     inc(Count)
@@ -4700 +4670 @@
                 end; // for uix:=0 to MyRO.nUn-1
             assert(Count = TrCnt);
-          end
+          end;
         end
         else
@@ -4712 +4682 @@
               trix[i - TrRow * sb.Position] := i;
               x := (i - TrRow * sb.Position) * TrPitch;
-              NoMap.SetOutput(Panel);
-              NoMap.PaintUnit(xTroop + 2 + x, yTroop + 1,
+              NoMapPanel.SetOutput(Panel);
+              NoMapPanel.PaintUnit(xTroop + 2 + x, yTroop + 1,
                 MyRO.EnemyUn[MyRO.nEnemyUn + i], 0);
             end;
@@ -4720 +4690 @@
       if not SmallScreen or supervising then
       begin // show terrain and improvements
-        PaintZoomedTile(Panel, xTerrain - xxt * 2, 110 - yyt * 3, TroopLoc);
-        if (UnFocus >= 0) and (MyUn[UnFocus].Job <> jNone) then
-        begin
+        with NoMapPanel do
+          PaintZoomedTile(Panel, xTerrain - xxt * 2, 110 - yyt * 3, TroopLoc);
+        if (UnFocus >= 0) and (MyUn[UnFocus].Job <> jNone) then begin
           JobFocus := MyUn[UnFocus].Job;
           Server(sGetJobProgress, me, MyUn[UnFocus].Loc, JobProgressData);
@@ -4770 +4740 @@
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
             PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight)
-    end { if TroopLoc>=0 }
+    end; { if TroopLoc>=0 }
   end;
 
@@ -4800 +4770 @@
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
             PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight);
-        end
+        end;
   end;
   EOT.SetBack(Panel.Canvas, EOT.Left, EOT.Top - (ClientHeight - PanelHeight));
@@ -4828 +4798 @@
   end;
   if GameMode <> cMovie then
-    ImageOp_BCC(TopBar, Templates, 2, 1, 145, 38, 36, 36, $BFBF20, $4040DF);
+    ImageOp_BCC(TopBar, Templates.Data, Point(2, 1), MenuLogo.BoundsRect, $BFBF20, $4040DF);
   if MyRO.nCity > 0 then
   begin
@@ -4844 +4814 @@
 
     // treasury section
-    ImageOp_BCC(TopBar, Templates, xTreasurySection + 8, 1, 145, 1, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 8, 1), TreasuryIcon.BoundsRect,
       $40A040, $4030C0);
     s := IntToStr(TrueMoney);
@@ -4851 +4821 @@
     if MyRO.Government <> gAnarchy then
     begin
-      ImageOp_BCC(TopBar, Templates, xTreasurySection + 48, 22, 124, 1, 14, 14,
+      ImageOp_BCC(TopBar, Templates.Data, Point(xTreasurySection + 48, 22), ChangeIcon.BoundsRect,
         $0000C0, $0080C0);
       if TaxSum >= 0 then
@@ -4862 +4832 @@
 
     // research section
-    ImageOp_BCC(TopBar, Templates, xResearchSection + 8, 1, 145, 75, 36, 36,
+    ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 8, 1), ResearchIcon.BoundsRect,
       $FF0000, $00FFE0);
     if MyData.FarTech <> adNexus then
@@ -4913 +4883 @@
     if (MyData.FarTech <> adNexus) and (ScienceSum > 0) then
     begin
-      ImageOp_BCC(TopBar, Templates, xResearchSection + 48 + CostFactor + 11,
-        22, 124, 1, 14, 14, $0000C0, $0080C0);
+      ImageOp_BCC(TopBar, Templates.Data, Point(xResearchSection + 48 + CostFactor + 11,
+        22), ChangeIcon.BoundsRect, $0000C0, $0080C0);
       s := Format(Phrases.Lookup('TECHGAIN'), [ScienceSum]);
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
         CostFactor + 26, 18, s);
-    end
+    end;
   end;
   if ClientMode <> cEditMap then
@@ -4930 +4900 @@
   end;
   RectInvalidate(0, 0, ClientWidth, TopBarHeight);
-end; { PanelPaint }
+end;
 
 procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
@@ -4937 +4907 @@
   Outside, Changed: boolean;
 begin
-  dx := G.lx + 1 - (xw - Loc + G.lx * 1024 + 1) mod G.lx;
-  Outside := (dx >= (MapWidth + 1) div (xxt * 2) - 2) or (ywmax > 0) and
-    ((yw > 0) and (Loc div G.lx <= yw + 1) or (yw < ywmax) and
-    (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
+  with MainMap do begin
+    dx := G.lx + 1 - (xw - Loc + G.lx * 1024 + 1) mod G.lx;
+    Outside := (dx >= (MapWidth + 1) div (xxt * 2) - 2) or (ywmax > 0) and
+      ((yw > 0) and (Loc div G.lx <= yw + 1) or (yw < ywmax) and
+      (Loc div G.lx >= yw + (MapHeight - 1) div yyt - 2));
+  end;
   Changed := true;
-  if Outside then
-  begin
+  if Outside then begin
     Centre(Loc);
-    PaintAllMaps
+    PaintAllMaps;
   end
   else if not MapValid then
@@ -4980 +4951 @@
         begin
           NewFocus := uix;
-          Break
+          Break;
         end
         else
@@ -4988 +4959 @@
           begin
             NewFocus := uix;
-            Dist := TestDist
-          end
-        end
+            Dist := TestDist;
+          end;
+        end;
     end;
     if GotoOnly then
@@ -5020 +4991 @@
     PanelPaint;
   end;
-end; { NextUnit }
+end;
 
 procedure TMainScreen.Scroll(dx, dy: integer);
@@ -5036 +5007 @@
   xwMini := xw;
   ywMini := yw;
-  MiniPaint;
+  MiniMapPaint;
   CopyMiniToPanel;
   RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
@@ -5046 +5017 @@
 procedure TMainScreen.Timer1Timer(Sender: TObject);
 var
-  dx, dy, speed: integer;
+  dx, dy, ScrollSpeed: integer;
 begin
   if idle and (me >= 0) and (GameMode <> cMovie) then
@@ -5060 +5031 @@
           PaintLocTemp(MyUn[UnFocus].Loc)
         else if TurnComplete and not supervising then
-          EOT.SetButtonIndexFast(eotBlinkOn)
-      end
+          EOT.SetButtonIndexFast(eotBlinkOn);
+      end;
     end
     else
@@ -5067 +5038 @@
       if DpiApplication.Active and not mScrollOff.Checked then
       begin
-        if mScrollFast.Checked then
-          speed := 2
-        else
-          speed := 1;
+        if mScrollFast.Checked then ScrollSpeed := 2
+          else ScrollSpeed := 1;
         dx := 0;
         dy := 0;
         if DpiMouse.CursorPos.y < DpiScreen.height - PanelHeight then
           if DpiMouse.CursorPos.x = 0 then
-            dx := -speed // scroll left
-          else if DpiMouse.CursorPos.x >= DpiScreen.width - 1 then
-            dx := speed; // scroll right
+            dx := -ScrollSpeed // scroll left
+          else if DpiMouse.CursorPos.x = DpiScreen.width - 1 then
+            dx := ScrollSpeed; // scroll right
         if DpiMouse.CursorPos.y = 0 then
-          dy := -speed // scroll up
-        else if (DpiMouse.CursorPos.y >= DpiScreen.height - 1) and
+          dy := -ScrollSpeed // scroll up
+        else if (DpiMouse.CursorPos.y = DpiScreen.height - 1) and
           (DpiMouse.CursorPos.x >= TerrainBtn.Left + TerrainBtn.width) and
           (DpiMouse.CursorPos.x < xRightPanel + 10 - 8) then
-          dy := speed; // scroll down
+          dy := ScrollSpeed; // scroll down
         if (dx <> 0) or (dy <> 0) then
         begin
@@ -5090 +5059 @@
             DpiScreen.ActiveForm.OnDeactivate(nil);
           Scroll(dx, dy);
-        end
+        end;
       end;
 
@@ -5104 +5073 @@
           // if MoveHintToLoc>=0 then
           // ShowMoveHint(MoveHintToLoc, true);
-        end
+        end;
       end
       else if TurnComplete and not supervising then
@@ -5111 +5080 @@
           EOT.SetButtonIndexFast(eotBlinkOff)
         else if BlinkTime = BlinkOffTime then
-          EOT.SetButtonIndexFast(eotBlinkOn)
-      end
-    end
+          EOT.SetButtonIndexFast(eotBlinkOn);
+      end;
+    end;
+end;
+
+procedure TMainScreen.SetMapPos(Loc: integer; MapPos: TPoint);
+begin
+  with MainMap do begin
+    if FastScrolling and MapValid then
+      Update;
+    // necessary because ScrollDC for form canvas is called after
+    xw := (Loc mod G.lx) - (MapPos.X - ((xxt * 2) * ((Loc div G.lx) and 1)) div 2)
+      div (xxt * 2);
+    xw := (xw + G.lx) mod G.lx;
+    if ywmax <= 0 then yw := ywcenter
+    else begin
+      yw := (Loc div G.lx - (MapPos.Y * 2) div (yyt * 2) + 1) and not 1;
+      if yw < 0 then yw := 0
+        else if yw > ywmax then yw := ywmax;
+    end;
+  end;
 end;
 
 procedure TMainScreen.Centre(Loc: integer);
 begin
-  if FastScrolling and MapValid then
-    Update;
-  // necessary because ScrollDC for form canvas is called after
-  xw := (Loc mod G.lx - (MapWidth - xxt * 2 * ((Loc div G.lx) and 1))
-    div (xxt * 4) + G.lx) mod G.lx;
-  if ywmax <= 0 then
-    yw := ywcenter
-  else
-  begin
-    yw := (Loc div G.lx - MapHeight div (yyt * 2) + 1) and not 1;
-    if yw < 0 then
-      yw := 0
-    else if yw > ywmax then
-      yw := ywmax;
-  end
+  SetMapPos(Loc, Point(MapWidth div 2, MapHeight div 2));
 end;
 
@@ -5162 +5135 @@
       PanelPaint;
       ShowNewContent(wmPersistent, Loc, ShowEvent);
-    end
-end;
-
-function TMainScreen.LocationOfScreenPixel(x, y: integer): integer;
+    end;
+end;
+
+function TMainScreen.LocationOfScreenPixel(x, y: integer): Integer;
 var
   qx, qy: integer;
 begin
-  qx := (x * (yyt * 2) + y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
-  qy := (y * (xxt * 2) - x * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
-    div (xxt * yyt * 4) - 999;
-  result := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx *
-    (yw + qx + qy);
+  with MainMap do begin
+    qx := (x * (yyt * 2) + y * (xxt * 2) + xxt * yyt * 2) div (xxt * yyt * 4) - 1;
+    qy := (y * (xxt * 2) - x * (yyt * 2) - xxt * yyt * 2 + 4000 * xxt * yyt)
+      div (xxt * yyt * 4) - 999;
+    Result := (xw + (qx - qy + 2048) div 2 - 1024 + G.lx) mod G.lx + G.lx *
+      (yw + qx + qy);
+  end;
+end;
+
+function TMainScreen.GetCenterLoc: Integer;
+begin
+  Result := (xw + MapWidth div (MainMap.xxt * 4)) mod G.lx +
+    (yw + MapHeight div (MainMap.yyt * 2)) * G.lx;
 end;
 
@@ -5242 +5223 @@
       BrushLoc := MouseLoc;
       PaintLoc(MouseLoc, 2);
-      MiniPaint;
+      MiniMapPaint;
       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),
-          yMini + 2, xMini + 1 + G.lx + MapWidth div (2 * xxt),
-          yMini + 2 + G.ly - 1, MainTexture.clMark, MainTexture.clMark)
-      else
-        Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
-          yMini + 2 + yw, xMini + 2 + G.lx + MapWidth div (2 * xxt) - 1,
-          yMini + 2 + yw + MapHeight div yyt - 2, MainTexture.clMark,
-          MainTexture.clMark);
+        MiniMap.Bitmap.Canvas, 0, 0);
+      with MainMap do begin
+        if ywmax <= 0 then
+          Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
+            yMini + 2, xMini + 1 + G.lx + MapWidth div (2 * xxt),
+            yMini + 2 + G.ly - 1, MainTexture.clMark, MainTexture.clMark)
+        else
+          Frame(Panel.Canvas, xMini + 2 + G.lx - MapWidth div (2 * xxt),
+            yMini + 2 + yw, xMini + 2 + G.lx + MapWidth div (2 * xxt) - 1,
+            yMini + 2 + yw + MapHeight div yyt - 2, MainTexture.clMark,
+            MainTexture.clMark);
+      end;
       RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
         xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini
-        + 2 + G.ly)
+        + 2 + G.ly);
     end
     else if MyMap[MouseLoc] and fCity <> 0 then { city clicked }
@@ -5269 +5252 @@
         UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
         DoCenter := false;
-      end
+      end;
     end
     else if MyMap[MouseLoc] and fUnit <> 0 then { unit clicked }
@@ -5291 +5274 @@
             end;
             if i = 0 then
-              uix := UnFocus
+              uix := UnFocus;
           end
           else
@@ -5317 +5300 @@
     begin
       Centre(MouseLoc);
-      PaintAllMaps
-    end
+      PaintAllMaps;
+    end;
   end
   else if (ClientMode <> cEditMap) and (Button = mbRight) and
@@ -5338 +5321 @@
               MyRO.EnemyModel[emix].mix, MouseLoc) >= rExecuted) then
             begin
-              if Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr = 0 then
+              if not Assigned(Tribe[p1].ModelPicture[MyRO.EnemyModel[emix].mix].HGr) then
                 InitEnemyModel(emix);
               m2 := TDpiMenuItem.Create(m);
@@ -5368 +5351 @@
           Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance)
             or usWaiting;
-          MoveUnit(dx, dy, muAutoNext) { simple move }
+          MoveUnit(dx, dy, muAutoNext); { simple move }
         end
         else if GetMoveAdvice(UnFocus, MouseLoc, MoveAdviceData) >= rExecuted
@@ -5393 +5376 @@
               if BattleDlg.ModalResult <> mrOK then
                 exit;
-            end
+            end;
           end;
           DestinationMarkON := false;
@@ -5400 +5383 @@
             usWaiting;
           MoveToLoc(MouseLoc, false); { goto }
-        end
-      end
+        end;
+      end;
   end
   else if (Button = mbMiddle) and (UnFocus >= 0) and
@@ -5414 +5397 @@
       MoveToLoc(MouseLoc, true); { goto }
     if (UnFocus = uix) and (MyUn[uix].Loc = MouseLoc) then
-      MenuClick(mEnhance)
+      MenuClick(mEnhance);
   end
   else if (Button = mbLeft) and (ssShift in Shift) and
@@ -5449 +5432 @@
       BattleDlg.IsSuicideQuery := false;
       BattleDlg.Show;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -5891 +5874 @@
     if CityCaptured and (MyMap[ToLoc] and fCity = 0) then
     begin // city destroyed
-      for i := 0 to 27 do { tell about destroyed wonders }
-        if (MyRO.Wonder[i].CityID = -2) and (MyData.ToldWonders[i].CityID <> -2)
+      for i := 0 to nWonder - 1 do { tell about destroyed wonders }
+        if (MyRO.Wonder[i].CityID = WonderDestroyed) and (MyData.ToldWonders[i].CityID <> WonderDestroyed)
         then
           with MessgExDlg do
@@ -5913 +5896 @@
     begin // city captured
       ListDlg.AddCity;
-      for i := 0 to 27 do { tell about capture of wonders }
+      for i := 0 to nWonder - 1 do { tell about capture of wonders }
         if MyRO.City[MyRO.nCity - 1].Built[i] > 0 then
           with MessgExDlg do
@@ -6030 +6013 @@
     xw1 := xw + G.lx;
     // ((xFromLoc-xw1)*2+yFromLoc and 1+1)*xxt+dx*xxt/2-MapWidth/2 -> min
-    while abs(((xFromLoc - xw1 + G.lx) * 2 + yFromLoc and 1 + 1) * xxt * 2 + dx
-      * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
-      * 2 + dx * xxt - MapWidth) do
-      dec(xw1, G.lx);
-
-    xTo := (xToLoc - xw1) * (xxt * 2) + yToLoc and 1 * xxt + (xxt - xxu);
-    yTo := (yToLoc - yw) * yyt + (yyt - yyu_anchor);
-    xFrom := (xFromLoc - xw1) * (xxt * 2) + yFromLoc and 1 * xxt + (xxt - xxu);
-    yFrom := (yFromLoc - yw) * yyt + (yyt - yyu_anchor);
-    if xFrom < xTo then
-    begin
-      xMin := xFrom;
-      xRange := xTo - xFrom
-    end
-    else
-    begin
-      xMin := xTo;
-      xRange := xFrom - xTo
-    end;
-    if yFrom < yTo then
-    begin
-      yMin := yFrom;
-      yRange := yTo - yFrom
-    end
-    else
-    begin
-      yMin := yTo;
-      yRange := yFrom - yTo
-    end;
-    inc(xRange, xxt * 2);
-    inc(yRange, yyt * 3);
+    with MainMap do begin
+      while abs(((xFromLoc - xw1 + G.lx) * 2 + yFromLoc and 1 + 1) * xxt * 2 + dx
+        * xxt - MapWidth) < abs(((xFromLoc - xw1) * 2 + yFromLoc and 1 + 1) * xxt
+        * 2 + dx * xxt - MapWidth) do
+        dec(xw1, G.lx);
+
+      xTo := (xToLoc - xw1) * (xxt * 2) + yToLoc and 1 * xxt + (xxt - xxu);
+      yTo := (yToLoc - yw) * yyt + (yyt - yyu_anchor);
+      xFrom := (xFromLoc - xw1) * (xxt * 2) + yFromLoc and 1 * xxt + (xxt - xxu);
+      yFrom := (yFromLoc - yw) * yyt + (yyt - yyu_anchor);
+      if xFrom < xTo then begin
+        xMin := xFrom;
+        xRange := xTo - xFrom
+      end else begin
+        xMin := xTo;
+        xRange := xFrom - xTo
+      end;
+      if yFrom < yTo then begin
+        yMin := yFrom;
+        yRange := yTo - yFrom
+      end else begin
+        yMin := yTo;
+        yRange := yFrom - yTo
+      end;
+      inc(xRange, xxt * 2);
+      inc(yRange, yyt * 3);
+    end;
 
     MainOffscreenPaint;
@@ -6162 +6141 @@
       begin
         assert(false);
-        Break
+        Break;
       end;
     until false;
@@ -6188 +6167 @@
           NextUnit(UnStartLoc, true)
         end;
-      end
-    end
-  end
+      end;
+    end;
+  end;
 end;
 
@@ -6207 +6186 @@
       if ssShift in Shift then
       begin
-        xMouse := (xwMini + (x - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
-          div 2) mod G.lx;
+        with MainMap do
+          xMouse := (xwMini + (x - (xMini + 2) + MapWidth div (xxt * 2) + G.lx)
+            div 2) mod G.lx;
         MouseLoc := xMouse + G.lx * (y - (yMini + 2));
         if MyMap[MouseLoc] and fTerrain <> fUNKNOWN then
@@ -6215 +6195 @@
           if (p1 = me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
             NatStatDlg.ShowNewContent(wmPersistent, p1);
-        end
+        end;
       end
       else
@@ -6310 +6290 @@
               CheckTerrainBtnVisible;
               PanelPaint;
-            end
+            end;
           end
           else if Server(sGetUnits, me, TroopLoc, TrCnt) >= rExecuted then
@@ -6319 +6299 @@
               UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
                 MyRO.nEnemyUn + trix[i]); // unit info
-    end
-  end
+    end;
+  end;
 end;
 
@@ -6412 +6392 @@
 procedure TMainScreen.SetDebugMap(p: integer);
 begin
-  IsoEngine.pDebugMap := p;
-  IsoEngine.Options := IsoEngine.Options and not(1 shl moLocCodes);
+  MainMap.pDebugMap := p;
+  MapOptions := MapOptions - [moLocCodes];
   mLocCodes.Checked := false;
   MapValid := false;
@@ -6421 +6401 @@
 procedure TMainScreen.SetViewpoint(p: integer);
 var
-  i: integer;
+  i: Integer;
 begin
   if supervising and (G.RO[0].Turn > 0) and
@@ -6432 +6412 @@
     SumCities(TaxSum, ScienceSum);
     for i := 0 to MyRO.nModel - 1 do
-      if Tribe[me].ModelPicture[i].HGr = 0 then
-        InitMyModel(i, true);
+      if not Assigned(Tribe[me].ModelPicture[i].HGr) then
+        InitMyModel(i, True);
 
     SetTroopLoc(-1);
     PanelPaint;
-    MapValid := false;
+    MapValid := False;
     PaintAllMaps;
   end;
@@ -7222 +7202 @@
       // check if city types already usefull:
       if MyRO.nCity > 0 then
-        for i := 28 to nImp - 1 do
+        for i := nWonder to nImp - 1 do
           if (i <> imTrGoods) and (Imp[i].Kind = ikCommon) and
             (Imp[i].Preq <> preNA) and
@@ -7275 +7255 @@
             m.ShortCut := ShortCut(48 + p1, [ssAlt]);
           m.RadioItem := true;
-          if m.Tag = IsoEngine.pDebugMap then
+          if m.Tag = MainMap.pDebugMap then
             m.Checked := true;
           mDebugMap.Add(m);
         end;
     end;
-    mSmallTiles.Checked := xxt = 33;
-    mNormalTiles.Checked := xxt = 48;
-    mBigTiles.Checked := xxt = 72;
+    mSmallTiles.Checked := MainMap.TileSize = tsSmall;
+    mNormalTiles.Checked := MainMap.TileSize = tsMedium;
+    mBigTiles.Checked := MainMap.TileSize = tsBig;
   end
   else if Popup = StatPopup then
@@ -7301 +7281 @@
     mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
     { mWonders.Enabled:= false;
-      for i:=0 to 27 do if MyRO.Wonder[i].CityID<>-1 then
+      for i:=0 to nWonder - 1 do if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
       mWonders.Enabled:=true; }
     mDiagram.Enabled := MyRO.Turn >= 2;
@@ -7473 +7453 @@
         FocusOnLoc(TroopLoc, flRepaintPanel)
       else
-        PanelPaint
+        PanelPaint;
     end
     else if StepFocus then
@@ -7480 +7460 @@
     begin
       SetTroopLoc(-1);
-      PanelPaint
+      PanelPaint;
     end;
   end;
@@ -7496 +7476 @@
 begin
   if Tracking and (ssLeft in Shift) then
-  begin
+  with MainMap do begin
     if (x >= xMini + 2) and (y >= yMini + 2) and (x < xMini + 2 + 2 * G.lx) and
       (y < yMini + 2 + G.ly) then
@@ -7514 +7494 @@
           yw := ywmax;
       end;
-      DpiBitCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, Mini.Canvas, 0, 0);
+      DpiBitCanvas(Buffer.Canvas, 0, 0, G.lx * 2, G.ly, MiniMap.Bitmap.Canvas, 0, 0);
       if ywmax <= 0 then
         Frame(Buffer.Canvas, x - xMini - 2 - MapWidth div (xxt * 2), 0,
@@ -7544 +7524 @@
     xwMini := xw;
     ywMini := yw;
-    MiniPaint;
+    MiniMapPaint;
     PanelPaint;
   end;
@@ -7737 +7717 @@
 var
   Reg: TRegistry;
-  DefaultOptionChecked: Integer;
-begin
-  DefaultOptionChecked := 1 shl 1 + 1 shl 7 + 1 shl 10 + 1 shl 12 + 1 shl 14 +
-    1 shl 18 + 1 shl 19;
+  DefaultOptionChecked: TSaveOptions;
+begin
+  DefaultOptionChecked := [soEnMoves, soSlowMoves, soNames, soRepScreens,
+    soSoundOn, soScrollOff, soAlSlowMoves];
   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')
+    if ValueExists('TileSize') then MainMap.TileSize := TTileSize(ReadInteger('TileSize'))
+      else MainMap.TileSize := tsMedium;
+    NoMap.TileSize := MainMap.TileSize;
+    if ValueExists('OptionChecked') then OptionChecked := TSaveOptions(ReadInteger('OptionChecked'))
       else OptionChecked := DefaultOptionChecked;
-    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
-      else MapOptionChecked := 1 shl moCityNames;
+    if ValueExists('MapOptionChecked') then MapOptionChecked := TMapOptions(ReadInteger('MapOptionChecked'))
+      else MapOptionChecked := [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);
+    if (not (soScrollFast in OptionChecked)) and (not (soScrollSlow in OptionChecked)) and
+      (not (soScrollOff in OptionChecked)) then
+      OptionChecked := OptionChecked + [soScrollSlow];
       // old regver with no scrolling
   finally
@@ -7762 +7742 @@
   end;
 
-  if 1 shl 13 and OptionChecked <> 0 then
+  if soSoundOff in OptionChecked  then
     SoundMode := smOff
-  else if 1 shl 15 and OptionChecked <> 0 then
+  else if soSoundOnAlt in OptionChecked then
     SoundMode := smOnAlt
   else
@@ -7825 +7805 @@
       end
       else if Flag = tfAllTechs then
-        TellNewModels
+        TellNewModels;
     end;
   end;
@@ -7834 +7814 @@
   with TButtonC(Sender) do
   begin
-    MapOptionChecked := MapOptionChecked xor (1 shl (Tag shr 8));
+    MapOptionChecked := TMapOptions(Integer(MapOptionChecked) xor (1 shl (Tag shr 8)));
     SetMapOptions;
-    ButtonIndex := MapOptionChecked shr (Tag shr 8) and 1 + 2
+    ButtonIndex := Integer(MapOptionChecked) shr (Tag shr 8) and 1 + 2;
   end;
   if Sender = MapBtn0 then
   begin
-    MiniPaint;
-    PanelPaint
+    MiniMapPaint;
+    PanelPaint;
   end // update mini map only
   else
@@ -7854 +7834 @@
   if TButtonBase(Sender).Down then
   begin
-    MapOptionChecked := MapOptionChecked or (1 shl moGreatWall);
+    MapOptionChecked := MapOptionChecked + [moGreatWall];
     TButtonBase(Sender).Hint := '';
   end
   else
   begin
-    MapOptionChecked := MapOptionChecked and not(1 shl moGreatWall);
+    MapOptionChecked := MapOptionChecked - [moGreatWall];
     TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
       -1 + TButtonBase(Sender).Tag and $FF);
@@ -7872 +7852 @@
   if TButtonBase(Sender).Down then
   begin
-    MapOptionChecked := MapOptionChecked or (1 shl moBareTerrain);
+    MapOptionChecked := MapOptionChecked + [moBareTerrain];
     TButtonBase(Sender).Hint := '';
   end
   else
   begin
-    MapOptionChecked := MapOptionChecked and not(1 shl moBareTerrain);
+    MapOptionChecked := MapOptionChecked - [moBareTerrain];
     TButtonBase(Sender).Hint := Phrases.Lookup('CONTROLS',
       -1 + TButtonBase(Sender).Tag and $FF);
@@ -7976 +7956 @@
 procedure TMainScreen.mSmallTilesClick(Sender: TObject);
 begin
-  SetTileSize(33, 16);
+  SetTileSizeCenter(tsSmall);
 end;
 
 procedure TMainScreen.mNormalTilesClick(Sender: TObject);
 begin
-  SetTileSize(48, 24);
+  SetTileSizeCenter(tsMedium);
 end;
 
 procedure TMainScreen.mBigTilesClick(Sender: TObject);
 begin
-  SetTileSize(72, 36);
-end;
-
-procedure TMainScreen.SetTileSize(x, y: integer);
+  SetTileSizeCenter(tsBig);
+end;
+
+procedure TMainScreen.SetTileSizeCenter(TileSize: TTileSize);
+begin
+  SetTileSize(TileSize, GetCenterLoc, Point(MapWidth div 2, MapHeight div 2));
+end;
+
+procedure TMainScreen.SetTileSize(TileSize: TTileSize; Loc: Integer; MapPos: TPoint);
 var
-  i, CenterLoc: integer;
-begin
-  CenterLoc := (xw + MapWidth div (xxt * 4)) mod G.lx +
-    (yw + MapHeight div (yyt * 2)) * G.lx;
-  IsoEngine.ApplyTileSize(x, y);
+  i: integer;
+begin
+  MainMap.TileSize := TileSize;
+  NoMap.TileSize := TileSize;
   FormResize(nil);
-  Centre(CenterLoc);
+  SetMapPos(Loc, MapPos);
   PaintAllMaps;
   for i := 0 to DpiScreen.FormCount - 1 do
@@ -8004 +7988 @@
 end;
 
+procedure TMainScreen.SaveMenuItemsState;
+var
+  i, j: integer;
+begin
+  if soTellAI in OptionChecked then OptionChecked := [soTellAI]
+    else OptionChecked := [];
+  for i := 0 to ComponentCount - 1 do
+    if Components[i] is TDpiMenuItem then
+      for j := 0 to Length(SaveOption) - 1 do
+        if TDpiMenuItem(Components[i]).Checked and
+          (TDpiMenuItem(Components[i]).Tag = SaveOption[j]) then
+          OptionChecked := OptionChecked + [TSaveOption(j)];
+end;
+
 procedure TMainScreen.SaveSettings;
 var
-  i, j: integer;
   Reg: TRegistry;
 begin
-  OptionChecked := OptionChecked and soExtraMask;
-  for i := 0 to ComponentCount - 1 do
-    if Components[i] is TDpiMenuItem then
-      for j := 0 to nSaveOption - 1 do
-        if TDpiMenuItem(Components[i]).Checked and
-          (TDpiMenuItem(Components[i]).Tag = SaveOption[j]) then
-          inc(OptionChecked, 1 shl j);
+  SaveMenuItemsState;
 
   Reg := TRegistry.Create;
@@ -8021 +8012 @@
   try
     OpenKey(AppRegistryKey, true);
-    WriteInteger('TileWidth', xxt * 2);
-    WriteInteger('TileHeight', yyt * 2);
-    WriteInteger('OptionChecked', OptionChecked);
-    WriteInteger('MapOptionChecked', MapOptionChecked);
+    WriteInteger('TileSize', Integer(MainMap.TileSize));
+    WriteInteger('OptionChecked', Integer(OptionChecked));
+    WriteInteger('MapOptionChecked', Integer(MapOptionChecked));
     WriteInteger('CityReport', integer(CityRepMask));
   finally