diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-07-09 00:05:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-07-09 00:05:38 +0300 |
| commit | e0af6cf371bedcfedcba2fb23e166ff5d345c447 (patch) | |
| tree | 889f26a33e59101c3f300d47aeecef9db44d0408 /src/net/tmwa | |
| parent | 3f31d4f379f2baa5ae98f3a5f551307735820fa3 (diff) | |
| download | plus-e0af6cf371bedcfedcba2fb23e166ff5d345c447.tar.gz plus-e0af6cf371bedcfedcba2fb23e166ff5d345c447.tar.bz2 plus-e0af6cf371bedcfedcba2fb23e166ff5d345c447.tar.xz plus-e0af6cf371bedcfedcba2fb23e166ff5d345c447.zip | |
Reserve bits in gender field for future usage.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 7589553ff..d6f67f716 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -511,8 +511,9 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType) msg.readInt16(); // manner dstBeing->setStatusEffectBlock(32, msg.readInt16()); // opt3 msg.readInt8(); // karma - dstBeing->setGender((msg.readInt8() == 0) - ? GENDER_FEMALE : GENDER_MALE); + // reserving bit for future usage + dstBeing->setGender(((msg.readInt8() & 1) == 0) + ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific dstBeing->setSprite(SPRITE_WEAPON, weapon, "", 1, true); diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 0a28a9a8c..3d605b1ff 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -273,7 +273,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, static_cast<LoginHandler*>(Net::getLoginHandler())->getToken(); LocalPlayer *tempPlayer = new LocalPlayer(msg.readInt32(), 0); - tempPlayer->setGender(token.sex); + // reserving bit for future usage + tempPlayer->setGender(token.sex & 1); character->data.mAttributes[EXP] = msg.readInt32(); character->data.mAttributes[MONEY] = msg.readInt32(); |