X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_saveload.pas;h=2d91494b1e50b13806bb4c193b319b0ed7e7c2af;hb=HEAD;hp=4e5697465bfc8b8c42ede7cc174ebc3e2dc07742;hpb=414f2873efa0cce84499f64774db7000e6268971;p=d2df-sdl.git

diff --git a/src/game/g_saveload.pas b/src/game/g_saveload.pas
index 4e56974..2d91494 100644
--- a/src/game/g_saveload.pas
+++ b/src/game/g_saveload.pas
@@ -180,7 +180,7 @@ begin
       //if (Length(gCurrentMapFileName) <> 0) then e_LogWritefln('SAVE: current map is ''%s''...', [gCurrentMapFileName]);
       utils.writeStr(st, gCurrentMapFileName);
       // Ïóòü ê êàðòå
-      utils.writeStr(st, gGameSettings.WAD);
+      utils.writeStr(st, ExtractFileName(gGameSettings.WAD));
       // Èìÿ êàðòû
       utils.writeStr(st, g_ExtractFileName(gMapInfo.Map));
       // Êîëè÷åñòâî èãðîêîâ
@@ -194,7 +194,7 @@ begin
       // Ëèìèò âðåìåíè
       utils.writeInt(st, Word(gGameSettings.TimeLimit));
       // Ëèìèò î÷êîâ
-      utils.writeInt(st, Word(gGameSettings.GoalLimit));
+      utils.writeInt(st, Word(gGameSettings.ScoreLimit));
       // Ëèìèò æèçíåé
       utils.writeInt(st, Byte(gGameSettings.MaxLives));
       // Èãðîâûå îïöèè
@@ -291,7 +291,7 @@ var
   WAD_Path, Map_Name: AnsiString;
   nPlayers: Integer;
   Game_Type, Game_Mode, Game_MaxLives: Byte;
-  Game_TimeLimit, Game_GoalLimit: Word;
+  Game_TimeLimit, Game_ScoreLimit: Word;
   Game_Time, Game_Options: Cardinal;
   Game_CoopMonstersKilled,
   Game_CoopSecretsFound,
@@ -317,7 +317,9 @@ begin
 
       e_WriteLog('Loading saved game...', TMsgType.Notify);
 
-      {$IF DEFINED(D2F_DEBUG)}try{$ENDIF}
+{$IF DEFINED(D2F_DEBUG)}
+      try
+{$ENDIF}
         //g_Game_Free(false); // don't free textures for the same map
         g_Game_ClearLoading();
         g_Game_SetLoadingText(_lc[I_LOAD_SAVE_FILE], 0, False);
@@ -351,7 +353,7 @@ begin
         // Ëèìèò âðåìåíè
         Game_TimeLimit := utils.readWord(st);
         // Ëèìèò î÷êîâ
-        Game_GoalLimit := utils.readWord(st);
+        Game_ScoreLimit := utils.readWord(st);
         // Ëèìèò æèçíåé
         Game_MaxLives := utils.readByte(st);
         // Èãðîâûå îïöèè
@@ -373,41 +375,26 @@ begin
         ///// /////
 
         // Çàãðóæàåì êàðòó:
-        ZeroMemory(@gGameSettings, sizeof(TGameSettings));
+        gGameSettings := Default(TGameSettings);
         gAimLine := false;
         gShowMap := false;
-        if (Game_Type = GT_NONE) or (Game_Type = GT_SINGLE) then
-        begin
-          // Íàñòðîéêè èãðû
-          gGameSettings.GameType := GT_SINGLE;
-          gGameSettings.MaxLives := 0;
-          gGameSettings.Options := gGameSettings.Options+GAME_OPTION_ALLOWEXIT;
-          gGameSettings.Options := gGameSettings.Options+GAME_OPTION_MONSTERS;
-          gGameSettings.Options := gGameSettings.Options+GAME_OPTION_BOTVSMONSTER;
-          gSwitchGameMode := GM_SINGLE;
-        end
-        else
-        begin
-          // Íàñòðîéêè èãðû
-          gGameSettings.GameType := GT_CUSTOM;
-          gGameSettings.GameMode := Game_Mode;
-          gSwitchGameMode := Game_Mode;
-          gGameSettings.TimeLimit := Game_TimeLimit;
-          gGameSettings.GoalLimit := Game_GoalLimit;
-          gGameSettings.MaxLives := IfThen(Game_Mode = GM_CTF, 0, Game_MaxLives);
-          gGameSettings.Options := Game_Options;
-        end;
+        // Íàñòðîéêè èãðû
+        gGameSettings.GameType := Game_Type;
+        gGameSettings.GameMode := Game_Mode;
+        gGameSettings.TimeLimit := Game_TimeLimit;
+        gGameSettings.ScoreLimit := Game_ScoreLimit;
+        gGameSettings.MaxLives := Game_MaxLives;
+        gGameSettings.Options := TGameOptions(Game_Options);
+        gSwitchGameMode := Game_Mode;
         g_Game_ExecuteEvent('ongamestart');
 
         // Óñòàíîâêà ðàçìåðîâ îêîí èãðîêîâ
         g_Game_SetupScreenSize();
 
         // Çàãðóçêà è çàïóñê êàðòû
-        if not g_Game_StartMap(WAD_Path+':\'+Map_Name, True, curmapfile) then
-        begin
-          g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WAD_Path + ':\' + Map_Name]));
-          exit;
-        end;
+        //FIXME: save/load `asMegawad`
+        if not g_Game_StartMap(false{asMegawad}, WAD_Path+':\'+Map_Name, True, curmapfile) then
+          raise Exception.Create(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WAD_Path + ':\' + Map_Name]));
 
         // Íàñòðîéêè èãðîêîâ è áîòîâ
         g_Player_Init();
@@ -487,14 +474,14 @@ begin
         // done
         gLoadGameMode := false;
         result := true;
-      {$IF DEFINED(D2F_DEBUG)}
+{$IF DEFINED(D2F_DEBUG)}
       except
         begin
           errpos := LongWord(st.position);
           raise;
         end;
       end;
-      {$ENDIF}
+{$ENDIF}
     finally
       st.Free();
     end;