Changeset 233 for trunk

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.

Location:

trunk

Files:

• UClientGUI.pas (modified) (1 diff)
• UCore.pas (modified) (2 diffs)
• UGame.pas (modified) (4 diffs)
• UGameClient.pas (modified) (1 diff)
• UMap.pas (modified) (1 diff)
• UPlayer.pas (modified) (1 diff)

trunk/UClientGUI.pas

@@ -95 +95 @@
     if Assigned(ControlPlayer) then begin
       for Cell in ControlPlayer.PlayerMap.Cells do begin
-        if (Cell.MapCell.Terrain <> ttVoid) and View.IsCellVisible(Cell.MapCell) then begin
+        if View.IsCellVisible(Cell.MapCell) and (Cell.MapCell.Terrain <> ttVoid) then begin
           if Cell.MapCell.Player = ControlPlayer then
             CellText := IntToStr(Cell.GetAvialPower)

trunk/UCore.pas

@@ -308 +308 @@
       Game.Running := False;
       FormNew.Save(Server);
+      GameSettings.PostConfig;
       Game.Assign(GameSettings);
       StartNewGame;
@@ -533 +534 @@
 
   if Game.FileName = '' then begin
+    GameSettings.PostConfig;
     Game.Assign(GameSettings);
     StartNewGame;

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;

trunk/UGameClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer, UCommThread,
-  UThreading, UCommFrame, UMap, UPlayer;
+  UThreading, UCommFrame, UPlayer;
 
 type

trunk/UMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, XMLRead, XMLWrite, DOM, fgl,
+  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl,
   UXMLUtils;
 

trunk/UPlayer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, UMap, XmlRead, XmlWrite, DOM, fgl, XMLConf,
+  Classes, SysUtils, Graphics, UMap, DOM, fgl, XMLConf,
   UXMLUtils, Math, UGeometry;