summaryrefslogtreecommitdiff
path: root/src/text.h
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.h
parent840da9d6f64fea9275d0d1e916136fad29560c54 (diff)
downloadmana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.gz
mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.bz2
mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.tar.xz
mana-client-c5fe99dcfd22b7e4d455ab8961d5f6c6210872d7.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 6dcfd90a..550c00a5 100644
--- a/src/text.h
+++ b/src/text.h
@@ -40,7 +40,7 @@ class Text
*/
Text(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
- gcn::Color colour, bool isSpeech = false);
+ gcn::Color color, bool isSpeech = false);
/**
* Destructor. The text is removed from the screen.
@@ -65,7 +65,7 @@ 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. */
bool mIsSpeech; /**< Is this text a speech bubble? */
protected:
@@ -78,7 +78,7 @@ class FlashText : public Text
public:
FlashText(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
- gcn::Color colour);
+ gcn::Color color);
/**
* Remove the text from the screen