diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2007-05-23 22:11:54 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2007-05-23 22:11:54 +0000 |
| commit | 0e7df1f731f9afe24c6ba7458211f4c81e4717b3 (patch) | |
| tree | b7ef48b879a90c8d10f9447fe910c6fb62784461 /src/particle.cpp | |
| parent | 993c98c3813b2ad7caf3dcd9761b4c9a17de39b6 (diff) | |
| download | mana-0e7df1f731f9afe24c6ba7458211f4c81e4717b3.tar.gz mana-0e7df1f731f9afe24c6ba7458211f4c81e4717b3.tar.bz2 mana-0e7df1f731f9afe24c6ba7458211f4c81e4717b3.tar.xz mana-0e7df1f731f9afe24c6ba7458211f4c81e4717b3.zip | |
Changed argument order in text particle creation.
Diffstat (limited to 'src/particle.cpp')
| -rw-r--r-- | src/particle.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/particle.cpp b/src/particle.cpp index b35522ce..88e8c2b3 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -313,15 +313,13 @@ Particle::addEffect (std::string particleEffectFile, int pixelX, int pixelY) Particle*
-Particle::addTextSplashEffect(std::string text, gcn::Font *font,
- int colorR, int colorG, int colorB, int x, int y)
+Particle::addTextSplashEffect(std::string text,
+ int colorR, int colorG, int colorB,
+ gcn::Font *font, int x, int y)
{
- Particle *newParticle = new TextParticle(mMap, text, font,
- colorR, colorG, colorB);
- newParticle->setPosition( x,
- y,
- 0
- );
+ Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
+ font);
+ newParticle->setPosition(x, y, 0);
newParticle->setVector ( ((rand()%100) - 50) / 200.0f, //X Vector
((rand()%100) - 50) / 200.0f, //Y Vector
((rand()%100) / 200.0f) + 4.0f //Z Vector
|