summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-02-10 12:29:02 +0100
committerSergeanur <s.anureev@yandex.ua>2021-02-10 12:42:59 +0100
commit3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248 (patch)
tree66d594586756271668e4482d67fee510f86bc7f1 /src/core
parentMerge branch 'miami' into VC/ControllerMenu (diff)
downloadre3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar.gz
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar.bz2
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar.lz
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar.xz
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.tar.zst
re3-3c7a7bc8a7ca5a9bfff709fc53d3036597cc2248.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Frontend.cpp13
-rw-r--r--src/core/Frontend.h4
-rw-r--r--src/core/MenuScreens.cpp7
-rw-r--r--src/core/MenuScreensCustom.cpp9
4 files changed, 8 insertions, 25 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 141f46f8..31580e0e 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -125,7 +125,7 @@ bool CMenuManager::m_PrefsMarketing = false;
bool CMenuManager::m_PrefsDisableTutorials = false;
#endif // !MASTER
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
uint32 TimeToStopPadShaking;
#endif
@@ -1089,7 +1089,7 @@ CMenuManager::DrawStandardMenus(bool activeScreen)
}
switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
case MENUACTION_CTRLVIBRATION:
if (m_PrefsUseVibration)
rightText = TheText.Get("FEM_ON");
@@ -2300,9 +2300,6 @@ CMenuManager::DrawBackground(bool transitionCall)
break;
case MENUPAGE_SKIN_SELECT:
case MENUPAGE_KEYBOARD_CONTROLS:
-#ifdef GAMEPAD_MENU
- case MENUPAGE_CONTROLLER_SETTINGS:
-#endif
menuBg.topLeft_x = 14.0f;
menuBg.topLeft_y = 39.0f;
menuBg.topRight_x = 636.0f;
@@ -4926,7 +4923,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
if (changeAmount != 0) {
switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
case MENUACTION_CTRLCONFIG:
CPad::GetPad(0)->Mode += changeAmount;
if (CPad::GetPad(0)->Mode > 3)
@@ -5077,7 +5074,7 @@ void
CMenuManager::ProcessOnOffMenuOptions()
{
switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
case MENUACTION_CTRLVIBRATION:
m_PrefsUseVibration = !m_PrefsUseVibration;
if (m_PrefsUseVibration) {
@@ -5551,7 +5548,7 @@ CMenuManager::SwitchMenuOnAndOff()
m_bStartUpFrontEndRequested = false;
m_bShutDownFrontEndRequested = false;
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
// Reset pad shaking.
if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) {
CPad::StopPadsShaking();
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index fc09f2dc..112ea7ad 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -199,7 +199,7 @@ enum eMenuScreen
MENUPAGE_MOUSE_CONTROLS = 31,
MENUPAGE_PAUSE_MENU = 32,
MENUPAGE_NONE = 33, // Then chooses main menu or pause menu
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
MENUPAGE_CONTROLLER_SETTINGS,
#endif
#ifdef LEGACY_MENU_OPTIONS
@@ -284,7 +284,7 @@ enum eMenuAction
MENUACTION_DRAWDIST,
MENUACTION_MOUSESENS,
MENUACTION_MP3VOLUMEBOOST,
-#if defined(LEGACY_MENU_OPTIONS) || defined(GAMEPAD_MENU)
+#ifdef GAMEPAD_MENU
MENUACTION_CTRLVIBRATION,
MENUACTION_CTRLCONFIG,
#endif
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
index 72e19c49..20484389 100644
--- a/src/core/MenuScreens.cpp
+++ b/src/core/MenuScreens.cpp
@@ -277,13 +277,6 @@ CMenuScreen aScreens[] = {
{ "", 0, 0, },
#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
{ "FED_DBG", MENUPAGE_NONE, 0,
MENUACTION_RELOADIDE, "FED_RID", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
index 69af9acf..c4a415c2 100644
--- a/src/core/MenuScreensCustom.cpp
+++ b/src/core/MenuScreensCustom.cpp
@@ -629,7 +629,7 @@ CMenuScreenCustom aScreens[] = {
#ifdef GAMEPAD_MENU
MENUACTION_CHANGEMENU, "FET_AGS", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS}, 0, 0, MENUALIGN_CENTER,
#endif
-#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+#ifdef DETECT_JOYSTICK_MENU
MENUACTION_CHANGEMENU, "FEC_JOD", {nil, SAVESLOT_NONE, MENUPAGE_DETECT_JOYSTICK}, 0, 0, MENUALIGN_CENTER,
#endif
MENUACTION_CHANGEMENU, "FEC_MOU", {nil, SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS}, 0, 0, MENUALIGN_CENTER,
@@ -703,13 +703,6 @@ CMenuScreenCustom aScreens[] = {
SELECT_CONTROLLER_TYPE
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
#ifdef LEGACY_MENU_OPTIONS
// MENUPAGE_DEBUG_MENU = 18