diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-30 22:37:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-30 22:37:01 +0300 |
| commit | b78cc1c9f70f7add1c66c6a40b55b9add71de6df (patch) | |
| tree | 7c3bb0aa2c2737ba478814c79e466f707f7e35b7 /src/net/tmwa | |
| parent | d82994bca93b4278c4751a2a4c1313ba2f41bd4b (diff) | |
| download | manaplus-b78cc1c9f70f7add1c66c6a40b55b9add71de6df.tar.gz manaplus-b78cc1c9f70f7add1c66c6a40b55b9add71de6df.tar.bz2 manaplus-b78cc1c9f70f7add1c66c6a40b55b9add71de6df.tar.xz manaplus-b78cc1c9f70f7add1c66c6a40b55b9add71de6df.zip | |
Add karma field to beings.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 10 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 863c4420f..6d19dbe72 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -556,7 +556,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); // reserving bit for future usage dstBeing->setGender(Being::intToGender( static_cast<uint8_t>(msg.readUInt8("gender") & 3))); @@ -707,7 +707,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); // reserving bit for future usage dstBeing->setGender(Being::intToGender( static_cast<uint8_t>(msg.readUInt8("gender") & 3))); @@ -858,7 +858,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const msg.readInt16("emblem"); msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); // reserving bit for future usage dstBeing->setGender(Being::intToGender( static_cast<uint8_t>(msg.readUInt8("gender") & 3))); @@ -1138,7 +1138,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) } else { - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); } uint8_t gender = msg.readUInt8("gender"); @@ -1342,7 +1342,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) } else { - msg.readUInt8("karma"); + dstBeing->setKarma(msg.readUInt8("karma")); } uint8_t gender = msg.readUInt8("gender"); diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index c687739e2..8c98c56e2 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -159,7 +159,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, const int misc1 = msg.readInt16("misc1"); msg.readInt32("option"); - msg.readInt32("karma"); + tempPlayer->setKarma(msg.readInt32("karma")); msg.readInt32("manner"); msg.readInt16("character points left"); |