diff options
| author | Ira Rice <irarice@gmail.com> | 2009-03-12 23:59:28 -0600 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-12 23:59:28 -0600 |
| commit | 9df0ea3ab0faeb3e9fce71dccb76624d7737798f (patch) | |
| tree | c23c33199a4ee08fc10af2bc77e662295fec7119 | |
| parent | 14fbd95172a6c41abc8e985680c684c40e9e50a8 (diff) | |
| download | mana-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.gz mana-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.bz2 mana-9df0ea3ab0faeb3e9fce71dccb76624d7737798f.tar.xz mana-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>
| -rw-r--r-- | src/gui/speechbubble.cpp | 5 | ||||
| -rw-r--r-- | src/player.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index cb1724c8..944bae42 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -25,10 +25,13 @@ #include <guichan/widgets/label.hpp> #include "gui.h" +#include "palette.h" #include "scrollarea.h" #include "speechbubble.h" #include "textbox.h" +#include "../graphics.h" + #include "../utils/gettext.h" SpeechBubble::SpeechBubble(): @@ -74,6 +77,8 @@ void SpeechBubble::setText(std::string text, bool showName) if ((text == mText) && (mCaption->getWidth() <= mSpeechBox->getMinWidth())) return; + graphics->setColor(guiPalette->getColor(Palette::TEXT)); + int width = mCaption->getWidth(); mSpeechBox->setTextWrapped(text, 130 > width ? 130 : width); 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 { |