Changeset 330 for trunk/LocalPlayer

Timestamp:

Mar 26, 2021, 2:16:04 PM (4 years ago)

Author:

chronos

Message:

• Modified: Reworker IsoEngine unit to support multiple iso maps with different tile sizes.
• Modified: Changing tile size in main windows map doesn't affect other tile drawing on panel and in other windows like help window.
• Modified: Optimized tile size switching. Graphic assets needed for given tile size is prepared only once. Then switching between them is just about changing references to objects and redrawing.
• Modified: Code cleanup.

Location:

trunk/LocalPlayer

Files:

• Battle.lfm (modified) ( previous)
• Battle.pas (modified) (9 diffs)
• CityScreen.pas (modified) (6 diffs)
• Enhance.lfm (modified) ( previous)
• Enhance.pas (modified) (8 diffs)
• Help.pas (modified) (9 diffs)
• IsoEngine.pas (modified) (19 diffs)
• Term.pas (modified) (62 diffs)
• UnitStat.pas (modified) (6 diffs)

trunk/LocalPlayer/Battle.pas

@@ -6 +6 @@
 uses
   ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg;
+  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, IsoEngine;
 
 type
+
+  { TBattleDlg }
+
   TBattleDlg = class(TDrawDlg)
     OKBtn: TButtonA;
     CancelBtn: TButtonA;
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
@@ -21 +25 @@
     procedure OKBtnClick(Sender: TObject);
     procedure CancelBtnClick(Sender: TObject);
+    procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
+      Forecast: TBattleForecastEx);
+  private
+    IsoMap: TIsoMap;
   public
     uix, ToLoc: Integer;
@@ -30 +38 @@
   BattleDlg: TBattleDlg;
 
-procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
-  Forecast: TBattleForecastEx);
-
 implementation
 
 uses
-  Term, ClientTools, IsoEngine;
+  Term, ClientTools;
 
 {$R *.lfm}
@@ -48 +53 @@
   FirstStrikeColor = $A0A0A0;
 
-procedure PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
+procedure TBattleDlg.PaintBattleOutcome(ca: TCanvas; xm, ym, uix, ToLoc: Integer;
   Forecast: TBattleForecastEx);
 var
@@ -172 +177 @@
       (LADamage - LAAvoidedDamage - TextSize.cy) div 2, LabelText);
 
-  NoMap.SetOutput(Buffer);
+  IsoMap.SetOutput(Buffer);
   BitBltCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
     ym - 8 - 12 - 48);
@@ -184 +189 @@
     else Sprite(Buffer,HGrTerrain,0,16,66,32,1+7*(xxt*2+1),1+yyt+2*(2+TerrType-fForest)*(yyt*3+1));
     end; }
-  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   BitBltCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
     0, 0);
@@ -192 +197 @@
   MakeUnitInfo(me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
-  NoMap.PaintUnit(1, 0, UnitInfo, 0);
+  IsoMap.PaintUnit(1, 0, UnitInfo, 0);
   BitBltCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }
@@ -198 +203 @@
 procedure TBattleDlg.FormCreate(Sender: TObject);
 begin
+  IsoMap := TIsoMap.Create;
   OKBtn.Caption := Phrases.Lookup('BTN_YES');
   CancelBtn.Caption := Phrases.Lookup('BTN_NO');
@@ -276 +282 @@
 end;
 
+procedure TBattleDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(IsoMap);
+end;
+
 procedure TBattleDlg.FormMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);

trunk/LocalPlayer/CityScreen.pas

@@ -407 +407 @@
     rare: boolean;
   begin
+    with AreaMap do begin
     if Server(sGetCityTileInfo, me, Loc, TileInfo) <> eOk then
     begin
@@ -442 +443 @@
       Sprite(offscreen, HGrSystem, x + xxt - 5 + d * (2 * i + 1 - Total),
         y + yyt - 5, 10, 10, xGr, yGr);
+    end;
     end;
   end;
@@ -593 +595 @@
   end;
 
+  with AreaMap do begin
   rx := (192 + xxt * 2 - 1) div (xxt * 2);
   ry := (96 + yyt * 2 - 1) div (yyt * 2);
@@ -619 +622 @@
               Loc1, (dx = 0) and (dy = 0));
         end;
+  end;
 
   if Report.Working > 1 then
@@ -930 +934 @@
             y := ((Cnt - 6 * Page) div 3) * 52 + yZoomMap + 20;
             MakeUnitInfo(me, MyUn[i], UnitInfo);
-            NoMap.SetOutput(offscreen);
-            NoMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
+            AreaMap.SetOutput(offscreen);
+            AreaMap.PaintUnit(x, y, UnitInfo, MyUn[i].Status);
 
             for j := 0 to UnitReport.FoodSupport - 1 do
@@ -1317 +1321 @@
     else if (x >= xmArea - 192) and (x < xmArea + 192) and (y >= ymArea - 96)
       and (y < ymArea + 96) then
