projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Footsteps: Fix offset footstep and shallow water sound bugs
[oweals/minetest.git]
/
src
/
guiEngine.cpp
diff --git
a/src/guiEngine.cpp
b/src/guiEngine.cpp
index a3c35f68de2ba336f849a1310432fdadfa9a3519..03fee6b967e4c712f959b15d706b40a4960a8f6b 100644
(file)
--- a/
src/guiEngine.cpp
+++ b/
src/guiEngine.cpp
@@
-194,11
+194,9
@@
GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
-1,
m_menumanager,
NULL /* &client */,
-1,
m_menumanager,
NULL /* &client */,
- NULL /* gamedef */,
m_texture_source,
m_formspecgui,
m_buttonhandler,
m_texture_source,
m_formspecgui,
m_buttonhandler,
- NULL,
false);
m_menu->allowClose(false);
false);
m_menu->allowClose(false);
@@
-215,13
+213,13
@@
GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
m_data->script_data.errormessage = "";
if (!loadMainMenuScript()) {
m_data->script_data.errormessage = "";
if (!loadMainMenuScript()) {
- errorstream << "No future without main
menu
" << std::endl;
+ errorstream << "No future without main
menu!
" << std::endl;
abort();
}
run();
} catch (LuaError &e) {
abort();
}
run();
} catch (LuaError &e) {
- errorstream << "M
AINMENU ERROR
: " << e.what() << std::endl;
+ errorstream << "M
ain menu error
: " << e.what() << std::endl;
m_data->script_data.errormessage = e.what();
}
m_data->script_data.errormessage = e.what();
}
@@
-233,13
+231,13
@@
GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
/******************************************************************************/
bool GUIEngine::loadMainMenuScript()
{
/******************************************************************************/
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 = 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);
std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua";
try {
m_script->loadScript(script);