diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:50:28 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:50:28 +0300 |
commit | 616ab2676cc932ab59152c510d584c429090987a (patch) | |
tree | 9184b8836b51a073f67ee60a46043084687207a7 /src/net/tmwa/beinghandler.cpp | |
parent | 4b397f4c8e2b0c8d636cc2782d9571567473975b (diff) | |
download | manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.gz manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.bz2 manaplus-616ab2676cc932ab59152c510d584c429090987a.tar.xz manaplus-616ab2676cc932ab59152c510d584c429090987a.zip |
Remove getter for serverFeatures.
Diffstat (limited to 'src/net/tmwa/beinghandler.cpp')
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index bea17edb6..2a9b31c0f 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -296,7 +296,7 @@ void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg) const int id2 = 0; const int16_t id = msg.readInt16("id1"); - if (type == 2 || Net::getServerFeatures()->haveItemColors()) + if (type == 2 || serverFeatures->haveItemColors()) { id2 = msg.readInt16("id2"); } @@ -569,7 +569,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const dstBeing->updateSprite(SPRITE_WEAPON, weapon, "", 1, true); if (!mHideShield) dstBeing->updateSprite(SPRITE_SHIELD, shield); - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { dstBeing->updateSprite(SPRITE_BOTTOMCLOTHES, headBottom, "", colors[0]); @@ -720,7 +720,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const dstBeing->updateSprite(SPRITE_WEAPON, weapon, "", 1, true); if (!mHideShield) dstBeing->updateSprite(SPRITE_SHIELD, shield); - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { dstBeing->updateSprite(SPRITE_BOTTOMCLOTHES, headBottom, "", colors[0]); @@ -871,7 +871,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const dstBeing->updateSprite(SPRITE_WEAPON, weapon, "", 1, true); if (!mHideShield) dstBeing->updateSprite(SPRITE_SHIELD, shield); - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { dstBeing->updateSprite(SPRITE_BOTTOMCLOTHES, headBottom, "", colors[0]); @@ -947,7 +947,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const void BeingHandler::processBeingMove3(Net::MessageIn &msg) { BLOCK_START("BeingHandler::processBeingMove3") - if (!Net::getServerFeatures()->haveMove3()) + if (!serverFeatures->haveMove3()) { BLOCK_END("BeingHandler::processBeingMove3") return; @@ -1103,7 +1103,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) uint16_t gloves; if (dstBeing->getType() == ActorType::Monster) { - if (Net::getServerFeatures()->haveServerHp()) + if (serverFeatures->haveServerHp()) { const int hp = msg.readInt32("hp"); const int maxHP = msg.readInt32("max hp"); @@ -1131,7 +1131,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - if (Net::getServerFeatures()->haveMonsterAttackRange() + if (serverFeatures->haveMonsterAttackRange() && dstBeing->getType() == ActorType::Monster) { const int attackRange = static_cast<int>( @@ -1307,7 +1307,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) uint16_t gloves; if (dstBeing->getType() == ActorType::Monster) { - if (Net::getServerFeatures()->haveServerHp()) + if (serverFeatures->haveServerHp()) { const int hp = msg.readInt32("hp"); const int maxHP = msg.readInt32("max hp"); @@ -1335,7 +1335,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) msg.readInt16("manner"); dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3")); - if (Net::getServerFeatures()->haveMonsterAttackRange() + if (serverFeatures->haveMonsterAttackRange() && dstBeing->getType() == ActorType::Monster) { const int attackRange = static_cast<int>( @@ -1377,7 +1377,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) { dstBeing->setAction(BeingAction::STAND, 0); dstBeing->setTileCoords(srcX, srcY); - if (!Net::getServerFeatures()->haveMove3()) + if (!serverFeatures->haveMove3()) dstBeing->setDestination(dstX, dstY); } |