Perform mesh animation only once per frame.

[dragonfireclient.git] / src / guiFileSelectMenu.cpp

diff --git a/src/guiFileSelectMenu.cpp b/src/guiFileSelectMenu.cpp
index 93d43f7868ee348a9547d104860735540c90b6ed..0bb02f8a6cee740d87ccaf09aa27e7a384406634 100644 (file)
--- a/src/guiFileSelectMenu.cpp
+++ b/src/guiFileSelectMenu.cpp
@@ -26,18 +26,17 @@ GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
                                std::string title, std::string formname) :
 GUIModalMenu(env, parent, id, menumgr)
 {
-       m_title = narrow_to_wide(title);
+       m_title = utf8_to_wide(title);
        m_parent = parent;
        m_formname = formname;
        m_text_dst = 0;
        m_accepted = false;
-       m_previous_locale = setlocale(LC_ALL,0);
 }
 
 GUIFileSelectMenu::~GUIFileSelectMenu()
 {
        removeChildren();
-       setlocale(LC_ALL,m_previous_locale.c_str());
+       setlocale(LC_NUMERIC, "C");
 }
 
 void GUIFileSelectMenu::removeChildren()
@@ -86,10 +85,10 @@ void GUIFileSelectMenu::drawMenu()
 
 void GUIFileSelectMenu::acceptInput() {
        if ((m_text_dst != 0) && (this->m_formname != "")){
-               std::map<std::string, std::string> fields;
+               StringMap fields;
 
                if (m_accepted)
-                       fields[m_formname + "_accepted"] = wide_to_narrow(m_fileOpenDialog->getFileName());
+                       fields[m_formname + "_accepted"] = wide_to_utf8(m_fileOpenDialog->getFileName());
                else
                        fields[m_formname + "_canceled"] = m_formname;
 
@@ -101,12 +100,6 @@ bool GUIFileSelectMenu::OnEvent(const SEvent& event)
 {
 
        if (event.EventType == irr::EET_GUI_EVENT) {
-
-               int callerId = event.GUIEvent.Caller->getID();
-               if (callerId >= 0) {
-                       std::cout << "CallerId:" << callerId << std::endl;
-               }
-
                switch (event.GUIEvent.EventType) {
                        case gui::EGET_ELEMENT_CLOSED:
                        case gui::EGET_FILE_CHOOSE_DIALOG_CANCELLED: