Changeset 479 for trunk/MiniMap.pas

Timestamp:

Dec 6, 2023, 5:28:20 PM (11 months ago)

Author:

chronos

Message:

• Fixed: Do not draw minimap outside of bitmap memory.
• Modified: Code cleanup.

File:

• trunk/MiniMap.pas (modified) (10 diffs)

trunk/MiniMap.pas

@@ -167 +167 @@
   MiniPixel: TPixelPointer;
   Map: ^TTileList;
+  xx, yy: Integer;
 begin
   Map := PreviewMap(StartLandMass);
@@ -175 +176 @@
   Bitmap.BeginUpdate;
   MiniPixel := TPixelPointer.Create(Bitmap);
-  for y := 0 to ScaleToNative(Size.Y) - 1 do begin
-    for x := 0 to ScaleToNative(Size.X) - 1 do begin
+  xx := ScaleToNative(Size.X);
+  yy := ScaleToNative(Size.Y);
+  for y := 0 to yy - 1 do begin
+    for x := 0 to xx - 1 do begin
       for i := 0 to 1 do begin
-        xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
+        xm := (x * 2 + i + y and 1) mod (xx * 2);
         MiniPixel.SetX(xm);
         cm := Colors[Map[ScaleFromNative(x) * lxmax div Size.X + lxmax *
           ((ScaleFromNative(y) * (lymax - 1) + Size.Y div 2) div (Size.Y - 1))] and
-          fTerrain, i];
-        MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
-        MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
-        MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+          fTerrain, I];
+        if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+        (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
+          MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
+          MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
+          MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+        end;
       end;
     end;
@@ -198 +204 @@
   MiniPixel: TPixelPointer;
   PrevMiniPixel: TPixelPointer;
+  xx, yy: Integer;
 begin
   OwnColor := HGrSystem.Data.Canvas.Pixels[95, 67];
@@ -207 +214 @@
     MiniPixel := TPixelPointer.Create(Bitmap);
     PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
-    for y := 0 to ScaleToNative(Size.Y) - 1 do begin
-      for x := 0 to ScaleToNative(Size.X) - 1 do begin
+    xx := ScaleToNative(Size.X);
+    yy := ScaleToNative(Size.Y);
+    for y := 0 to yy - 1 do begin
+      for x := 0 to xx - 1 do begin
         for i := 0 to 1 do begin
-          xm := (x * 2 + i + y and 1) mod (ScaleToNative(Size.X) * 2);
+          xm := (x * 2 + i + y and 1) mod (xx * 2);
           MiniPixel.SetX(xm);
           Tile := SaveMap[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
@@ -221 +230 @@
               // 2x2 city dot covers two lines
               PrevMiniPixel.SetX(xm);
-              PrevMiniPixel.Pixel^.B := cm shr 16;
-              PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
-              PrevMiniPixel.Pixel^.R := cm and $FF;
+              if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
+                PrevMiniPixel.Pixel^.B := cm shr 16;
+                PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
+                PrevMiniPixel.Pixel^.R := cm and $FF;
+              end;
             end;
           end
@@ -231 +243 @@
           end else
             cm := Colors[Tile and fTerrain, i];
-          MiniPixel.Pixel^.B := (cm shr 16) and $ff;
-          MiniPixel.Pixel^.G := (cm shr 8) and $ff;
-          MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+          if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
+            MiniPixel.Pixel^.B := (cm shr 16) and $ff;
+            MiniPixel.Pixel^.G := (cm shr 8) and $ff;
+            MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+          end;
         end;
       end;
@@ -254 +269 @@
   MyUnit: PUn;
   EnemyUnit: PUnitInfo;
+  xx, yy: Integer;
 begin
   if not Assigned(MyMap) then Exit;
@@ -268 +284 @@
   MiniPixel := TPixelPointer.Create(Bitmap);
   PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
-  for y := 0 to ScaleToNative(Size.Y) - 1 do begin
-    for x := 0 to ScaleToNative(Size.X) - 1 do begin
+
+  xx := ScaleToNative(Size.X);
+  yy := ScaleToNative(Size.Y);
+  for y := 0 to yy - 1 do begin
+    for x := 0 to xx - 1 do begin
       Loc := ScaleFromNative(x) + Size.X * ScaleFromNative(y);
       if (MyMap[Loc] and fTerrain) <> fUNKNOWN then begin
         for i := 0 to 1 do begin
           xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
-            ScaleToNative(Size.X) * 5) mod (ScaleToNative(Size.X) * 2);
+            xx * 5) mod (xx * 2);
           MiniPixel.SetX(xm);
           TerrainTile := MyMap[Loc] and fTerrain;
@@ -296 +315 @@
               // 2x2 city dot covers two lines
               PrevMiniPixel.SetX(xm);
-              PrevMiniPixel.Pixel^.B := (cm shr 16) and $ff;
-              PrevMiniPixel.Pixel^.G := (cm shr 8) and $ff;
-              PrevMiniPixel.Pixel^.R := (cm shr 0) and $ff;
+              if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * PrevMiniPixel.BytesPerLine)) then begin
+                PrevMiniPixel.Pixel^.B := (cm shr 16) and $ff;
+                PrevMiniPixel.Pixel^.G := (cm shr 8) and $ff;
+                PrevMiniPixel.Pixel^.R := (cm shr 0) and $ff;
+              end;
             end;
           end
@@ -318 +340 @@
             else cm := Tribe[MyRO.Territory[Loc]].Color;
           end;
-          MiniPixel.Pixel^.B := (cm shr 16) and $ff;
-          MiniPixel.Pixel^.G := (cm shr 8) and $ff;
-          MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+          if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + yy * MiniPixel.BytesPerLine)) then begin
+            MiniPixel.Pixel^.B := (cm shr 16) and $ff;
+            MiniPixel.Pixel^.G := (cm shr 8) and $ff;
+            MiniPixel.Pixel^.R := (cm shr 0) and $ff;
+          end;
         end;
       end;