diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp index 14a87ef46..277a49145 100644 --- a/src/config/user_config.hpp +++ b/src/config/user_config.hpp @@ -673,7 +673,7 @@ namespace UserConfigParams PARAM_PREFIX BoolUserConfigParam m_force_legacy_device PARAM_DEFAULT(BoolUserConfigParam(false, "force_legacy_device", &m_video_group, "Force OpenGL 2 context, even if OpenGL 3 is available.")); - PARAM_PREFIX BoolUserConfigParam split_screen_horizontally + PARAM_PREFIX BoolUserConfigParam m_split_screen_horizontally PARAM_DEFAULT(BoolUserConfigParam(true, "split_screen_horizontally", &m_video_group, "When playing a non-square amount of players (e.g. 2)," " should it split horizontally (top/bottom)")); diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index 0c5365c8d..79de52218 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -334,7 +334,7 @@ core::recti IrrDriver::getSplitscreenWindow(int window_num) total_players = 1; int columns = (int)(std::ceil(std::sqrt(total_players))); int rows = (int)(std::ceil((double)(total_players) / columns)); - if (UserConfigParams::split_screen_horizontally) + if (UserConfigParams::m_split_screen_horizontally) std::swap(columns, rows); // Calculate the base dimensions of each viewport diff --git a/src/states_screens/options/options_screen_display.cpp b/src/states_screens/options/options_screen_display.cpp index cf8a34b23..3225dd6cc 100644 --- a/src/states_screens/options/options_screen_display.cpp +++ b/src/states_screens/options/options_screen_display.cpp @@ -128,7 +128,7 @@ void OptionsScreenDisplay::init() // ---- splitscreen mode GUIEngine::SpinnerWidget* splitscreen_method = getWidget("splitscreen_method"); assert( splitscreen_method != NULL ); - splitscreen_method->setValue(UserConfigParams::split_screen_horizontally ? 1 : 0); + splitscreen_method->setValue(UserConfigParams::m_split_screen_horizontally ? 1 : 0); } // init // -------------------------------------------------------------------------------------------- @@ -406,7 +406,7 @@ void OptionsScreenDisplay::eventCallback(Widget* widget, const std::string& name { GUIEngine::SpinnerWidget* splitscreen_method = getWidget("splitscreen_method"); assert( splitscreen_method != NULL ); - UserConfigParams::split_screen_horizontally = (splitscreen_method->getValue() == 1); + UserConfigParams::m_split_screen_horizontally = (splitscreen_method->getValue() == 1); if (World::getWorld()) { for (unsigned i = 0; i < Camera::getNumCameras(); i++)