Split in Being setSprite into setSprite and setSpriteId.

3 files changed, 50 insertions, 100 deletions

diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 0243f1899..dbf797e2b 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -50,66 +50,36 @@ void BeingHandler::undress(Being *const being) const
 {
     if (!being)
         return;
-    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);
+    being->setSpriteId(SPRITE_WEAPON,
+        0);
+    being->setSpriteId(SPRITE_HEAD_BOTTOM,
+        0);
+    being->setSpriteId(SPRITE_HEAD_TOP,
+        0);
+    being->setSpriteId(SPRITE_HEAD_MID,
+        0);
+    being->setSpriteId(SPRITE_CLOTHES_COLOR,
+        0);
+    being->setSpriteId(SPRITE_SHIELD,
+        0);
+    being->setSpriteId(SPRITE_FLOOR,
+        0);
+    being->setSpriteId(SPRITE_ROBE,
+        0);
+    being->setSpriteId(SPRITE_EVOL2,
+        0);
+    being->setSpriteId(SPRITE_EVOL3,
+        0);
+    being->setSpriteId(SPRITE_EVOL4,
+        0);
+    being->setSpriteId(SPRITE_EVOL5,
+        0);
+    being->setSpriteId(SPRITE_EVOL6,
+        0);
+    being->setSpriteId(SPRITE_HAIR,
+        0);
+    being->setSpriteId(SPRITE_SHOES,
+        0);
 }
 
 void BeingHandler::requestRanks(const RankT rank) const
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 2a06e899b..bffa9d274 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -165,10 +165,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 itemColor,
                 CardsList(cards));
             dstBeing->setWeaponId(id);
-            dstBeing->setSprite(SPRITE_FLOOR,
-                id2,
-                std::string(),
-                ItemColor_one);
+            dstBeing->setSpriteId(SPRITE_FLOOR,
+                id2);
             if (localPlayer)
                 localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 321745312..555a876be 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -147,10 +147,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     tempPlayer->setHairColor(color);
     if (hairStyle == 0)
     {
-        tempPlayer->setSprite(SPRITE_HAIR_COLOR,
-            0,
-            std::string(),
-            ItemColor_one);
+        tempPlayer->setSpriteId(SPRITE_HAIR_COLOR,
+            0);
     }
     else
     {
@@ -187,38 +185,22 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         shoes = msg.readInt32("robe");
     if (!serverFeatures->haveAdvancedSprites())
     {
-        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->setSpriteId(SPRITE_HAIR,
+            shoes);
+        tempPlayer->setSpriteId(SPRITE_SHOES,
+            gloves);
+        tempPlayer->setSpriteId(SPRITE_SHIELD,
+            cape);
+        tempPlayer->setSpriteId(SPRITE_HEAD_TOP,
+            misc1);
+        tempPlayer->setSpriteId(SPRITE_WEAPON,
+            bottomClothes);
+        tempPlayer->setSpriteId(SPRITE_FLOOR,
+            shield);
+        tempPlayer->setSpriteId(SPRITE_CLOTHES_COLOR,
+            hat);
+        tempPlayer->setSpriteId(SPRITE_HEAD_BOTTOM,
+            topClothes);
 //        tempPlayer->setSprite(SPRITE_HEAD_MID, misc2);
     }
     if (packetVersion >= 20110928)