Changeset 590 for trunk/MiniMap.pas

Timestamp:

Jul 24, 2024, 10:25:56 PM (4 months ago)

Author:

chronos

Message:

• Modified: Map load and save moved to separate class TMap.

File:

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

trunk/MiniMap.pas

@@ -5 +5 @@
 
 uses
-  Classes, SysUtils, Protocol, ClientTools,
+  Classes, SysUtils, Protocol, ClientTools, Map,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Common{$ELSE}Graphics{$ENDIF};
 
@@ -111 +111 @@
 procedure TMiniMap.LoadFromMapFile(FileName: string; var nMapLandTiles, nMapStartPositions: Integer);
 var
-  x, y, lxFile, lyFile: integer;
-  MapFile: file;
-  s: string[255];
+  x, y: integer;
   MapRow: array [0 .. lxmax - 1] of Cardinal;
   ImageFileName: string;
+  Map: TMap;
+  Tile: Cardinal;
 begin
   ImageFileName := Copy(FileName, 1, Length(FileName) - Length(CevoMapExt)) + CevoMapPictureExt;
@@ -125 +125 @@
     if Bitmap.Height > MaxHeightMapLogo then
       Bitmap.Height := MaxHeightMapLogo;
-    Size.X := Bitmap.Width div 2;
-    Size.Y := Bitmap.Height;
+    Size := Point(Bitmap.Width div 2, Bitmap.Height);
   end else begin
     Mode := mmNone;
-    Size.X := MaxWidthMapLogo;
-    Size.Y := MaxHeightMapLogo;
-  end;
-
-  AssignFile(MapFile, FileName);
+    Size := Point(MaxWidthMapLogo, MaxHeightMapLogo);
+  end;
+
+  Map := TMap.Create;
   try
-    Reset(MapFile, 4);
-    BlockRead(MapFile, s[1], 2); { file id }
-    BlockRead(MapFile, x, 1); { format id }
-    BlockRead(MapFile, x, 1); // MaxTurn
-    BlockRead(MapFile, lxFile, 1);
-    BlockRead(MapFile, lyFile, 1);
+    Map.LoadFromFile(FileName);
     nMapLandTiles := 0;
     nMapStartPositions := 0;
-    for y := 0 to lyFile - 1 do begin
-      BlockRead(MapFile, MapRow, lxFile);
-      for x := 0 to lxFile - 1 do
-      begin
-        if (MapRow[x] and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
+    for y := 0 to Map.Size.Y - 1 do begin
+      for X := 0 to Map.Size.X - 1 do begin
+        Tile := Map.Tiles[Y * Map.Size.X + X];
+        if (Tile and fTerrain) in [fGrass, fPrairie, fTundra, fSwamp,
           fForest, fHills] then
           Inc(nMapLandTiles);
-        if MapRow[x] and (fPrefStartPos or fStartPos) <> 0 then
+        if Tile and (fPrefStartPos or fStartPos) <> 0 then
           Inc(nMapStartPositions);
-      end
+      end;
     end;
     if nMapStartPositions > nPl then
       nMapStartPositions := nPl;
-    CloseFile(MapFile);
-  except
-    CloseFile(MapFile);
+  finally
+    FreeAndNil(Map);
   end;
 end;