Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nikolay Korolev
2021-08-08 17:14:21 +03:00
parent 668311a444 63046894b0
commit 478bdcc1ca
8 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/save/GenericGameStorage.cpp
View File

@@ -1176,16 +1176,16 @@ void DisplaySaveResult(int unk, char* name)
bool SaveGameForPause(int type)
{
if (AllowMissionReplay != 0 && AllowMissionReplay != 7) {
if (AllowMissionReplay != MISSION_RETRY_STAGE_NORMAL && AllowMissionReplay != MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART) {
debug("SaveGameForPause failed during AllowMissionReplay %d", AllowMissionReplay);
return false;
}
if (type != 3 && WaitForSave > CTimer::GetTimeInMilliseconds()) {
if (type != SAVE_TYPE_QUICKSAVE_FOR_MISSION_REPLAY && WaitForSave > CTimer::GetTimeInMilliseconds()) {
debug("SaveGameForPause failed WaitForSave");
return false;
}
WaitForSave = 0;
if (gGameState != GS_PLAYING_GAME || (CTheScripts::bAlreadyRunningAMissionScript && type != 5)) {
if (gGameState != GS_PLAYING_GAME || (CTheScripts::bAlreadyRunningAMissionScript && type != SAVE_TYPE_QUICKSAVE_FOR_SCRIPT_ON_A_MISSION)) {
DisplaySaveResult(3, CStats::LastMissionPassedName);
return false;
}

10
src/save/GenericGameStorage.h
View File

@@ -53,4 +53,14 @@ const char TopLineEmptyFile[] = "THIS FILE IS NOT VALID YET";
extern int8 IsQuickSave; // originally int
bool SaveGameForPause(int);
enum {
SAVE_TYPE_NORMAL,
SAVE_TYPE_QUICKSAVE,
SAVE_TYPE_2,
SAVE_TYPE_QUICKSAVE_FOR_MISSION_REPLAY,
SAVE_TYPE_QUICKSAVE_FOR_SCRIPT,
SAVE_TYPE_QUICKSAVE_FOR_SCRIPT_ON_A_MISSION
};
#endif