Changeset 604 for trunk

Timestamp:

Aug 12, 2024, 5:03:49 PM (3 months ago)

Author:

chronos

Message:

• Fixed: Error after ending turn of loaded auto saved game.

File:

• trunk/GameServer.pas (modified) (3 diffs)

trunk/GameServer.pas

@@ -393 +393 @@
 end;
 
+const
+  AutoSavePrefix = '~';
+
 function ToAutoSaveFileName(FileName: string): string;
 begin
-  Result := ExtractFileDir(FileName) + DirectorySeparator + '~' + ExtractFileName(FileName);
+  if Copy(ExtractFileName(FileName), 1, 1) <> AutoSavePrefix then
+    Result := ExtractFileDir(FileName) + DirectorySeparator + AutoSavePrefix + ExtractFileName(FileName)
+    else Result := FileName;
+end;
+
+function FromAutoSaveFileName(FileName: string): string;
+begin
+  if Copy(ExtractFileName(FileName), 1, 1) = AutoSavePrefix then
+    Result := ExtractFileDir(FileName) + DirectorySeparator + Copy(ExtractFileName(FileName), 2, MaxInt)
+    else Result := FileName;
 end;
 
@@ -401 +413 @@
 begin
   FileName := ExtractFileName(FileName);
-  Result := (Length(FileName) > 0) and (FileName[1] = '~');
+  Result := (Length(FileName) > 0) and (FileName[1] = AutoSavePrefix);
 end;
 
@@ -1250 +1262 @@
   NoLogCityTileChanges;
   if IsAutoSaveFileName(LogFileName) then begin
-    Delete(LogFileName, 1, 1);
+    LogFileName := FromAutoSaveFileName(LogFileName);
     nLogOpened := -1;
   end