summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:19:49 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 16:19:49 +0200
commit873840a6a50d9495f8ac410996cb88bedc2c4004 (patch)
tree28e611b5a838907860575561931253bdd7a1c739
parentmerge (diff)
parentsmall fix (diff)
downloadre3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar.gz
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar.bz2
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar.lz
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar.xz
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.tar.zst
re3-873840a6a50d9495f8ac410996cb88bedc2c4004.zip
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/control/Script.h2
-rw-r--r--src/core/Frontend.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index afd72473..0e403c49 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -911,7 +911,7 @@ void CTheScripts::Process()
break;
case MISSION_RETRY_STAGE_WAIT_FOR_MENU:
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_USER;
- RetryMission(0, 0);
+ RetryMission(MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER);
break;
case MISSION_RETRY_STAGE_START_RESTARTING:
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART;
diff --git a/src/control/Script.h b/src/control/Script.h
index ccd9d7b5..7f9a7717 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -618,7 +618,7 @@ extern bool AlreadySavedGame;
#endif
uint32 AddExtraDeathDelay();
-void RetryMission(int, int);
+void RetryMission(int, int unk = 0);
enum {
MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER = 0,
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0fd5c5bd..22be4848 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -4782,7 +4782,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
case MENUACTION_UNK114:
doingMissionRetry = false;
RequestFrontEndShutDown();
- RetryMission(2, 0);
+ RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
return;
#endif
case MENUACTION_SAVEGAME:
@@ -5437,7 +5437,7 @@ CMenuManager::ProcessFileActions()
break;
}
if (doingMissionRetry) {
- RetryMission(2, 0);
+ RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
m_nCurrSaveSlot = SLOT_COUNT;
doingMissionRetry = false;
}