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/player.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/player.cpp') 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-60-g2f50