summaryrefslogtreecommitdiff
path: root/src/text.cpp
diff options
context:
space:
mode:
authorMajin Sniper <majinsniper@gmx.de>2009-03-12 22:42:42 +0100
committerIra Rice <irarice@gmail.com>2009-03-12 21:53:00 -0600
commitf0d5e3da15a308fcc962590330e7d8e39e8874b9 (patch)
treea0e7f61b1f6a2f2aee20549c9ac55a123ba3ccba /src/text.cpp
parent5207b4cbb462cfa962a6f566897a6affd92eef94 (diff)
downloadmana-f0d5e3da15a308fcc962590330e7d8e39e8874b9.tar.gz
mana-f0d5e3da15a308fcc962590330e7d8e39e8874b9.tar.bz2
mana-f0d5e3da15a308fcc962590330e7d8e39e8874b9.tar.xz
mana-f0d5e3da15a308fcc962590330e7d8e39e8874b9.zip
Make use of the new available colors
This patch lets all being derivatives use the palette to set their name's colors. Text Particle Effects all respect the new settings. Some widgets were updated to use the colors.
Diffstat (limited to 'src/text.cpp')
-rw-r--r--src/text.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/text.cpp b/src/text.cpp
index 2d96152b..420eeb8b 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -32,8 +32,9 @@
int Text::mInstances = 0;
Text::Text(const std::string &text, int x, int y,
- gcn::Graphics::Alignment alignment, gcn::Color color) :
- mText(text), mColor(color)
+ gcn::Graphics::Alignment alignment, const gcn::Color* color) :
+ mText(text),
+ mColor(color)
{
if (textManager == 0)
{
@@ -80,11 +81,12 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
TextRenderer::renderText(graphics, mText,
mX - xOff, mY - yOff, gcn::Graphics::LEFT,
- &mColor, boldFont, true, true);
+ mColor, boldFont, true);
}
FlashText::FlashText(const std::string &text, int x, int y,
- gcn::Graphics::Alignment alignment, gcn::Color color) :
+ gcn::Graphics::Alignment alignment,
+ const gcn::Color *color) :
Text(text, x, y, alignment, color),
mTime(0)
{