Changeset 227 for trunk/UCore.pas

Timestamp:

Sep 9, 2018, 11:45:45 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Load and start new game after main form is shown so cells can be correctly zoomed to be visible all.

File:

• trunk/UCore.pas (modified) (5 diffs)

trunk/UCore.pas

@@ -94 +94 @@
     LocalClients: TClients;
     ServerList: TServerList;
+    procedure ReopenGameOnInit;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -490 +491 @@
   SelectClient;
   LastOpenedList1.AddItem(FileName);
-  FormClient.AZoomAll.Execute;
   UpdateOtherForms;
   UpdateInterface;
@@ -496 +496 @@
   if Assigned(ServerClient) then ServerClient.TurnStart
     else raise Exception.Create(SMissingServerClientForPlayer);
+  FormClient.AZoomAll.Execute;
 end;
 
@@ -515 +516 @@
     Action.Assign(TAction(FormClient.ActionList1.Actions[I]));
     Action.ActionList := FormMain.ActionList1;
+  end;
+end;
+
+procedure TCore.ReopenGameOnInit;
+begin
+  CommandLineParams;
+  if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
+    FileExists(LastOpenedList1.Items[0]) then
+    LoadGame(LastOpenedList1.Items[0]);
+
+  if Game.FileName = '' then begin
+    Game.Assign(GameSettings);
+    StartNewGame;
   end;
 end;
@@ -626 +640 @@
     ServerList.LoadConfig(XmlConfig1, 'ServerList');
 
-    CommandLineParams;
-    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
-      FileExists(LastOpenedList1.Items[0]) then
-      LoadGame(LastOpenedList1.Items[0]);
     FormClientActions;
-
-    if Game.FileName = '' then begin
-      Game.Assign(GameSettings);
-      StartNewGame;
-    end;
   end;
 end;