Merge c12a79d6e6 into fa98bbc1f0

src/glue/CGlueMgr.cpp

@@ -393,11 +393,6 @@ int32_t CGlueMgr::Idle(const void* a1, void* a2) {
         break;
     }
 
-    case IDLE_CREATE_CHARACTER: {
-        CGlueMgr::PollCreateCharacter(msg, complete, result);
-        break;
-    }
-
     case IDLE_DELETE_CHARACTER: {
         CGlueMgr::PollDeleteCharacter(msg, complete, result);
         break;
@@ -768,37 +763,6 @@ void CGlueMgr::PollCharacterList(const char* msg, int32_t complete, int32_t resu
     }
 }
 
-void CGlueMgr::PollCreateCharacter(const char* msg, int32_t complete, int32_t result) {
-    FrameScript_SignalEvent(UPDATE_STATUS_DIALOG, "%s", msg);
-
-    if (CGlueMgr::HandleBattlenetDisconnect()) {
-        CGlueMgr::SetIdleState(IDLE_NONE);
-    }
-
-    if (!complete) {
-        return;
-    }
-
-    // Error
-
-    if (result == 0) {
-        FrameScript_SignalEvent(OPEN_STATUS_DIALOG, "%s%s", "OKAY", msg);
-
-        CGlueMgr::SetIdleState(IDLE_NONE);
-
-        return;
-    }
-
-    // Success
-
-    CGlueMgr::SetIdleState(IDLE_NONE);
-
-    FrameScript_SignalEvent(CLOSE_STATUS_DIALOG, nullptr);
-    FrameScript_SignalEvent(SELECT_LAST_CHARACTER, nullptr);
-
-    CGlueMgr::SetScreen("charselect");
-}
-
 void CGlueMgr::PollDeleteCharacter(const char* msg, int32_t complete, int32_t result) {
     FrameScript_SignalEvent(UPDATE_STATUS_DIALOG, "%s", msg);
 

src/glue/CGlueMgr.hpp

@@ -80,7 +80,6 @@ class CGlueMgr {
         static int32_t OnKickReasonMsg(void* param, NETMESSAGE msgId, uint32_t time, CDataStore* msg);
         static void PollAccountLogin(int32_t errorCode, const char* msg, int32_t complete, int32_t result, WOWCS_OPS op);
         static void PollCharacterList(const char* msg, int32_t complete, int32_t result, int32_t errorCode);
-        static void PollCreateCharacter(const char* msg, int32_t complete, int32_t result);
         static void PollDeleteCharacter(const char* msg, int32_t complete, int32_t result);
         static void PollEnterWorld();
         static void PollLoginServerLogin();

src/net/connection/ClientConnection.cpp

@@ -104,10 +104,6 @@ void ClientConnection::GetRealmList() {
     }
 }
 
-void ClientConnection::HandleCharacterCreate(uint8_t result) {
-    this->Complete(result == 47, result);
-}
-
 void ClientConnection::HandleCharacterDelete(uint8_t result) {
     this->Complete(result == 71, result);
 }

src/net/connection/ClientConnection.hpp

@@ -22,7 +22,6 @@ class ClientConnection : public RealmConnection {
 
         // Virtual member functions
         virtual int32_t HandleConnect();
-        virtual void HandleCharacterCreate(uint8_t result);
         virtual void HandleCharacterDelete(uint8_t result);
 
         // Member functions

src/net/connection/RealmConnection.cpp

@@ -20,7 +20,7 @@ int32_t RealmConnection::MessageHandler(void* param, NETMESSAGE msgId, uint32_t
     }
 
     case SMSG_CHAR_CREATE: {
-        result = connection->CreateCharHandler(msgId, time, msg);
+        // TODO
         break;
     }
 
@@ -294,15 +294,6 @@ int32_t RealmConnection::HandleCharEnum(uint32_t msgId, uint32_t time, CDataStor
     return 1;
 }
 
-int32_t RealmConnection::CreateCharHandler(uint32_t msgId, uint32_t time, CDataStore* msg) {
-    uint8_t result;
-    msg->Get(result);
-
-    this->HandleCharacterCreate(result);
-
-    return 1;
-}
-
 int32_t RealmConnection::DeleteCharHandler(uint32_t msgId, uint32_t time, CDataStore* msg) {
     uint8_t result;
     msg->Get(result);

src/net/connection/RealmConnection.hpp

@@ -46,14 +46,12 @@ class RealmConnection : public NetClient {
 
         // Virtual member functions
         virtual int32_t HandleAuthChallenge(AuthenticationChallenge* challenge);
-        virtual void HandleCharacterCreate(uint8_t result) = 0;
         virtual void HandleCharacterDelete(uint8_t result) = 0;
 
         // Member functions
         RealmConnection(RealmResponse* realmResponse);
         int32_t HandleAuthResponse(uint32_t msgId, uint32_t time, CDataStore* msg);
         int32_t HandleCharEnum(uint32_t msgId, uint32_t time, CDataStore* msg);
-        int32_t CreateCharHandler(uint32_t msgId, uint32_t time, CDataStore* msg);
         int32_t DeleteCharHandler(uint32_t msgId, uint32_t time, CDataStore* msg);
         void RequestCharacterEnum();
         void RequestCharacterLogin(uint64_t guid, int32_t a2);