From 784f311d768852dbf2d360e290ba29b130b985f8 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sat, 16 Aug 2014 15:33:05 -0400 Subject: [PATCH] Make it available for everybody. --- Common/KeyMap.cpp | 4 +--- Core/Config.cpp | 3 +-- Core/Config.h | 2 -- UI/GameSettingsScreen.cpp | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 8a31095de9..6b3bfc5bad 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -630,9 +630,7 @@ const KeyMap_IntStrPair psp_button_names[] = { {VIRTKEY_AXIS_Y_MIN, "An.Down"}, {VIRTKEY_AXIS_X_MIN, "An.Left"}, {VIRTKEY_AXIS_X_MAX, "An.Right"}, -#ifndef MOBILE_DEVICE - { VIRTKEY_ANALOG_LIGHTLY, "Analog limiter" }, -#endif + {VIRTKEY_ANALOG_LIGHTLY, "Analog limiter"}, {VIRTKEY_RAPID_FIRE, "RapidFire"}, {VIRTKEY_UNTHROTTLE, "Unthrottle"}, diff --git a/Core/Config.cpp b/Core/Config.cpp index d4843aa36c..09831af2ba 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -541,9 +541,8 @@ static ConfigSetting controlSettings[] = { ConfigSetting("AnalogStickX", &g_Config.fAnalogStickX, -1.0f), ConfigSetting("AnalogStickY", &g_Config.fAnalogStickY, -1.0f), ConfigSetting("AnalogStickScale", &g_Config.fAnalogStickScale, defaultControlScale), -#if !defined(MOBILE_DEVICE) ConfigSetting("AnalogLimiterDeadzone", &g_Config.fAnalogLimiterDeadzone, 0.5f), -#endif + ConfigSetting(false), }; diff --git a/Core/Config.h b/Core/Config.h index 5966c87344..a21be55426 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -248,9 +248,7 @@ public: bool bHapticFeedback; -#if !defined(MOBILE_DEVICE) float fAnalogLimiterDeadzone; -#endif // GLES backend-specific hacks. Not saved to the ini file, do not add checkboxes. Will be made into // proper options when good enough. // PrescaleUV: diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 45637e5378..073bed439f 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -350,13 +350,11 @@ void GameSettingsScreen::CreateViews() { View *style = controlsSettings->Add(new PopupMultiChoice(&g_Config.iTouchButtonStyle, c->T("Button style"), touchControlStyles, 0, ARRAY_SIZE(touchControlStyles), c, screenManager())); style->SetEnabledPtr(&g_Config.bShowTouchControls); -#if !defined(MOBILE_DEVICE) controlsSettings->Add(new ItemHeader(c->T("Keyboard", "Keyboard Control Settings"))); #if defined(USING_WIN_UI) controlsSettings->Add(new CheckBox(&g_Config.bIgnoreWindowsKey, c->T("Ignore Windows Key"))); #endif // #if defined(USING_WIN_UI) controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fAnalogLimiterDeadzone, 0.0f, 1.0f, "Analog Limiter", 0.10f, screenManager())); -#endif // #if !defined(MOBILE_DEVICE) // System ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));