erle
/
mainmenu_csm
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Main menu tweaks

This commit is contained in:
ShadowNinja 2015-10-15 13:05:33 -04:00 committed by Nils Dagsson Moskopp
parent 856a228407
commit fc2c76e0fc
Signed by: erle
GPG Key ID: A3BC671C35191080
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/init.lua
View File

@ -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

2
builtin/mainmenu/dlg_settings_advanced.lua
View File

@ -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))