+    with AreaMap do
     begin
       qx := ((4000 * xxt * yyt) + (x - xmArea) * (yyt * 2) + (y - ymArea + yyt)

trunk/LocalPlayer/Enhance.pas

@@ -7 +7 @@
   ScreenTools, BaseWin, Protocol, ClientTools, Term, LCLIntf, LCLType,
 
-  SysUtils, Classes, Graphics, Controls, Forms,
+  SysUtils, Classes, Graphics, Controls, Forms, IsoEngine,
   ButtonB, ButtonC, Menus;
 
@@ -28 +28 @@
     Popup: TPopupMenu;
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormPaint(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -35 +36 @@
     procedure JobClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    NoMap: TIsoMap;
   public
     procedure ShowNewContent(NewMode: integer; TerrType: integer = -1);
@@ -47 +50 @@
 implementation
 
-uses Help;
+uses
+  Help;
 
 {$R *.lfm}
@@ -57 +61 @@
 begin
   inherited;
+  NoMap := TIsoMap.Create;
   CaptionRight := CloseBtn.Left;
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
@@ -85 +90 @@
 end;
 
+procedure TEnhanceDlg.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(NoMap);
+end;
+
 procedure TEnhanceDlg.FormPaint(Sender: TObject);
 var
@@ -129 +139 @@
   while (EndStage < 5) and (MyData.EnhancementJobs[Page, EndStage] <> jNone) do
     inc(EndStage);
-  x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
+  with NoMap do
+    x := InnerWidth div 2 - xxt - (xxt + 3) * EndStage;
 
   TerrType := Page;
@@ -185 +196 @@
     end;
 
-    if TerrType < fForest then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + TerrType * (xxt * 2 + 1), 1 + yyt)
-    else
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
-        (yyt * 3 + 1));
-    end;
-    if TileImp and fTerImp = tiFarm then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
-    else if TileImp and fTerImp = tiIrrigation then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
-        1 + yyt + 12 * (yyt * 3 + 1));
-    if TileImp and fRR <> 0 then
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
-    end
-    else if TileImp and fRoad <> 0 then
-    begin
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
-    end;
-    if TileImp and fTerImp = tiMine then
-      Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
-        1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
-    inc(x, xxt * 2 + 6)
+    with NoMap do begin
+      if TerrType < fForest then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + TerrType * (xxt * 2 + 1), 1 + yyt)
+      else
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 2 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 7 * (xxt * 2 + 1), 1 + yyt + 2 * (2 + TerrType - fForest) *
+          (yyt * 3 + 1));
+      end;
+      if TileImp and fTerImp = tiFarm then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1))
+      else if TileImp and fTerImp = tiIrrigation then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2, 1,
+          1 + yyt + 12 * (yyt * 3 + 1));
+      if TileImp and fRR <> 0 then
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 6 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 10 * (yyt * 3 + 1));
+      end
+      else if TileImp and fRoad <> 0 then
+      begin
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 6 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 9 * (yyt * 3 + 1));
+      end;
+      if TileImp and fTerImp = tiMine then
+        Sprite(offscreen, HGrTerrain, x, 64 - yyt, xxt * 2, yyt * 2,
+          1 + 2 * (xxt * 2 + 1), 1 + yyt + 12 * (yyt * 3 + 1));
+      inc(x, xxt * 2 + 6)
+    end;
   end;
 

trunk/LocalPlayer/Help.pas

@@ -7 +7 @@
   Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonB, PVSB, Types, fgl;
+  ButtonB, PVSB, Types, fgl, IsoEngine;
 
 const
@@ -102 +102 @@
     ExtPic, TerrIcon: TBitmap;
     ScrollBar: TPVScrollbar;
+    NoMap: TIsoMap;
     x0: array [-2..180] of Integer;
     procedure PaintTerrIcon(x, y, xSrc, ySrc: Integer);
@@ -273 +274 @@
 begin
   inherited;
+  NoMap := TIsoMap.Create;
+
   HistItems := THistItems.Create;
 
@@ -331 +334 @@
   // FreeAndNil(CaptionFont);
   FreeAndNil(HistItems);
+  FreeAndNil(NoMap);
 end;
 
@@ -502 +506 @@
 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,
+  with NoMap do 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 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;
 end;
 
@@ -605 +611 @@
                     12 + x0[i], -7 + i * 24, 56, 40, 137, 127);
                 1:
-                  begin
+                  with NoMap do begin
                     PaintTerrIcon(12 + x0[i], -7 + i * 24,
                       1 + 3 * (xxt * 2 + 1), 1 + yyt);
@@ -618 +624 @@
                   end;
                 2:
-                  begin
+                  with NoMap do begin
                     PaintTerrIcon(12 + x0[i], -7 + i * 24,
                       1 + 7 * (xxt * 2 + 1), 1 + yyt + 4 * (yyt * 3 + 1));
