From ffcae5620973ecfac018f517b1961116cd15baad Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 25 Feb 2014 01:52:10 -0500 Subject: [PATCH] Actually force the pause button on Symbian, iOS, and Meego Harmattan. Instead of leaving a loophole open which could allow an ini edit, just force it on for these. --- Core/Config.cpp | 4 +--- Core/Config.h | 2 ++ UI/GamepadEmu.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 2b85017ae9..dfcca9ed1d 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -433,9 +433,7 @@ static ConfigSetting controlSettings[] = { ConfigSetting("ShowAnalogStick", &g_Config.bShowTouchAnalogStick, true), ConfigSetting("ShowTouchDpad", &g_Config.bShowTouchDpad, true), ConfigSetting("ShowTouchUnthrottle", &g_Config.bShowTouchUnthrottle, true), -#if defined(__SYMBIAN32__) || defined(IOS) || defined(MEEGO_EDITION_HARMATTAN) - ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true), -#else +#if !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN) ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false), #endif #if defined(USING_WIN_UI) diff --git a/Core/Config.h b/Core/Config.h index 50df70bc49..1145c5f543 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -227,7 +227,9 @@ public: bool bShowTouchAnalogStick; bool bShowTouchDpad; +#if !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN) bool bShowTouchPause; +#endif bool bHapticFeedback; diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index f25bb3bf6d..ad31453948 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -461,7 +461,9 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause) { int stickImage = g_Config.iTouchButtonStyle ? I_STICK_LINE : I_STICK; int stickBg = g_Config.iTouchButtonStyle ? I_STICK_BG_LINE : I_STICK_BG; +#if !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN) if (g_Config.bShowTouchPause) +#endif root->Add(new BoolButton(pause, roundImage, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90); if (g_Config.bShowTouchCircle)