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/particle/textparticle.cpp | |
parent | 9c12fcdfe590f34543fcecc2691b625c408f1746 (diff) | |
download | manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2 manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.zip |
Move color into gui dir.
Diffstat (limited to 'src/particle/textparticle.cpp')
-rw-r--r-- | src/particle/textparticle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp index 1ac6ac6c2..41ea683f6 100644 --- a/src/particle/textparticle.cpp +++ b/src/particle/textparticle.cpp @@ -26,13 +26,13 @@ #include "gui/theme.h" -#include "gui/base/color.hpp" +#include "gui/color.h" #include "gui/font.h" #include "debug.h" TextParticle::TextParticle(const std::string &text, - const gcn::Color *const color, + const Color *const color, Font *const font, const bool outline) : Particle(), mText(text), @@ -74,7 +74,7 @@ void TextParticle::draw(Graphics *const graphics, / static_cast<float>(mFadeIn); } - gcn::Color color = *mColor; + Color color = *mColor; color.a = static_cast<int>(alpha); graphics->setColor(color); |