@@ -703 +709 @@
             end;
           pkTer, pkBigTer:
-            begin
+            with NoMap do begin
               if HelpLineInfo.Format = pkBigTer then
                 y := i * 24 - 3 + yyt
@@ -758 +764 @@
             end;
           pkTerImp:
-            begin
+            with NoMap do begin
               ofs := 8;
               if HelpLineInfo.Picpix = 5 then

trunk/LocalPlayer/IsoEngine.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, ScreenTools, Tribes, {$IFNDEF SCR}Term, {$ENDIF}
+  Protocol, ClientTools, ScreenTools, Tribes,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, UPixelPointer, UGraphicSet;
+
+const
+  TerrainIconLines = 21;
+  TerrainIconCols = 9;
 
 type
   TInitEnemyModelEvent = function(emix: integer): boolean;
+  TTileSize = (tsSmall, tsMedium, tsBig);
+
+  TTerrainSpriteSize = array of TRect;
+
+  { TCitiesPictures }
+
+  TCitiesPictures = class
+    Pictures: array [2..3, 0..3] of TCityPicture;
+    procedure Prepare(HGrCities: TGraphicSet; xxt, yyt: Integer);
+  end;
 
   { TIsoMap }
@@ -15 +29 @@
   TIsoMap = class
   private
+    FTileSize: TTileSize;
     const
       Dirx: array [0..7] of Integer = (1, 2, 1, 0, -1, -2, -1, 0);
@@ -21 +36 @@
     function IsShoreTile(Loc: integer): boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
+    procedure SetTileSize(AValue: TTileSize);
     procedure ShadeOutside(x0, y0, Width, Height, xm, ym: integer);
   protected
@@ -36 +52 @@
     DataCanvas: TCanvas;
     MaskCanvas: TCanvas;
+    LandPatch: TBitmap;
+    OceanPatch: TBitmap;
+    Borders: TBitmap;
+    BordersOK: PInteger;
+    CitiesPictures: TCitiesPictures;
     function Connection4(Loc, Mask, Value: integer): integer;
     function Connection8(Loc, Mask: integer): integer;
@@ -48 +69 @@
     procedure Sprite(HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
     procedure TSprite(xDst, yDst, grix: integer; PureBlack: boolean = false);
+    procedure ApplyTileSize(ATileSize: TTileSize);
   public
+    xxt: Integer; // half of tile size x/y
+    yyt: Integer; // half of tile size x/y
+    TSpriteSize: TTerrainSpriteSize;
+    HGrTerrain: TGraphicSet;
+    HGrCities: TGraphicSet;
+    MapOptions: TMapOptions;
+    pDebugMap: Integer; // -1 for off
     constructor Create;
+    destructor Destroy; override;
+    procedure Reset;
     procedure SetOutput(Output: TBitmap);
     procedure SetPaintBounds(Left, Top, Right, Bottom: integer);
@@ -63 +94 @@
     procedure AttackEffect(const ShowMove: TShowMove);
     procedure AttackEnd;
+    procedure ReduceTerrainIconsSize;
     property AdviceLoc: integer read FAdviceLoc write FAdviceLoc;
-  end;
-
-var
-  NoMap: TIsoMap;
-  MapOptions: TMapOptions;
-  pDebugMap: Integer; // -1 for off
+    property TileSize: TTileSize read FTileSize write SetTileSize;
+  end;
+
+  { TIsoMapCache }
+
+  TIsoMapCache = class
+    LandPatch: TBitmap;
+    OceanPatch: TBitmap;
+    Borders: TBitmap;
+    BordersOk: Integer;
+    TSpriteSize: TTerrainSpriteSize;
+    HGrTerrain: TGraphicSet;
+    HGrCities: TGraphicSet;
+    CitiesPictures: TCitiesPictures;
+    procedure AssignToIsoMap(IsoMap: TIsoMap);
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+const
+  DefaultTileSize: TTileSize = tsMedium;
+  TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24),
+    (X: 72; Y: 36));
 
 function IsJungle(y: integer): boolean;
 procedure Init(InitEnemyModelHandler: TInitEnemyModelEvent);
-function ApplyTileSize(ATileSize: TTileSize): boolean;
-procedure Done;
-procedure IsoEngineReset;
+
 
 implementation
+
+uses
+  Term;
 
 const
   ShoreDither = fGrass;
-  TerrainIconLines = 21;
-  TerrainIconCols = 9;
 
   // sprites indexes
@@ -111 +159 @@
 
 var
-  BordersOK: integer;
   OnInitEnemyModel: TInitEnemyModelEvent;
-  LandPatch: TBitmap;
-  OceanPatch: TBitmap;
-  Borders: TBitmap;
-  TSpriteSize: array [0 .. TerrainIconLines * TerrainIconCols - 1] of TRect;
   DebugMap: ^TTileList;
-  CitiesPictures: array [2 .. 3, 0 .. 3] of TCityPicture;
   FoW: Boolean;
   ShowLoc: Boolean;
