Changeset 377 for trunk/Game.pas

Timestamp:

Jan 3, 2025, 11:20:28 PM (4 days ago)

Author:

chronos

Message:

• Fixed: Map image was not always loaded and applied.

File:

• trunk/Game.pas (modified) (4 diffs)

trunk/Game.pas

@@ -86 +86 @@
     StoredRandSeed: Cardinal;
     GeneratePlayers: Boolean;
-    procedure PostConfig;
     procedure Assign(Source: TGame);
     function AttackProbability(AttackCount, DefendCount: Integer): Double;
@@ -297 +296 @@
   Cell: TCell;
 begin
+  // Load map image
+  if (Map.Shape = msImage) then begin
+    if LoadedImageFileName <> MapImageFileName then begin
+      LoadedImageFileName := MapImageFileName;
+      if FileExists(MapImageFileName) then begin
+        Map.Image.Picture.LoadFromFile(MapImageFileName)
+      end else begin
+        LoadedImageFileName := '';
+        Map.Image.Picture.Clear;
+      end;
+    end;
+  end;
+
   // Randomize map terrain
   for Cell in Map.Cells do
@@ -376 +388 @@
 end;
 
-procedure TGame.PostConfig;
-begin
-  if (Map.Shape = msImage) and FileExists(MapImageFileName) and
-  (LoadedImageFileName <> MapImageFileName) then begin
-    LoadedImageFileName := MapImageFileName;
-    Map.Image.Picture.LoadFromFile(MapImageFileName);
-  end;
-end;
-
 procedure TGame.SelectPlayerStartCell(Player: TPlayer);
 var
@@ -502 +505 @@
   Map.Assign(Source.Map);
   MapImageFileName := Source.MapImageFileName;
+  LoadedImageFileName := Source.LoadedImageFileName;
   VoidEnabled := Source.VoidEnabled;
   VoidPercentage := Source.VoidPercentage;