diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-12 10:23:10 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-12 10:23:10 +0200 |
| commit | b99edf9a6b5271c7784d51abad4db716fc15addc (patch) | |
| tree | fbbc525059aefa51100b78b54a238822b6ad3dfb | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar.gz re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar.bz2 re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar.lz re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar.xz re3-b99edf9a6b5271c7784d51abad4db716fc15addc.tar.zst re3-b99edf9a6b5271c7784d51abad4db716fc15addc.zip | |
| -rw-r--r-- | src/control/Script.cpp | 1 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 20 | ||||
| -rw-r--r-- | src/core/Frontend.h | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 5b5825eb..49a33600 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -3246,6 +3246,7 @@ void RetryMission(int type, int unk) if (type == MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER) { doingMissionRetry = true; FrontEndMenuManager.m_nCurrScreen = MENUPAGE_MISSION_RETRY; + FrontEndMenuManager.m_bAttemptingMissionRetry = true; FrontEndMenuManager.RequestFrontEndStartUp(); } else if (type == MISSION_RETRY_TYPE_BEGIN_RESTARTING) { diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 22be4848..6ef75a33 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -542,6 +542,10 @@ CMenuManager::CMenuManager() #ifdef GAMEPAD_MENU m_PrefsControllerType = CONTROLLER_XBOXONE; #endif + +#ifdef MISSION_REPLAY + m_bAttemptingMissionRetry = false; +#endif } void @@ -573,11 +577,17 @@ CMenuManager::Initialise(void) m_fMapCenterY = MENU_Y(225.0f); CPad::StopPadsShaking(); #ifdef MISSION_REPLAY - if (!m_OnlySaveMenu && m_nCurrScreen != MENUPAGE_MISSION_RETRY) + if (!m_OnlySaveMenu) { + if (m_nCurrScreen == MENUPAGE_MISSION_RETRY && m_bAttemptingMissionRetry) + m_bAttemptingMissionRetry = false; + else + m_nCurrScreen = MENUPAGE_NONE; + } #else if (!m_OnlySaveMenu) -#endif m_nCurrScreen = MENUPAGE_NONE; +#endif + DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0); DMAudio.Service(); @@ -4447,7 +4457,11 @@ CMenuManager::UserInput(void) if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) { if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT && m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS - && m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO) + && m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO +#ifdef MISSION_REPLAY + && m_nCurrScreen != MENUPAGE_MISSION_RETRY +#endif + ) { m_bShowMouse = false; goBack = true; diff --git a/src/core/Frontend.h b/src/core/Frontend.h index 858d3fd9..31d6fa8d 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -711,6 +711,10 @@ public: int8 m_nDisplayMSAALevel; #endif +#ifdef MISSION_REPLAY + bool m_bAttemptingMissionRetry; +#endif + #ifdef GAMEPAD_MENU enum { |