mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-23 17:45:28 +00:00
Code Issues Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
Nikolay Korolev 2021-08-08 17:19:49 +03:00
parent 478bdcc1ca 947f67dfb7
commit 873840a6a5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/control/Script.cpp
View file

@ -911,7 +911,7 @@ void CTheScripts::Process()
break; break;
case MISSION_RETRY_STAGE_WAIT_FOR_MENU: case MISSION_RETRY_STAGE_WAIT_FOR_MENU:
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_USER; AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_USER;
RetryMission(0, 0); RetryMission(MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER);
break; break;
case MISSION_RETRY_STAGE_START_RESTARTING: case MISSION_RETRY_STAGE_START_RESTARTING:
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART; AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART;

2
src/control/Script.h
View file

@ -618,7 +618,7 @@ extern bool AlreadySavedGame;
#endif #endif
uint32 AddExtraDeathDelay(); uint32 AddExtraDeathDelay();
void RetryMission(int, int); void RetryMission(int, int unk = 0);
enum { enum {
MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER = 0, MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER = 0,

4
src/core/Frontend.cpp
View file

@ -4782,7 +4782,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
case MENUACTION_UNK114: case MENUACTION_UNK114:
doingMissionRetry = false; doingMissionRetry = false;
RequestFrontEndShutDown(); RequestFrontEndShutDown();
RetryMission(2, 0); RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
return; return;
#endif #endif
case MENUACTION_SAVEGAME: case MENUACTION_SAVEGAME:
@ -5437,7 +5437,7 @@ CMenuManager::ProcessFileActions()
break; break;
} }
if (doingMissionRetry) { if (doingMissionRetry) {
RetryMission(2, 0); RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
m_nCurrSaveSlot = SLOT_COUNT; m_nCurrSaveSlot = SLOT_COUNT;
doingMissionRetry = false; doingMissionRetry = false;
} }