Simplify set weapon sprite.

3 files changed, 3 insertions, 49 deletions

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index c4b8e85d5..f1f47ca61 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -54,91 +54,76 @@ void BeingHandler::undress(Being *const being) const
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_HEAD_BOTTOM,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_HEAD_TOP,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_HEAD_MID,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_CLOTHES_COLOR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_SHIELD,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_FLOOR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_ROBE,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_EVOL2,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_EVOL3,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_EVOL4,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_EVOL5,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_EVOL6,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_HAIR,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
     being->setSprite(SPRITE_SHOES,
         0,
         std::string(),
         ItemColor_one,
-        IsWeapon_false,
         nullptr);
 }
 
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index bcfaa06eb..83c6b9515 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -164,14 +164,12 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 "",
                 itemColor,
-                IsWeapon_true,
                 cards);
             dstBeing->setWeaponId(id);
             dstBeing->setSprite(SPRITE_FLOOR,
                 id2,
                 std::string(),
                 ItemColor_one,
-                IsWeapon_false,
                 nullptr);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -181,7 +179,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
@@ -191,7 +188,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
@@ -202,7 +198,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
@@ -222,7 +217,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -232,7 +226,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
@@ -242,7 +235,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
@@ -252,7 +244,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
@@ -262,7 +253,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
@@ -272,7 +262,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
@@ -282,7 +271,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
@@ -292,7 +280,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
@@ -302,7 +289,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL3);
@@ -312,7 +298,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
@@ -322,7 +307,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL5);
@@ -332,7 +316,6 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 id,
                 color,
                 itemColor,
-                IsWeapon_false,
                 cards);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
@@ -489,8 +472,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
             SPRITE_BODY,
             weapon,
             "",
-            ItemColor_one,
-            IsWeapon_true);
+            ItemColor_one);
         dstBeing->setWeaponId(weapon);
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
     }
@@ -696,8 +678,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
                 SPRITE_BODY,
                 weapon,
                 "",
-                ItemColor_one,
-                IsWeapon_true);
+                ItemColor_one);
             dstBeing->setWeaponId(weapon);
         }
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
@@ -901,8 +882,7 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
             SPRITE_BODY,
             weapon,
             "",
-            ItemColor_one,
-            IsWeapon_true);
+            ItemColor_one);
         dstBeing->setWeaponId(weapon);
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
     }
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 796be90ca..d3300f092 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -133,7 +133,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         weapon,
         "",
         ItemColor_one,
-        IsWeapon_true,
         nullptr);
     tempPlayer->setWeaponId(weapon);
 
@@ -153,7 +152,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             0,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
     }
     else
@@ -163,7 +161,6 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             ItemDB::get(-hairStyle).getDyeColorsString(
             color),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
     }
 
@@ -197,49 +194,41 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
             shoes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_SHOES,
             gloves,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_SHIELD,
             cape,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_HEAD_TOP,
             misc1,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_WEAPON,
             bottomClothes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_FLOOR,
             shield,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
             hat,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
         tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
             topClothes,
             std::string(),
             ItemColor_one,
-            IsWeapon_false,
             nullptr);
 //        tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
     }