diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
| commit | 1231406e5c9ac43d60c6ffb0ae664970b0e4eee0 (patch) | |
| tree | 45af35e9a6ee56b71f06d76efa7706bf16eaec9a /src/particle.cpp | |
| parent | 04c189cf7e3e8a393c81bfb3e11058ceace8802a (diff) | |
| parent | 4bd8d3fd96fab681ee4520b6a6f2a6ee73f6eb97 (diff) | |
| download | mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.gz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.bz2 mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.xz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/particle.cpp')
| -rw-r--r-- | src/particle.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/particle.cpp b/src/particle.cpp index 6dc45a08..82c163c6 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -324,12 +324,10 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, return newParticle; } -Particle *Particle::addTextSplashEffect(const std::string &text, - int colorR, int colorG, int colorB, - gcn::Font *font, int x, int y, bool outline) +Particle *Particle::addTextSplashEffect(const std::string &text, int x, int y, + const gcn::Color *color, gcn::Font *font, bool outline) { - Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, - font, outline); + Particle *newParticle = new TextParticle(mMap, text, color, font, outline); newParticle->moveTo(x, y); newParticle->setVelocity(((rand() % 100) - 50) / 200.0f, // X ((rand() % 100) - 50) / 200.0f, // Y @@ -345,13 +343,8 @@ Particle *Particle::addTextSplashEffect(const std::string &text, } Particle *Particle::addTextRiseFadeOutEffect(const std::string &text, - gcn::Font *font, - int x, int y, - int colorR, int colorG, - int colorB, bool outline) -{ - Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, - font, outline); + int x, int y, const gcn::Color *color, gcn::Font *font, bool outline){ + Particle *newParticle = new TextParticle(mMap, text, color, font, outline); newParticle->moveTo(x, y); newParticle->setVelocity(0.0f, 0.0f, 0.5f); newParticle->setGravity(0.0015f); |