Fixes

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();

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

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,