Fix how address is logged when a wrong password is supplied

[dragonfireclient.git] / src / guiEngine.cpp

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 752f9ddd25af8fd44fe591bbb515c215e1d5b6c8..c616bc3222883947719500b3c16112759a8a8bf2 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -53,7 +53,7 @@ TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine)
 }
 
 /******************************************************************************/
-void TextDestGuiEngine::gotText(std::map<std::string, std::string> fields)
+void TextDestGuiEngine::gotText(const StringMap &fields)
 {
        m_engine->getScriptIface()->handleMainMenuButtons(fields);
 }
@@ -61,7 +61,7 @@ void TextDestGuiEngine::gotText(std::map<std::string, std::string> fields)
 /******************************************************************************/
 void TextDestGuiEngine::gotText(std::wstring text)
 {
-       m_engine->getScriptIface()->handleMainMenuEvent(wide_to_narrow(text));
+       m_engine->getScriptIface()->handleMainMenuEvent(wide_to_utf8(text));
 }
 
 /******************************************************************************/
@@ -172,7 +172,7 @@ GUIEngine::GUIEngine(       irr::IrrlichtDevice* dev,
                m_sound_manager = &dummySoundManager;
 
        //create topleft header
-       std::wstring t = narrow_to_wide(std::string(PROJECT_NAME_C " ") +
+       std::wstring t = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
                        g_version_hash);
 
        core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight());
@@ -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();
@@ -572,13 +569,13 @@ bool GUIEngine::downloadFile(std::string url, std::string target)
 /******************************************************************************/
 void GUIEngine::setTopleftText(std::string append)
 {
-       std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME_C " ") +
-                       g_version_hash);
+       std::wstring toset = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
+               g_version_hash);
 
        if (append != "")
        {
                toset += L" / ";
-               toset += narrow_to_wide(append);
+               toset += utf8_to_wide(append);
        }
 
        m_irr_toplefttext->setText(toset.c_str());