diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 17:14:21 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-08 17:14:21 +0300 |
| commit | 478bdcc1ca041bccf791c3aa7dbbc1a04da72454 (patch) | |
| tree | 589cfc6708f54f58e10d5c8774fcb244c79b46e3 /src/core/Frontend.cpp | |
| parent | 668311a444a350dea9f23e5828722a5f40e7a3d5 (diff) | |
| parent | 63046894b099598c41096651a9816ee3adc032a4 (diff) | |
merge
Diffstat (limited to 'src/core/Frontend.cpp')
| -rw-r--r-- | src/core/Frontend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 64e27a32..0fd5c5bd 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -4621,7 +4621,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; } @@ -4776,7 +4776,7 @@ 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: @@ -5444,7 +5444,7 @@ CMenuManager::ProcessFileActions() #endif if (CheckSlotDataValid(m_nCurrSaveSlot)) { #ifdef USE_DEBUG_SCRIPT_LOADER - scriptToLoad = 0; + CTheScripts::ScriptToLoad = 0; #endif #ifdef XBOX_MESSAGE_SCREEN |