@@ -127 +169 @@
   ShowGrWall: Boolean;
   ShowDebug: Boolean;
+  IsoMapCache: array[TTileSize] of TIsoMapCache;
 
 function IsJungle(y: integer): boolean;
@@ -136 +179 @@
 begin
   OnInitEnemyModel := InitEnemyModelHandler;
-  if NoMap <> nil then
-    FreeAndNil(NoMap);
-  NoMap := TIsoMap.Create;
-end;
-
-procedure ReduceTerrainIconsSize;
+end;
+
+{ TCitiesPictures }
+
+procedure TCitiesPictures.Prepare(HGrCities: TGraphicSet; xxt, yyt: Integer);
+var
+  Age: Integer;
+  Size: Integer;
+begin
+  // prepare age 2+3 cities
+  for age := 2 to 3 do
+    for size := 0 to 3 do
+      with Pictures[Age, Size] do
+        FindPosition(HGrCities, Size * (xxt * 2 + 1), (Age - 2) * (yyt * 3 + 1),
+          xxt * 2 - 1, yyt * 3 - 1, $00FFFF, xShield, yShield);
+end;
+
+{ TIsoMapCache }
+
+procedure TIsoMapCache.AssignToIsoMap(IsoMap: TIsoMap);
+begin
+  IsoMap.HGrTerrain := HGrTerrain;
+  IsoMap.HGrCities := HGrCities;
+  IsoMap.Borders := Borders;
+  IsoMap.BordersOK := @BordersOk;
+  IsoMap.LandPatch := LandPatch;
+  IsoMap.OceanPatch := OceanPatch;
+  IsoMap.TSpriteSize := TSpriteSize;
+  IsoMap.CitiesPictures := CitiesPictures;
+end;
+
+constructor TIsoMapCache.Create;
+begin
+  LandPatch := TBitmap.Create;
+  LandPatch.PixelFormat := pf24bit;
+  OceanPatch := TBitmap.Create;
+  OceanPatch.PixelFormat := pf24bit;
+  Borders := TBitmap.Create;
+  Borders.PixelFormat := pf24bit;
+  HGrTerrain := nil;
+  HGrCities := nil;
+  SetLength(TSpriteSize, TerrainIconLines * TerrainIconCols);
+  CitiesPictures := TCitiesPictures.Create;
+end;
+
+destructor TIsoMapCache.Destroy;
+begin
+  FreeAndNil(CitiesPictures);
+  FreeAndNil(LandPatch);
+  FreeAndNil(OceanPatch);
+  FreeAndNil(Borders);
+  inherited;
+end;
+
+procedure TIsoMap.ReduceTerrainIconsSize;
 var
   MaskLine: array of TPixelPointer;
@@ -206 +298 @@
 end;
 
-function ApplyTileSize(ATileSize: TTileSize): boolean;
+procedure TIsoMap.ApplyTileSize(ATileSize: TTileSize);
 var
   x: Integer;
@@ -212 +304 @@
   xSrc: Integer;
   ySrc: Integer;
-  HGrTerrainNew: TGraphicSet;
-  HGrCitiesNew: TGraphicSet;
-  Age: Integer;
-  Size: Integer;
   LandMore: TBitmap;
   OceanMore: TBitmap;
   DitherMask: TBitmap;
-  xxtNew: Integer;
-  yytNew: Integer;
-begin
-  xxtNew := TileSizes[ATileSize].X;
-  yytNew := TileSizes[ATileSize].Y;
-  result := false;
-  HGrTerrainNew := LoadGraphicSet(Format('Terrain%dx%d.png',
-    [xxtNew * 2, yytNew * 2]));
-  if not Assigned(HGrTerrainNew) then
-    exit;
-  HGrCitiesNew := LoadGraphicSet(Format('Cities%dx%d.png',
-    [xxtNew * 2, yytNew * 2]));
-  if not Assigned(HGrCitiesNew) then
-    exit;
-  xxt := xxtNew;
-  yyt := yytNew;
-  TileSize := ATileSize;
-  HGrTerrain := HGrTerrainNew;
-  HGrCities := HGrCitiesNew;
-  Result := true;
-
-  // prepare age 2+3 cities
-  for age := 2 to 3 do
-    for size := 0 to 3 do
-      with CitiesPictures[age, size] do
-        FindPosition(HGrCities, size * (xxt * 2 + 1), (age - 2) * (yyt * 3 + 1),
-          xxt * 2 - 1, yyt * 3 - 1, $00FFFF, xShield, yShield);
+  FileName: string;
+begin
+  FTileSize := ATileSize;
+  xxt := TileSizes[ATileSize].X;
+  yyt := TileSizes[ATileSize].Y;
+
+  if Assigned(IsoMapCache[ATileSize]) then begin
+    IsoMapCache[ATileSize].AssignToIsoMap(Self);
+    Exit;
+  end;
+  IsoMapCache[ATileSize] := TIsoMapCache.Create;
+
+  FileName := Format('Terrain%dx%d.png', [xxt * 2, yyt * 2]);
+  IsoMapCache[ATileSize].HGrTerrain := LoadGraphicSet(FileName);
+  if not Assigned(IsoMapCache[ATileSize].HGrTerrain) then
+    raise Exception.Create(FileName + ' not found.');
+
+  FileName := Format('Cities%dx%d.png', [xxt * 2, yyt * 2]);
+  IsoMapCache[ATileSize].HGrCities := LoadGraphicSet(FileName);
+  if not Assigned(IsoMapCache[ATileSize].HGrCities) then
+    raise Exception.Create(FileName + ' not found.');
+
+  IsoMapCache[ATileSize].AssignToIsoMap(Self);
+
+  CitiesPictures.Prepare(HGrCities, xxt, yyt);
 
   { prepare dithered ground tiles }
