summaryrefslogtreecommitdiff
path: root/src/text.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-02-10 16:56:05 +0100
committerPhilipp Sehmisch <crush@themanaworld.org>2009-02-10 16:56:05 +0100
commitc5fe99dcfd22b7e4d455ab8961d5f6c6210872d7 (patch)
tree87dbf38995dd4e66da83e30cef6085c9bceba05d /src/text.cpp
parent840da9d6f64fea9275d0d1e916136fad29560c54 (diff)
downloadmana-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.gz
mana-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.bz2
mana-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.xz
mana-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.zip
Changed spelling from colour to color.
Diffstat (limited to 'src/text.cpp')
-rw-r--r--src/text.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/text.cpp b/src/text.cpp
index e4f1d409..5d88bd69 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -37,9 +37,9 @@ Image *Text::mBubbleArrow;
Text::Text(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
- gcn::Color colour, bool isSpeech) :
+ gcn::Color color, bool isSpeech) :
mText(text),
- mColour(colour),
+ mcolor(color),
mIsSpeech(isSpeech)
{
if (textManager == 0)
@@ -47,7 +47,7 @@ Text::Text(const std::string &text, int x, int y,
textManager = new TextManager;
ResourceManager *resman = ResourceManager::getInstance();
Image *sbImage = resman->getImage("graphics/gui/bubble.png|W:#"
- + config.getValue("speechBubbleColour", "000000"));
+ + config.getValue("speechBubblecolor", "000000"));
mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5);
mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5);
mBubble.grid[2] = sbImage->getSubImage(10, 0, 5, 5);
@@ -161,15 +161,15 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
gcn::Graphics::LEFT);
}
- graphics->setColor(mColour);
+ graphics->setColor(mcolor);
graphics->drawText(mText, mX - xOff, mY - yOff,
gcn::Graphics::LEFT);
}
FlashText::FlashText(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
- gcn::Color colour) :
- Text(text, x, y, alignment, colour),
+ gcn::Color color) :
+ Text(text, x, y, alignment, color),
mTime(0)
{
}