Changeset 330 for trunk/LocalPlayer/CityScreen.pas

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.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (6 diffs)

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)