diff options
| author | est31 <MTest31@outlook.com> | 2015-07-17 16:40:41 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-23 07:38:13 +0200 |
| commit | 3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7 (patch) | |
| tree | 5ae54f8dcfc2b496a4937dc8ccf524d7c99f4e23 /src/guiEngine.cpp | |
| parent | 1e0e85f82e030e761c36ba5a12427bec0fb4e4f2 (diff) | |
| download | minetest-3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7.tar.gz minetest-3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7.tar.bz2 minetest-3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7.zip | |
Optional reconnect functionality
Enable the server to request the client to reconnect.
This can be done with the now extended minetest.request_shutdown([reason], [reconnect]) setting.
Diffstat (limited to 'src/guiEngine.cpp')
| -rw-r--r-- | src/guiEngine.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index eac9db0c6..c616bc322 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -208,10 +208,8 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_script = new MainMenuScripting(this); try { - if (m_data->errormessage != "") { - m_script->setMainMenuErrorMessage(m_data->errormessage); - m_data->errormessage = ""; - } + m_script->setMainMenuData(&m_data->script_data); + m_data->script_data.errormessage = ""; if (!loadMainMenuScript()) { errorstream << "No future without mainmenu" << std::endl; @@ -219,10 +217,9 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, } run(); - } - catch(LuaError &e) { + } catch (LuaError &e) { errorstream << "MAINMENU ERROR: " << e.what() << std::endl; - m_data->errormessage = e.what(); + m_data->script_data.errormessage = e.what(); } m_menu->quitMenu(); |