diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-11-29 01:09:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-11-29 01:09:38 +0300 |
| commit | 52d5ee2941bb0e33f49a7092d8ec32ee8e0fd54e (patch) | |
| tree | 82b2c303ad958e29f14a7145aa2139518a5ffcf9 /src | |
| parent | ad04cbfc166ac5166d8967165bddb719a970fe5f (diff) | |
| download | plus-52d5ee2941bb0e33f49a7092d8ec32ee8e0fd54e.tar.gz plus-52d5ee2941bb0e33f49a7092d8ec32ee8e0fd54e.tar.bz2 plus-52d5ee2941bb0e33f49a7092d8ec32ee8e0fd54e.tar.xz plus-52d5ee2941bb0e33f49a7092d8ec32ee8e0fd54e.zip | |
Use server feature haveNpcGender.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 11 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 7736c5298..ad3614015 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -41,6 +41,8 @@ #include "gui/windows/outfitwindow.h" +#include "net/serverfeatures.h" + #include "net/ea/eaprotocol.h" #include "net/eathena/messageout.h" @@ -1051,7 +1053,8 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) // if (!mHideShield) // setSprite(dstBeing, SPRITE_SHIELD, shield); } - else if (dstBeing->getType() == ActorType::Npc) + else if (dstBeing->getType() == ActorType::Npc + && serverFeatures->haveNpcGender()) { dstBeing->setGender(Being::intToGender(gender)); } @@ -1215,7 +1218,8 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) // if (!mHideShield) // setSprite(dstBeing, SPRITE_SHIELD, shield); } - else if (dstBeing->getType() == ActorType::Npc) + else if (dstBeing->getType() == ActorType::Npc + && serverFeatures->haveNpcGender()) { dstBeing->setGender(Being::intToGender(gender)); } @@ -1381,7 +1385,8 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) // if (!mHideShield) // setSprite(dstBeing, SPRITE_SHIELD, shield); } - else if (dstBeing->getType() == ActorType::Npc) + else if (dstBeing->getType() == ActorType::Npc + && serverFeatures->haveNpcGender()) { dstBeing->setGender(Being::intToGender(gender)); } diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 3bf62b646..fd9c04dfc 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -1117,7 +1117,8 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) if (!mHideShield) setSprite(dstBeing, SPRITE_SHIELD, shield); } - else if (dstBeing->getType() == ActorType::Npc) + else if (dstBeing->getType() == ActorType::Npc + && serverFeatures->haveNpcGender()) { setServerGender(dstBeing, gender); } @@ -1321,7 +1322,8 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) if (!mHideShield) setSprite(dstBeing, SPRITE_SHIELD, shield); } - else if (dstBeing->getType() == ActorType::Npc) + else if (dstBeing->getType() == ActorType::Npc + && serverFeatures->haveNpcGender()) { setServerGender(dstBeing, gender); } |