Changeset 354 for trunk/Core.pas

Timestamp:

Dec 29, 2024, 1:35:37 PM (6 days ago)

Author:

chronos

Message:

• Modified: Automatically save running game on application exit and reopen it on next start.

File:

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

trunk/Core.pas

@@ -83 +83 @@
     procedure Delay(Time: Integer);
     procedure GameNewTurnExecute(Sender: TObject);
-    procedure AutoSave;
     procedure CommandLineParams;
     procedure SelectClient;
@@ -89 +88 @@
     procedure FormClientActions;
     procedure LoadGameSystems;
+    function GetAutoSaveFileName: string;
   public
     Game: TGame;
@@ -98 +98 @@
     CellGridVisible: Boolean;
     UnitShapeVisible: Boolean;
-    AutoSaveEnabled: Boolean;
-    ReopenLastFile: Boolean;
     FormClients: TFormClients;
     LocalClients: TClients;
@@ -105 +103 @@
     GameSystems: TGameSystems;
     FormMain: TFormMain;
+    procedure AutoSave;
     procedure ReopenGameOnInit;
     procedure LoadConfig;
@@ -145 +144 @@
   SRestartGameQuestion = 'Do you want to restart current game?';
   SPlayersNotInitialized = 'Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells.';
-  SFileDialogFilter = 'xTactics games (.xtg)|*.xtg|All files|*.*';
+  SFileDialogFilter = 'xTactics games (' + GameFileExt + ')|*' + GameFileExt + '|All files|*.*';
   SMissingServerClientForPlayer = 'Server client for current player not found.';
 
@@ -188 +187 @@
 procedure TCore.GameNewTurnExecute(Sender: TObject);
 begin
-  if AutoSaveEnabled then AutoSave;
+  AutoSave;
 end;
 
@@ -196 +195 @@
 begin
   OldFileName := Game.FileName;
-  Game.SaveToFile(GetAppConfigDir(False) + 'AutoSave.xtg');
+  Game.SaveToFile(GetAutoSaveFileName);
   Game.FileName := OldFileName;
 end;
@@ -210 +209 @@
   DevelMode := XMLConfig1.GetValue('DevelMode', false);
   AnimationSpeed := XMLConfig1.GetValue('AnimationSpeed', 50);
-  AutoSaveEnabled := XMLConfig1.GetValue('AutoSave', True);
-  ReopenLastFile := XMLConfig1.GetValue('ReopenLastFile', True);
   Translator1.Language := Translator1.Languages.SearchByCode(String(XMLConfig1.GetValue('Language', '')));
   ScaleDPI1.DPI := Point(XMLConfig1.GetValue('DPIX', 96), XMLConfig1.GetValue('DPIY', 96));
@@ -227 +224 @@
   XMLConfig1.SetValue('DevelMode', DevelMode);
   XMLConfig1.SetValue('AnimationSpeed', AnimationSpeed);
-  XMLConfig1.SetValue('AutoSave', AutoSaveEnabled);
-  XMLConfig1.SetValue('ReopenLastFile', ReopenLastFile);
   XMLConfig1.SetValue('DPIX', ScaleDPI1.DPI.X);
   XMLConfig1.SetValue('DPIY', ScaleDPI1.DPI.Y);
@@ -695 +690 @@
 end;
 
+function TCore.GetAutoSaveFileName: string;
+begin
+  Result := GetAppConfigDir(False) + 'AutoSave' + GameFileExt;
+end;
+
 procedure TCore.ReopenGameOnInit;
+var
+  OldFileName: string;
 begin
   CommandLineParams;
-  if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
+  if not GameLoaded and (LastOpenedList1.Items.Count > 0) and
     FileExists(LastOpenedList1.Items[0]) then
-    LoadGame(LastOpenedList1.Items[0]);
+    Game.FileName := LastOpenedList1.Items[0];
+
+  if not GameLoaded and FileExists(GetAutoSaveFileName) then begin
+    OldFileName := Game.FileName;
+    LoadGame(GetAutoSaveFileName);
+    LastOpenedList1.Items.Delete(0);
+    Game.FileName := OldFileName;
+  end;
 
   if Game.FileName = '' then begin