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.cpp | |
| parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text.cpp b/src/text.cpp index 5d88bd69..c4559879 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -39,7 +39,7 @@ Text::Text(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, gcn::Color color, bool isSpeech) : mText(text), - mcolor(color), + mColor(color), mIsSpeech(isSpeech) { if (textManager == 0) @@ -161,7 +161,7 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff) gcn::Graphics::LEFT); } - graphics->setColor(mcolor); + graphics->setColor(mColor); graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT); } |