diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-04-15 13:52:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-15 13:52:07 +0300 |
| commit | e39ac061384a0877367b9a7fbd24b1a01626be3d (patch) | |
| tree | a1de64c672bbdc8fc57aa5e08651bf8892057498 /src/net/eathena/beinghandler.cpp | |
| parent | a239e426893cb1526769bb65719f9bb673ea14a4 (diff) | |
| download | plus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.gz plus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.bz2 plus-e39ac061384a0877367b9a7fbd24b1a01626be3d.tar.xz plus-e39ac061384a0877367b9a7fbd24b1a01626be3d.zip | |
Remove hideShield setting.
Diffstat (limited to 'src/net/eathena/beinghandler.cpp')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 6e1a38d4d..1c913a691 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -531,8 +531,7 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg, break; case 2: // LOOK_WEAPON Weapon ID in id, Shield ID in id2 dstBeing->setSprite(SPRITE_BODY, id, "", 1, true); - if (!mHideShield) - dstBeing->setSprite(SPRITE_FLOOR, id2); + dstBeing->setSprite(SPRITE_FLOOR, id2); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 3: // LOOK_HEAD_BOTTOM @@ -561,11 +560,8 @@ void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg, dstBeing->setLook(static_cast<uint8_t>(id)); break; case 8: // eAthena LOOK_SHIELD - if (!mHideShield) - { - dstBeing->setSprite(SPRITE_FLOOR, id, color, - static_cast<unsigned char>(id2)); - } + dstBeing->setSprite(SPRITE_FLOOR, id, color, + static_cast<unsigned char>(id2)); localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR); break; case 9: // eAthena LOOK_SHOES @@ -728,8 +724,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg) setSprite(dstBeing, SPRITE_HAIR, shoes); setSprite(dstBeing, SPRITE_SHOES, gloves); setSprite(dstBeing, SPRITE_BODY, weapon, "", 1, true); -// if (!mHideShield) -// setSprite(dstBeing, SPRITE_FLOOR, shield); +// setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc && serverFeatures->haveNpcGender()) @@ -894,8 +889,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) setSprite(dstBeing, SPRITE_SHOES, gloves); setSprite(dstBeing, SPRITE_BODY, weapon, "", 1, true); } -// if (!mHideShield) -// setSprite(dstBeing, SPRITE_FLOOR, shield); +// setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc && serverFeatures->haveNpcGender()) @@ -1062,8 +1056,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg) setSprite(dstBeing, SPRITE_HAIR, shoes); setSprite(dstBeing, SPRITE_SHOES, gloves); setSprite(dstBeing, SPRITE_BODY, weapon, "", 1, true); -// if (!mHideShield) -// setSprite(dstBeing, SPRITE_FLOOR, shield); +// setSprite(dstBeing, SPRITE_FLOOR, shield); } else if (dstBeing->getType() == ActorType::Npc && serverFeatures->haveNpcGender()) |