summaryrefslogtreecommitdiff
path: root/src/text.h
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-02-10 16:56:05 +0100
committerIra Rice <irarice@gmail.com>2009-02-11 08:29:51 -0700
commit4a41ce55224ad7b54c6b5ea78126d8d314f5ef41 (patch)
tree2d2172cb0c0985c7711206dc5adda6bfa219245e /src/text.h
parentd036e2c771bcd19a21e26aec155d4269cecdb1c2 (diff)
downloadmana-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.gz
mana-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.bz2
mana-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.tar.xz
mana-4a41ce55224ad7b54c6b5ea78126d8d314f5ef41.zip
Changed spelling from colour to color.
Diffstat (limited to 'src/text.h')
-rw-r--r--src/text.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text.h b/src/text.h
index d62a125d..0b53dd48 100644
--- a/src/text.h
+++ b/src/text.h
@@ -39,7 +39,7 @@ class Text
* Constructor creates a text object to display on the screen.
*/
Text(const std::string &text, int x, int y,
- gcn::Graphics::Alignment alignment, gcn::Color colour);
+ gcn::Graphics::Alignment alignment, gcn::Color color);
/**
* Destructor. The text is removed from the screen.
@@ -64,14 +64,14 @@ class Text
int mXOffset; /**< The offset of mX from the desired x. */
static int mInstances; /**< Instances of text. */
std::string mText; /**< The text to display. */
- gcn::Color mColour; /**< The colour of the text. */
+ gcn::Color mColor; /**< The color of the text. */
};
class FlashText : public Text
{
public:
FlashText(const std::string &text, int x, int y,
- gcn::Graphics::Alignment alignment, gcn::Color colour);
+ gcn::Graphics::Alignment alignment, gcn::Color color);
/**
* Remove the text from the screen