Changeset 304 for trunk/UCore.pas

Timestamp:

Aug 11, 2019, 4:53:05 PM (5 years ago)

Author:

chronos

Message:

• Fixed: First game system was rewritten by game system stored in game file.
• Modified: Each TGame instance has own TGameSystem instance and different game systems are assigned.

File:

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

trunk/UCore.pas

@@ -616 +616 @@
   end;
   if GameSystems.Count > 0 then begin
-    GameSettings.GameSystem := GameSystems.First;
-    Game.GameSystem := GameSystems.First;
+    GameSettings.GameSystem.Assign(GameSystems.First);
+    Game.GameSystem.Assign(GameSystems.First);
   end;
 end;
@@ -740 +740 @@
     // GameSystemName needs to be loaded before game systems config itself.
     // Players reference Nations from game system.
-    GameSettings.GameSystemName := string(XMLConfig1.GetValue(DOMString('Game/GameSystemName'), DOMString('HexWars')));
-    GameSettings.GameSystem := GameSystems.SearchByName(GameSettings.GameSystemName);
-
+    GameSettings.GameSystem.Assign(GameSystems.SearchByName(string(XMLConfig1.GetValue(DOMString('Game/GameSystemName'), DOMString('HexWars')))));
     GameSettings.LoadConfig(XMLConfig1, 'Game');
-    if not Assigned(GameSettings.GameSystem) then
-      GameSettings.GameSystem := GameSystems.First;
     Server.LoadConfig(XMLConfig1, 'Server');
     ServerList.LoadConfig(XmlConfig1, 'ServerList');