Changeset 330 for trunk/LocalPlayer/Enhance.pas

Timestamp:

Mar 26, 2021, 2:16:04 PM (3 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.

File:

• trunk/LocalPlayer/Enhance.pas (modified) (8 diffs)

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;