2 files changed, 10 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 6cc8bae4b..f0cc40bd9 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -118,8 +118,7 @@ bool Being::mEnableReorderSprites = true;
 bool Being::mHideErased = false;
 Move Being::mMoveNames = Move_false;
 bool Being::mUseDiagonal = true;
-bool Being::mShowBadges = true;
-bool Being::mShowBadgesTop = true;
+uint8_t Being::mShowBadges = 1;
 int Being::mAwayEffect = -1;
 
 std::list<BeingCacheEntry*> beingInfoCache;
@@ -1885,12 +1884,18 @@ void Being::drawEmotion(Graphics *const graphics,
     {
         int x;
         int y;
-        if (!mShowBadgesTop && mDispName && gui)
+        if (mShowBadges == 2 && mDispName && gui)
         {
             Font *const font = gui->getFont();
             x = mDispName->getX() - offsetX + mDispName->getWidth();
             y = mDispName->getY() - offsetY - font->getHeight();
         }
+        else if (mShowBadges == 3 && mDispName && gui)
+        {
+            Font *const font = gui->getFont();
+            x = px + 8 - mBadgesCount * 8;
+            y = mDispName->getY() - offsetY;
+        }
         else
         {
             x = px + 8 - mBadgesCount * 8;
@@ -2424,8 +2429,7 @@ void Being::reReadConfig()
         mHideErased = config.getBoolValue("hideErased");
         mMoveNames = fromBool(config.getBoolValue("moveNames"), Move);
         mUseDiagonal = config.getBoolValue("useDiagonalSpeed");
-        mShowBadges = config.getBoolValue("showBadges");
-        mShowBadgesTop = config.getBoolValue("showBadgesTop");
+        mShowBadges = config.getIntValue("showBadges");
 
         mUpdateConfigTime = cur_time;
     }
diff --git a/src/being/being.h b/src/being/being.h
index 5d4c5d0ec..1f01001c3 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -1106,8 +1106,7 @@ class Being notfinal : public ActorSprite,
         static bool mHideErased;
         static Move mMoveNames;
         static bool mUseDiagonal;
-        static bool mShowBadges;
-        static bool mShowBadgesTop;
+        static uint8_t mShowBadges;
         static int mAwayEffect;
 
         unsigned int mMoveTime;