From a86bdc28fb8bc8a70c6a19523789495d87c7a56d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 May 2015 18:55:26 +0300 Subject: Add strong type bool type ForceDisplay. --- src/being/being.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index a493d9a1a..472836140 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -336,7 +336,9 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) if (mInfo) { setName(mInfo->getName()); - setupSpriteDisplay(mInfo->getDisplay(), true, 0, + setupSpriteDisplay(mInfo->getDisplay(), + ForceDisplay_true, + 0, mInfo->getColor(mLook)); mYDiff = mInfo->getSortOffsetY(); } @@ -348,7 +350,9 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) if (mInfo) { setName(mInfo->getName()); - setupSpriteDisplay(mInfo->getDisplay(), true, 0, + setupSpriteDisplay(mInfo->getDisplay(), + ForceDisplay_true, + 0, mInfo->getColor(mLook)); mYDiff = mInfo->getSortOffsetY(); } @@ -359,7 +363,9 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) if (mInfo) { setName(mInfo->getName()); - setupSpriteDisplay(mInfo->getDisplay(), true, 0, + setupSpriteDisplay(mInfo->getDisplay(), + ForceDisplay_true, + 0, mInfo->getColor(mLook)); mYDiff = mInfo->getSortOffsetY(); } @@ -370,7 +376,9 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) if (mInfo) { setName(mInfo->getName()); - setupSpriteDisplay(mInfo->getDisplay(), true, 0, + setupSpriteDisplay(mInfo->getDisplay(), + ForceDisplay_true, + 0, mInfo->getColor(mLook)); mYDiff = mInfo->getSortOffsetY(); } @@ -381,7 +389,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) mInfo = NPCDB::get(mSubType); if (mInfo) { - setupSpriteDisplay(mInfo->getDisplay(), false); + setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false); mYDiff = mInfo->getSortOffsetY(); } } @@ -389,7 +397,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) { mInfo = AvatarDB::get(mSubType); if (mInfo) - setupSpriteDisplay(mInfo->getDisplay(), false); + setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false); } else if (mType == ActorType::LocalPet) { @@ -397,7 +405,7 @@ void Being::setSubtype(const uint16_t subtype, const uint16_t look) if (mInfo) { setName(mInfo->getName()); - setupSpriteDisplay(mInfo->getDisplay(), false); + setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false); mYDiff = mInfo->getSortOffsetY(); const int speed = mInfo->getWalkSpeed(); if (!speed) -- cgit v1.2.3-70-g09d2