From a86bdc28fb8bc8a70c6a19523789495d87c7a56d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 6 May 2015 18:55:26 +0300
Subject: Add strong type bool type ForceDisplay.

---
 src/being/actorsprite.cpp |  4 ++--
 src/being/actorsprite.h   |  3 ++-
 src/being/being.cpp       | 22 +++++++++++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'src/being')

diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index b305b35a7..0def1ea5b 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -249,7 +249,7 @@ void ActorSprite::handleStatusEffect(const StatusEffect *const effect,
 }
 
 void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
-                                     const bool forceDisplay,
+                                     const ForceDisplay forceDisplay,
                                      const int imageType,
                                      const std::string &color)
 {
@@ -267,7 +267,7 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
     }
 
     // Ensure that something is shown, if desired
-    if (empty() && forceDisplay)
+    if (empty() && forceDisplay == ForceDisplay_true)
     {
         if (display.image.empty())
         {
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index f5d4f0214..24051ea2c 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -200,7 +200,8 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
                                         const int effectId);
 
         void setupSpriteDisplay(const SpriteDisplay &display,
-                                const bool forceDisplay = true,
+                                const ForceDisplay forceDisplay
+                                = ForceDisplay_true,
                                 const int imageType = 0,
                                 const std::string &color = "");
 
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