Changeset 589 for trunk/GameServer.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/GameServer.pas (modified) (15 diffs)

trunk/GameServer.pas

@@ -69 +69 @@
 procedure Done;
 
-procedure StartNewGame(const Path, FileName, Map: string;
+procedure StartNewGame(const FileName, AMapFileName: string;
   Newlx, Newly, NewLandMass, NewMaxTurn: Integer);
-function LoadGame(const Path, FileName: string; Turn: Integer;
+function LoadGame(const FileName: string; Turn: Integer;
   MovieMode: Boolean): Boolean;
 procedure EditMap(const Map: string; Newlx, Newly, NewLandMass: Integer);
 procedure DirectHelp(Command: Integer);
+function ToAutoSaveFileName(FileName: string): string;
+function IsAutoSaveFileName(FileName: string): Boolean;
 
 procedure ChangeClient;
@@ -391 +393 @@
 end;
 
+function ToAutoSaveFileName(FileName: string): string;
+begin
+  Result := ExtractFileDir(FileName) + DirectorySeparator + '~' + ExtractFileName(FileName);
+end;
+
+function IsAutoSaveFileName(FileName: string): Boolean;
+begin
+  FileName := ExtractFileName(FileName);
+  Result := (Length(FileName) > 0) and (FileName[1] = '~');
+end;
+
 procedure LogChanges;
 var
@@ -579 +592 @@
 begin
   Result := False;
-  MapFile := nil;
+  if not FileExists(FileName) then Exit;
+  MapFile := TFileStream.Create(FileName, fmOpenRead or fmShareExclusive);
   try
-    MapFile := TFileStream.Create(FileName, fmOpenRead or fmShareExclusive);
     MapFile.Position := 0;
     MapFile.Read(S[1], 8); { file id }
@@ -611 +624 @@
       Result := True;
     end;
+  finally
     FreeAndNil(MapFile);
-  except
-    if MapFile <> nil then
-      FreeAndNil(MapFile);
   end;
 end;
@@ -641 +652 @@
 
   if Auto and AutoSaveExists then // append to existing file
-    LogFile := TFileStream.Create(SavePath + FileName, fmOpenReadWrite or
-      fmShareExclusive)
+    LogFile := TFileStream.Create(FileName, fmOpenReadWrite or fmShareExclusive)
   else // create new file
-    LogFile := TFileStream.Create(SavePath + FileName,
-      fmCreate or fmShareExclusive);
+    LogFile := TFileStream.Create(FileName, fmCreate or fmShareExclusive);
 
   Zero := 0;
@@ -1111 +1120 @@
 end;
 
-function LoadGame(const Path, FileName: string; Turn: Integer;
-  MovieMode: Boolean): Boolean;
+function LoadGame(const FileName: string; Turn: Integer; MovieMode: Boolean): Boolean;
 var
   J: TBrain;
@@ -1125 +1133 @@
   Started, StatRequest: Boolean;
 begin
-  SavePath := Path;
+  SavePath := ExtractFileDir(FileName);
   LogFileName := FileName;
   LoadTurn := Turn;
-  LogFile := TFileStream.Create(SavePath + LogFileName, fmOpenRead or
+  LogFile := TFileStream.Create(LogFileName, fmOpenRead or
     fmShareExclusive);
   LogFile.Position := 0;
@@ -1203 +1211 @@
   else
     Mode := moLoading_Fast;
-{$IFDEF TEXTLOG}AssignFile(TextLog, SavePath + LogFileName + '.txt');
+{$IFDEF TEXTLOG}AssignFile(TextLog, LogFileName + '.txt');
   Rewrite(TextLog); {$ENDIF}
   LoadOK := True;
@@ -1299 +1307 @@
   NoLogChanges;
   NoLogCityTileChanges;
-  if LogFileName[1] = '~' then
-  begin
+  if IsAutoSaveFileName(LogFileName) then begin
     Delete(LogFileName, 1, 1);
     nLogOpened := -1;
@@ -1327 +1334 @@
   if not LoadOK then
   begin
-    NotifyMessage := SavePath + LogFileName;
+    NotifyMessage := LogFileName;
     Notify(ntLoadError);
   end;
@@ -1360 +1367 @@
 end;
 
-procedure StartNewGame(const Path, FileName, Map: string;
+procedure StartNewGame(const FileName, AMapFileName: string;
   Newlx, Newly, NewLandMass, NewMaxTurn: Integer);
 var
@@ -1366 +1373 @@
 begin
   Notify(ntStartDone);
-  SavePath := Path;
+  SavePath := ExtractFileDir(FileName);
   LogFileName := FileName;
-  MapFileName := Map;
+  MapFileName := AMapFileName;
   {$IFDEF FastContact}
     lx := 24;
@@ -3138 +3145 @@
             begin
               LogChanges;
-              SaveGame('~' + LogFileName, True);
+              SaveGame(ToAutoSaveFileName(LogFileName), True);
             end;
 {$ENDIF}
@@ -3268 +3275 @@
             SaveGame(LogFileName, False);
           end;
-          DeleteFile(SavePath + '~' + LogFileName);
+          DeleteFile(ToAutoSaveFileName(LogFileName));
           EndGame;
           case Command of
@@ -3276 +3283 @@
               Notify(ntStartGo);
             sNextRound:
-              StartNewGame(SavePath, LogFileName, MapFileName, lx, ly,
-                LandMass, MaxTurn);
+              StartNewGame(LogFileName, MapFileName, lx, ly, LandMass, MaxTurn);
             sReload:
-              LoadGame(SavePath, LogFileName, Integer(Data), False);
+              LoadGame(LogFileName, Integer(Data), False);
           end;
         end