Merge 9df49cd3f7 into f1d1dad08b

src/console/Handlers.cpp

@@ -4,7 +4,6 @@
 #include "console/Command.hpp"
 #include "console/Screen.hpp"
 #include "event/Event.hpp"
-#include "storm/Unicode.hpp"
 #include <cstdint>
 
 static int32_t s_historyIndex = 0;
@@ -12,20 +11,24 @@ static int32_t s_historyIndex = 0;
 namespace {
 
 int32_t OnChar(const EVENT_DATA_CHAR* data, void* param) {
-    char character[8] = {};
+    char character[2];
 
     if (ConsoleAccessGetEnabled() && EventIsKeyDown(ConsoleGetHotKey())) {
         return 0;
     }
 
     if (ConsoleGetActive()) {
-        SUniSPutUTF8(data->ch, character);
+        character[0] = char(data->ch);
+        character[1] = 0;
 
         PasteInInputLine(character);
         ResetHighlight();
         return 0;
     }
 
+    // SUniSPutUTF8(data->ch, character);
+
+
     return 1;
 }
 

src/glue/CGlueMgr.cpp

@@ -366,48 +366,46 @@ void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t comp
         FrameScript_SignalEvent(4, "%s", msg);
     }
 
-    if (!complete) {
+    if (complete) {
-        return;
+        if (result == 0) {
-    }
+            if (errorCode != 2) {
-
-    if (result == 0) {
-        if (errorCode != 2) {
-            // TODO
-        }
-
-        CGlueMgr::m_idleState = IDLE_NONE;
-        CGlueMgr::m_showedDisconnect = 0;
-
-        if (errorCode == 2) {
-            // TODO CGlueMgr::m_disconnectPending = 1;
-            // TODO ClientServices::Connection()->Disconnect();
-        }
-
-        if (errorCode != 13) {
-            // TODO CCharacterSelection::ClearCharacterList();
-
-            if (ClientServices::GetInstance()->m_realmList.Count()) {
-                FrameScript_SignalEvent(5, nullptr);
-                CRealmList::UpdateList();
-            } else {
                 // TODO
             }
 
+            CGlueMgr::m_idleState = IDLE_NONE;
+            CGlueMgr::m_showedDisconnect = 0;
+
+            if (errorCode == 2) {
+                // TODO CGlueMgr::m_disconnectPending = 1;
+                // TODO ClientServices::Connection()->Disconnect();
+            }
+
+            if (errorCode != 13) {
+                // TODO CCharacterSelection::ClearCharacterList();
+
+                if (ClientServices::GetInstance()->m_realmList.Count()) {
+                    FrameScript_SignalEvent(5, nullptr);
+                    CRealmList::UpdateList();
+                } else {
+                    // TODO
+                }
+
+                return;
+            }
+
+            if (!SStrCmpI(CGlueMgr::m_currentScreen, "charselect", STORM_MAX_STR)) {
+                CGlueMgr::SetScreen("login");
+                return;
+            }
+
             return;
         }
 
-        if (!SStrCmpI(CGlueMgr::m_currentScreen, "charselect", STORM_MAX_STR)) {
+        if (op == COP_CONNECT) {
-            CGlueMgr::SetScreen("login");
+            // TODO
+
             return;
         }
-
-        return;
-    }
-
-    if (op == COP_CONNECT) {
-        // TODO
-
-        return;
     }
 }