diff options
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 19 | ||||
| -rw-r--r-- | src/being/being.h | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 08f1acddd..1023eb1d6 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2802,11 +2802,9 @@ void Being::setSpriteColorId(const unsigned int slot, beingEquipmentWindow->updateBeing(this); } -// set sprite id, colors, cards +// set sprite id, colors from cards, cards void Being::setSpriteCards(const unsigned int slot, const int id, - std::string color, - ItemColor colorId, CardsList cards) restrict2 { if (!charServerHandler || slot >= charServerHandler->maxSprite()) @@ -2822,6 +2820,9 @@ void Being::setSpriteCards(const unsigned int slot, // if (slot && mSlots[slot].spriteId == id) // return; + ItemColor colorId = ItemColor_one; + std::string color; + // id = 0 means unequip if (id == 0) { @@ -3061,11 +3062,9 @@ void Being::setHairStyle(const unsigned int slot, const int id) restrict2 { // dumpSprites(); - setSpriteCards(slot, + setSpriteColor(slot, id, - ItemDB::get(id).getDyeColorsString(mHairColor), - ItemColor_one, - mSlots[slot].cardsId); + ItemDB::get(id).getDyeColorsString(mHairColor)); // dumpSprites(); } @@ -3077,11 +3076,9 @@ void Being::setHairColor(const unsigned int slot, const int id = beingSlot.spriteId; if (id != 0) { - setSpriteCards(slot, + setSpriteColor(slot, id, - ItemDB::get(id).getDyeColorsString(color), - ItemColor_one, - beingSlot.cardsId); + ItemDB::get(id).getDyeColorsString(color)); } } diff --git a/src/being/being.h b/src/being/being.h index 62ad47ea9..af3f702c9 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -330,8 +330,6 @@ class Being notfinal : public ActorSprite, void setSpriteCards(const unsigned int slot, const int id, - std::string color, - ItemColor colorId, CardsList cards) restrict2; void setSpriteId(const unsigned int slot, |