summaryrefslogtreecommitdiffstats
path: root/src/core/MenuScreensCustom.cpp
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/MenuScreensCustom.cpp
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 '')
-rw-r--r--src/core/MenuScreensCustom.cpp9
1 files changed, 1 insertions, 8 deletions
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