diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp index d210abeaf..04224087a 100644 --- a/src/config/user_config.hpp +++ b/src/config/user_config.hpp @@ -922,7 +922,7 @@ namespace UserConfigParams "Quality of anisotropic filtering (usual values include 2-4-8-16; 0 to disable)") ); PARAM_PREFIX IntUserConfigParam m_swap_interval - PARAM_DEFAULT( IntUserConfigParam(0, "swap_interval", + PARAM_DEFAULT( IntUserConfigParam(0, "swap-interval", &m_graphics_quality, "Swap interval for vsync: 0 = disabled, 1 = full") ); PARAM_PREFIX BoolUserConfigParam m_motionblur diff --git a/src/main_android.cpp b/src/main_android.cpp index 0fbcee5cc..1ac58743e 100644 --- a/src/main_android.cpp +++ b/src/main_android.cpp @@ -66,11 +66,6 @@ void override_default_params_for_mobile() // Enable multitouch race GUI UserConfigParams::m_multitouch_draw_gui = true; -#ifdef IOS_STK - // Default 30 fps for battery saving (only used in iOS) - UserConfigParams::m_swap_interval = 2; -#endif - #ifdef ANDROID // For usage in StringUtils::getUserAgentString if (SDL_IsAndroidTV()) diff --git a/src/main_loop.cpp b/src/main_loop.cpp index e78f9f0f8..f4d522913 100644 --- a/src/main_loop.cpp +++ b/src/main_loop.cpp @@ -311,9 +311,9 @@ float MainLoop::getLimitedDt() // For iOS devices most at locked at 60, for new iPad Pro supports 120 // which is currently m_max_fps const int max_fps = - UserConfigParams::m_swap_interval == 2 ? 30 : + UserConfigParams::m_swap_interval == 2 ? UserConfigParams::m_max_fps : UserConfigParams::m_swap_interval == 1 ? 60 : - UserConfigParams::m_max_fps; + 30; #else const int max_fps = (irr_driver->isRecording() && UserConfigParams::m_limit_game_fps ) diff --git a/src/states_screens/options/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp index 5799709cb..4869fd5c4 100644 --- a/src/states_screens/options/options_screen_video.cpp +++ b/src/states_screens/options/options_screen_video.cpp @@ -234,9 +234,9 @@ void OptionsScreenVideo::init() #ifdef IOS_STK //I18N: In the video options, maximum frame per second getWidget("vsync_label")->setText(_("Maximum FPS")); - vsync->addLabel("120"); - vsync->addLabel("60"); vsync->addLabel("30"); + vsync->addLabel("60"); + vsync->addLabel("120"); vsync->setValue(UserConfigParams::m_swap_interval); #else vsync->addLabel(_("Disabled"));