Changeset 301 for trunk/UCore.pas

Timestamp:

Jul 10, 2019, 11:35:10 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Corrected dimensions in About dialog.
• Removed: Old Player and Players forms replaced by general item list.

File:

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

trunk/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
-  UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
+  UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator, DOM,
   URegistry, ULastOpenedList, UTheme, Registry, Menus, UFormClient, UPlayer,
   UGameServer, UGameClient, fgl, UServerList, UGameSystem, Graphics;
@@ -326 +326 @@
   FormAbout := TFormAbout.Create(Self);
   try
+    FormAbout.ApplicationInfo := ApplicationInfo;
     FormAbout.ShowModal;
   finally
@@ -737 +738 @@
     GameSettings.Players[1].Name := SPlayer + ' 2';
 
+    // 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.LoadConfig(XMLConfig1, 'Game');
-    GameSettings.GameSystem := GameSystems.SearchByName(GameSettings.GameSystemName);
     if not Assigned(GameSettings.GameSystem) then
       GameSettings.GameSystem := GameSystems.First;