mirror of
https://github.com/halpz/re3.git
synced 2024-12-22 17:35:29 +00:00
merge
This commit is contained in:
commit
873840a6a5
|
@ -911,7 +911,7 @@ void CTheScripts::Process()
|
|||
break;
|
||||
case MISSION_RETRY_STAGE_WAIT_FOR_MENU:
|
||||
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_USER;
|
||||
RetryMission(0, 0);
|
||||
RetryMission(MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER);
|
||||
break;
|
||||
case MISSION_RETRY_STAGE_START_RESTARTING:
|
||||
AllowMissionReplay = MISSION_RETRY_STAGE_WAIT_FOR_TIMER_AFTER_RESTART;
|
||||
|
|
|
@ -618,7 +618,7 @@ extern bool AlreadySavedGame;
|
|||
#endif
|
||||
|
||||
uint32 AddExtraDeathDelay();
|
||||
void RetryMission(int, int);
|
||||
void RetryMission(int, int unk = 0);
|
||||
|
||||
enum {
|
||||
MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER = 0,
|
||||
|
|
|
@ -4782,7 +4782,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
|
|||
case MENUACTION_UNK114:
|
||||
doingMissionRetry = false;
|
||||
RequestFrontEndShutDown();
|
||||
RetryMission(2, 0);
|
||||
RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
|
||||
return;
|
||||
#endif
|
||||
case MENUACTION_SAVEGAME:
|
||||
|
@ -5437,7 +5437,7 @@ CMenuManager::ProcessFileActions()
|
|||
break;
|
||||
}
|
||||
if (doingMissionRetry) {
|
||||
RetryMission(2, 0);
|
||||
RetryMission(MISSION_RETRY_TYPE_BEGIN_RESTARTING);
|
||||
m_nCurrSaveSlot = SLOT_COUNT;
|
||||
doingMissionRetry = false;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue