Changeset 169 for trunk/Start.pas

Timestamp:

Jun 15, 2019, 11:42:35 AM (5 years ago)

Author:

chronos

Message:

• Modified: Store Saved and Maps subdirectory names only once in string variable.

File:

• trunk/Start.pas (modified) (13 diffs)

trunk/Start.pas

@@ -72 +72 @@
     procedure FormShow(Sender: TObject);
     procedure FormHide(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure BrainClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; x, y: integer);
+    procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; x, y: integer);
+    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
     procedure Up1BtnClick(Sender: TObject);
     procedure Down1BtnClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure ListClick(Sender: TObject);
     procedure RenameBtnClick(Sender: TObject);
@@ -88 +92 @@
     procedure Down2BtnClick(Sender: TObject);
     procedure QuitBtnClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure CustomizeBtnClick(Sender: TObject);
     procedure AutoDiffUpBtnClick(Sender: TObject);
     procedure AutoDiffDownBtnClick(Sender: TObject);
-    procedure FormMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; x, y: integer);
-    procedure FormMouseMove(Sender: TObject; Shift: TShiftState; x, y: integer);
     procedure AutoEnemyUpBtnClick(Sender: TObject);
     procedure AutoEnemyDownBtnClick(Sender: TObject);
@@ -926 +926 @@
       begin // load
         FileName := List.Items[List.ItemIndex];
-        if LoadGame(DataDir + 'Saved' + DirectorySeparator, FileName + CevoExt, LoadTurn, false)
+        if LoadGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, LoadTurn, false)
         then
           UnlistBackupFile(FileName)
@@ -1010 +1010 @@
         end;
 
-        StartNewGame(DataDir + 'Saved' + DirectorySeparator, FileName + CevoExt, MapFileName,
+        StartNewGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, MapFileName,
           lxpre[WorldSize], lypre[WorldSize], StartLandMass, MaxTurn);
         UnlistBackupFile(FileName);
@@ -1145 +1145 @@
     pgLoad:
       begin
-        AssignFile(LogFile, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex]
+        AssignFile(LogFile, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex]
           + CevoExt);
         try
@@ -1198 +1198 @@
         if Page = pgEditMap then
           MapFileName := List.Items[List.ItemIndex] + CevoMapExt;
-        if LoadGraphicFile(Mini, DataDir + 'Maps' + DirectorySeparator + Copy(MapFileName, 1,
+        if LoadGraphicFile(Mini, GetMapsDir + DirectorySeparator + Copy(MapFileName, 1,
           Length(MapFileName) - 9) + '.png', gfNoError) then
         begin
@@ -1215 +1215 @@
         end;
 
-        AssignFile(MapFile, DataDir + 'Maps' + DirectorySeparator + MapFileName);
+        AssignFile(MapFile, GetMapsDir + DirectorySeparator + MapFileName);
         try
           Reset(MapFile, 4);
@@ -1395 +1395 @@
 begin
   FormerGames.Clear;
-  if FindFirst(DataDir + 'Saved' + DirectorySeparator + '*' + CevoExt, $21, F) = 0 then
+  if FindFirst(GetSavedDir + DirectorySeparator + '*' + CevoExt, $21, F) = 0 then
     repeat
       I := FormerGames.Count;
@@ -1415 +1415 @@
 begin
   Maps.Clear;
-  if FindFirst(DataDir + 'Maps' + DirectorySeparator + '*' + CevoMapExt, $21, f) = 0 then
+  if FindFirst(GetMapsDir + DirectorySeparator + '*' + CevoMapExt, $21, f) = 0 then
     repeat
       Maps.Add(Copy(f.Name, 1, Length(f.Name) - 9));
@@ -1790 +1790 @@
         end;
       if Page = pgLoad then
-        AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
-        AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
       ok := true;
       try
         if Page = pgLoad then
-          Rename(f, DataDir + 'Saved'+ DirectorySeparator + NewName + CevoExt)
+          Rename(f, GetSavedDir + DirectorySeparator + NewName + CevoExt)
         else
-          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + CevoMapExt);
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + CevoMapExt);
       except
         // Play('INVALID');
@@ -1806 +1806 @@
       if Page <> pgLoad then
         try // rename map picture
-          AssignFile(f, DataDir + 'Maps'+ DirectorySeparator + List.Items[List.ItemIndex]
+          AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex]
             + '.png');
-          Rename(f, DataDir + 'Maps'+ DirectorySeparator + NewName + '.png');
+          Rename(f, GetMapsDir + DirectorySeparator + NewName + '.png');
         except
         end;
@@ -1842 +1842 @@
     begin
       if Page = pgLoad then
-        AssignFile(f, DataDir + 'Saved' + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
+        AssignFile(f, GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt)
       else
-        AssignFile(f, DataDir + 'Maps' + DirectorySeparator + List.Items[List.ItemIndex] +
+        AssignFile(f, GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] +
           CevoMapExt);
       Erase(f);
@@ -2036 +2036 @@
 procedure TStartDlg.ReplayBtnClick(Sender: TObject);
 begin
-  LoadGame(DataDir + 'Saved' + DirectorySeparator, List.Items[List.ItemIndex] + CevoExt,
+  LoadGame(GetSavedDir + DirectorySeparator, List.Items[List.ItemIndex] + CevoExt,
     LastTurn, True);
   SlotAvailable := -1;