Changeset 233 for trunk/UGame.pas

Timestamp:

Sep 19, 2018, 3:20:20 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Map type Image wasn't using loaded image from file on repeated new game creation.

File:

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

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
-  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl,
+  DOM, Math, LazFileUtils, UXMLUtils, Dialogs, LCLType, LCLIntf, fgl,
   UGeometry, UPlayer, UMap, UMapType;
 
@@ -77 +77 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
+    procedure PostConfig;
     procedure Assign(Source: TGame);
     function AttackProbability(AttackCount, DefendCount: Integer): Double;
@@ -273 +274 @@
   Cell: TCell;
 begin
-  if (Map.Shape = msImage) and FileExists(MapImageFileName) and
-  (LoadedImageFileName <> MapImageFileName) then begin
-    LoadedImageFileName := MapImageFileName;
-    Map.Image.Picture.LoadFromFile(MapImageFileName);
-  end;
-
   // Randomize map terrain
   for Cell in Map.Cells do
@@ -290 +285 @@
     Power := Random(MaxNeutralUnits + 1);
     Player := nil;
+  end;
+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;