Skip to content
Permalink
Browse files

Snake case for screen options in minetest.conf (#5792)

  • Loading branch information
Dumbeldor authored and nerzhul committed Jun 3, 2017
1 parent 63ca71e commit dd0a058e1fc74f37605022b52fa1f6b04086bbbf
Showing with 15 additions and 15 deletions.
  1. +3 −3 src/client/clientlauncher.cpp
  2. +4 −4 src/defaultsettings.cpp
  3. +4 −4 src/game.cpp
  4. +4 −4 src/guiEngine.cpp
@@ -522,8 +522,8 @@ bool ClientLauncher::create_engine_device()
{
// Resolution selection
bool fullscreen = g_settings->getBool("fullscreen");
u16 screenW = g_settings->getU16("screenW");
u16 screenH = g_settings->getU16("screenH");
u16 screen_w = g_settings->getU16("screen_w");
u16 screen_h = g_settings->getU16("screen_h");

// bpp, fsaa, vsync
bool vsync = g_settings->getBool("vsync");
@@ -553,7 +553,7 @@ bool ClientLauncher::create_engine_device()

SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
params.DriverType = driverType;
params.WindowSize = core::dimension2d<u32>(screenW, screenH);
params.WindowSize = core::dimension2d<u32>(screen_w, screen_h);
params.Bits = bits;
params.AntiAlias = fsaa;
params.Fullscreen = fullscreen;
@@ -125,8 +125,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("fps_max", "60");
settings->setDefault("pause_fps_max", "20");
settings->setDefault("viewing_range", "100");
settings->setDefault("screenW", "800");
settings->setDefault("screenH", "600");
settings->setDefault("screen_w", "800");
settings->setDefault("screen_h", "600");
settings->setDefault("autosave_screensize", "true");
settings->setDefault("fullscreen", "false");
settings->setDefault("fullscreen_bpp", "24");
@@ -360,8 +360,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_console", "false");

#ifdef __ANDROID__
settings->setDefault("screenW", "0");
settings->setDefault("screenH", "0");
settings->setDefault("screen_w", "0");
settings->setDefault("screen_h", "0");
settings->setDefault("enable_shaders", "false");
settings->setDefault("fullscreen", "true");
settings->setDefault("video_driver", "ogles1");
@@ -1633,8 +1633,8 @@ void Game::run()
&& client->checkPrivilege("fast");
#endif

irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screenW"),
g_settings->getU16("screenH"));
irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screen_w"),
g_settings->getU16("screen_h"));

while (device->run()
&& !(*kill || g_gamecallback->shutdown_requested
@@ -1648,8 +1648,8 @@ void Game::run()
if (previous_screen_size != current_screen_size &&
current_screen_size != irr::core::dimension2d<u32>(0,0) &&
g_settings->getBool("autosave_screensize")) {
g_settings->setU16("screenW", current_screen_size.Width);
g_settings->setU16("screenH", current_screen_size.Height);
g_settings->setU16("screen_w", current_screen_size.Width);
g_settings->setU16("screen_h", current_screen_size.Height);
previous_screen_size = current_screen_size;
}

@@ -262,8 +262,8 @@ void GUIEngine::run()

unsigned int text_height = g_fontengine->getTextHeight();

irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screenW"),
g_settings->getU16("screenH"));
irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screen_w"),
g_settings->getU16("screen_h"));

while (m_device->run() && (!m_startgame) && (!m_kill)) {

@@ -275,8 +275,8 @@ void GUIEngine::run()
if (previous_screen_size != current_screen_size &&
current_screen_size != irr::core::dimension2d<u32>(0,0) &&
g_settings->getBool("autosave_screensize")) {
g_settings->setU16("screenW", current_screen_size.Width);
g_settings->setU16("screenH", current_screen_size.Height);
g_settings->setU16("screen_w", current_screen_size.Width);
g_settings->setU16("screen_h", current_screen_size.Height);
previous_screen_size = current_screen_size;
}

0 comments on commit dd0a058

Please sign in to comment.