-  if not Assigned(LandPatch) then begin
-    LandPatch := TBitmap.Create;
-    LandPatch.PixelFormat := pf24bit;
-  end;
   LandPatch.Canvas.Brush.Color := 0;
   LandPatch.SetSize(xxt * 18, yyt * 9);
   LandPatch.Canvas.FillRect(0, 0, LandPatch.Width, LandPatch.Height);
-  if not Assigned(OceanPatch) then begin
-    OceanPatch := TBitmap.Create;
-    OceanPatch.PixelFormat := pf24bit;
-  end;
   OceanPatch.Canvas.Brush.Color := 0;
   OceanPatch.SetSize(xxt * 8, yyt * 4);
@@ -437 +515 @@
   ReduceTerrainIconsSize;
 
-  if not Assigned(Borders) then begin
-    Borders := TBitmap.Create;
-    Borders.PixelFormat := pf24bit;
-  end;
   Borders.SetSize(xxt * 2, (yyt * 2) * nPl);
   Borders.Canvas.FillRect(0, 0, Borders.Width, Borders.Height);
-  BordersOK := 0;
-end;
-
-procedure Done;
-begin
-  FreeAndNil(NoMap);
-  FreeAndNil(LandPatch);
-  FreeAndNil(OceanPatch);
-  FreeAndNil(Borders);
-end;
-
-procedure IsoEngineReset;
-begin
-  BordersOK := 0;
+  BordersOK^ := 0;
+end;
+
+procedure TIsoMap.Reset;
+begin
+  BordersOK^ := 0;
 end;
 
@@ -469 +535 @@
   DefLoc := -1;
   FAdviceLoc := -1;
+  TileSize := DefaultTileSize;
+end;
+
+destructor TIsoMap.Destroy;
+begin
+  inherited;
 end;
 
@@ -711 +783 @@
     else
     begin
-      cpic := CitiesPictures[age, xGr];
+      cpic := CitiesPictures.Pictures[age, xGr];
       xShield := x - xxt + cpic.xShield;
       yShield := y - 2 * yyt + cpic.yShield;
@@ -1024 +1096 @@
   begin
     if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
-      (Tile and fTerrain <> fUNKNOWN) then
-    begin
+      (Tile and fTerrain <> fUNKNOWN) then begin
       p1 := MyRO.Territory[Loc];
-      if (p1 >= 0) and (ShowMyBorder or (p1 <> me)) then
-      begin
-        if BordersOK and (1 shl p1) = 0 then
-        begin
+      if (p1 >= 0) and (ShowMyBorder or (p1 <> me)) then begin
+        if BordersOK^ and (1 shl p1) = 0 then begin
           UnshareBitmap(Borders);
           BitBltCanvas(Borders.Canvas, 0, p1 * (yyt * 2), xxt * 2,
@@ -1049 +1118 @@
           end;
           Borders.EndUpdate;
-          BordersOK := BordersOK or 1 shl p1;
+          BordersOK^ := BordersOK^ or 1 shl p1;
         end;
         for dy := 0 to 1 do
-          for dx := 0 to 1 do
-          begin
+          for dx := 0 to 1 do begin
             Loc1 := dLoc(Loc, dx * 2 - 1, dy * 2 - 1);
             begin
@@ -1071 +1139 @@
               end;
             end;
-          end
+          end;
       end;
     end;
@@ -1347 +1415 @@
     Line^.NextPixel;
   end;
+end;
+
+procedure TIsoMap.SetTileSize(AValue: TTileSize);
+begin
+  if FTileSize = AValue then Exit;
+  FTileSize := AValue;
+  ApplyTileSize(AValue);
 end;
 
@@ -1641 +1716 @@
 end;
 
-initialization
-
-NoMap := nil;
-LandPatch := nil;
-OceanPatch := nil;
-Borders := nil;
+procedure IsoEngineDone;
+var
+  I: TTileSize;
+begin
+  for I := Low(IsoMapCache) to High(IsoMapCache) do
+    FreeAndNil(IsoMapCache[I]);
+end;
+
+finalization
+
+IsoEngineDone;
 
 end.

trunk/LocalPlayer/Term.pas

@@ -14 +14 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  UGraphicSet, UMiniMap;
+  UGraphicSet, UMiniMap, IsoEngine;
 
 const
@@ -21 +21 @@
 type
   TPaintLocTempStyle = (pltsNormal, pltsBlink);
-  TTileSize = (tsSmall, tsMedium, tsBig);
 
   TSoundBlock = (sbStart, sbWonder, sbScience, sbContact, sbTurn);
@@ -270 +269 @@
     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;
@@ -321 +324 @@
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
+    procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
   public
     UsedOffscreenWidth, UsedOffscreenHeight: integer;
@@ -438 +442 @@
     'CITY_INVALIDTYPE');
 
