diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-21 14:18:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-21 14:18:01 +0300 |
| commit | 98486abc3255f65f6d21df3359e0cf07992fbfc1 (patch) | |
| tree | 9d5eb499af4c7b35f029dbdc928c0efa4997ad7e /src | |
| parent | e7ebc6c703cd31577bd78f7b133ba18c5dfab1a9 (diff) | |
| download | manaplus-98486abc3255f65f6d21df3359e0cf07992fbfc1.tar.gz manaplus-98486abc3255f65f6d21df3359e0cf07992fbfc1.tar.bz2 manaplus-98486abc3255f65f6d21df3359e0cf07992fbfc1.tar.xz manaplus-98486abc3255f65f6d21df3359e0cf07992fbfc1.zip | |
Fix some status effects packet field names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/eathena/beingrecv.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/beingrecv.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 01dcde62b..ae4cd1e74 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -1208,8 +1208,8 @@ void BeingRecv::processPlayerStatusChange(Net::MessageIn &msg) if (!dstBeing) return; - const uint16_t stunMode = msg.readInt16("stun mode"); - uint32_t statusEffects = msg.readInt16("status effect"); + const uint16_t stunMode = msg.readInt16("opt1"); + uint32_t statusEffects = msg.readInt16("opt2"); statusEffects |= (CAST_U32(msg.readInt32("option"))) << 16; dstBeing->setKarma(msg.readUInt8("karma")); @@ -1233,7 +1233,7 @@ void BeingRecv::processPlayerStatusChange2(Net::MessageIn &msg) if (!dstBeing) return; - const uint32_t statusEffects = msg.readInt32("status effect"); + const uint32_t statusEffects = msg.readInt32("option"); dstBeing->setLevel(msg.readInt32("level")); msg.readInt32("showEFST"); diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index 74f6e4492..fa2cfe186 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -232,7 +232,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg) const int16_t speed = msg.readInt16("speed"); const uint16_t stunMode = msg.readInt16("opt1"); uint32_t statusEffects = msg.readInt16("opt2"); - statusEffects |= (CAST_U32(msg.readInt16("options"))) + statusEffects |= (CAST_U32(msg.readInt16("option"))) << 16; const int16_t job = msg.readInt16("job"); int disguiseId = 0; @@ -367,7 +367,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg) const int16_t speed = msg.readInt16("speed"); const uint16_t stunMode = msg.readInt16("opt1"); uint32_t statusEffects = msg.readInt16("opt2"); - statusEffects |= (CAST_U32(msg.readInt16("options"))) + statusEffects |= (CAST_U32(msg.readInt16("option"))) << 16; const int16_t job = msg.readInt16("job"); int disguiseId = 0; @@ -498,7 +498,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg) const int16_t speed = msg.readInt16("speed"); const uint16_t stunMode = msg.readInt16("opt1"); uint32_t statusEffects = msg.readInt16("opt2"); - statusEffects |= (CAST_U32(msg.readInt16("options"))) + statusEffects |= (CAST_U32(msg.readInt16("option"))) << 16; const int16_t job = msg.readInt16("job"); int disguiseId = 0; @@ -1184,9 +1184,9 @@ void BeingRecv::processPlayerStatusChange(Net::MessageIn &msg) return; } - const uint16_t stunMode = msg.readInt16("stun mode"); - uint32_t statusEffects = msg.readInt16("status effect"); - statusEffects |= (CAST_U32(msg.readInt16("opt?"))) << 16; + const uint16_t stunMode = msg.readInt16("opt1"); + uint32_t statusEffects = msg.readInt16("opt2"); + statusEffects |= (CAST_U32(msg.readInt16("option"))) << 16; msg.readUInt8("Unused?"); dstBeing->setStunMode(stunMode); |