diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
| commit | 48646db55005a0da079bd2c945875dc8225e2f86 (patch) | |
| tree | 4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/text.cpp | |
| parent | 9c12fcdfe590f34543fcecc2691b625c408f1746 (diff) | |
| download | manaplus-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz manaplus-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2 manaplus-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz manaplus-48646db55005a0da079bd2c945875dc8225e2f86.zip | |
Move color into gui dir.
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text.cpp b/src/text.cpp index dfc127598..27d794d33 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -39,7 +39,7 @@ ImageRect Text::mBubble; Text::Text(const std::string &text, const int x, const int y, const Graphics::Alignment alignment, - const gcn::Color *const color, const bool isSpeech, + const Color *const color, const bool isSpeech, Font *const font) : mFont(font ? font : (gui ? gui->getFont() : nullptr)), mX(x), @@ -112,7 +112,7 @@ Text::~Text() } } -void Text::setColor(const gcn::Color *const color) +void Text::setColor(const Color *const color) { mColor = color; } @@ -152,7 +152,7 @@ void Text::draw(Graphics *const graphics, const int xOff, const int yOff) FlashText::FlashText(const std::string &text, const int x, const int y, const Graphics::Alignment alignment, - const gcn::Color *const color, Font *const font) : + const Color *const color, Font *const font) : Text(text, x, y, alignment, color, false, font), mTime(0) { |