Changeset 719 for trunk/LocalPlayer/IsoEngine.pas

Timestamp:

Jan 12, 2026, 11:29:21 AM (12 hours ago)

Author:

chronos

Message:

• Fixed: Map objects not drawn beyond city radius in city dialog if fractional scaling active.

File:

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

trunk/LocalPlayer/IsoEngine.pas

@@ -77 +77 @@
     procedure PaintTileExtraTerrain(X, Y, Loc: Integer);
     procedure PaintTileObjects(nx, ny, X, Y, Loc, CityLoc, CityOwner: Integer;
-      UseBlink: Boolean);
-    procedure PaintTileObjectsRadius(nx, ny, X, Y, Loc, CityLoc, CityOwner: Integer;
-      UseBlink: Boolean; Radius: Integer; Inside: Boolean);
+      UseBlink: Boolean; Radius: Integer = -1; Inside: Boolean = False);
     procedure PaintTileObjects1(X, Y, Loc, CityLoc, CityOwner: Integer;
       UseBlink: Boolean);
@@ -1182 +1180 @@
 end;
 
-procedure TIsoMap.PaintTileObjects(nx, ny, X, Y, Loc, CityLoc, CityOwner: Integer;
-  UseBlink: Boolean);
+procedure TIsoMap.PaintTileObjects(nx, ny, X, Y, Loc, CityLoc,
+  CityOwner: Integer; UseBlink: Boolean; Radius: Integer = -1; Inside: Boolean = False);
 var
   dx, dy: Integer;
+  ALoc: Integer;
 begin
   for dy := -2 to ny + 1 do
     for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-        PaintTileObjects1(X + xxt * dx, Y + yyt + yyt * dy, dLoc(Loc, dx, dy),
-          CityLoc, CityOwner, UseBlink);
-
-  for dy := -2 to ny + 1 do
-    for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-        PaintTileObjects2(X + xxt * dx, Y + yyt + yyt * dy, dLoc(Loc, dx, dy),
-          CityLoc, CityOwner, UseBlink);
-
-  for dy := -2 to ny + 1 do
-    for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-        PaintTileObjects3(X + xxt * dx, Y + yyt + yyt * dy, dLoc(Loc, dx, dy),
-          CityLoc, CityOwner, UseBlink);
-end;
-
-procedure TIsoMap.PaintTileObjectsRadius(nx, ny, X, Y, Loc, CityLoc,
-  CityOwner: Integer; UseBlink: Boolean; Radius: Integer; Inside: Boolean);
-var
-  dx, dy: Integer;
-  ALoc: Integer;
-begin
-  for dy := -2 to ny + 1 do
-    for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-      begin
+      if (dx + dy) and 1 = 0 then begin
         ALoc := dLoc(Loc, dx, dy);
-        if (Inside and (Distance(ALoc, CityLoc) <= 5)) or
-          (not Inside and (Distance(ALoc, CityLoc) > 5)) then
+        if (Radius < 0) or
+          (Inside and (Distance(ALoc, CityLoc) <= Radius)) or
+          (not Inside and (Distance(ALoc, CityLoc) > Radius)) then
           PaintTileObjects1(X + xxt * dx, Y + yyt + yyt * dy, ALoc, CityLoc,
             CityOwner, UseBlink);
@@ -1225 +1199 @@
   for dy := -2 to ny + 1 do
     for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-      begin
+      if (dx + dy) and 1 = 0 then begin
         ALoc := dLoc(Loc, dx, dy);
-        if (Inside and (Distance(ALoc, CityLoc) <= 5)) or
-          (not Inside and (Distance(ALoc, CityLoc) > 5)) then
+        if (Radius < 0) or
+          (Inside and (Distance(ALoc, CityLoc) <= Radius)) or
+          (not Inside and (Distance(ALoc, CityLoc) > Radius)) then
           PaintTileObjects2(X + xxt * dx, Y + yyt + yyt * dy, ALoc, CityLoc,
             CityOwner, UseBlink);
       end;
 
+  if Radius >= 0 then UnshareBitmap(FOutput);
+
   for dy := -2 to ny + 1 do
     for dx := -2 to nx + 1 do
-      if (dx + dy) and 1 = 0 then
-      begin
+      if (dx + dy) and 1 = 0 then begin
         ALoc := dLoc(Loc, dx, dy);
