Changeset 370 for trunk/Core.pas

Timestamp:

Jan 2, 2025, 4:56:18 PM (4 days ago)

Author:

chronos

Message:

• Fixed: Game systems were not loaded correctly due to wrong relative path inside flatpak.

File:

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

trunk/Core.pas

@@ -524 +524 @@
 {$ENDIF}
 begin
-  GameFilesDir := '';
+  GameFilesDir := ExtractFilePath(ParamStr(0));
   {$IFDEF Linux}
   // If installed in Linux system then use installation shared game directory for data files
@@ -817 +817 @@
 
 procedure TCore.Init;
+var
+  GameSystem: TGameSystem;
 begin
   if not Core.Initialized then begin
@@ -828 +830 @@
     // GameSystemName needs to be loaded before game systems config itself.
     // Players reference Nations from game system.
-    GameSettings.GameSystem.Assign(GameSystems.SearchByName(string(XMLConfig1.GetValue(DOMString('Game/GameSystemName'), DOMString('HexWars')))));
+    GameSystem := GameSystems.SearchByName(string(XMLConfig1.GetValue(DOMString('Game/GameSystemName'), DOMString('HexWars'))));
+    if Assigned(GameSystem) then GameSettings.GameSystem.Assign(GameSystem);
     GameSettings.LoadConfig(XMLConfig1, 'Game');
     Server.LoadConfig(XMLConfig1, 'Server');