summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-10 19:58:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-10 19:58:05 +0300
commit3ba8553af2f4a85c00aec37c96803ae54c3331cd (patch)
treeaaf4fd52a6f1b5b130de15b35783ab517ac34708
parentf6b5e4e208c3020957422c7efdf97ac1d878a012 (diff)
downloadmv-3ba8553af2f4a85c00aec37c96803ae54c3331cd.tar.gz
mv-3ba8553af2f4a85c00aec37c96803ae54c3331cd.tar.bz2
mv-3ba8553af2f4a85c00aec37c96803ae54c3331cd.tar.xz
mv-3ba8553af2f4a85c00aec37c96803ae54c3331cd.zip
eathena: fix packet SMSG_PARTY_INVITE_RESPONSE 0x02c5.
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/partyhandler.cpp4
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index cb044e516..3c1848f45 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -98,7 +98,7 @@ int16_t packet_lengths[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, -1, -1, 107, 6, -1, 0, 0, 0, 191, 0, 0, 0, 0, 0, 0,
// #0x02C0
- 0, -1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0,
+ 0, -1, 0, 0, 0, 30, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0,
10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index c53654c57..90f39d89c 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -407,9 +407,9 @@ void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const
if (!Ea::partyTab)
return;
- const std::string nick = msg.readString(24);
+ const std::string nick = msg.readString(24, "nick");
- switch (msg.readUInt8())
+ switch (msg.readInt32("result"))
{
case 0:
NotifyManager::notify(NotifyTypes::PARTY_INVITE_ALREADY_MEMBER,
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index fd274c82f..df6da397d 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -143,7 +143,7 @@
#define SMSG_PARTY_CREATE 0x00fa
#define SMSG_PARTY_INFO 0x00fb
-#define SMSG_PARTY_INVITE_RESPONSE 0x00fd
+#define SMSG_PARTY_INVITE_RESPONSE 0x02c5
#define SMSG_PARTY_INVITED 0x00fe
#define SMSG_PARTY_SETTINGS 0x07d8
#define SMSG_PARTY_MOVE 0x0104