summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-18 00:40:10 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-18 00:40:10 +0300
commitf6666a0854d1300ae54eba5b850a41f3b9ebc047 (patch)
tree969c98a02d6c2998c868df16d82dc88990eb9f06
parent388cb093276e34ba5aaf1e994439e8347ffc0e3a (diff)
downloadmanaplus-f6666a0854d1300ae54eba5b850a41f3b9ebc047.tar.gz
manaplus-f6666a0854d1300ae54eba5b850a41f3b9ebc047.tar.bz2
manaplus-f6666a0854d1300ae54eba5b850a41f3b9ebc047.tar.xz
manaplus-f6666a0854d1300ae54eba5b850a41f3b9ebc047.zip
eathena: add partial support for packet SMSG_CHAR_DELETE2_ACK 0x0828.
-rw-r--r--src/net/eathena/charserverhandler.cpp13
-rw-r--r--src/net/eathena/charserverhandler.h2
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/protocol.h1
4 files changed, 17 insertions, 1 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 9d3ed3abc..28a311c81 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -93,6 +93,7 @@ CharServerHandler::CharServerHandler() :
SMSG_CHAR_RENAME,
SMSG_CHAR_CHANGE_SLOT,
SMSG_CHAR_CAPTCHA_NOT_SUPPORTED,
+ SMSG_CHAR_DELETE2_ACK,
0
};
handledMessages = _messages;
@@ -159,6 +160,10 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
processCharCaptchaNotSupported(msg);
break;
+ case SMSG_CHAR_DELETE2_ACK:
+ processCharDelete2Ack(msg);
+ break;
+
default:
break;
}
@@ -639,4 +644,12 @@ void CharServerHandler::processCharCaptchaNotSupported(Net::MessageIn &msg)
msg.readUInt8("1");
}
+void CharServerHandler::processCharDelete2Ack(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readInt32("char id");
+ msg.readInt32("result");
+ msg.readInt32("time");
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 6cd2f8be5..90ee9c248 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -106,6 +106,8 @@ class CharServerHandler final : public MessageHandler,
static void processCharCaptchaNotSupported(Net::MessageIn &msg);
+ static void processCharDelete2Ack(Net::MessageIn &msg);
+
private:
static std::string mNewName;
static uint32_t mPinSeed;
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index c93b4bfd6..73773c5cc 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -217,7 +217,7 @@ int16_t packet_lengths[] =
// #0x0800
-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 20,
3, 0, 8, -1, 86, -1, 6, 0, -1, 0, 4, 10, 10, 22, 8, 0,
- 0, 0, 0, 0, 6, 0, -1, 3, 0, 0, 0, 0, 0, -1, 0, 0,
+ 0, 0, 0, 0, 6, 0, -1, 3, 14, 0, 0, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 5, 0, 0, 6, 26, 0,
// #0x0840
-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0,
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index f8180dec2..8a717b5c6 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -51,6 +51,7 @@
#define SMSG_CHAR_CREATE_FAILED 0x006e
#define SMSG_CHAR_DELETE_SUCCEEDED 0x006f
#define SMSG_CHAR_DELETE_FAILED 0x0070
+#define SMSG_CHAR_DELETE2_ACK 0x0828
#define SMSG_CHAR_MAP_INFO 0x0071
#define SMSG_CHAR_SWITCH_RESPONSE 0x00b3