summaryrefslogtreecommitdiff
path: root/src/particle/particle.cpp
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.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/particle/particle.cpp')
-rw-r--r--src/particle/particle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index a9cc9993f..83ec97521 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -415,7 +415,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,
- gcn::Font *const font,
+ Font *const font,
const bool outline)
{
Particle *const newParticle = new TextParticle(text, color, font, outline);
@@ -439,7 +439,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,
- gcn::Font *const font,
+ Font *const font,
const bool outline)
{
Particle *const newParticle = new TextParticle(text, color, font, outline);