Add inactive being badge.

7 files changed, 41 insertions, 1 deletions

diff --git a/data/graphics/badges/CMakeLists.txt b/data/graphics/badges/CMakeLists.txt
index 22110ba93..52334e660 100644
--- a/data/graphics/badges/CMakeLists.txt
+++ b/data/graphics/badges/CMakeLists.txt
@@ -1,6 +1,8 @@
 SET(FILES
     gm.png
     gm.xml
+    inactive.png
+    inactive.xml
     shop.png
     shop.xml
     team1.png
diff --git a/data/graphics/badges/Makefile.am b/data/graphics/badges/Makefile.am
index 4e8b57e04..3a05e7a7f 100644
--- a/data/graphics/badges/Makefile.am
+++ b/data/graphics/badges/Makefile.am
@@ -3,6 +3,8 @@ badgesdir = $(pkgdatadir)/data/graphics/badges
 badges_DATA =				\
 	gm.png		\
 	gm.xml		\
+	inactive.png		\
+	inactive.xml		\
 	shop.png		\
 	shop.xml		\
 	team1.png		\
diff --git a/data/graphics/badges/inactive.png b/data/graphics/badges/inactive.png
new file mode 100644
index 000000000..3f8b333c6
--- /dev/null
+++ b/data/graphics/badges/inactive.png
diff --git a/data/graphics/badges/inactive.xml b/data/graphics/badges/inactive.xml
new file mode 100644
index 000000000..e2a730989
--- /dev/null
+++ b/data/graphics/badges/inactive.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: 4144
+Copyright (C) 2015 ManaPlus developers -->
+<sprite>
+    <imageset name="icon"
+              src="graphics/badges/inactive.png"
+              width="16"
+              height="16"
+              offsetY="0"/>
+    <action name="default" imageset="icon">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 1980436d5..63be12ebe 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2107,7 +2107,7 @@ std::string Being::getGenderSign() const
             // TRANSLATORS: this away status writed in player nick
             str.append(_("A"));
         }
-        else if (mInactive)
+        else if (mInactive && !mShowBadges)
         {
             // TRANSLATORS: this inactive status writed in player nick
             str.append(_("I"));
@@ -2518,6 +2518,7 @@ bool Being::updateFromCache()
         }
 
         showShopBadge(mShop);
+        showInactiveBadge(mInactive);
         updateAwayEffect();
         if (mType == ActorType::Player || mTeamId)
             updateColors();
@@ -3370,6 +3371,7 @@ void Being::setState(const uint8_t state)
     mInactive = inactive;
     updateAwayEffect();
     showShopBadge(mShop);
+    showInactiveBadge(mInactive);
 
     if (needUpdate)
     {
@@ -3883,6 +3885,7 @@ void Being::showBadges(const bool show)
     showPartyBadge(show);
     showNameBadge(show);
     showShopBadge(show);
+    showInactiveBadge(show);
 }
 
 void Being::showPartyBadge(const bool show)
@@ -3925,6 +3928,21 @@ void Being::showShopBadge(const bool show)
     updateBadgesCount();
 }
 
+void Being::showInactiveBadge(const bool show)
+{
+    delete2(mBadges[BadgeIndex::Inactive]);
+    if (show && mShop && mShowBadges)
+    {
+        const std::string badge = paths.getStringValue("inactivebadge");
+        if (!badge.empty())
+        {
+            mBadges[BadgeIndex::Inactive] = AnimatedSprite::load(
+                paths.getStringValue("badges") + badge);
+        }
+    }
+    updateBadgesCount();
+}
+
 void Being::updateBadgesCount()
 {
     mBadgesCount = 0;
diff --git a/src/being/being.h b/src/being/being.h
index 656eb21fb..47a904479 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -944,6 +944,8 @@ class Being notfinal : public ActorSprite,
 
         void showShopBadge(const bool show);
 
+        void showInactiveBadge(const bool show);
+
         void showBadges(const bool show);
 
         uint16_t getTeamId() const
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 2d3b24410..83c53c129 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -608,6 +608,7 @@ DefaultsData* getPathsDefaults()
     AddDEF("team3badge", "team3.xml");
     AddDEF("gmbadge", "gm.xml");
     AddDEF("shopbadge", "shop.xml");
+    AddDEF("inactivebadge", "inactive.xml");
 
     return configData;
 }