Skip to content

Commit

Permalink
Add to defaultsettings.cpp, renane default to auto
Browse files Browse the repository at this point in the history
  • Loading branch information
PorygonZRocks authored and PorygonZRocks committed Dec 8, 2017
1 parent fb89441 commit 81fb5e2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 1 addition & 2 deletions builtin/mainmenu/init.lua
Expand Up @@ -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" ..
Expand Down
7 changes: 4 additions & 3 deletions builtin/settingtypes.txt
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/defaultsettings.cpp
Expand Up @@ -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");
Expand Down

0 comments on commit 81fb5e2

Please sign in to comment.