summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/speechbubble.cpp5
-rw-r--r--src/player.cpp2
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
{