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

9 files changed, 43 insertions, 43 deletions

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 855a081e9..4adc83fcb 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -495,7 +495,7 @@ void Being::setSubtype(const BeingTypeId subtype,
             // TRANSLATORS: default race name
             setRaceName(_("Human"));
             if (charServerHandler)
-                setSprite(charServerHandler->baseSprite(), id);
+                setSprite(charServerHandler->baseSprite(), id, std::string());
         }
         else
         {
@@ -3663,7 +3663,7 @@ void Being::undressItemById(const int id) restrict2
     {
         if (id == mSpriteIDs[f])
         {
-            setSprite(CAST_U32(f), 0);
+            setSprite(CAST_U32(f), 0, std::string());
             break;
         }
     }
diff --git a/src/being/being.h b/src/being/being.h
index 5c9f7115d..28cf7a04a 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -321,7 +321,7 @@ class Being notfinal : public ActorSprite,
          */
         void setSprite(const unsigned int slot,
                        const int id,
-                       std::string color = "",
+                       std::string color,
                        ItemColor colorId = ItemColor_one,
                        const IsWeapon isWeapon = IsWeapon_false,
                        const IsTempSprite isTempSprite = IsTempSprite_false,
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 02ef2686f..55b39bc62 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -156,7 +156,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
          it != it_fend;
          ++ it, i ++)
     {
-        mPlayer->setSprite(i, *it);
+        mPlayer->setSprite(i, *it, std::string());
     }
 
     if (!maxHairColor)
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 39a4460b6..f3de8d925 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -50,21 +50,21 @@ void BeingHandler::undress(Being *const being) const
 {
     if (!being)
         return;
-    being->setSprite(SPRITE_WEAPON, 0);
-    being->setSprite(SPRITE_HEAD_BOTTOM, 0);
-    being->setSprite(SPRITE_HEAD_TOP, 0);
-    being->setSprite(SPRITE_HEAD_MID, 0);
-    being->setSprite(SPRITE_CLOTHES_COLOR, 0);
-    being->setSprite(SPRITE_SHIELD, 0);
-    being->setSprite(SPRITE_FLOOR, 0);
-    being->setSprite(SPRITE_ROBE, 0);
-    being->setSprite(SPRITE_EVOL2, 0);
-    being->setSprite(SPRITE_EVOL3, 0);
-    being->setSprite(SPRITE_EVOL4, 0);
-    being->setSprite(SPRITE_EVOL5, 0);
-    being->setSprite(SPRITE_EVOL6, 0);
-    being->setSprite(SPRITE_HAIR, 0);
-    being->setSprite(SPRITE_SHOES, 0);
+    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);
 }
 
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 07779147a..ee31c236d 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,7 +165,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 "",
                 itemColor,
                 IsWeapon_true);
-            dstBeing->setSprite(SPRITE_FLOOR, id2);
+            dstBeing->setSprite(SPRITE_FLOOR, id2, std::string());
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 598602355..0b3e5b82d 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -182,14 +182,14 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         shoes = msg.readInt32("robe");
     if (!serverFeatures->haveAdvancedSprites())
     {
-        tempPlayer->setSprite(SPRITE_HAIR, shoes);
-        tempPlayer->setSprite(SPRITE_SHOES, gloves);
-        tempPlayer->setSprite(SPRITE_SHIELD, cape);
-        tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1);
-        tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes);
-        tempPlayer->setSprite(SPRITE_FLOOR, shield);
-        tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat);
-        tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes);
+        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_HEAD_MID, misc2);
     }
     if (packetVersion >= 20110928)
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 777dbf706..6a3e8a854 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -49,11 +49,11 @@ void BeingHandler::undress(Being *const being) const
 {
     if (!being)
         return;
-    being->setSprite(SPRITE_WEAPON, 0);
-    being->setSprite(SPRITE_HEAD_BOTTOM, 0);
-    being->setSprite(SPRITE_CLOTHES_COLOR, 0);
-    being->setSprite(SPRITE_HAIR, 0);
-    being->setSprite(SPRITE_SHOES, 0);
+    being->setSprite(SPRITE_WEAPON, 0, std::string());
+    being->setSprite(SPRITE_HEAD_BOTTOM, 0, std::string());
+    being->setSprite(SPRITE_CLOTHES_COLOR, 0, std::string());
+    being->setSprite(SPRITE_HAIR, 0, std::string());
+    being->setSprite(SPRITE_SHOES, 0, std::string());
 //    being->setSprite(SPRITE_BODY, 0, "", true);
 }
 
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 5eec60985..31b9bfdd0 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,7 +148,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 "",
                 ItemColor_one,
                 IsWeapon_true);
-            dstBeing->setSprite(SPRITE_FLOOR, id2);
+            dstBeing->setSprite(SPRITE_FLOOR, id2, std::string());
             localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 3:     // Change lower headgear for eAthena, pants for us
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 18c0ab791..c599f17af 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -148,15 +148,15 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     character->data.mStats[Attributes::DEX].base = msg.readUInt8("dex");
     character->data.mStats[Attributes::LUK].base = msg.readUInt8("luk");
 
-    tempPlayer->setSprite(SPRITE_HAIR, shoes);
-    tempPlayer->setSprite(SPRITE_SHOES, gloves);
-    tempPlayer->setSprite(SPRITE_SHIELD, cape);
-    tempPlayer->setSprite(SPRITE_HEAD_TOP, misc1);
-    tempPlayer->setSprite(SPRITE_WEAPON, bottomClothes);
-    tempPlayer->setSprite(SPRITE_FLOOR, shield);
-    tempPlayer->setSprite(SPRITE_CLOTHES_COLOR, hat);  // head option top
-    tempPlayer->setSprite(SPRITE_HEAD_BOTTOM, topClothes);
-    tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
+    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_HEAD_MID, misc2, std::string());
 
     character->slot = msg.readUInt8("slot");
     const uint8_t sex = CAST_U8(msg.readUInt8("gender"));