summaryrefslogtreecommitdiff
path: root/src/player.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-05-12 10:41:31 -0600
committerJared Adams <jaxad0127@gmail.com>2009-05-12 10:41:31 -0600
commita2aa7c577b6d69b8185111a8ea8781957ce45b38 (patch)
tree5cd34f507fd16a9c66f7e83fffea3e94a49acaac /src/player.cpp
parentfd47b191acef2230183cee1ab54901c777291e46 (diff)
downloadmana-a2aa7c577b6d69b8185111a8ea8781957ce45b38.tar.gz
mana-a2aa7c577b6d69b8185111a8ea8781957ce45b38.tar.bz2
mana-a2aa7c577b6d69b8185111a8ea8781957ce45b38.tar.xz
mana-a2aa7c577b6d69b8185111a8ea8781957ce45b38.zip
Handle in party status in a much saner way
Diffstat (limited to 'src/player.cpp')
-rw-r--r--src/player.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/player.cpp b/src/player.cpp
index f658b8b5..e797fdfe 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -31,7 +31,6 @@
#include "text.h"
#include "gui/palette.h"
-#include "gui/partywindow.h"
#include "resources/colordb.h"
#include "resources/itemdb.h"
@@ -77,7 +76,7 @@ void Player::setName(const std::string &name)
{
color = &guiPalette->getColor(Palette::SELF);
}
- else if (partyWindow->findMember(getId()))
+ else if (mInParty)
{
color = &guiPalette->getColor(Palette::PARTY);
}
@@ -304,6 +303,9 @@ short Player::getNumberOfGuilds()
void Player::setInParty(bool value)
{
mInParty = value;
+
+ if (this != player_node && mName)
+ mName->setColor(&guiPalette->getColor(value ? Palette::PARTY : Palette::PC));
}
void Player::optionChanged(const std::string &value)