diff options
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 17 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 56f894097..1bd20c0e3 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -616,8 +616,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); - // reserving bit for future usage + dstBeing->setKarma(msg.readUInt8("karma")); dstBeing->setGender(Being::intToGender(msg.readUInt8("gender"))); if (!disguiseId) @@ -742,8 +741,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); - // reserving bit for future usage + dstBeing->setKarma(msg.readUInt8("karma")); dstBeing->setGender(Being::intToGender(msg.readUInt8("gender"))); if (!disguiseId) @@ -868,8 +866,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); - // reserving bit for future usage + dstBeing->setKarma(msg.readUInt8("karma")); dstBeing->setGender(Being::intToGender(msg.readUInt8("gender"))); if (!disguiseId) @@ -1037,7 +1034,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>( msg.readInt32("opt3"))); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); uint8_t gender = msg.readUInt8("gender"); if (dstBeing->getType() == ActorType::Player) @@ -1202,7 +1199,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>( msg.readInt32("opt3"))); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); uint8_t gender = msg.readUInt8("gender"); if (dstBeing->getType() == ActorType::Player) @@ -1369,7 +1366,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>( msg.readInt32("opt3"))); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); uint8_t gender = msg.readUInt8("gender"); if (dstBeing->getType() == ActorType::Player) @@ -1784,7 +1781,7 @@ 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.readInt32("opt?"))) << 16; - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); dstBeing->setStunMode(stunMode); dstBeing->setStatusEffectBlock(0, static_cast<uint16_t>( diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 35d64e70f..b2ba2da08 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -161,7 +161,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, const int misc1 = msg.readInt16(); // look like unused msg.readInt32("option"); - msg.readInt32("karma"); + tempPlayer->setKarma(msg.readInt32("karma")); msg.readInt32("manner"); msg.readInt16("left points"); |