Merge c12a79d6e6 into 71a31e19bd

src/console/Screen.cpp

@@ -84,6 +84,26 @@ CONSOLELINE::~CONSOLELINE() {
     }
 }
 
+void CONSOLELINE::Backspace() {
+    if (this->inputpos > this->inputstart) {
+        if (this->chars <= this->inputpos) {
+            this->buffer[this->inputpos - 1] = '\0';
+        }
+        else {
+            memcpy(
+                &this->buffer[this->inputpos - 1],
+                &this->buffer[this->inputpos],
+                this->chars - this->inputpos + 1
+            );
+        }
+
+        this->inputpos--;
+        this->chars--;
+
+        SetInputString(this->buffer);
+    }
+}
+
 void DrawBackground() {
     uint16_t indices[] = {
         0, 1, 2, 3

src/console/Screen.hpp

@@ -19,6 +19,7 @@ class CONSOLELINE : public TSLinkedNode<CONSOLELINE> {
 
         // Member functions
         ~CONSOLELINE();
+        void Backspace();
 };
 
 void ConsoleScreenAnimate(float elapsedSec);

src/glue/CGlueMgr.cpp

@@ -1129,7 +1129,7 @@ void CGlueMgr::StatusDialogClick() {
         }
 
         case IDLE_REALM_LIST:
-        case IDLE_5:
+        case IDLE_CREATE_CHARACTER:
         case IDLE_DELETE_CHARACTER:
         case IDLE_ENTER_WORLD: {
             ClientServices::Connection()->Cancel(2);

src/glue/CGlueMgr.hpp

@@ -20,7 +20,7 @@ class CGlueMgr {
             IDLE_ACCOUNT_LOGIN      = 2,
             IDLE_CHARACTER_LIST     = 3,
             IDLE_REALM_LIST         = 4,
-            IDLE_5                  = 5,
+            IDLE_CREATE_CHARACTER   = 5,
             IDLE_DELETE_CHARACTER   = 6,
             IDLE_7                  = 7,
             IDLE_8                  = 8,

src/net/Types.hpp

@@ -60,11 +60,11 @@ enum NETMESSAGE {
     CMSG_AUTH_SRP6_BEGIN                = 0x0033,
     CMSG_AUTH_SRP6_PROOF                = 0x0034,
     CMSG_AUTH_SRP6_RECODE               = 0x0035,
-    CMSG_CREATE_CHARACTER               = 0x0036,
+    CMSG_CHAR_CREATE                    = 0x0036,
     CMSG_ENUM_CHARACTERS                = 0x0037,
     CMSG_CHAR_DELETE                    = 0x0038,
     SMSG_AUTH_SRP6_RESPONSE             = 0x0039,
-    SMSG_CREATE_CHAR                    = 0x003A,
+    SMSG_CHAR_CREATE                    = 0x003A,
     SMSG_ENUM_CHARACTERS_RESULT         = 0x003B,
     SMSG_DELETE_CHAR                    = 0x003C,
     CMSG_PLAYER_LOGIN                   = 0x003D,

src/net/connection/RealmConnection.cpp

@@ -19,7 +19,7 @@ int32_t RealmConnection::MessageHandler(void* param, NETMESSAGE msgId, uint32_t
         break;
     }
 
-    case SMSG_CREATE_CHAR: {
+    case SMSG_CHAR_CREATE: {
         // TODO
         break;
     }
@@ -91,7 +91,7 @@ RealmConnection::RealmConnection(RealmResponse* realmResponse) {
     this->SetMessageHandler(SMSG_AUTH_RESPONSE, &RealmConnection::MessageHandler, this);
     this->SetMessageHandler(SMSG_ADDON_INFO, &RealmConnection::MessageHandler, this);
     this->SetMessageHandler(SMSG_ENUM_CHARACTERS_RESULT, &RealmConnection::MessageHandler, this);
-    this->SetMessageHandler(SMSG_CREATE_CHAR, &RealmConnection::MessageHandler, this);
+    this->SetMessageHandler(SMSG_CHAR_CREATE, &RealmConnection::MessageHandler, this);
     this->SetMessageHandler(SMSG_CHARACTER_LOGIN_FAILED, &RealmConnection::MessageHandler, this);
     this->SetMessageHandler(SMSG_LOGOUT_COMPLETE, &RealmConnection::MessageHandler, this);
     this->SetMessageHandler(SMSG_LOGOUT_CANCEL_ACK, &RealmConnection::MessageHandler, this);