Remove default value from parameter colorId in Being->setSprite.

3 files changed, 101 insertions, 28 deletions

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index f3de8d925..0243f1899 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -50,22 +50,66 @@ void BeingHandler::undress(Being *const being) const
 {
     if (!being)
         return;
-    being->setSprite(SPRITE_WEAPON, 0, std::string());
-    being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string());
-    being->setSprite(SPRITE_HEAD_TOP, 0, std::string());
-    being->setSprite(SPRITE_HEAD_MID, 0, std::string());
-    being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string());
-    being->setSprite(SPRITE_SHIELD, 0, std::string());
-    being->setSprite(SPRITE_FLOOR, 0, std::string());
-    being->setSprite(SPRITE_ROBE, 0, std::string());
-    being->setSprite(SPRITE_EVOL2, 0, std::string());
-    being->setSprite(SPRITE_EVOL3, 0, std::string());
-    being->setSprite(SPRITE_EVOL4, 0, std::string());
-    being->setSprite(SPRITE_EVOL5, 0, std::string());
-    being->setSprite(SPRITE_EVOL6, 0, std::string());
-    being->setSprite(SPRITE_HAIR, 0, std::string());
-    being->setSprite(SPRITE_SHOES, 0, std::string());
-//    being->setSprite(SPRITE_BODY, 0, "", true);
+    being->setSprite(SPRITE_WEAPON,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_HEAD_BOTTOM,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_HEAD_TOP,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_HEAD_MID,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_CLOTHES_COLOR,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_SHIELD,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_FLOOR,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_ROBE,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_EVOL2,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_EVOL3,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_EVOL4,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_EVOL5,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_EVOL6,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_HAIR,
+        0,
+        std::string(),
+        ItemColor_one);
+    being->setSprite(SPRITE_SHOES,
+        0,
+        std::string(),
+        ItemColor_one);
 }
 
 void BeingHandler::requestRanks(const RankT rank) const
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index ee31c236d..4c7e2727e 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,7 +165,10 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 "",
                 itemColor,
                 IsWeapon_true);
-            dstBeing->setSprite(SPRITE_FLOOR, id2, std::string());
+            dstBeing->setSprite(SPRITE_FLOOR,
+                id2,
+                std::string(),
+                ItemColor_one);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 0b3e5b82d..e10339b40 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -147,13 +147,15 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     tempPlayer->setHairColor(color);
     if (hairStyle == 0)
     {
-        tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string());
+        tempPlayer->setSprite(SPRITE_HAIR_COLOR, 0, std::string(), ItemColor_one);
     }
     else
     {
-        tempPlayer->setSprite(SPRITE_HAIR_COLOR, hairStyle * -1,
+        tempPlayer->setSprite(SPRITE_HAIR_COLOR,
+            hairStyle * -1,
             ItemDB::get(-hairStyle).getDyeColorsString(
-            color));
+            color),
+            ItemColor_one);
     }
 
     const uint16_t look = msg.readInt16("clothes color");
@@ -182,14 +184,38 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         shoes = msg.readInt32("robe");
     if (!serverFeatures->haveAdvancedSprites())
     {
-        tempPlayer->setSprite(SPRITE_HAIR, shoes, std::string());
-        tempPlayer->setSprite(SPRITE_SHOES, gloves, std::string());
-        tempPlayer->setSprite(SPRITE_SHIELD, cape, std::string());
-        tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1, std::string());
-        tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes, std::string());
-        tempPlayer->setSprite(SPRITE_FLOOR, shield, std::string());
-        tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat, std::string());
-        tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes, std::string());
+        tempPlayer->setSprite(SPRITE_HAIR,
+            shoes,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_SHOES,
+            gloves,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_SHIELD,
+            cape,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_HEAD_TOP,
+            misc1,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_WEAPON,
+            bottomClothes,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_FLOOR,
+            shield,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
+            hat,
+            std::string(),
+            ItemColor_one);
+        tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
+            topClothes,
+            std::string(),
+            ItemColor_one);
 //        tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
     }
     if (packetVersion >= 20110928)