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 /src | |
| parent | ef0aa7d5b543b6561e1b7292b2d0a0ac43add55d (diff) | |
| download | minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.tar.gz minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.tar.bz2 minetest-bb154c2e1cf185f181c3e85df9addb79e6d18b4c.zip | |
Main menu tweaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/guiEngine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 6d66ed08d..03fee6b96 100644 --- 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); |