diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-15 13:05:33 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-01-13 18:13:43 -0500 |
| commit | bb154c2e1cf185f181c3e85df9addb79e6d18b4c (patch) | |
| tree | 6b7f73967b0b1888943631b73ee939583d548e77 /builtin | |
| parent | ef0aa7d5b543b6561e1b7292b2d0a0ac43add55d (diff) | |
| download | minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.tar.gz minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.tar.bz2 minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.zip | |
Main menu tweaks
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/init.lua | 7 | ||||
| -rw-r--r-- | builtin/mainmenu/dlg_settings_advanced.lua | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/builtin/init.lua b/builtin/init.lua index 4400a19d6..b34ad14a0 100644 --- a/builtin/init.lua +++ b/builtin/init.lua @@ -37,9 +37,9 @@ dofile(commonpath .. "misc_helpers.lua") if INIT == "game" then dofile(gamepath .. "init.lua") elseif INIT == "mainmenu" then - local mainmenuscript = core.setting_get("main_menu_script") - if mainmenuscript ~= nil and mainmenuscript ~= "" then - dofile(mainmenuscript) + local mm_script = core.setting_get("main_menu_script") + if mm_script and mm_script ~= "" then + dofile(mm_script) else dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua") end @@ -48,4 +48,3 @@ elseif INIT == "async" then else error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT))) end - diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index 85218c852..60ec1250f 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -667,4 +667,4 @@ end -- The documentation of mapgen noise parameter formats (title plus 16 lines) -- Noise parameter 'mgv5_np_ground' in group format (13 lines) ---assert(loadfile(core.get_mainmenu_path()..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false)) +--assert(loadfile(core.get_builtin_path()..DIR_DELIM.."mainmenu"..DIR_DELIM.."generate_from_settingtypes.lua"))(parse_config_file(true, false)) |