Changeset 594 for trunk

Timestamp:

Aug 11, 2024, 9:03:53 PM (3 months ago)

Author:

chronos

Message:

• Fixed: Do not show units and cities in maps mini map preview.
• Fixed: Editor maps access violation on Windows.

File:

• trunk/MiniMap.pas (modified) (1 diff)

trunk/MiniMap.pas

@@ -184 +184 @@
           MiniPixel.SetX(xm);
           Tile := Map.Tiles[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
-          if Tile and fTerrain = fUNKNOWN then
-            cm := $000000
-          else if Tile and smCity <> 0 then begin
-            if Tile and smOwned <> 0 then cm := OwnColor
-              else cm := EnemyColor;
-            if y > 0 then begin
-              // 2x2 city dot covers two lines
-              PrevMiniPixel.SetX(xm);
-              if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
-                PrevMiniPixel.PixelB := cm shr 16;
-                PrevMiniPixel.PixelG:= cm shr 8 and $FF;
-                PrevMiniPixel.PixelR := cm and $FF;
-              end;
-            end;
-          end
-          else if (i = 0) and (Tile and smUnit <> 0) then begin
-            if Tile and smOwned <> 0 then cm := OwnColor
-              else cm := EnemyColor;
-          end else
-            cm := Colors[Tile and fTerrain, i];
+          if Tile and fTerrain = fUNKNOWN then cm := $000000
+            else cm := Colors[Tile and fTerrain, i];
+          // TODO: Needs to use (yy - 1) to avoid access violation for unknown reason
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + (yy - 1) * MiniPixel.BytesPerLine)) then begin
             MiniPixel.PixelB := (cm shr 16) and $ff;
             MiniPixel.PixelG := (cm shr 8) and $ff;