mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Main menu tweaks
This commit is contained in:
parent
ef0aa7d5b5
commit
bb154c2e1c
@ -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
|
||||
|
||||
|
@ -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))
|
||||
|
@ -213,13 +213,13 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
|
||||
m_data->script_data.errormessage = "";
|
||||
|
||||
if (!loadMainMenuScript()) {
|
||||
errorstream << "No future without mainmenu" << std::endl;
|
||||
errorstream << "No future without main menu!" << std::endl;
|
||||
abort();
|
||||
}
|
||||
|
||||
run();
|
||||
} catch (LuaError &e) {
|
||||
errorstream << "MAINMENU ERROR: " << e.what() << std::endl;
|
||||
errorstream << "Main menu error: " << e.what() << std::endl;
|
||||
m_data->script_data.errormessage = e.what();
|
||||
}
|
||||
|
||||
@ -231,13 +231,13 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
|
||||
/******************************************************************************/
|
||||
bool GUIEngine::loadMainMenuScript()
|
||||
{
|
||||
// Try custom menu script (main_menu_path)
|
||||
|
||||
// Set main menu path (for core.get_mainmenu_path())
|
||||
m_scriptdir = g_settings->get("main_menu_path");
|
||||
if (m_scriptdir.empty()) {
|
||||
m_scriptdir = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "mainmenu";
|
||||
m_scriptdir = porting::path_share + DIR_DELIM + "builtin" + DIR_DELIM + "mainmenu";
|
||||
}
|
||||
|
||||
// Load builtin (which will load the main menu script)
|
||||
std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua";
|
||||
try {
|
||||
m_script->loadScript(script);
|
||||
|
Loading…
Reference in New Issue
Block a user