From cdd3c77337a6bbff0d51d174663867463db8cf15 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 24 Nov 2018 16:22:23 -0500 Subject: Show short group name when available instead of (GM) --- src/gui/windows/whoisonline.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 37dbf2a89..bc16397ed 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -55,6 +55,8 @@ #include "net/playerhandler.h" #include "net/serverfeatures.h" +#include "resources/db/groupdb.h" + #include "utils/foreach.h" #include "utils/gettext.h" #include "utils/sdlhelper.h" @@ -471,7 +473,7 @@ void WhoIsOnline::loadWebList() OnlinePlayer *const player = new OnlinePlayer(nick, CAST_U8(255), level, - Gender::UNSPECIFIED, -1); + Gender::UNSPECIFIED, -1, 0); mOnlinePlayers.insert(player); mOnlineNicks.insert(nick); @@ -870,8 +872,15 @@ void OnlinePlayer::setText(std::string color) } } - if ((mStatus != 255 && ((mStatus & BeingFlag::GM) != 0)) || mIsGM) + if (GroupDb::getShowBadge(mGroup)) + { + const std::string name = GroupDb::getName(mGroup); + mText.append(strprintf("(%s) ", name.c_str())); + } + else if ((mStatus != 255 && ((mStatus & BeingFlag::GM) != 0)) || mIsGM) + { mText.append("(GM) "); + } if (mLevel > 0) mText.append(strprintf("%d", mLevel)); @@ -881,6 +890,9 @@ void OnlinePlayer::setText(std::string color) else if (mGender == Gender::MALE) mText.append("\u2642"); + if (GroupDb::getHighlightName(mGroup) && color == "0") + color = "2"; + if (mStatus > 0 && mStatus != 255) { if ((mStatus & BeingFlag::SHOP) != 0) -- cgit v1.2.3-60-g2f50