From 99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 10 May 2009 12:32:05 -0600 Subject: Fix default party color Also reset name color for speech bubbles back to where it was. --- src/gui/palette.cpp | 2 +- src/player.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index f46eeb92..4d1233e8 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -95,7 +95,7 @@ Palette::Palette() : addColor(PLAYER, 0x1fa052, STATIC, indent + _("Player"), 'Y'); addColor(WHISPER, 0x0000ff, STATIC, indent + _("Whisper"), 'W'); addColor(IS, 0xa08527, STATIC, indent + _("Is"), 'I'); - addColor(PARTY, 0xff00d8, STATIC, indent + _("Party"), 'P'); + addColor(PARTY, 0xf48055, STATIC, indent + _("Party"), 'P'); addColor(SERVER, 0x8415e2, STATIC, indent + _("Server"), 'S'); addColor(LOGGER, 0x919191, STATIC, indent + _("Logger"), 'L'); addColor(HYPERLINK, 0xe50d0d, STATIC, indent + _("Hyperlink"), '<'); diff --git a/src/player.cpp b/src/player.cpp index d6f1a43f..f658b8b5 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -69,19 +69,20 @@ void Player::setName(const std::string &name) &guiPalette->getColor(Palette::GM_NAME)); } else - { + { + mNameColor = &guiPalette->getColor(Palette::PLAYER); + const gcn::Color *color; if (this == player_node) { - color = mNameColor = &guiPalette->getColor(Palette::SELF); + color = &guiPalette->getColor(Palette::SELF); } else if (partyWindow->findMember(getId())) { - color = mNameColor = &guiPalette->getColor(Palette::PARTY); + color = &guiPalette->getColor(Palette::PARTY); } else { - mNameColor = &guiPalette->getColor(Palette::PLAYER); color = &guiPalette->getColor(Palette::PC); } -- cgit v1.2.3-70-g09d2