Changeset 310 for trunk/UCore.pas

Timestamp:

Aug 18, 2021, 4:02:44 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Use correct game data files directory on Linux.
• Fixed: Copy Systems and Maps with with package.
• Modified: Use fullscreen mode switching from Common package PersistentForm class.

File:

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

trunk/UCore.pas

@@ -10 +10 @@
   URegistry, ULastOpenedList, UTheme, UAboutDialog, Registry, Menus,
   UFormClient, UPlayer, UGameServer, UGameClient, fgl, UServerList, UGameSystem,
-  Graphics;
+  Graphics, UUnit;
 
 type
@@ -75 +75 @@
     FormNewTabIndex: Integer;
     OldWindowState: TWindowState;
-    InFullScreenMode: Boolean;
+    FullScreen: Boolean;
+    GameFilesDir: string;
     procedure LoadRecentExecute(Sender: TObject);
     procedure StartNewGame;
@@ -90 +91 @@
     procedure FormClientActions;
     procedure LoadGameSystems;
+    procedure ToggleFullscreen;
   public
     Game: TGame;
@@ -130 +132 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UClientAI, UFormKeyShortcuts,
+  UFormMain, UFormNew, UFormSettings, UClientAI, UFormKeyShortcuts, UCommon,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats, UClientGUI;
 
@@ -303 +305 @@
 procedure TCore.AFullscreenExecute(Sender: TObject);
 begin
-  if InFullScreenMode then begin
-    // Workaround: WindowState has sometimes wrong value under Linux.
-    // Try to switch fullscreen again before switching back.
-    if FormMain.WindowState <> wsFullScreen then begin
-      FormMain.WindowState := wsFullScreen;
-    end;
-    {$IFDEF WINDOWS}
-    FormMain.BorderStyle := bsSizeable;
-    {$ENDIF}
-    FormMain.WindowState := OldWindowState;
-    InFullScreenMode := False;
-  end else begin
-    OldWindowState := FormMain.WindowState;
-    {$IFDEF WINDOWS}
-    FormMain.BorderStyle := bsNone;
-    {$ENDIF}
-    FormMain.WindowState := wsFullScreen;
-    InFullScreenMode := True;
-  end;
+  ToggleFullscreen;
 end;
 
@@ -402 +386 @@
   if FileExists(Game.FileName) then
     Game.SaveToFile(Game.FileName)
-    else AGameSave.Execute;
+    else AGameSaveAs.Execute;
 end;
 
@@ -476 +460 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 const
-  LinuxLanguagesDir = '/usr/share/xtactics/languages';
-begin
+  LinuxGameFilesDir = '/usr/share/xtactics';
+  LinuxLanguagesDir = LinuxGameFilesDir + '/Languages';
+begin
+  GameFilesDir := '';
   {$IFDEF Linux}
+  // If installed in Linux system then use installation shared game directory for data files
+  if DirectoryExists(LinuxGameFilesDir) then
+    GameFilesDir := LinuxGameFilesDir;
   // If installed in Linux system then use installation directory for po files
   if not DirectoryExists(CoolTranslator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
@@ -484 +473 @@
   {$ENDIF}
   
-    GameSystems := TGameSystems.Create;
+  GameSystems := TGameSystems.Create;
   Server := TServer.Create;
   LocalClients := TClients.Create;
@@ -494 +483 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
+  Game.MapImageFileName := CombinePaths(GameFilesDir, 'Images' + DirectorySeparator + 'Maps' + DirectorySeparator + 'WorldMap.png');
   Server.Game := Game;
   LocalClients.Game := Game;
@@ -604 +594 @@
 procedure TCore.LoadGameSystems;
 var
-  NewItem: TGameSystem;
-begin
-  if DirectoryExists('Systems') then begin
-    GameSystems.LoadFromDir('Systems');
+  NewGameSystem: TGameSystem;
+  NewUnitKind: TUnitKind;
+  SystemsDir: string;
+begin
+  if GameFilesDir <> '' then
+    SystemsDir := GameFilesDir + DirectorySeparator + 'Systems'
+    else SystemsDir := 'Systems';
+  if DirectoryExists(SystemsDir) then begin
+    GameSystems.LoadFromDir(SystemsDir);
   end else begin
-    NewItem := TGameSystem.Create;
-    NewItem.FileName := 'Custom';
-    GameSystems.Add(NewItem);
+    // Create default game system if the directory with definitions was not found
+    NewGameSystem := TGameSystem.Create;
+    NewGameSystem.FileName := 'HexWars';
+    NewUnitKind := TUnitKind.Create;
+    NewUnitKind.Name := 'Unit';
+    NewGameSystem.UnitKinds.Add(NewUnitKind);
+    GameSystems.Add(NewGameSystem);
   end;
   if GameSystems.Count > 0 then begin
@@ -617 +616 @@
     Game.GameSystem.Assign(GameSystems.First);
   end;
+end;
+
+procedure TCore.ToggleFullscreen;
+begin
+  FullScreen := not FullScreen;
+  PersistentForm.Form := FormMain;
+  PersistentForm.SetFullScreen(FullScreen);
+  UpdateInterface;
 end;