From 81fb5e23ef63ad221ed4f2265715fe26ec0c04f9 Mon Sep 17 00:00:00 2001 From: PorygonZRocks Date: Fri, 8 Dec 2017 13:34:58 -0600 Subject: [PATCH] Add to defaultsettings.cpp, renane default to auto --- builtin/mainmenu/init.lua | 3 +-- builtin/settingtypes.txt | 7 ++++--- src/defaultsettings.cpp | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 834e00ccf6cd7..1861a835e45e2 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -25,8 +25,7 @@ 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") -local menustyle = menustylesetting -if menustyle == "default" then +if menustyle == "auto" then menustyle = PLATFORM == "Android" and "simple" or "full" end defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index d027c2e8d80c1..d408d22675be2 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1240,9 +1240,10 @@ curl_file_download_timeout (cURL file download timeout) int 300000 high_precision_fpu (High-precision FPU) bool true # Changes the main menu UI: -# - Full (default for non-Android): Multple singleplayer worlds, subgame choice, texture pack chooser, etc. -# - Simple (default for Android): One singleplayer world, no subgame or texture pack choosers. May be necessary for smaller screens. -main_menu_style (Main menu style) enum default default,full,simple +# - Full: Multple singleplayer worlds, subgame choice, texture pack chooser, etc. +# - Simple: One singleplayer world, no subgame 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 # 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 cc113c6f6ddd6..e4a59151ac269 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -254,6 +254,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_path", ""); settings->setDefault("main_menu_mod_mgr", "1"); settings->setDefault("main_menu_game_mgr", "0");