diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-21 15:46:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-21 15:46:14 +0300 |
| commit | 5c61d7b6e04a824b9a60f25e73abd938487b2fc4 (patch) | |
| tree | 73d9e751b32076a90f6277bda1eb8d6cc66d05a3 /src/being | |
| parent | fbadc806e050929f44b54fc2973a28d2fdfc516c (diff) | |
| download | ManaVerse-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.gz ManaVerse-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.bz2 ManaVerse-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.tar.xz ManaVerse-5c61d7b6e04a824b9a60f25e73abd938487b2fc4.zip | |
Remove colorId parameter from Being::updateSprite.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 13 | ||||
| -rw-r--r-- | src/being/being.h | 3 |
2 files changed, 6 insertions, 10 deletions
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, |