ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename variables to match the coding style

Browse Source
This commit is contained in:
Benau 2024-05-17 07:32:42 +00:00
parent 14c002c7ca
commit 02e540ba67
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/user_config.hpp
View File

@ -673,7 +673,7 @@ namespace UserConfigParams
PARAM_PREFIX BoolUserConfigParam m_force_legacy_device PARAM_PREFIX BoolUserConfigParam m_force_legacy_device
PARAM_DEFAULT(BoolUserConfigParam(false, "force_legacy_device", PARAM_DEFAULT(BoolUserConfigParam(false, "force_legacy_device",
&m_video_group, "Force OpenGL 2 context, even if OpenGL 3 is available.")); &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", PARAM_DEFAULT(BoolUserConfigParam(true, "split_screen_horizontally",
&m_video_group, "When playing a non-square amount of players (e.g. 2)," &m_video_group, "When playing a non-square amount of players (e.g. 2),"
" should it split horizontally (top/bottom)")); " should it split horizontally (top/bottom)"));

2
src/graphics/irr_driver.cpp
View File

@ -334,7 +334,7 @@ core::recti IrrDriver::getSplitscreenWindow(int window_num)
total_players = 1; total_players = 1;
int columns = (int)(std::ceil(std::sqrt(total_players))); int columns = (int)(std::ceil(std::sqrt(total_players)));
int rows = (int)(std::ceil((double)(total_players) / columns)); int rows = (int)(std::ceil((double)(total_players) / columns));
if (UserConfigParams::split_screen_horizontally) if (UserConfigParams::m_split_screen_horizontally)
std::swap(columns, rows); std::swap(columns, rows);
// Calculate the base dimensions of each viewport // Calculate the base dimensions of each viewport

4
src/states_screens/options/options_screen_display.cpp
View File

@ -128,7 +128,7 @@ void OptionsScreenDisplay::init()
// ---- splitscreen mode // ---- splitscreen mode
GUIEngine::SpinnerWidget* splitscreen_method = getWidget<GUIEngine::SpinnerWidget>("splitscreen_method"); GUIEngine::SpinnerWidget* splitscreen_method = getWidget<GUIEngine::SpinnerWidget>("splitscreen_method");
assert( splitscreen_method != NULL ); assert( splitscreen_method != NULL );
splitscreen_method->setValue(UserConfigParams::split_screen_horizontally ? 1 : 0); splitscreen_method->setValue(UserConfigParams::m_split_screen_horizontally ? 1 : 0);
} // init } // init
// -------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------
@ -406,7 +406,7 @@ void OptionsScreenDisplay::eventCallback(Widget* widget, const std::string& name
{ {
GUIEngine::SpinnerWidget* splitscreen_method = getWidget<GUIEngine::SpinnerWidget>("splitscreen_method"); GUIEngine::SpinnerWidget* splitscreen_method = getWidget<GUIEngine::SpinnerWidget>("splitscreen_method");
assert( splitscreen_method != NULL ); assert( splitscreen_method != NULL );
UserConfigParams::split_screen_horizontally = (splitscreen_method->getValue() == 1); UserConfigParams::m_split_screen_horizontally = (splitscreen_method->getValue() == 1);
if (World::getWorld()) if (World::getWorld())
{ {
for (unsigned i = 0; i < Camera::getNumCameras(); i++) for (unsigned i = 0; i < Camera::getNumCameras(); i++)