summaryrefslogtreecommitdiff
path: root/src/particle/particle.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/particle/particle.h
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadplus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
plus-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/particle/particle.h')
-rw-r--r--src/particle/particle.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/particle/particle.h b/src/particle/particle.h
index f75803772..f69770513 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -36,9 +36,10 @@ class ParticleEmitter;
namespace gcn
{
class Color;
- class Font;
}
+class Font;
+
typedef std::list<Particle *> Particles;
typedef Particles::iterator ParticleIterator;
typedef Particles::const_iterator ParticleConstIterator;
@@ -136,7 +137,7 @@ class Particle : public Actor
Particle *addTextSplashEffect(const std::string &text,
const int x, const int y,
const gcn::Color *const color,
- gcn::Font *const font,
+ Font *const font,
const bool outline = false);
/**
@@ -145,7 +146,7 @@ class Particle : public Actor
Particle *addTextRiseFadeOutEffect(const std::string &text,
const int x, const int y,
const gcn::Color *const color,
- gcn::Font *const font,
+ Font *const font,
const bool outline = false);
/**