-  TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24),
-    (X: 72; Y: 36));
-
 type
   TPersistentData = record
@@ -477 +478 @@
   AdvIcon: array [0 .. nAdv - 1] of Integer;
   { icons displayed with the technologies }
-  xxt: Integer; // half of tile size x/y
-  yyt: Integer; // half of tile size x/y
-  TileSize: TTileSize;
   GameMode: Integer;
   ClientMode: Integer;
@@ -491 +489 @@
   SoundPreloadDone: TSoundBlocks;
   MarkCityLoc: Integer;
-  HGrTerrain: TGraphicSet;
-  HGrCities: TGraphicSet;
   MovieSpeed: Integer;
   CityRepMask: Cardinal;
@@ -524 +520 @@
 
 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;
@@ -582 +578 @@
 
   SaveOption: array of Integer;
-  MainMap: TIsoMap;
   CurrentMoveInfo: TCurrentMoveInfo;
 
@@ -925 +920 @@
 end;
 
-procedure PaintZoomedTile(dst: TBitmap; x, y, Loc: integer);
+procedure TMainScreen.PaintZoomedTile(dst: TBitmap; 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;
 
@@ -948 +946 @@
   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;
@@ -1268 +1256 @@
 begin
   MiniMap.MapOptions := MapOptionChecked;
-  IsoEngine.MapOptions := MapOptionChecked;
+  MainMap.MapOptions := MapOptionChecked;
   if ClientMode = cEditMap then
-    IsoEngine.MapOptions := IsoEngine.MapOptions + [moEditMode];
+    MainMap.MapOptions := MainMap.MapOptions + [moEditMode];
   if mLocCodes.Checked then
-    IsoEngine.MapOptions := IsoEngine.MapOptions + [moLocCodes];
+    MainMap.MapOptions := MainMap.MapOptions + [moLocCodes];
 end;
 
@@ -1638 +1626 @@
 
   IsoEngine.Init(InitEnemyModel);
-  if not IsoEngine.ApplyTileSize(TileSize) and (TileSize <> tsMedium) then
-    ApplyTileSize(tsMedium);
   // non-default tile size is missing a file, switch to default
-  MainMap := TIsoMap.Create;
   MainMap.SetOutput(offscreen);
 
@@ -1654 +1639 @@
   sb := TPVScrollbar.Create(Self);
   sb.OnUpdate := ScrollBarUpdate;
+end;
+
+procedure TMainScreen.DoneModule;
+begin
+  FreeAndNil(SmallImp);
+  FreeAndNil(UnusedTribeFiles);
+  FreeAndNil(TribeNames);
+  // AdvisorDlg.DeInit;
 end;
 
@@ -1839 +1832 @@
     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
@@ -2536 +2529 @@
       end;
 
-    cReleaseModule:
-      begin
-        FreeAndNil(SmallImp);
-        FreeAndNil(UnusedTribeFiles);
-        FreeAndNil(TribeNames);
-        FreeAndNil(MainMap);
-        IsoEngine.Done;
-        // AdvisorDlg.DeInit;
-      end;
+    cReleaseModule: DoneModule;
 
     cHelpOnly, cStartHelp, cStartCredits:
@@ -2573 +2558 @@
         ClientMode := -1;
         SetMapOptions;
-        IsoEngine.pDebugMap := -1;
+        MainMap.pDebugMap := -1;
         idle := false;
         FillChar(Jump, SizeOf(Jump), 0);
@@ -2580 +2565 @@
         GameMode := Command;
         GrExt.ResetPixUsed;
-        IsoEngineReset;
+        MainMap.Reset;
+        NoMap.Reset;
         Tribes.Init;
         GetTribeList;
@@ -2897 +2883 @@
         ClientMode := cEditMap;
         SetMapOptions;
-        IsoEngine.pDebugMap := -1;
+        MainMap.pDebugMap := -1;
         ItsMeAgain(0);
         MyData := nil;
@@ -3393 +3379 @@
     cRefreshDebugMap:
       begin
-        if integer(Data) = IsoEngine.pDebugMap then
+        if integer(Data) = MainMap.pDebugMap then
         begin
           MapValid := false;
@@ -3445 +3431 @@
   i, j: integer;
 begin
+  NoMap := TIsoMap.Create;
+  MainMap := TIsoMap.Create;
+  NoMapPanel := TIsoMap.Create;
+
   KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
   UpdateKeyShortcuts;
@@ -3559 +3549 @@
       FreeAndNil(AILogo[I]);
   FreeAndNil(Offscreen);
+  FreeAndNil(MainMap);
+  FreeAndNil(NoMap);
+  FreeAndNil(NoMapPanel);
 end;
 
@@ -3568 +3561 @@
     Update;
   end else begin
-    if (WheelDelta > 0) and (TileSize < High(TTileSize)) then SetTileSize(Succ(TileSize))
-    else if (WheelDelta < 0) and (TileSize > Low(TTileSize)) then SetTileSize(Pred(TileSize));
+    if (WheelDelta > 0) and (MainMap.TileSize < High(TTileSize)) then
+      SetTileSize(Succ(MainMap.TileSize))
+    else if (WheelDelta < 0) and (MainMap.TileSize > Low(TTileSize)) then
+      SetTileSize(Pred(MainMap.TileSize));
   end;
 end;
@@ -3578 +3573 @@
 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
@@ -3705 +3699 @@
     xTroop := xMidPanel + 15
   else
-  begin
+  with MainMap do begin
     if supervising then
       xTerrain := xMidPanel + 2 * xxt + 14
@@ -3974 +3968 @@
   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;
 
@@ -4003 +3998 @@
   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;
@@ -4011 +4005 @@
       prPaint or prAutoBounds or prInvalidate);
     Update;
