diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 16:29:57 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 16:29:57 +0200 |
| commit | 68db861c45755f3b5996895003ba638f7f6ace05 (patch) | |
| tree | 392706931d0ef3c44fdc12290ba786208553e935 /src/core/Frontend.cpp | |
| parent | merge (diff) | |
| parent | merge (diff) | |
| download | re3-68db861c45755f3b5996895003ba638f7f6ace05.tar re3-68db861c45755f3b5996895003ba638f7f6ace05.tar.gz re3-68db861c45755f3b5996895003ba638f7f6ace05.tar.bz2 re3-68db861c45755f3b5996895003ba638f7f6ace05.tar.lz re3-68db861c45755f3b5996895003ba638f7f6ace05.tar.xz re3-68db861c45755f3b5996895003ba638f7f6ace05.tar.zst re3-68db861c45755f3b5996895003ba638f7f6ace05.zip | |
Diffstat (limited to 'src/core/Frontend.cpp')
| -rw-r--r-- | src/core/Frontend.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index dc2e1e02..3fb4bcbc 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -4634,7 +4634,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u #ifdef USE_DEBUG_SCRIPT_LOADER if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_NEW_GAME || m_nCurrScreen == MENUPAGE_NEW_GAME_RELOAD) { if (CPad::GetPad(0)->GetChar('R')) { - scriptToLoad = 1; + CTheScripts::ScriptToLoad = 1; DoSettingsBeforeStartingAGame(); return; } @@ -4789,13 +4789,13 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u #ifdef MISSION_REPLAY case MENUACTION_REJECT_RETRY: doingMissionRetry = false; - AllowMissionReplay = 0; + AllowMissionReplay = MISSION_RETRY_STAGE_NORMAL; RequestFrontEndShutDown(); break; case MENUACTION_UNK114: doingMissionRetry = false; RequestFrontEndShutDown(); - RetryMission(2, 0); + RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING); return; #endif case MENUACTION_SAVEGAME: @@ -5451,14 +5451,14 @@ CMenuManager::ProcessFileActions() break; } if (doingMissionRetry) { - RetryMission(2, 0); + RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING); m_nCurrSaveSlot = SLOT_COUNT; doingMissionRetry = false; } #endif if (CheckSlotDataValid(m_nCurrSaveSlot)) { #ifdef USE_DEBUG_SCRIPT_LOADER - scriptToLoad = 0; + CTheScripts::ScriptToLoad = 0; #endif #ifdef XBOX_MESSAGE_SCREEN |