Changeset 465 for branches/highdpi/MiniMap.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (6 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/MiniMap.pas (moved) (moved from branches/highdpi/UMiniMap.pas ) (9 diffs)

branches/highdpi/MiniMap.pas

@@ -1 +1 @@
 {$INCLUDE Switches.inc}
-unit UMiniMap;
+unit MiniMap;
 
 interface
@@ -37 +37 @@
 
 uses
-  ScreenTools, UPixelPointer, Global, GameServer, IsoEngine, Tribes;
+  ScreenTools, PixelPointer, Global, GameServer, IsoEngine, Tribes;
 
 const
@@ -162 +162 @@
 procedure TMiniMap.PaintRandom(Brightness, StartLandMass: Integer; WorldSize: TPoint);
 var
-  i, x, y, xm, cm: Integer;
+  i, x, y, xm: Integer;
+  cm: Int64;
   MiniPixel: TPixelPointer;
   Map: ^TTileList;
@@ -172 +173 @@
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
-  MiniPixel := PixelPointer(Bitmap);
+  MiniPixel := TPixelPointer.Create(Bitmap);
   for y := 0 to ScaleToNative(Size.Y) - 1 do begin
     for x := 0 to ScaleToNative(Size.X) - 1 do begin
@@ -193 +194 @@
 procedure TMiniMap.PaintFile(SaveMap: TMapArray);
 var
-  i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
+  cm: Int64;
+  i, x, y, xm, Tile, OwnColor, EnemyColor: integer;
   MiniPixel: TPixelPointer;
   PrevMiniPixel: TPixelPointer;
@@ -203 +205 @@
   if Mode = mmPicture then begin
     Bitmap.BeginUpdate;
-    MiniPixel := PixelPointer(Bitmap);
-    PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+    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
@@ -211 +213 @@
           MiniPixel.SetX(xm);
           Tile := SaveMap[ScaleFromNative(x) + Size.X * ScaleFromNative(y)];
+          if Tile > 11 then Tile := fUnknown;
           if Tile and fTerrain = fUNKNOWN then
             cm := $000000
@@ -264 +267 @@
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
-  MiniPixel := PixelPointer(Bitmap);
-  PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+  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
@@ -328 +331 @@
 end;
 
-
 end.
 
+
+