Split in Being setSprite into setSprite and setSpriteId.

1 files changed, 20 insertions, 40 deletions

diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 982779a23..85f06159d 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -124,10 +124,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     msg.readUInt8("unused");
     if (hairStyle == 0)
     {
-        tempPlayer->setSprite(SPRITE_HAIR_COLOR,
-            0,
-            std::string(),
-            ItemColor_one);
+        tempPlayer->setSpriteId(SPRITE_HAIR_COLOR,
+            0);
     }
     else
     {
@@ -150,42 +148,24 @@ 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,
-        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,
-        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->setSpriteId(SPRITE_HEAD_MID,
+        misc2);
 
     character->slot = msg.readUInt8("slot");
     const uint8_t sex = CAST_U8(msg.readUInt8("gender"));