-        if (Inside and (Distance(ALoc, CityLoc) <= 5)) or
-          (not Inside and (Distance(ALoc, CityLoc) > 5)) then
+        if (Radius < 0) or
+          (Inside and (Distance(ALoc, CityLoc) <= Radius)) or
+          (not Inside and (Distance(ALoc, CityLoc) > Radius)) then
           PaintTileObjects3(X + xxt * dx, Y + yyt + yyt * dy, ALoc, CityLoc,
             CityOwner, UseBlink);
@@ -1403 +1379 @@
 
   if moEditMode in MapOptions then
-     Fog := (Loc < 0) or (Loc >= G.lx * G.ly)
-     // else if CityLoc >= 0 then
-     // Fog:= (Loc < 0) or (Loc >= G.lx * G.ly) or (Distance(Loc, CityLoc) > 5)
-   else if ShowGrWall then
-     Fog := Tile and fGrWall = 0
-   else
-     Fog := FogOfWar and (Tile and fObserved = 0);
-   if Fog and ShowObjects then
-     if Loc < -G.lx then
-       Sprite(HGrTerrain, X, Y + yyt, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
-         1 + yyt * 2 + 15 * (yyt * 3 + 1))
-     else if Loc >= G.lx * (G.ly + 1) then
-       Sprite(HGrTerrain, X, Y, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
-         1 + yyt + 15 * (yyt * 3 + 1))
-     else begin
-       TerrainSprite(X, Y, spGrid, xxt <> 33, True);
-     end;
+    Fog := (Loc < 0) or (Loc >= G.lx * G.ly)
+    // else if CityLoc >= 0 then
+    // Fog := (Loc < 0) or (Loc >= G.lx * G.ly) or (Distance(Loc, CityLoc) > 5)
+  else if ShowGrWall then
+    Fog := Tile and fGrWall = 0
+  else
+    Fog := FogOfWar and (Tile and fObserved = 0);
+
+  if Fog and ShowObjects then begin
+    if Loc < -G.lx then
+      Sprite(HGrTerrain, X, Y + yyt, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
+        1 + yyt * 2 + 15 * (yyt * 3 + 1))
+    else if Loc >= G.lx * (G.ly + 1) then
+      Sprite(HGrTerrain, X, Y, xxt * 2, yyt, 1 + 6 * (xxt * 2 + 1),
+        1 + yyt + 15 * (yyt * 3 + 1))
+    else begin
+      TerrainSprite(X, Y, spGrid, xxt <> 33, True);
+    end;
+  end;
 end;
 
@@ -1512 +1490 @@
     else if Tile and fStealthUnit <> 0 then
       Sprite(HGrStdUnits, X + (xxt - xxu), Y + (yyt - yyu_anchor), xxu * 2,
-        yyu * 2, 1 + 5 * (xxu * 2 + 1), 1 + 1 * (yyu * 2 + 1))
+        yyu * 2, 1 + 5 * (xxu * 2 + 1), 1 + 1 * (yyu * 2 + 1));
   end;
 
@@ -1524 +1502 @@
       (Loc < G.lx * G.ly) and (DebugMap[Loc] <> 0) then
       TextOut(X + xxt - 16, Y + yyt - 9, $00E0FF,
-        IntToStr(Integer(DebugMap[Loc])))
+        IntToStr(Integer(DebugMap[Loc])));
 end;
 
@@ -1751 +1729 @@
   if CityOwner >= 0 then begin
     // Paint objects outside radius
-    PaintTileObjectsRadius(nx, ny, X, Y, Loc, CityLoc, CityOwner, UseBlink, 5, False);
+    PaintTileObjects(nx, ny, X, Y, Loc, CityLoc, CityOwner, UseBlink, 5, False);
 
     dx := ((CityLoc mod G.lx * 2 + CityLoc div G.lx and 1) -
@@ -1763 +1741 @@
 
     // Paint objects inside radius
-    PaintTileObjectsRadius(nx, ny, X, Y, Loc, CityLoc, CityOwner, UseBlink, 5, True);
+    PaintTileObjects(nx, ny, X, Y, Loc, CityLoc, CityOwner, UseBlink, 5, True);
   end else begin
     if ShowLoc or (moEditMode in MapOptions) or (moGrid in MapOptions) then