From 71cccfd289845fcd31e64f35d600ebafd4aa29c6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Jun 2016 14:48:50 +0300
Subject: Split in Being setSprite into setSprite and setSpriteId.

---
 src/net/tmwa/beinghandler.cpp   | 30 +++++++--------------
 src/net/tmwa/beingrecv.cpp      |  6 ++---
 src/net/tmwa/charserverrecv.cpp | 60 ++++++++++++++---------------------------
 3 files changed, 32 insertions(+), 64 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 159e56fb8..346aedf58 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -49,26 +49,16 @@ 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_CLOTHES_COLOR,
-        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_CLOTHES_COLOR,
+        0);
+    being->setSpriteId(SPRITE_HAIR,
+        0);
+    being->setSpriteId(SPRITE_SHOES,
+        0);
 }
 
 #ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index d86d8b2ec..2ece0e993 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -148,10 +148,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
                 "",
                 ItemColor_one);
             dstBeing->setWeaponId(id);
-            dstBeing->setSprite(SPRITE_FLOOR,
-                id2,
-                std::string(),
-                ItemColor_one);
+            dstBeing->setSpriteId(SPRITE_FLOOR,
+                id2);
             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 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"));
-- 
cgit v1.2.3-70-g09d2