diff options
| -rw-r--r-- | data/graphics/gui/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/blacknblack/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/blackwood/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/enchilado/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/mana/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/pink/colors.xml | 2 | ||||
| -rw-r--r-- | data/themes/wood/colors.xml | 2 | ||||
| -rw-r--r-- | src/gui/whoisonline.cpp | 12 |
8 files changed, 17 insertions, 9 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index a4798c760..62b6ad3ca 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00c000" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER" color="#0000ff" /> <color id="WHISPER_OFFLINE" color="#000050" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index cda7bdfe4..27face716 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#ff00f1" /> <color id="ITEM_NOT_EQUIPPED" color="#ffffff" /> <color id="CHAT" color="#ffffff" /> - <color id="GM" color="#ffff00" /> + <color id="GM" color="#00ff00" /> <color id="PLAYER" color="#ffffff" /> <color id="WHISPER" color="#55ffff" /> <color id="WHISPER_OFFLINE" color="#ff5044" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index f21ae45b9..c5c15cdca 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#744c04" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00ff00" /> <color id="PLAYER" color="#00ff00" /> <color id="WHISPER" color="#0000ff" /> <color id="WHISPER_OFFLINE" color="#0000e0" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index bf3fd8f3e..772c8cb44 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00ff00" /> <color id="PLAYER" color="#009000" /> <color id="WHISPER" color="#0000ff" /> <color id="WHISPER_OFFLINE" color="#000050" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 79821eff2..b38315a29 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00ff00" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER" color="#0000ff" /> <color id="WHISPER_OFFLINE" color="#000050" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 478779f6e..8b65b349c 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#FF00FF" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00ff00" /> <color id="PLAYER" color="#009000" /> <color id="WHISPER" color="#0000ff" /> <color id="WHISPER_OFFLINE" color="#000050" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 4b3d14111..9857cf6b9 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -22,7 +22,7 @@ <color id="ITEM_EQUIPPED" color="#000091" /> <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> - <color id="GM" color="#ff0000" /> + <color id="GM" color="#00c000" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER" color="#00feaf" /> <color id="WHISPER_OFFLINE" color="#000a40" /> diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 503ce3758..ec4691fca 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -375,9 +375,13 @@ void WhoIsOnline::loadWebList() } trim(nick); + bool isGM(false); pos = lineStr.find(gmText, 0); if (pos != std::string::npos) + { lineStr = lineStr.substr(pos + gmText.length()); + isGM = true; + } trim(lineStr); pos = lineStr.find("/", 0); @@ -421,7 +425,10 @@ void WhoIsOnline::loadWebList() { case PlayerRelation::NEUTRAL: default: - player->setText("0"); + if (isGM) + player->setText("G"); + else + player->setText("0"); neutral.push_back(player); break; @@ -769,8 +776,9 @@ void OnlinePlayer::setText(std::string color) // TRANSLATORS: this inactive status writed in player nick mText += _("I"); } + if (mStatus & Being::FLAG_GM && color == "0") - color = "2"; + color = "G"; } if (mVersion > 0) |