summaryrefslogtreecommitdiff
path: root/src/player.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-03-12 23:59:28 -0600
committerIra Rice <irarice@gmail.com>2009-03-12 23:59:28 -0600
commit9df0ea3ab0faeb3e9fce71dccb76624d7737798f (patch)
treec23c33199a4ee08fc10af2bc77e662295fec7119 /src/player.cpp
parent14fbd95172a6c41abc8e985680c684c40e9e50a8 (diff)
downloadmana-client-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.gz
mana-client-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.bz2
mana-client-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.xz
mana-client-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.zip
Fixed an incorrect palette reference, as well as a break that was
introduced from the palette code. TODO: Cancel is effectively broken, and broken badly in the Colors setup pane. Fix this. Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/player.cpp')
-rw-r--r--src/player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/player.cpp b/src/player.cpp
index b289c3e5..ba4ed1ff 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -57,7 +57,7 @@ void Player::setName(const std::string &name)
mNameColor = &guiPalette->getColor(Palette::GM);
mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy +
NAME_Y_OFFSET, gcn::Graphics::CENTER,
- &guiPalette->getColor(Palette::GM));
+ &guiPalette->getColor(Palette::GM_NAME));
}
else
{