From 8c8e641b2ce47daa2f824a87b27d63bfeb609098 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 5 Sep 2015 17:31:32 +0300 Subject: Add inactive being badge. --- src/being/being.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/being/being.cpp') 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; -- cgit v1.2.3-70-g09d2