diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:38:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 17:38:06 +0300 |
commit | ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7 (patch) | |
tree | 729fbb5786bdf41ae8004e1850248ca2e890974c /src/being | |
parent | 8cdbcd738db5477a72b8c7b11c4b0f160f5ac2b6 (diff) | |
download | mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.gz mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.bz2 mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.tar.xz mv-ca23f86b2b1ae730d0511bb1613e5f4b7211c8d7.zip |
Remove default value from parameter isWeapon in Being->setSprite.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.cpp | 30 | ||||
-rw-r--r-- | src/being/being.h | 2 |
2 files changed, 23 insertions, 9 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 69550b6d3..04b2463b4 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -499,7 +499,8 @@ void Being::setSubtype(const BeingTypeId subtype, setSprite(charServerHandler->baseSprite(), id, std::string(), - ItemColor_one); + ItemColor_one, + IsWeapon_false); } } else @@ -511,7 +512,8 @@ void Being::setSubtype(const BeingTypeId subtype, setSprite(charServerHandler->baseSprite(), id, info.getColor(fromInt(mLook, ItemColor)), - ItemColor_one); + ItemColor_one, + IsWeapon_false); } } } @@ -2610,13 +2612,21 @@ void Being::setSprite(const unsigned int slot, void Being::setSpriteID(const unsigned int slot, const int id) restrict2 { - setSprite(slot, id, mSpriteColors[slot], ItemColor_one); + setSprite(slot, + id, + mSpriteColors[slot], + ItemColor_one, + IsWeapon_false); } void Being::setSpriteColor(const unsigned int slot, const std::string &restrict color) restrict2 { - setSprite(slot, mSpriteIDs[slot], color, ItemColor_one); + setSprite(slot, + mSpriteIDs[slot], + color, + ItemColor_one, + IsWeapon_false); } void Being::setHairStyle(const unsigned int slot, @@ -2626,7 +2636,8 @@ void Being::setHairStyle(const unsigned int slot, setSprite(slot, id, ItemDB::get(id).getDyeColorsString(mHairColor), - ItemColor_one); + ItemColor_one, + IsWeapon_false); // dumpSprites(); } @@ -2640,7 +2651,8 @@ void Being::setHairColor(const unsigned int slot, setSprite(slot, mSpriteIDs[slot], ItemDB::get(id).getDyeColorsString(color), - ItemColor_one); + ItemColor_one, + IsWeapon_false); } } @@ -2828,7 +2840,8 @@ void Being::setGender(const GenderT gender) restrict2 setSprite(i, mSpriteIDs[i], mSpriteColors[i], - ItemColor_one); + ItemColor_one, + IsWeapon_false); } } @@ -3681,7 +3694,8 @@ void Being::undressItemById(const int id) restrict2 setSprite(CAST_U32(f), 0, std::string(), - ItemColor_one); + ItemColor_one, + IsWeapon_false); break; } } diff --git a/src/being/being.h b/src/being/being.h index 80752bfd2..6d6929bca 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -323,7 +323,7 @@ class Being notfinal : public ActorSprite, const int id, std::string color, ItemColor colorId, - const IsWeapon isWeapon = IsWeapon_false, + const IsWeapon isWeapon, const IsTempSprite isTempSprite = IsTempSprite_false, const int *const cards = nullptr) restrict2; |