Changeset 375 for trunk/Core.pas

Timestamp:

Jan 3, 2025, 2:43:39 PM (5 days ago)

Author:

chronos

Message:

• Fixed: Default generated game system was not playable as units were not able to move.
• Fixed: Wrong game data directories detection.

File:

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

trunk/Core.pas

@@ -74 +74 @@
     GameLoaded: Boolean;
     FormNewTabIndex: Integer;
-    BaseDir: string;
+    MapImagesDir: string;
+    GameSystemsDir: string;
     procedure LoadRecentExecute(Sender: TObject);
     procedure StartNewGame;
@@ -135 +136 @@
 const
   DefaultRegKey = '\Software\Chronosoft\xTactics';
+  AutoSaveFileName = 'AutoSave' + GameFileExt;
+  GameSystemsDirName = 'Systems';
+  LanguagesDirName = 'Languages';
+  MapImagesDirName = 'Images' + DirectorySeparator + 'Maps';
+  DefaultGameSystemName = 'Default';
 
 resourcestring
@@ -293 +299 @@
   AGameEnd.Enabled := Game.Running;
   AFullscreen.Checked := FormMain.FullScreen;
-  {$ifdef DEBUG}
+  {$IFDEF DEBUG}
   ATests.Visible := True;
   ATests.Enabled := True;
-  {$else}
+  {$ELSE}
   ATests.Visible := False;
   ATests.Enabled := False;
-  {$endif}
+  {$ENDIF}
 end;
 
@@ -518 +524 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
+var
+  BaseDir: string;
 {$IFDEF UNIX}
 const
-  LanguagesDir = 'Languages';
-  LinuxBaseDir = '/usr/share/xtactics';
-  LinuxLanguagesDir = LinuxBaseDir + DirectorySeparator + LanguagesDir;
-  LinuxBaseDir2 = '/app/share/xtactics';
-  LinuxLanguagesDir2 = LinuxBaseDir2 + DirectorySeparator + LanguagesDir;
+  LinuxRelativeDir = '../share/xtactics';
+var
+  NewDir: string;
 {$ENDIF}
 begin
-  BaseDir := ExtractFilePath(ParamStr(0));
-  Translator1.POFilesFolder := BaseDir + DirectorySeparator + LanguagesDir;
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  GameSystemsDir := CombinePaths(BaseDir, GameSystemsDirName);
+  MapImagesDir := CombinePaths(BaseDir, MapImagesDirName);
+  Translator1.POFilesFolder := CombinePaths(BaseDir, LanguagesDirName);
 
   {$IFDEF UNIX}
-  // If installed in Linux system then use installation shared game directory for data files
-  if not DirectoryExists(BaseDir) and DirectoryExists(LinuxBaseDir) then
-    BaseDir := LinuxBaseDir;
-
-  if not DirectoryExists(BaseDir) and DirectoryExists(LinuxBaseDir2) then
-    BaseDir := LinuxBaseDir2;
+  // If installed in Linux system then use installation shared game directory for game systems
+  if not DirectoryExists(GameSystemsDir) then begin
+    NewDir := ExpandFileName(BaseDir + DirectorySeparator + LinuxRelativeDir +
+      DirectorySeparator + GameSystemsDirName);
+    if DirectoryExists(NewDir) then GameSystemsDir := NewDir;
+  end;
+
+  // If installed in Linux system then use installation shared game directory for map images
+  if not DirectoryExists(GameSystemsDir) then begin
+    NewDir := ExpandFileName(BaseDir + DirectorySeparator + LinuxRelativeDir +
+      DirectorySeparator + MapImagesDirName);
+    if DirectoryExists(NewDir) then MapImagesDir := NewDir;
+  end;
 
   // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
-    Translator1.POFilesFolder := LinuxLanguagesDir;
-  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir2) then
-    Translator1.POFilesFolder := LinuxLanguagesDir2;
+  if not DirectoryExists(Translator1.POFilesFolder) then begin
+    NewDir := ExpandFileName(BaseDir + DirectorySeparator + LinuxRelativeDir +
+      DirectorySeparator + LanguagesDirName);
+    if DirectoryExists(NewDir) then Translator1.POFilesFolder := NewDir;
+  end;
   {$ENDIF}
 
@@ -555 +571 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
-  Game.MapImageFileName := CombinePaths(BaseDir, 'Images' + DirectorySeparator + 'Maps' + DirectorySeparator + 'WorldMap.png');
+  Game.MapImageFileName := MapImagesDir + DirectorySeparator + 'WorldMap.png';
   Server.Game := Game;
   LocalClients.Game := Game;
@@ -680 +696 @@
   NewGameSystem: TGameSystem;
   NewUnitKind: TUnitKind;
-  SystemsDir: string;
-const
-  GameSystemsDirName = 'Systems';
-  DefaultGameSystemName = 'Default';
-begin
-  if BaseDir <> '' then
-    SystemsDir := BaseDir + DirectorySeparator + GameSystemsDirName
-    else SystemsDir := ExpandFileName(GameSystemsDirName);
-  if DirectoryExists(SystemsDir) then begin
-    GameSystems.LoadFromDir(SystemsDir);
+begin
+  if DirectoryExists(GameSystemsDir) then begin
+    GameSystems.LoadFromDir(GameSystemsDir);
   end else begin
     // Create default game system if the directory with definitions was not found
@@ -696 +705 @@
     NewUnitKind := TUnitKind.Create;
     NewUnitKind.Name := 'Unit';
+    NewUnitKind.Moves := 1;
+    NewUnitKind.Power := 99;
     NewGameSystem.UnitKinds.Add(NewUnitKind);
     GameSystems.Add(NewGameSystem);
@@ -707 +718 @@
 function TCore.GetAutoSaveFileName: string;
 begin
-  Result := GetAppConfigDir(False) + 'AutoSave' + GameFileExt;
+  Result := GetAppConfigDir(False) + AutoSaveFileName;
 end;