mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-01-06 20:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse source
This commit is contained in:
Sergeanur 2021-08-12 11:43:17 +03:00
parent cb35f78511 b99edf9a6b
commit 9a1b826021
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/control/Script.cpp
View file

@ -3444,6 +3444,7 @@ void RetryMission(int type, int unk)
if (type == MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER) { if (type == MISSION_RETRY_TYPE_SUGGEST_TO_PLAYER) {
doingMissionRetry = true; doingMissionRetry = true;
FrontEndMenuManager.m_nCurrScreen = MENUPAGE_MISSION_RETRY; FrontEndMenuManager.m_nCurrScreen = MENUPAGE_MISSION_RETRY;
FrontEndMenuManager.m_bAttemptingMissionRetry = true;
FrontEndMenuManager.RequestFrontEndStartUp(); FrontEndMenuManager.RequestFrontEndStartUp();
} }
else if (type == MISSION_RETRY_TYPE_BEGIN_RESTARTING) { else if (type == MISSION_RETRY_TYPE_BEGIN_RESTARTING) {

20
src/core/Frontend.cpp
View file

@ -556,6 +556,10 @@ CMenuManager::CMenuManager()
#ifdef GAMEPAD_MENU #ifdef GAMEPAD_MENU
m_PrefsControllerType = CONTROLLER_XBOXONE; m_PrefsControllerType = CONTROLLER_XBOXONE;
#endif #endif
#ifdef MISSION_REPLAY
m_bAttemptingMissionRetry = false;
#endif
} }
void void
@ -587,11 +591,17 @@ CMenuManager::Initialise(void)
m_fMapCenterY = MENU_Y(225.0f); m_fMapCenterY = MENU_Y(225.0f);
CPad::StopPadsShaking(); CPad::StopPadsShaking();
#ifdef MISSION_REPLAY #ifdef MISSION_REPLAY
if (!m_OnlySaveMenu && m_nCurrScreen != MENUPAGE_MISSION_RETRY) if (!m_OnlySaveMenu) {
if (m_nCurrScreen == MENUPAGE_MISSION_RETRY && m_bAttemptingMissionRetry)
m_bAttemptingMissionRetry = false;
else
m_nCurrScreen = MENUPAGE_NONE;
}
#else #else
if (!m_OnlySaveMenu) if (!m_OnlySaveMenu)
#endif
m_nCurrScreen = MENUPAGE_NONE; m_nCurrScreen = MENUPAGE_NONE;
#endif
DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND); DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
DMAudio.Service(); DMAudio.Service();
@ -4460,7 +4470,11 @@ CMenuManager::UserInput(void)
if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) { if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) {
if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT
&& m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS
&& m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO) && m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO
#ifdef MISSION_REPLAY
&& m_nCurrScreen != MENUPAGE_MISSION_RETRY
#endif
)
{ {
m_bShowMouse = false; m_bShowMouse = false;
goBack = true; goBack = true;

4
src/core/Frontend.h
View file

@ -711,6 +711,10 @@ public:
int8 m_nDisplayMSAALevel; int8 m_nDisplayMSAALevel;
#endif #endif
#ifdef MISSION_REPLAY
bool m_bAttemptingMissionRetry;
#endif
#ifdef GAMEPAD_MENU #ifdef GAMEPAD_MENU
enum enum
{ {