diff options
author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
---|---|---|
committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
commit | f262dbd28f08001d70416e3cc4e62273d3fee2cd (patch) | |
tree | 539cbc8b27edf696120df0ac26531640c323692f /src/text.h | |
parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
download | mana-client-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-client-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-client-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-client-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/text.h')
-rw-r--r-- | src/text.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 mcolor; /**< The color of the text. */ + gcn::Color mColor; /**< The color of the text. */ bool mIsSpeech; /**< Is this text a speech bubble? */ protected: |