summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/particle
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadplus-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
plus-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
plus-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
plus-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp4
-rw-r--r--src/particle/particle.h13
-rw-r--r--src/particle/textparticle.cpp6
-rw-r--r--src/particle/textparticle.h4
4 files changed, 11 insertions, 16 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 83ec97521..c446fa177 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -414,7 +414,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile,
Particle *Particle::addTextSplashEffect(const std::string &text,
const int x, const int y,
- const gcn::Color *const color,
+ const Color *const color,
Font *const font,
const bool outline)
{
@@ -438,7 +438,7 @@ Particle *Particle::addTextSplashEffect(const std::string &text,
Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
const int x, const int y,
- const gcn::Color *const color,
+ const Color *const color,
Font *const font,
const bool outline)
{
diff --git a/src/particle/particle.h b/src/particle/particle.h
index f69770513..491232b17 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -30,16 +30,11 @@
#include <list>
#include <string>
+class Color;
+class Font;
class Particle;
class ParticleEmitter;
-namespace gcn
-{
- class Color;
-}
-
-class Font;
-
typedef std::list<Particle *> Particles;
typedef Particles::iterator ParticleIterator;
typedef Particles::const_iterator ParticleConstIterator;
@@ -136,7 +131,7 @@ class Particle : public Actor
*/
Particle *addTextSplashEffect(const std::string &text,
const int x, const int y,
- const gcn::Color *const color,
+ const Color *const color,
Font *const font,
const bool outline = false);
@@ -145,7 +140,7 @@ class Particle : public Actor
*/
Particle *addTextRiseFadeOutEffect(const std::string &text,
const int x, const int y,
- const gcn::Color *const color,
+ const Color *const color,
Font *const font,
const bool outline = false);
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);
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index 0d598508d..ec586c3a9 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -32,7 +32,7 @@ class TextParticle final : public Particle
* Constructor.
*/
TextParticle(const std::string &text,
- const gcn::Color *const color,
+ const Color *const color,
Font *const font, const bool outline = false);
A_DELETE_COPY(TextParticle)
@@ -54,7 +54,7 @@ class TextParticle final : public Particle
private:
std::string mText; /**< Text of the particle. */
Font *mTextFont; /**< Font used for drawing the text. */
- const gcn::Color *mColor; /**< Color used for drawing the text. */
+ const Color *mColor; /**< Color used for drawing the text. */
int mTextWidth;
bool mOutline; /**< Make the text better readable */
};