summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-07 18:51:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-07 18:51:02 +0300
commitb73aec167532701db9ab645ef5d75e5dff1fa963 (patch)
treefac969e66948a005fb78b81bf27180d6544f352a /src
parent2b0176f628521b5eabb2e5874ff4c211ed18c2fd (diff)
downloadmv-b73aec167532701db9ab645ef5d75e5dff1fa963.tar.gz
mv-b73aec167532701db9ab645ef5d75e5dff1fa963.tar.bz2
mv-b73aec167532701db9ab645ef5d75e5dff1fa963.tar.xz
mv-b73aec167532701db9ab645ef5d75e5dff1fa963.zip
eathena: fix packet SMSG_PARTY_SETTINGS 0x07d8.
Diffstat (limited to 'src')
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/partyhandler.cpp6
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index 4196f72ad..a4fdf0416 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -209,7 +209,7 @@ int16_t packet_lengths[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x07C0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 8, 268, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 8, 25, 0, 0, 0, 0,
//0 1 2 3 4 5 6 7 8 9 a b c d e f
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index d4404340c..99a9e86bd 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -265,9 +265,9 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg)
Ea::partyTab->loadFromLogFile("#Party");
}
- // These seem to indicate the sharing mode for exp and items
- const int16_t exp = msg.readInt16();
- const int16_t item = msg.readInt16();
+ msg.readInt32("party exp");
+ const int16_t exp = msg.readInt8("exp");
+ const int16_t item = msg.readInt8("item");
processPartySettingsContinue(exp, item);
}
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index b487584b0..8def51255 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -142,7 +142,7 @@
#define SMSG_PARTY_INFO 0x00fb
#define SMSG_PARTY_INVITE_RESPONSE 0x00fd
#define SMSG_PARTY_INVITED 0x00fe
-#define SMSG_PARTY_SETTINGS 0x0101
+#define SMSG_PARTY_SETTINGS 0x07d8
#define SMSG_PARTY_MOVE 0x0104
#define SMSG_PARTY_LEAVE 0x0105
#define SMSG_PARTY_UPDATE_HP 0x0106