a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 07:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
Sergeanur 2021-02-10 13:29:02 +02:00
parent 5072c8b6f0
commit 3c7a7bc8a7
4 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/Frontend.cpp
View file

@ -125,7 +125,7 @@ bool CMenuManager::m_PrefsMarketing = false;
bool CMenuManager::m_PrefsDisableTutorials = false; bool CMenuManager::m_PrefsDisableTutorials = false;
#endif // !MASTER #endif // !MASTER
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
uint32 TimeToStopPadShaking; uint32 TimeToStopPadShaking;
#endif #endif
@ -1089,7 +1089,7 @@ CMenuManager::DrawStandardMenus(bool activeScreen)
} }
switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) { switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
case MENUACTION_CTRLVIBRATION: case MENUACTION_CTRLVIBRATION:
if (m_PrefsUseVibration) if (m_PrefsUseVibration)
rightText = TheText.Get("FEM_ON"); rightText = TheText.Get("FEM_ON");
@ -2300,9 +2300,6 @@ CMenuManager::DrawBackground(bool transitionCall)
break; break;
case MENUPAGE_SKIN_SELECT: case MENUPAGE_SKIN_SELECT:
case MENUPAGE_KEYBOARD_CONTROLS: case MENUPAGE_KEYBOARD_CONTROLS:
#ifdef GAMEPAD_MENU
case MENUPAGE_CONTROLLER_SETTINGS:
#endif
menuBg.topLeft_x = 14.0f; menuBg.topLeft_x = 14.0f;
menuBg.topLeft_y = 39.0f; menuBg.topLeft_y = 39.0f;
menuBg.topRight_x = 636.0f; menuBg.topRight_x = 636.0f;
@ -4926,7 +4923,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
if (changeAmount != 0) { if (changeAmount != 0) {
switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) { switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
case MENUACTION_CTRLCONFIG: case MENUACTION_CTRLCONFIG:
CPad::GetPad(0)->Mode += changeAmount; CPad::GetPad(0)->Mode += changeAmount;
if (CPad::GetPad(0)->Mode > 3) if (CPad::GetPad(0)->Mode > 3)
@ -5077,7 +5074,7 @@ void
CMenuManager::ProcessOnOffMenuOptions() CMenuManager::ProcessOnOffMenuOptions()
{ {
switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) { switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
case MENUACTION_CTRLVIBRATION: case MENUACTION_CTRLVIBRATION:
m_PrefsUseVibration = !m_PrefsUseVibration; m_PrefsUseVibration = !m_PrefsUseVibration;
if (m_PrefsUseVibration) { if (m_PrefsUseVibration) {
@ -5551,7 +5548,7 @@ CMenuManager::SwitchMenuOnAndOff()
m_bStartUpFrontEndRequested = false; m_bStartUpFrontEndRequested = false;
m_bShutDownFrontEndRequested = false; m_bShutDownFrontEndRequested = false;
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
// Reset pad shaking. // Reset pad shaking.
if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) { if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) {
CPad::StopPadsShaking(); CPad::StopPadsShaking();

4
src/core/Frontend.h
View file

@ -199,7 +199,7 @@ enum eMenuScreen
MENUPAGE_MOUSE_CONTROLS = 31, MENUPAGE_MOUSE_CONTROLS = 31,
MENUPAGE_PAUSE_MENU = 32, MENUPAGE_PAUSE_MENU = 32,
MENUPAGE_NONE = 33, // Then chooses main menu or pause menu MENUPAGE_NONE = 33, // Then chooses main menu or pause menu
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
MENUPAGE_CONTROLLER_SETTINGS, MENUPAGE_CONTROLLER_SETTINGS,
#endif #endif
#ifdef LEGACY_MENU_OPTIONS #ifdef LEGACY_MENU_OPTIONS
@ -284,7 +284,7 @@ enum eMenuAction
MENUACTION_DRAWDIST, MENUACTION_DRAWDIST,
MENUACTION_MOUSESENS, MENUACTION_MOUSESENS,
MENUACTION_MP3VOLUMEBOOST, MENUACTION_MP3VOLUMEBOOST,
#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU) #ifdef GAMEPAD_MENU
MENUACTION_CTRLVIBRATION, MENUACTION_CTRLVIBRATION,
MENUACTION_CTRLCONFIG, MENUACTION_CTRLCONFIG,
#endif #endif

7
src/core/MenuScreens.cpp
View file

@ -277,13 +277,6 @@ CMenuScreen aScreens[] = {
{ "", 0, 0, }, { "", 0, 0, },
#ifdef LEGACY_MENU_OPTIONS #ifdef LEGACY_MENU_OPTIONS
// MENUPAGE_CONTROLLER_SETTINGS
{ "FET_CON", MENUPAGE_OPTIONS, 0,
MENUACTION_CTRLCONFIG, "FEC_CCF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS, 0, 0, 0,
MENUACTION_CTRLVIBRATION, "FEC_VIB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS, 0, 0, 0,
MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
},
// MENUPAGE_DEBUG_MENU // MENUPAGE_DEBUG_MENU
{ "FED_DBG", MENUPAGE_NONE, 0, { "FED_DBG", MENUPAGE_NONE, 0,
MENUACTION_RELOADIDE, "FED_RID", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0, MENUACTION_RELOADIDE, "FED_RID", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,

9
src/core/MenuScreensCustom.cpp
View file

@ -629,7 +629,7 @@ CMenuScreenCustom aScreens[] = {
#ifdef GAMEPAD_MENU #ifdef GAMEPAD_MENU
MENUACTION_CHANGEMENU, "FET_AGS", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, MENUALIGN_CENTER, MENUACTION_CHANGEMENU, "FET_AGS", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, MENUALIGN_CENTER,
#endif #endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS #ifdef DETECT_JOYSTICK_MENU
MENUACTION_CHANGEMENU, "FEC_JOD", {nil, SAVESLOT_NONE, MENUPAGE_DETECT_JOYSTICK}, 0, 0, MENUALIGN_CENTER, MENUACTION_CHANGEMENU, "FEC_JOD", {nil, SAVESLOT_NONE, MENUPAGE_DETECT_JOYSTICK}, 0, 0, MENUALIGN_CENTER,
#endif #endif
MENUACTION_CHANGEMENU, "FEC_MOU", {nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_CENTER, MENUACTION_CHANGEMENU, "FEC_MOU", {nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_CENTER,
@ -703,13 +703,6 @@ CMenuScreenCustom aScreens[] = {
SELECT_CONTROLLER_TYPE SELECT_CONTROLLER_TYPE
MENUACTION_GOBACK, "FEDS_TB", { nil, SAVESLOT_NONE, MENUPAGE_NONE }, 0, 0, MENUALIGN_LEFT, MENUACTION_GOBACK, "FEDS_TB", { nil, SAVESLOT_NONE, MENUPAGE_NONE }, 0, 0, MENUALIGN_LEFT,
}, },
#elif defined(LEGACY_MENU_OPTIONS)
// MENUPAGE_CONTROLLER_SETTINGS = 4
{ "FET_CON", MENUPAGE_OPTIONS, nil, nil,
MENUACTION_CTRLCONFIG, "FEC_CCF", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, 0,
MENUACTION_CTRLVIBRATION, "FEC_VIB", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, 0,
MENUACTION_GOBACK, "FEDS_TB", {nil, SAVESLOT_NONE, MENUPAGE_NONE}, 0, 0, 0,
},
#endif #endif
#ifdef LEGACY_MENU_OPTIONS #ifdef LEGACY_MENU_OPTIONS
// MENUPAGE_DEBUG_MENU = 18 // MENUPAGE_DEBUG_MENU = 18