Changeset 199 for trunk/UCore.pas

Timestamp:

May 16, 2018, 2:48:57 PM (6 years ago)

Author:

chronos

Message:

• Modified: Initial game setting made independent to current game settings. So last game can be automatically loaded on start and initial setting will be intact.

File:

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

trunk/UCore.pas

@@ -83 +83 @@
   public
     Game: TGame;
+    GameSettings: TGame;
     Server: TServer;
     UseSingleView: Boolean;
@@ -312 +313 @@
   try
     FormNew.Load(Server);
-    FormNew.ServerList := ServerList;
     if FormNew.ShowModal = mrOk then begin
       FormNew.Save(Server);
+      Game.Assign(GameSettings);
       StartNewGame;
       GameLoaded := False;
@@ -399 +400 @@
   Server := TServer.Create;
   Clients := TClients.Create;
+  GameSettings := TGame.Create;
   Game := TGame.Create;
   Game.OnMoveUpdated := DoMoveUpdated;
@@ -424 +426 @@
   FreeAndNil(Clients);
   FreeAndNil(Game);
+  FreeAndNil(GameSettings);
 end;
 
@@ -557 +560 @@
 
     // Update translated default player names
-    Game.PlayersSetting[0].Name := SPlayer + ' 1';
-    Game.PlayersSetting[1].Name := SPlayer + ' 2';
+    GameSettings.Players[0].Name := SPlayer + ' 1';
+    GameSettings.Players[1].Name := SPlayer + ' 2';
 
     LoadConfig;
-    Game.LoadConfig(XMLConfig1, 'Game');
+    GameSettings.LoadConfig(XMLConfig1, 'Game');
     Server.LoadConfig(XMLConfig1, 'Server');
     ServerList.LoadConfig(XmlConfig1, 'ServerList');
@@ -576 +579 @@
 procedure TCore.Done;
 begin
-  Game.SaveConfig(XMLConfig1, 'Game');
+  GameSettings.SaveConfig(XMLConfig1, 'Game');
   Server.SaveConfig(XMLConfig1, 'Server');
   ServerList.SaveConfig(XmlConfig1, 'ServerList');