diff options
| author | Paramat <paramat@users.noreply.github.com> | 2018-12-06 23:52:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 23:52:11 +0000 |
| commit | f0dca284b3d4fe266e88f6df8c6e3ad9d1411496 (patch) | |
| tree | 3bebc2c88e291d35274a727687da8ead5935f31c | |
| parent | 0c6933bdf72f09e23604606769b68b5ae3ce42b7 (diff) | |
| download | minetest-f0dca284b3d4fe266e88f6df8c6e3ad9d1411496.tar.gz minetest-f0dca284b3d4fe266e88f6df8c6e3ad9d1411496.tar.bz2 minetest-f0dca284b3d4fe266e88f6df8c6e3ad9d1411496.zip | |
Main menu style: Set to 'full' for Android, remove 'auto' option (#7936)
| -rw-r--r-- | builtin/mainmenu/init.lua | 3 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 3 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index d959cd902..8b8f3cd39 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -25,9 +25,6 @@ mt_color_dark_green = "#25C191" local menupath = core.get_mainmenu_path() local basepath = core.get_builtin_path() local menustyle = core.settings:get("main_menu_style") -if menustyle == "auto" then - menustyle = PLATFORM == "Android" and "simple" or "full" -end defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. DIR_DELIM .. "pack" .. DIR_DELIM diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index dfe0d1ff0..40db037ea 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1309,8 +1309,7 @@ high_precision_fpu (High-precision FPU) bool true # - Full: Multple singleplayer worlds, game choice, texture pack chooser, etc. # - Simple: One singleplayer world, no game or texture pack choosers. May be # necessary for smaller screens. -# - Auto: Simple on Android, full on everything else. -main_menu_style (Main menu style) enum auto auto,full,simple +main_menu_style (Main menu style) enum full full,simple # Replaces the default main menu with a custom one. main_menu_script (Main menu script) string diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6a924b840..1ae6e0465 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -271,7 +271,7 @@ void set_default_settings(Settings *settings) settings->setDefault("joystick_frustum_sensitivity", "170"); // Main menu - settings->setDefault("main_menu_style", "auto"); + settings->setDefault("main_menu_style", "full"); settings->setDefault("main_menu_path", ""); settings->setDefault("serverlist_file", "favoriteservers.txt"); |