Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nikolay Korolev
2021-08-08 17:14:21 +03:00
parent 668311a444 63046894b0
commit 478bdcc1ca
8 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Frontend.cpp
View File

@@ -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