summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-18 00:50:07 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-18 00:50:07 +0300
commitf5b6737ff13e1ad538745fb0c9d09254b80cb3ed (patch)
tree0e92ac957ea380632b5a74ec0e9ff072c729ec20
parentf6666a0854d1300ae54eba5b850a41f3b9ebc047 (diff)
downloadmanaplus-f5b6737ff13e1ad538745fb0c9d09254b80cb3ed.tar.gz
manaplus-f5b6737ff13e1ad538745fb0c9d09254b80cb3ed.tar.bz2
manaplus-f5b6737ff13e1ad538745fb0c9d09254b80cb3ed.tar.xz
manaplus-f5b6737ff13e1ad538745fb0c9d09254b80cb3ed.zip
eathena: add partial support for packet SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK 0x082a.
-rw-r--r--src/net/eathena/charserverhandler.cpp12
-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, 16 insertions, 1 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 28a311c81..7b67caa7c 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -94,6 +94,7 @@ CharServerHandler::CharServerHandler() :
SMSG_CHAR_CHANGE_SLOT,
SMSG_CHAR_CAPTCHA_NOT_SUPPORTED,
SMSG_CHAR_DELETE2_ACK,
+ SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK,
0
};
handledMessages = _messages;
@@ -164,6 +165,10 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
processCharDelete2Ack(msg);
break;
+ case SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK:
+ processCharDelete2AcceptActual(msg);
+ break;
+
default:
break;
}
@@ -652,4 +657,11 @@ void CharServerHandler::processCharDelete2Ack(Net::MessageIn &msg)
msg.readInt32("time");
}
+void CharServerHandler::processCharDelete2AcceptActual(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readInt32("char id");
+ msg.readInt32("result");
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 90ee9c248..edb6db570 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -108,6 +108,8 @@ class CharServerHandler final : public MessageHandler,
static void processCharDelete2Ack(Net::MessageIn &msg);
+ static void processCharDelete2AcceptActual(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 73773c5cc..9d9e0eb34 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, 14, 0, 0, 0, 0, -1, 0, 0,
+ 0, 0, 0, 0, 6, 0, -1, 3, 14, 0, 10, 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 8a717b5c6..f4947736f 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -52,6 +52,7 @@
#define SMSG_CHAR_DELETE_SUCCEEDED 0x006f
#define SMSG_CHAR_DELETE_FAILED 0x0070
#define SMSG_CHAR_DELETE2_ACK 0x0828
+#define SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK 0x082a
#define SMSG_CHAR_MAP_INFO 0x0071
#define SMSG_CHAR_SWITCH_RESPONSE 0x00b3