From 3d524b386e3dd6d89d481749cd0015bff247a703 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Jun 2016 15:09:39 +0300
Subject: In Being split setSpriteId into setSpriteId and unSetSprite.

---
 src/being/being.cpp | 42 ++++++++++++++++++++++++++++++++++++++++--
 src/being/being.h   |  2 ++
 2 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'src/being')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 19678cf64..e0980e4d7 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2576,6 +2576,45 @@ void Being::setSpriteId(const unsigned int slot,
         beingEquipmentWindow->updateBeing(this);
 }
 
+// reset sprite id, reset colors, reset cards
+void Being::unSetSprite(const unsigned int slot) restrict2
+{
+    if (!charServerHandler || slot >= charServerHandler->maxSprite())
+        return;
+
+    if (slot >= CAST_U32(mSprites.size()))
+        ensureSize(slot + 1);
+
+    if (slot >= CAST_U32(mSlots.size()))
+        mSlots.resize(slot + 1, BeingSlot());
+
+    removeSprite(slot);
+    mSpriteDraw[slot] = 0;
+
+    BeingSlot &beingSlot = mSlots[slot];
+    const int id1 = beingSlot.spriteId;
+    if (id1)
+    {
+        const ItemInfo &info = ItemDB::get(id1);
+        if (mMap &&
+            mType == ActorType::Player)
+        {
+            const BeingId pet = fromInt(info.getPet(), BeingId);
+            if (pet != BeingId_zero)
+                removePet(pet);
+        }
+        removeItemParticles(id1);
+    }
+
+    beingSlot.spriteId = 0;
+    beingSlot.color = std::string();
+    beingSlot.colorId = ItemColor_one;
+    beingSlot.cardsId = CardsList(nullptr);
+    recalcSpritesOrder();
+    if (beingEquipmentWindow)
+        beingEquipmentWindow->updateBeing(this);
+}
+
 // set sprite id, colors, reset cards
 void Being::setSprite(const unsigned int slot,
                       const int id,
@@ -3936,8 +3975,7 @@ void Being::undressItemById(const int id) restrict2
     {
         if (id == mSlots[f].spriteId)
         {
-            setSpriteId(CAST_U32(f),
-                0);
+            unSetSprite(CAST_U32(f));
             break;
         }
     }
diff --git a/src/being/being.h b/src/being/being.h
index 79068b255..03626bc75 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -329,6 +329,8 @@ class Being notfinal : public ActorSprite,
         void setSpriteId(const unsigned int slot,
                          const int id) restrict2;
 
+        void unSetSprite(const unsigned int slot) restrict2;
+
         void setWeaponId(const int id) restrict2;
 
         void setTempSprite(const unsigned int slot,
-- 
cgit v1.2.3-70-g09d2