-  end
+  end;
 end;
 
@@ -4018 +4012 @@
   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;
 
@@ -4060 +4056 @@
     else
       BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
-        height + yMap, Buffer.Canvas, 0, -yMap)
+        height + yMap, Buffer.Canvas, 0, -yMap);
   end
   else
@@ -4070 +4066 @@
       BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
         height, Buffer.Canvas, 0, 0);
-  end
+  end;
 end;
 
@@ -4135 +4131 @@
   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);
+  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}
-    ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-      rec, rec, 0, nil);
+      ScrollDC(offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
+        rec, rec, 0, nil);
 {$ENDIF}
 {$IFDEF LINUX}
-    ScrollDC(offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-      rec, rec, 0, nil);
+      ScrollDC(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;
+      for DoInvalidate := false to FastScrolling do begin
+        if DoInvalidate then begin
+          rec.Bottom := MapHeight - overlap;
 {$IFDEF WINDOWS}
-        ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
-          rec, 0, nil);
+          ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
+            rec, 0, nil);
 {$ENDIF}
 {$IFDEF LINUX}
-        ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-          rec, rec, 0, nil);
+          ScrollDC(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 := 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
@@ -4227 +4218 @@
 procedure TMainScreen.MiniMapPaint;
 begin
-  MiniMap.Paint(MyMap, MapWidth, ClientMode, xxt, xwMini);
+  with MainMap do
+    MiniMap.Paint(MyMap, MapWidth, ClientMode, xxt, xwMini);
 end;
 
@@ -4253 +4245 @@
 procedure TMainScreen.CopyMiniToPanel;
 begin
-  BitBltCanvas(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);
+  with MainMap do begin
+    BitBltCanvas(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;
 
@@ -4457 +4451 @@
               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)
@@ -4637 +4632 @@
                           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
@@ -4655 +4650 @@
                           xTroop + x + 34 - BiColorTextWidth(Panel.Canvas, s)
                           div 2, yTroop - 16, s);
-                      end
+                      end;
                     end;
                     inc(Count)
@@ -4661 +4656 @@
                 end; // for uix:=0 to MyRO.nUn-1
             assert(Count = TrCnt);
-          end
+          end;
         end
         else
@@ -4673 +4668 @@
               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;
@@ -4681 +4676 @@
       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);
@@ -4731 +4726 @@
             (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
             PanelHeight, MainTexture.clBevelShade, MainTexture.clBevelLight)
-    end { if TroopLoc>=0 }
+    end; { if TroopLoc>=0 }
   end;
 
@@ -4761 +4756 @@
             (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));
@@ -4898 +4893 @@
   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;
@@ -5077 +5073 @@
 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;
+  with MainMap do 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;
   end;
 end;
@@ -5121 +5118 @@
       PanelPaint;
       ShowNewContent(wmPersistent, Loc, ShowEvent);
-    end
+    end;
 end;
 
@@ -5128 +5125 @@
   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;
 
@@ -5204 +5203 @@
       BitBltCanvas(Panel.Canvas, xMini + 2, yMini + 2, G.lx * 2, G.ly,
         MiniMap.Bitmap.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);
+      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
@@ -5989 +5990 @@
     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;
