Merge eeab035664 into f1d1dad08b

lib/common

@@ -1 +1 @@
-Subproject commit 438c900ff50b2dff0d8f7d9ff711051a3c83cbac
+Subproject commit 422bc11d30c6761343877677539dc4704ed8e05d

lib/typhoon

@@ -1 +1 @@
-Subproject commit 98bc6a59bcf1016b9f85239e6918e595ca0331c0
+Subproject commit 4cd18ccfd0b507fb686e1260b5d4c00a17c9d785

src/console/Handlers.cpp

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

src/glue/CGlueMgr.cpp

@@ -366,46 +366,48 @@ void CGlueMgr::PollAccountLogin(int32_t errorCode, const char* msg, int32_t comp
         FrameScript_SignalEvent(4, "%s", msg);
     }
 
-    if (complete) {
+    if (!complete) {
-        if (result == 0) {
+        return;
-            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 (op == COP_CONNECT) {
+        if (!SStrCmpI(CGlueMgr::m_currentScreen, "charselect", STORM_MAX_STR)) {
-            // TODO
+            CGlueMgr::SetScreen("login");
-
             return;
         }
+
+        return;
+    }
+
+    if (op == COP_CONNECT) {
+        // TODO
+
+        return;
     }
 }