summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-14 20:51:18 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-14 20:51:18 +0300
commitb53426b0c7651a7f4b727d9a1f2d2ad843ca7470 (patch)
tree011ec40ee324fcb1c25a7ff42b59d05f3b87492a
parent664a3cfbd51576334c1ad522d34dd5ed1d141e45 (diff)
downloadplus-b53426b0c7651a7f4b727d9a1f2d2ad843ca7470.tar.gz
plus-b53426b0c7651a7f4b727d9a1f2d2ad843ca7470.tar.bz2
plus-b53426b0c7651a7f4b727d9a1f2d2ad843ca7470.tar.xz
plus-b53426b0c7651a7f4b727d9a1f2d2ad843ca7470.zip
eathena: fix packet SMSG_PLAYER_STATUS_CHANGE 0x0229.
-rw-r--r--src/net/eathena/beinghandler.cpp4
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 33d86fe8c..02ceb0334 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1714,8 +1714,8 @@ void BeingHandler::processPlaterStatusChange(Net::MessageIn &msg) const
const uint16_t stunMode = msg.readInt16("stun mode");
uint32_t statusEffects = msg.readInt16("status effect");
- statusEffects |= (static_cast<uint32_t>(msg.readInt16("opt?"))) << 16;
- msg.readUInt8("Unused?");
+ statusEffects |= (static_cast<uint32_t>(msg.readInt32("opt?"))) << 16;
+ msg.readUInt8("karma");
dstBeing->setStunMode(stunMode);
dstBeing->setStatusEffectBlock(0, static_cast<uint16_t>(
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index 73d5929ef..8a957a964 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -85,7 +85,7 @@ int16_t packet_lengths[] =
// #0x0200
26, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 19, 10, 0, 0, 0,
2, -1, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -1, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0,
+ -1, 122, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 19, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x0240
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 2e3f627f6..bc1bf3f4d 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -110,7 +110,7 @@
#define SMSG_BEING_CHANGE_DIRECTION 0x009c
#define SMSG_BEING_RESURRECT 0x0148
-#define SMSG_PLAYER_STATUS_CHANGE 0x0119
+#define SMSG_PLAYER_STATUS_CHANGE 0x0229
#define SMSG_PLAYER_GUILD_PARTY_INFO 0x0195
#define SMSG_BEING_STATUS_CHANGE 0x0983
#define SMSG_BEING_STATUS_CHANGE2 0x043f