From 16da077d4094fd6941ae4de60f1b6f3e133f1b5a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 6 Oct 2014 00:46:45 +0300
Subject: Update visible character name and character rename.

---
 src/net/eathena/charserverhandler.cpp | 12 ++++--------
 src/net/eathena/charserverhandler.h   |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/net')

diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index e595c9ed4..021d12811 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -31,6 +31,7 @@
 #include "gui/dialogtype.h"
 
 #include "gui/windows/charcreatedialog.h"
+#include "gui/windows/charselectdialog.h"
 #include "gui/windows/okdialog.h"
 
 #include "net/character.h"
@@ -63,6 +64,7 @@ extern ServerInfo mapServer;
 CharServerHandler::CharServerHandler() :
     MessageHandler(),
     Ea::CharServerHandler(),
+    mNewName(),
     mPinSeed(0),
     mPinAccountId(0),
     mRenameId(0),
@@ -491,6 +493,7 @@ void CharServerHandler::renameCharacter(const int id,
 {
     createOutPacket(CMSG_CHAR_CHECK_RENAME);
     mRenameId = id;
+    mNewName = newName;
     outMsg.writeInt32(id, "char id");
     outMsg.writeString(newName, 24, "name");
 }
@@ -501,14 +504,6 @@ void CharServerHandler::processCharCheckRename(Net::MessageIn &msg)
     {
         createOutPacket(CMSG_CHAR_RENAME);
         outMsg.writeInt32(mRenameId, "char id");
-/*
-        // TRANSLATORS: info message
-        new OkDialog(_("Info"), _("Character renamed."),
-            // TRANSLATORS: ok dialog button
-            _("OK"),
-            DialogType::OK,
-            true, true, nullptr, 260);
-*/
     }
     else
     {
@@ -526,6 +521,7 @@ void CharServerHandler::processCharRename(Net::MessageIn &msg)
     const int flag = msg.readInt16("flag");
     if (!flag)
     {
+        mCharSelectDialog->setName(mRenameId, mNewName);
         // TRANSLATORS: info message
         new OkDialog(_("Info"), _("Character renamed."),
             // TRANSLATORS: ok dialog button
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 0fa9a7722..7f03e3093 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -95,6 +95,7 @@ class CharServerHandler final : public MessageHandler,
         void processCharRename(Net::MessageIn &msg);
 
     private:
+        std::string mNewName;
         uint32_t mPinSeed;
         uint32_t mPinAccountId;
         uint32_t mRenameId;
-- 
cgit v1.2.3-70-g09d2