From 112d2ad1904051160822d1845d1418cca889c0d5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 Mar 2012 03:56:02 +0300 Subject: Add support for other gender. Fix per gender and race items separation. --- src/net/ea/beinghandler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/net/ea/beinghandler.cpp') diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index f1d608717..f669163be 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -259,8 +259,8 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) if (dstBeing->getType() == ActorSprite::PLAYER) { - gender &= 1; - dstBeing->setGender((gender == 0) ? GENDER_FEMALE : GENDER_MALE); + gender &= 3; + dstBeing->setGender(Being::intToGender(gender)); // Set these after the gender, as the sprites may be gender-specific setSprite(dstBeing, EA_SPRITE_HAIR, hairStyle * -1, ColorDB::getHairColor(hairColor)); @@ -283,13 +283,15 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible) case 3: dstBeing->setGender(GENDER_MALE); break; + case 4: + dstBeing->setGender(GENDER_OTHER); + break; default: dstBeing->setGender(GENDER_UNSPECIFIED); break; } } - if (!visible) { Uint16 srcX, srcY, dstX, dstY; -- cgit v1.2.3-70-g09d2