diff options
| author | Nikolay <nickvnuk@gmail.com> | 2021-08-07 17:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 17:47:28 +0200 |
| commit | e947081622d337a5e22791691e5d0dbed56e0199 (patch) | |
| tree | 4cf5012d9795a870caf8ec00ef69b1f9baf15210 /src/save/GenericGameStorage.cpp | |
| parent | CVehicle fixes and cleanup (diff) | |
| parent | more cherry-pick fix (diff) | |
| download | re3-e947081622d337a5e22791691e5d0dbed56e0199.tar re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.gz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.bz2 re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.lz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.xz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.zst re3-e947081622d337a5e22791691e5d0dbed56e0199.zip | |
Diffstat (limited to 'src/save/GenericGameStorage.cpp')
| -rw-r--r-- | src/save/GenericGameStorage.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index dec84c9e..c42ae738 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -1176,13 +1176,20 @@ void DisplaySaveResult(int unk, char* name) bool SaveGameForPause(int type) { - if (AllowMissionReplay != 0 || type != 3 && WaitForSave > CTimer::GetTimeInMilliseconds()) + if (AllowMissionReplay != 0 && AllowMissionReplay != 7) { + debug("SaveGameForPause failed during AllowMissionReplay %d", AllowMissionReplay); return false; + } + if (type != 3 && WaitForSave > CTimer::GetTimeInMilliseconds()) { + debug("SaveGameForPause failed WaitForSave"); + return false; + } WaitForSave = 0; - if (gGameState != GS_PLAYING_GAME || CTheScripts::IsPlayerOnAMission() || CStats::LastMissionPassedName[0] == '\0') { + if (gGameState != GS_PLAYING_GAME || (CTheScripts::bAlreadyRunningAMissionScript && type != 5)) { DisplaySaveResult(3, CStats::LastMissionPassedName); return false; } + debug("SaveGameForPause ******************************** %s doSave %d", CStats::LastMissionPassedName, !CTheScripts::bAlreadyRunningAMissionScript); IsQuickSave = type; MissionStartTime = 0; int res = PcSaveHelper.SaveSlot(PAUSE_SAVE_SLOT); |