From 5c61d7b6e04a824b9a60f25e73abd938487b2fc4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Jun 2016 15:46:14 +0300
Subject: Remove colorId parameter from Being::updateSprite.

---
 src/being/being.cpp | 13 +++++--------
 src/being/being.h   |  3 +--
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/being')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 4e6795d70..fae5224b6 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2469,8 +2469,7 @@ void Being::updateColors()
 
 void Being::updateSprite(const unsigned int slot,
                          const int id,
-                         const std::string &restrict color,
-                         const ItemColor colorId) restrict2
+                         const std::string &restrict color) restrict2
 {
     if (!charServerHandler || slot >= charServerHandler->maxSprite())
         return;
@@ -2480,11 +2479,9 @@ void Being::updateSprite(const unsigned int slot,
 
     if (slot && mSlots[slot].spriteId == id)
         return;
-    setSpriteCards(slot,
+    setSpriteColor(slot,
         id,
-        color,
-        colorId,
-        mSlots[slot].cardsId);
+        color);
 }
 
 // set sprite id, reset colors, reset cards
@@ -2614,7 +2611,7 @@ void Being::unSetSprite(const unsigned int slot) restrict2
         beingEquipmentWindow->updateBeing(this);
 }
 
-// set sprite id, colors, reset cards
+// set sprite id, use color string, reset cards
 void Being::setSpriteColor(const unsigned int slot,
                            const int id,
                            std::string color) restrict2
@@ -2708,7 +2705,7 @@ void Being::setSpriteColor(const unsigned int slot,
         beingEquipmentWindow->updateBeing(this);
 }
 
-// set sprite id, colors, reset cards
+// set sprite id, use color id, reset cards
 void Being::setSpriteColorId(const unsigned int slot,
                              const int id,
                              ItemColor colorId) restrict2
diff --git a/src/being/being.h b/src/being/being.h
index e39baa079..62ad47ea9 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -348,8 +348,7 @@ class Being notfinal : public ActorSprite,
 
         void updateSprite(const unsigned int slot,
                           const int id,
-                          const std::string &restrict color = "",
-                          const ItemColor colorId = ItemColor_one)
+                          const std::string &restrict color = "")
                           restrict2;
 
         void setHairColorSpriteID(const unsigned int slot,
-- 
cgit v1.2.3-60-g2f50