Split Being::setSprite into Being::setSprite and Being::setSpriteCards.

3 files changed, 30 insertions, 60 deletions

diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 9a67b9358..159e56fb8 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -52,28 +52,23 @@ void BeingHandler::undress(Being *const being) const
     being->setSprite(SPRITE_WEAPON,
         0,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     being->setSprite(SPRITE_HEAD_BOTTOM,
         0,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     being->setSprite(SPRITE_CLOTHES_COLOR,
         0,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     being->setSprite(SPRITE_HAIR,
         0,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     being->setSprite(SPRITE_SHOES,
         0,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
 }
 
 #ifdef EATHENA_SUPPORT
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 16c2f1599..d86d8b2ec 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -146,38 +146,33 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
             dstBeing->setSprite(SPRITE_BODY,
                 id,
                 "",
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             dstBeing->setWeaponId(id);
             dstBeing->setSprite(SPRITE_FLOOR,
                 id2,
                 std::string(),
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 3:     // Change lower headgear for eAthena, pants for us
             dstBeing->setSprite(SPRITE_WEAPON,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_WEAPON);
             break;
         case 4:     // Change upper headgear for eAthena, hat for us
             dstBeing->setSprite(SPRITE_CLOTHES_COLOR,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_CLOTHES_COLOR);
             break;
         case 5:     // Change middle headgear for eathena, armor for us
             dstBeing->setSprite(SPRITE_HEAD_BOTTOM,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_BOTTOM);
             break;
         case 6:     // eAthena LOOK_HAIR_COLOR
@@ -191,64 +186,56 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
             dstBeing->setSprite(SPRITE_FLOOR,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_FLOOR);
             break;
         case 9:     // eAthena LOOK_SHOES
             dstBeing->setSprite(SPRITE_HAIR,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HAIR);
             break;
         case 10:   // LOOK_GLOVES
             dstBeing->setSprite(SPRITE_SHOES,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_SHOES);
             break;
         case 11:  // LOOK_CAPE
             dstBeing->setSprite(SPRITE_SHIELD,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_SHIELD);
             break;
         case 12:
             dstBeing->setSprite(SPRITE_HEAD_TOP,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_TOP);
             break;
         case 13:
             dstBeing->setSprite(SPRITE_HEAD_MID,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_HEAD_MID);
             break;
         case 14:
             dstBeing->setSprite(SPRITE_ROBE,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_ROBE);
             break;
         case 15:
             dstBeing->setSprite(SPRITE_EVOL2,
                 id,
                 color,
-                ItemColor_one,
-                zeroCards);
+                ItemColor_one);
             localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL2);
             break;
         case 16:
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index 2fd768870..982779a23 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -107,8 +107,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     tempPlayer->setSprite(SPRITE_BODY,
         weapon,
         "",
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setWeaponId(weapon);
 
     data.mAttributes[Attributes::LEVEL] = msg.readInt16("level");
@@ -128,16 +127,14 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
         tempPlayer->setSprite(SPRITE_HAIR_COLOR,
             0,
             std::string(),
-            ItemColor_one,
-            zeroCards);
+            ItemColor_one);
     }
     else
     {
         tempPlayer->setSprite(SPRITE_HAIR_COLOR,
             hairStyle * -1,
             ItemDB::get(-hairStyle).getDyeColorsString(hairColor),
-            ItemColor_one,
-            zeroCards);
+            ItemColor_one);
     }
     tempPlayer->setHairColor(hairColor);
 
@@ -156,48 +153,39 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg,
     tempPlayer->setSprite(SPRITE_HAIR,
         shoes,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_SHOES,
         gloves,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_SHIELD,
         cape,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_HEAD_TOP,
         misc1,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_WEAPON,
         bottomClothes,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_FLOOR,
         shield,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_CLOTHES_COLOR,
         hat,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_HEAD_BOTTOM,
         topClothes,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
     tempPlayer->setSprite(SPRITE_HEAD_MID,
         misc2,
         std::string(),
-        ItemColor_one,
-        zeroCards);
+        ItemColor_one);
 
     character->slot = msg.readUInt8("slot");
     const uint8_t sex = CAST_U8(msg.readUInt8("gender"));