Main menu tweaks

diff --git a/builtin/init.lua b/builtin/init.lua
index 4400a19d61b1ca5a0a2c6a806e63250d18468095..b34ad14a0d647ca78c7456b0d2dfee4a928e52c4 100644 (file)
--- 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 85218c8520fff9beec1e2f5ca2b71d3e29864302..60ec1250f1dc56e47554aceb62e126fd2063ecd0 100644 (file)
--- 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))

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 6d66ed08dbab485c9069136d5517f9ab9ffadcf2..03fee6b967e4c712f959b15d706b40a4960a8f6b 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -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);