Changeset 538 for trunk/LocalPlayer

Timestamp:

Apr 16, 2024, 10:57:39 AM (8 months ago)

Author:

chronos

Message:

• Fixed: Map drawing in case of fractional scaling.

File:

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

trunk/LocalPlayer/IsoEngine.pas

@@ -52 +52 @@
     DefHealth: Integer;
     FAdviceLoc: Integer;
-    DataCanvas: TCanvas;
-    MaskCanvas: TCanvas;
     LandPatch: TBitmap;
     OceanPatch: TBitmap;
@@ -329 +327 @@
     raise Exception.Create(FileName + ' not found.');
 
+
   FileName := Format('Cities%dx%d.png', [xxt * 2, yyt * 2]);
   IsoMapCache[ATileSize].HGrCities := LoadGraphicSet(FileName);
@@ -584 +583 @@
 begin
   FOutput.Canvas.Font.Color := Color;
-  FOutput.Canvas.TextRect(Rect(FLeft, FTop, FRight, FBottom), X, Y, S)
+  FOutput.Canvas.TextRect(Rect(FLeft, FTop, FRight, FBottom), X, Y, S);
 end;
 
@@ -593 +592 @@
   begin
     Width := Width - (FLeft - X);
-    xSrc := xSrc + (FLeft - X);
+    XSrc := XSrc + (FLeft - X);
     X := FLeft;
   end;
@@ -599 +598 @@
   begin
     Height := Height - (FTop - Y);
-    ySrc := ySrc + (FTop - Y);
+    YSrc := YSrc + (FTop - Y);
     Y := FTop;
   end;
@@ -609 +608 @@
     Exit;
 
+  {$IFDEF DPI}
   BitBltBitmap(FOutput, X, Y, Width, Height, Src, xSrc, ySrc, Rop);
+  {$ELSE}
+  BitBltCanvas(FOutput.Canvas, X, Y, Width, Height, Src.Canvas, xSrc, ySrc, Rop);
+  {$ENDIF}
 end;
 
@@ -649 +652 @@
     Exit;
 
-  BitBltCanvas(FOutput.Canvas, xDst, yDst, Width, Height, MaskCanvas, xSrc, ySrc, SRCAND);
+  BitBltBitmap(FOutput, xDst, yDst, Width, Height, HGrTerrain.Mask, xSrc, ySrc, SRCAND);
   if not PureBlack then
-    BitBltCanvas(FOutput.Canvas, xDst, yDst, Width, Height, DataCanvas, xSrc, ySrc, SRCPAINT);
+    BitBltBitmap(FOutput, xDst, yDst, Width, Height, HGrTerrain.Data, xSrc, ySrc, SRCPAINT);
 end;
 
@@ -707 +710 @@
       if Flags and unFortified <> 0 then
       begin
-        { DataCanvas := HGrTerrain.Data.Canvas;
-          MaskCanvas := HGrTerrain.Mask.Canvas;
-          TerrainSprite(X, Y + 16, 12 * 9 + 7);  }
+        { TerrainSprite(X, Y + 16, 12 * 9 + 7);  }
         Sprite(HGrStdUnits, X, Y, xxu * 2, yyu * 2, 1 + 6 * (xxu * 2 + 1), 1);
       end;
@@ -1152 +1153 @@
   end; { square not discovered }
 
-  if not(FoW and (Tile and fObserved = 0)) then
+  if not (FoW and (Tile and fObserved = 0)) then
     PaintBorder;
 
@@ -1569 +1570 @@
                 end;
               BitBltBitmapOutput(OceanPatch, X + dx * xxt, Y + dy * yyt, xxt, yyt,
-                Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY)
-            end
+                Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY);
+            end;
           end
           else
@@ -1625 +1626 @@
             else
               BitBltBitmapOutput(LandPatch, X + dx * xxt, Y + dy * yyt, xxt, yyt,
-                Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY)
+                Aix * (xxt * 2) + (dx + dy + 1) and 1 * xxt, bix * yyt, SRCCOPY);
           end;
       end;
 
-  DataCanvas := HGrTerrain.Data.Canvas;
-  MaskCanvas := HGrTerrain.Mask.Canvas;
   for dy := -2 to ny + 1 do
     for dx := -1 to nx do
@@ -1640 +1639 @@
         PaintTileExtraTerrain(X + xxt * dx, Y + yyt + yyt * dy,
           dLoc(Loc, dx, dy));
+
   if CityOwner >= 0 then
   begin