From c9a31afec60a5085e0a3dbd26c15db397730a768 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 8 Jun 2016 14:30:28 +0300
Subject: Add strong typed bool IsWeapon.

---
 src/net/eathena/beingrecv.cpp      | 30 +++++++++++++++++++++++-------
 src/net/eathena/charserverrecv.cpp |  6 +++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'src/net/eathena')

diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 5d4c59d00..07779147a 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -160,7 +160,11 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
             dstBeing->setSpriteID(SPRITE_HAIR_COLOR, id * -1);
             break;
         case 2:  // LOOK_WEAPON Weapon ID in id, Shield ID in id2
-            dstBeing->setSprite(SPRITE_BODY, id, "", itemColor, true);
+            dstBeing->setSprite(SPRITE_BODY,
+                id,
+                "",
+                itemColor,
+                IsWeapon_true);
             dstBeing->setSprite(SPRITE_FLOOR, id2);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
@@ -399,8 +403,12 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR, shoes);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_SHOES, gloves);
-        Ea::BeingRecv::setSprite(dstBeing, SPRITE_BODY, weapon, "",
-            ItemColor_one, true);
+        Ea::BeingRecv::setSprite(dstBeing,
+            SPRITE_BODY,
+            weapon,
+            "",
+            ItemColor_one,
+            IsWeapon_true);
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
     }
     else if (dstBeing->getType() == ActorType::Npc
@@ -601,8 +609,12 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
             Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop);
             Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR, shoes);
             Ea::BeingRecv::setSprite(dstBeing, SPRITE_SHOES, gloves);
-            Ea::BeingRecv::setSprite(dstBeing, SPRITE_BODY, weapon, "",
-                ItemColor_one, true);
+            Ea::BeingRecv::setSprite(dstBeing,
+                SPRITE_BODY,
+                weapon,
+                "",
+                ItemColor_one,
+                IsWeapon_true);
         }
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
     }
@@ -801,8 +813,12 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_CLOTHES_COLOR, headTop);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_HAIR, shoes);
         Ea::BeingRecv::setSprite(dstBeing, SPRITE_SHOES, gloves);
-        Ea::BeingRecv::setSprite(dstBeing, SPRITE_BODY, weapon, "",
-            ItemColor_one, true);
+        Ea::BeingRecv::setSprite(dstBeing,
+            SPRITE_BODY,
+            weapon,
+            "",
+            ItemColor_one,
+            IsWeapon_true);
 //        Ea::BeingRecv::setSprite(dstBeing, SPRITE_FLOOR, shield);
     }
     else if (dstBeing->getType() == ActorType::Npc
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index fcf90acc9..598602355 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -129,7 +129,11 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     const int option A_UNUSED = (msg.readInt16("weapon") | 1) ^ 1;
     const int weapon = 0;
 
-    tempPlayer->setSprite(SPRITE_BODY, weapon, "", ItemColor_one, true);
+    tempPlayer->setSprite(SPRITE_BODY,
+        weapon,
+        "",
+        ItemColor_one,
+        IsWeapon_true);
 
     data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
 
-- 
cgit v1.2.3-70-g09d2