diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-01 11:54:05 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-01 11:54:05 +0200 |
| commit | 70080f1fdbafe5ecd11c573d4d9fba522a5d8235 (patch) | |
| tree | f2a737732d7d7a05b7195b69bf3f317233acbca3 /src/core/Frontend.cpp | |
| parent | CVisibilityPlugins and CRenderer fixes; pulled MLO back in (diff) | |
| download | re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar.gz re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar.bz2 re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar.lz re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar.xz re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.tar.zst re3-70080f1fdbafe5ecd11c573d4d9fba522a5d8235.zip | |
Diffstat (limited to 'src/core/Frontend.cpp')
| -rw-r--r-- | src/core/Frontend.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 632a69ab..03d9a719 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -571,7 +571,11 @@ CMenuManager::Initialise(void) m_fMapCenterX = MENU_X_LEFT_ALIGNED(320.0f); m_fMapCenterY = MENU_Y(225.0f); CPad::StopPadsShaking(); +#ifdef MISSION_REPLAY + if (!m_OnlySaveMenu && m_nCurrScreen != MENUPAGE_MISSION_RETRY) +#else if (!m_OnlySaveMenu) +#endif m_nCurrScreen = MENUPAGE_NONE; DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0); @@ -4711,6 +4715,18 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u 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 case MENUACTION_SAVEGAME: { int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot; @@ -5355,6 +5371,19 @@ CMenuManager::ProcessFileActions() { switch (m_nCurrScreen) { case MENUPAGE_LOADING_IN_PROGRESS: +#ifdef MISSION_REPLAY + if (MissionSkipLevel) { + if (gGameState != GS_PLAYING_GAME) + DoSettingsBeforeStartingAGame(); + RequestFrontEndShutDown(); + break; + } + if (doingMissionRetry) { + RetryMission(2, 0); + m_nCurrSaveSlot = SLOT_COUNT; + doingMissionRetry = false; + } +#endif if (CheckSlotDataValid(m_nCurrSaveSlot)) { #ifdef USE_DEBUG_SCRIPT_LOADER scriptToLoad = 0; |