From e39ac061384a0877367b9a7fbd24b1a01626be3d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 15 Apr 2015 13:52:07 +0300
Subject: Remove hideShield setting.

---
 src/net/eathena/beinghandler.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/net/eathena/beinghandler.cpp')

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())
-- 
cgit v1.2.3-70-g09d2