diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-08 15:09:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-08 15:09:19 +0300 |
| commit | 83b27b146211fe301f751a6aed27e22271190795 (patch) | |
| tree | 0da6e720a250661030a0221ef444c8884a1dbe13 /src/being | |
| parent | c9a31afec60a5085e0a3dbd26c15db397730a768 (diff) | |
| download | ManaVerse-83b27b146211fe301f751a6aed27e22271190795.tar.gz ManaVerse-83b27b146211fe301f751a6aed27e22271190795.tar.bz2 ManaVerse-83b27b146211fe301f751a6aed27e22271190795.tar.xz ManaVerse-83b27b146211fe301f751a6aed27e22271190795.zip | |
Add strong typed bool IsTempSprite.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 28 | ||||
| -rw-r--r-- | src/being/being.h | 7 |
2 files changed, 21 insertions, 14 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 1a6e14fc4..3e57c969c 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -503,7 +503,8 @@ void Being::setSubtype(const BeingTypeId subtype, if (charServerHandler) { setSprite(charServerHandler->baseSprite(), - id, info.getColor(fromInt(mLook, ItemColor))); + id, + info.getColor(fromInt(mLook, ItemColor))); } } } @@ -2469,7 +2470,7 @@ void Being::updateSprite(const unsigned int slot, const std::string &restrict color, const ItemColor colorId, const IsWeapon isWeapon, - const bool isTempSprite) restrict2 + const IsTempSprite isTempSprite) restrict2 { if (!charServerHandler || slot >= charServerHandler->maxSprite()) return; @@ -2487,7 +2488,7 @@ void Being::setSprite(const unsigned int slot, std::string color, const ItemColor colorId, const IsWeapon isWeapon, - const bool isTempSprite) restrict2 + const IsTempSprite isTempSprite) restrict2 { if (!charServerHandler || slot >= charServerHandler->maxSprite()) return; @@ -2520,7 +2521,9 @@ void Being::setSprite(const unsigned int slot, if (id1) { const ItemInfo &info = ItemDB::get(id1); - if (!isTempSprite && mMap && mType == ActorType::Player) + if (isTempSprite == IsTempSprite_false && + mMap && + mType == ActorType::Player) { const BeingId pet = fromInt(info.getPet(), BeingId); if (pet != BeingId_zero) @@ -2538,7 +2541,8 @@ void Being::setSprite(const unsigned int slot, int startTime = 0; AnimatedSprite *restrict equipmentSprite = nullptr; - if (!isTempSprite && mType == ActorType::Player) + if (isTempSprite == IsTempSprite_false && + mType == ActorType::Player) { const BeingId pet = fromInt(info.getPet(), BeingId); if (pet != BeingId_zero) @@ -2581,7 +2585,7 @@ void Being::setSprite(const unsigned int slot, } } - if (!isTempSprite) + if (isTempSprite == IsTempSprite_false) { mSpriteIDs[slot] = id; mSpriteColors[slot] = color; @@ -3377,7 +3381,7 @@ void Being::recalcSpritesOrder() restrict2 mSpriteColors[remSprite], ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } else { @@ -3386,7 +3390,7 @@ void Being::recalcSpritesOrder() restrict2 .getDyeColorsString(mHairColor), ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } updatedSprite[remSprite] = true; } @@ -3410,7 +3414,7 @@ void Being::recalcSpritesOrder() restrict2 mSpriteColors[slot2], ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } else { @@ -3420,7 +3424,7 @@ void Being::recalcSpritesOrder() restrict2 mHairColor), ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } updatedSprite[slot2] = true; } @@ -3567,7 +3571,7 @@ void Being::recalcSpritesOrder() restrict2 mSpriteColors[slot], ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } } } @@ -3584,7 +3588,7 @@ void Being::recalcSpritesOrder() restrict2 mSpriteColors[slot], ItemColor_one, IsWeapon_false, - true); + IsTempSprite_true); } } } diff --git a/src/being/being.h b/src/being/being.h index ad31cd144..b71f38c0a 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -28,6 +28,7 @@ #include "enums/gui/usercolorid.h" +#include "enums/simpletypes/istempsprite.h" #include "enums/simpletypes/isweapon.h" #include "enums/simpletypes/move.h" @@ -323,14 +324,16 @@ class Being notfinal : public ActorSprite, std::string color = "", const ItemColor colorId = ItemColor_one, const IsWeapon isWeapon = IsWeapon_false, - const bool isTempSprite = false) restrict2; + const IsTempSprite isTempSprite = IsTempSprite_false) + restrict2; void updateSprite(const unsigned int slot, const int id, const std::string &restrict color = "", const ItemColor colorId = ItemColor_one, const IsWeapon isWeapon = IsWeapon_false, - const bool isTempSprite = false) restrict2; + const IsTempSprite isTempSprite = IsTempSprite_false) + restrict2; void setSpriteID(const unsigned int slot, const int id) restrict2; |