diff options
author | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
---|---|---|
committer | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
commit | 224da21ea258450fcc78dd7635de84aba1d1df5e (patch) | |
tree | dc4df492779986aff60ed785f4821daae968d023 /src/net/beinghandler.cpp | |
parent | d7a5438d3c7b140c0966243bae98ff447385d246 (diff) | |
parent | ed60c53eb2fe5ef377fc726df796d0aaf2005c6c (diff) | |
download | mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.gz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.bz2 mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.xz mana-client-224da21ea258450fcc78dd7635de84aba1d1df5e.zip |
Merge branch 'master' of git://gitorious.org/tmw/eathena
Diffstat (limited to 'src/net/beinghandler.cpp')
-rw-r--r-- | src/net/beinghandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 9d91d988..c8d12499 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -141,7 +141,8 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // manner dstBeing->setStatusEffectBlock(32, msg->readInt16()); // opt3 msg->readInt8(); // karma - dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setGender( + (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom); @@ -420,7 +421,8 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // manner dstBeing->setStatusEffectBlock(32, msg->readInt16()); // opt3 msg->readInt8(); // karma - dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setGender( + (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific dstBeing->setSprite(Being::WEAPON_SPRITE, weapon); |