diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-21 14:23:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-21 14:23:55 +0300 |
| commit | 2db418d196b1778c0160420201066af824f6eae1 (patch) | |
| tree | cf82e8b3e2bb3e15060eb18bcb9bf01d845f1e84 | |
| parent | 48cff567cb37f3ce18ee32e75bb7570db72368e0 (diff) | |
| download | manaplus-2db418d196b1778c0160420201066af824f6eae1.tar.gz manaplus-2db418d196b1778c0160420201066af824f6eae1.tar.bz2 manaplus-2db418d196b1778c0160420201066af824f6eae1.tar.xz manaplus-2db418d196b1778c0160420201066af824f6eae1.zip | |
In Being rename setSpriteID into setHairColorSpriteID.
| -rw-r--r-- | src/being/being.cpp | 4 | ||||
| -rw-r--r-- | src/being/being.h | 4 | ||||
| -rw-r--r-- | src/net/eathena/beingrecv.cpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 889129cff..84716dd8f 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2767,8 +2767,8 @@ void Being::setTempSprite(const unsigned int slot, } } -void Being::setSpriteID(const unsigned int slot, - const int id) restrict2 +void Being::setHairColorSpriteID(const unsigned int slot, + const int id) restrict2 { BeingSlot &beingSlot = mSlots[slot]; setSprite(slot, diff --git a/src/being/being.h b/src/being/being.h index 127385d16..825e4ab84 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -339,8 +339,8 @@ class Being notfinal : public ActorSprite, const ItemColor colorId = ItemColor_one) restrict2; - void setSpriteID(const unsigned int slot, - const int id) restrict2; + void setHairColorSpriteID(const unsigned int slot, + const int id) restrict2; void setSpriteColor(const unsigned int slot, const std::string &restrict color = "") restrict2; diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index b91737249..2a06e899b 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -155,7 +155,8 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg, break; case 1: // eAthena LOOK_HAIR dstBeing->setHairColor(fromInt(id, ItemColor)); - dstBeing->setSpriteID(SPRITE_HAIR_COLOR, id * -1); + dstBeing->setHairColorSpriteID(SPRITE_HAIR_COLOR, + id * -1); break; case 2: // LOOK_WEAPON Weapon ID in id, Shield ID in id2 dstBeing->setSpriteCards(SPRITE_BODY, |