Changeset 589 for trunk/Start.pas

Timestamp:

Jul 24, 2024, 10:51:34 AM (4 months ago)

Author:

chronos

Message:

• Fixed: With selected map it was not possible to start a new game due to wrong map path.

File:

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

trunk/Start.pas

@@ -6 +6 @@
 uses
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
-  LCLIntf, LCLType, SysUtils, Classes, BaseWin, ListBoxEx,
+  LCLIntf, LCLType, SysUtils, Classes, BaseWin, ListBoxEx, LazFileUtils,
   Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
   {$IFDEF DPI}System.UITypes, Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls,
@@ -905 +905 @@
       S := Phrases.Lookup('MPMAP')
     else if Page = pgStartMap then
-      S := Copy(MapFileName, 1, Length(MapFileName) - Length(CevoMapExt))
+      S := ExtractFileNameOnly(MapFileName)
     else if Page = pgEditMap then
       S := List.Items[List.ItemIndex]
@@ -944 +944 @@
   I: Integer;
 begin
-  if FileName[1] <> '~' then
-    FileName := '~' + FileName;
+  if not IsAutoSaveFileName(FileName) then
+    FileName := ToAutoSaveFileName(FileName);
   I := FormerGames.Count - 1;
-  while (I >= 0) and (AnsiCompareFileName(FormerGames[I], FileName) <> 0) do
+  while (I >= 0) and (AnsiCompareFileName(FormerGames[I], ExtractFileNameOnly(FileName)) <> 0) do
     Dec(I);
-  if I >= 0 then
-  begin
+  if I >= 0 then begin
     FormerGames.Delete(I);
     if ListIndex[tbNew] = I then
@@ -966 +965 @@
     pgLoad:
       begin // load
-        FileName := List.Items[List.ItemIndex];
-        if LoadGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, LoadTurn, False)
+        FileName := GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt;
+        if LoadGame(FileName, LoadTurn, False)
         then
           UnlistBackupFile(FileName)
@@ -992 +991 @@
 
           if (AutoDiff < 0) and (PlayersBrain[0].Kind = btNoTerm) then
-            FileName := 'Round' + IntToStr(GetProcessID())
+            FileName := GetSavedDir + DirectorySeparator + 'Round' + IntToStr(GetProcessID()) + CevoExt
           else begin
             Inc(GameCount);
-            FileName := Format(Phrases.Lookup('GAME'), [GameCount]);
+            FileName := GetSavedDir + DirectorySeparator + Format(Phrases.Lookup('GAME'), [GameCount]) + CevoExt;
           end;
 
@@ -1049 +1048 @@
         end;
 
-        StartNewGame(GetSavedDir + DirectorySeparator, FileName + CevoExt, MapFileName,
-          WorldSizes[WorldSize].X, WorldSizes[WorldSize].Y, StartLandMass, MaxTurn);
+        StartNewGame(FileName, MapFileName, WorldSizes[WorldSize].X,
+          WorldSizes[WorldSize].Y, StartLandMass, MaxTurn);
         UnlistBackupFile(FileName);
       end;
     pgEditMap:
-      EditMap(GetMapsDir + DirectorySeparator + MapFileName, lxmax, lymax, StartLandMass);
+      EditMap(MapFileName, lxmax, lymax, StartLandMass);
     pgEditRandom: // new map
       begin
@@ -1068 +1067 @@
           Free;
         end;
-        MapFileName := Format(Phrases.Lookup('MAP'), [MapCount]) + CevoMapExt;
-        EditMap(GetMapsDir + DirectorySeparator + MapFileName,
-          WorldSizes[WorldSize].X, WorldSizes[WorldSize].Y, StartLandMass);
+        MapFileName := GetMapsDir + DirectorySeparator + Format(Phrases.Lookup('MAP'),
+          [MapCount]) + CevoMapExt;
+        EditMap(MapFileName, WorldSizes[WorldSize].X, WorldSizes[WorldSize].Y,
+          StartLandMass);
       end;
   end;
@@ -1120 +1120 @@
         if Page = pgEditMap then begin
           if List.ItemIndex >= 0 then
-            MapFileName := List.Items[List.ItemIndex] + CevoMapExt
+            MapFileName := GetMapsDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoMapExt
             else Exit;
         end;
-        MiniMap.LoadFromMapFile(GetMapsDir + DirectorySeparator + MapFileName,
-          nMapLandTiles, nMapStartPositions);
+        MiniMap.LoadFromMapFile(MapFileName, nMapLandTiles, nMapStartPositions);
         if Page = pgEditMap then
           SmartInvalidate(x0Mini - 112, y0Mini + 61, x0Mini + 112, y0Mini + 91);
@@ -1296 +1295 @@
       while (I > 0) and (F.Time < Integer(FormerGames.Objects[I - 1])) do
         Dec(I);
-      FormerGames.InsertObject(I, Copy(F.Name, 1, Length(F.Name) - 5),
+      FormerGames.InsertObject(I, ExtractFileNameOnly(F.Name),
         TObject(F.Time));
     until FindNext(F) <> 0;
@@ -1318 +1317 @@
   Maps.Sort;
   Maps.Insert(0, Phrases.Lookup('RANMAP'));
-  ListIndex[tbMain] := Maps.IndexOf(Copy(MapFileName, 1, Length(MapFileName) - Length(CevoMapExt)));
+  ListIndex[tbMain] := Maps.IndexOf(ExtractFileNameOnly(MapFileName));
   if ListIndex[tbMain] < 0 then
     ListIndex[tbMain] := 0;
@@ -1661 +1660 @@
     InputDlg.ShowModal;
     NewName := InputDlg.EditInput.Text;
-    while (NewName <> '') and (NewName[1] = '~') do
+    while IsAutoSaveFileName(NewName) do
       Delete(NewName, 1, 1);
     if (InputDlg.ModalResult = mrOK) and (NewName <> '') and
@@ -1936 +1935 @@
 procedure TStartDlg.ReplayBtnClick(Sender: TObject);
 begin
-  LoadGame(GetSavedDir + DirectorySeparator, List.Items[List.ItemIndex] + CevoExt,
+  LoadGame(GetSavedDir + DirectorySeparator + List.Items[List.ItemIndex] + CevoExt,
     LastTurn, True);
   SlotAvailable := -1;