summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-28 10:25:14 +0200
committerGitHub <noreply@github.com>2020-05-28 10:25:14 +0200
commit9bcec542911c461d60dd80772b97f30399f3c818 (patch)
treeeb2d5037c4ec34298b06f99f36f1a29f01aec77c /src/core/Frontend.cpp
parentcrash fix (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-9bcec542911c461d60dd80772b97f30399f3c818.tar
re3-9bcec542911c461d60dd80772b97f30399f3c818.tar.gz
re3-9bcec542911c461d60dd80772b97f30399f3c818.tar.bz2
re3-9bcec542911c461d60dd80772b97f30399f3c818.tar.lz
re3-9bcec542911c461d60dd80772b97f30399f3c818.tar.xz
re3-9bcec542911c461d60dd80772b97f30399f3c818.tar.zst
re3-9bcec542911c461d60dd80772b97f30399f3c818.zip
Diffstat (limited to '')
-rw-r--r--src/core/Frontend.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index d58d0576..b291886f 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3497,6 +3497,13 @@ CMenuManager::Process(void)
SaveLoadFileError_SetUpErrorScreen();
}
if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS) {
+#ifdef MISSION_REPLAY
+ if (doingMissionRetry) {
+ RetryMission(2, 0);
+ m_nCurrSaveSlot = SLOT_COUNT;
+ doingMissionRetry = false;
+ }
+#endif
if (CheckSlotDataValid(m_nCurrSaveSlot)) {
TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
if (m_PrefsVsyncDisp != m_PrefsVsync)
@@ -4661,6 +4668,18 @@ CMenuManager::ProcessButtonPresses(void)
DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
OutputDebugString("STARTED PLAYING FRONTEND AUDIO TRACK");
break;
+#ifdef MISSION_REPLAY
+ case MENUACTION_REJECT_RETRY:
+ doingMissionRetry = false;
+ AllowMissionReplay = 0;
+ RequestFrontEndShutDown();
+ break;
+ case MENUACTION_UNK114:
+ doingMissionRetry = false;
+ RequestFrontEndShutDown();
+ RetryMission(2, 0);
+ return;
+#endif
}
}
ProcessOnOffMenuOptions();