Changeset 360

Timestamp:

Dec 31, 2024, 11:46:43 AM (7 days ago)

Author:

chronos

Message:

• Fixed: Store current player information to game save to be able to continue with different player.

Location:

trunk

Files:

• Core.pas (modified) (1 diff)
• Game.pas (modified) (2 diffs)

trunk/Core.pas

@@ -275 +275 @@
 
 procedure TCore.SelectClient;
-var
-  FirstHuman: TPlayer;
-begin
-  FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormMain.FormClient.Client := TClientGUI(LocalClients.SearchPlayer(FirstHuman))
-    else begin
-      FormMain.FormClient.Client := TClientGUI(LocalClients.New(SSpectator));
-      FormMain.FormClient.Client.LocalServer := Server;
-      FormMain.FormClient.Client.ConnectType := ctLocal;
-      FormMain.FormClient.Client.Active := True;
-      FormMain.FormClient.AZoomAll.Execute;
-    end;
+begin
+  if not Assigned(Game.CurrentPlayer) then
+    Game.CurrentPlayer := Game.Players.GetFirstHuman;
+  if Assigned(Game.CurrentPlayer) then begin
+    FormMain.FormClient.Client := TClientGUI(LocalClients.SearchPlayer(Game.CurrentPlayer));
+  end else begin
+    FormMain.FormClient.Client := TClientGUI(LocalClients.New(SSpectator));
+    FormMain.FormClient.Client.LocalServer := Server;
+    FormMain.FormClient.Client.ConnectType := ctLocal;
+    FormMain.FormClient.Client.Active := True;
+    FormMain.FormClient.AZoomAll.Execute;
+  end;
 end;
 

trunk/Game.pas

@@ -633 +633 @@
       if Assigned(NewNode) then
         Players.LoadFromNode(NewNode);
-      if Players.Count > 0 then CurrentPlayer := Players[0]
-        else CurrentPlayer := nil;
+      CurrentPlayer := Players.FindById(ReadInteger(RootNode, 'CurrentPlayer', -1));
+
+      if not Assigned(CurrentPlayer) and (Players.Count > 0) then CurrentPlayer := Players[0];
 
       NewNode := FindNode('Units');
@@ -685 +686 @@
       WriteInteger(RootNode, 'StayAliveForDefinedTurns', StayAliveForDefinedTurns);
       WriteBoolean(RootNode, 'Running', Running);
+      WriteInteger(RootNode, 'CurrentPlayer', CurrentPlayer.Id);
 
       NewNode := OwnerDocument.CreateElement('GameSystem');