Changeset 196 for trunk/UCore.pas

Timestamp:

May 16, 2018, 9:56:24 AM (6 years ago)

Author:

chronos

Message:

• Added: Allow to manage list of servers where to connect as client.

File:

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

trunk/UCore.pas

@@ -9 +9 @@
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
   URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
-  UGameServer, UGameClient, fgl;
+  UGameServer, UGameClient, fgl, UServerList;
 
 type
@@ -91 +91 @@
     FormClients: TFPGObjectList<TFormClient>;
     Clients: TClients;
+    ServerList: TServerList;
     procedure Spectate(Player: TPlayer);
     procedure UpdateActions;
     procedure Init;
+    procedure Done;
     property Initialized: Boolean read FInitialized;
   end;
@@ -295 +297 @@
   try
     FormNew.Load(Server);
+    FormNew.ServerList := ServerList;
     if FormNew.ShowModal = mrOk then begin
       FormNew.Save(Server);
@@ -392 +395 @@
   ForceDirectories(GetAppConfigDir(False));
   FormClients := TFPGObjectList<TFormClient>.Create;
+  ServerList := TServerList.Create;
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  FreeAndNil(ServerList);
   if Assigned(FormPlayersStats) then FreeAndNil(FormPlayersStats);
   if Assigned(FormUnitMoves) then FreeAndNil(FormUnitMoves);
@@ -401 +406 @@
   FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
-  Game.SaveConfig(XMLConfig1, 'Game');
-  Server.SaveConfig(XMLConfig1, 'Server');
-  SaveConfig;
   FreeAndNil(Server);
   FreeAndNil(Game);
@@ -546 +548 @@
     Game.LoadConfig(XMLConfig1, 'Game');
     Server.LoadConfig(XMLConfig1, 'Server');
+    ServerList.LoadConfig(XmlConfig1, 'ServerList');
 
     CommandLineParams;
@@ -556 +559 @@
 end;
 
+procedure TCore.Done;
+begin
+  Game.SaveConfig(XMLConfig1, 'Game');
+  Server.SaveConfig(XMLConfig1, 'Server');
+  ServerList.SaveConfig(XmlConfig1, 'ServerList');
+  SaveConfig;
+  XMLConfig1.Flush;
+end;
+
 end.