summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.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/Frontend.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/Frontend.cpp13
1 files changed, 5 insertions, 8 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();