@@ -6121 +6118 @@
       begin
         assert(false);
-        Break
+        Break;
       end;
     until false;
@@ -6147 +6144 @@
           NextUnit(UnStartLoc, true)
         end;
-      end
-    end
-  end
+      end;
+    end;
+  end;
 end;
 
@@ -6166 +6163 @@
       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
@@ -6174 +6172 @@
           if (p1 = me) or (p1 >= 0) and (MyRO.Treaty[p1] >= trNone) then
             NatStatDlg.ShowNewContent(wmPersistent, p1);
-        end
+        end;
       end
       else
@@ -6269 +6267 @@
               CheckTerrainBtnVisible;
               PanelPaint;
-            end
+            end;
           end
           else if Server(sGetUnits, me, TroopLoc, TrCnt) >= rExecuted then
@@ -6278 +6276 @@
               UnitStatDlg.ShowNewContent_EnemyUnit(wmPersistent,
                 MyRO.nEnemyUn + trix[i]); // unit info
-    end
-  end
+    end;
+  end;
 end;
 
@@ -6371 +6369 @@
 procedure TMainScreen.SetDebugMap(p: integer);
 begin
-  IsoEngine.pDebugMap := p;
-  IsoEngine.MapOptions := IsoEngine.MapOptions - [moLocCodes];
+  MainMap.pDebugMap := p;
+  MainMap.MapOptions := MainMap.MapOptions - [moLocCodes];
   mLocCodes.Checked := false;
   MapValid := false;
@@ -7234 +7232 @@
             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 := TileSize = tsSmall;
-    mNormalTiles.Checked := TileSize = tsMedium;
-    mBigTiles.Checked := TileSize = tsBig;
+    mSmallTiles.Checked := MainMap.TileSize = tsSmall;
+    mNormalTiles.Checked := MainMap.TileSize = tsMedium;
+    mBigTiles.Checked := MainMap.TileSize = tsBig;
   end
   else if Popup = StatPopup then
@@ -7432 +7430 @@
         FocusOnLoc(TroopLoc, flRepaintPanel)
       else
-        PanelPaint
+        PanelPaint;
     end
     else if StepFocus then
@@ -7439 +7437 @@
     begin
       SetTroopLoc(-1);
-      PanelPaint
+      PanelPaint;
     end;
   end;
@@ -7455 +7453 @@
 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
@@ -7703 +7701 @@
   with Reg do try
     OpenKey(AppRegistryKey, False);
-    if ValueExists('TileSize') then TileSize := TTileSize(ReadInteger('TileSize'))
-      else TileSize := tsMedium;
-    xxt := TileSizes[TileSize].X;
-    yyt := TileSizes[TileSize].Y;
+    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;
@@ -7953 +7950 @@
   i, CenterLoc: integer;
 begin
-  CenterLoc := (xw + MapWidth div (xxt * 4)) mod G.lx +
-    (yw + MapHeight div (yyt * 2)) * G.lx;
-  IsoEngine.ApplyTileSize(TileSize);
+  CenterLoc := (xw + MapWidth div (MainMap.xxt * 4)) mod G.lx +
+    (yw + MapHeight div (MainMap.yyt * 2)) * G.lx;
+  MainMap.TileSize := TileSize;
+  NoMap.TileSize := TileSize;
   FormResize(nil);
   Centre(CenterLoc);
@@ -7988 +7986 @@
   try
     OpenKey(AppRegistryKey, true);
-    WriteInteger('TileSize', Integer(TileSize));
+    WriteInteger('TileSize', Integer(MainMap.TileSize));
     WriteInteger('OptionChecked', Integer(OptionChecked));
     WriteInteger('MapOptionChecked', Integer(MapOptionChecked));

trunk/LocalPlayer/UnitStat.pas

@@ -7 +7 @@
   Protocol, ClientTools, Term, ScreenTools, BaseWin,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
-  ButtonB, ButtonC;
+  ButtonB, ButtonC, IsoEngine;
 
 type
@@ -24 +24 @@
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure HelpBtnClick(Sender: TObject);
-
+  private
+    NoMap: TIsoMap;
   public
     procedure CheckAge;
@@ -51 +52 @@
 
 uses
-  Tribes, IsoEngine, Help, Directories;
+  Tribes, Help, Directories;
 
 {$R *.lfm}
@@ -73 +74 @@
 begin
   inherited;
+  NoMap := TIsoMap.Create;
   AgePrepared := -2;
   TitleHeight := Screen.Height;
@@ -91 +93 @@
   FreeAndNil(Template);
   FreeAndNil(Back);
+  FreeAndNil(NoMap);
 end;
 
@@ -521 +524 @@
     begin
       if Kind in [dkOwnUnit, dkEnemyUnit, dkEnemyCityDefense] then
-        with ui do
+        with ui, NoMap do
         begin
           { Frame(offscreen.canvas,xView-1,yView-1,xView+64,yView+48,