diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-05-10 12:32:05 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-05-10 12:32:05 -0600 |
| commit | 99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0 (patch) | |
| tree | 3dd50a449f0f12a6b33954cb98dc3d59de8ad85f /src | |
| parent | 4fbc74784120976729f8409872235224c36bdaf3 (diff) | |
| download | mana-99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0.tar.gz mana-99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0.tar.bz2 mana-99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0.tar.xz mana-99d1fe7eab7b9b8e970be7ce2ae11d0533526ad0.zip | |
Fix default party color
Also reset name color for speech bubbles back to where it was.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/palette.cpp | 2 | ||||
| -rw-r--r-- | src/player.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
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); } |