diff options
author | Majin Sniper <majinsniper@gmx.de> | 2009-02-20 00:19:52 +0100 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-19 18:27:45 -0700 |
commit | 1713f33dbd71b6378c8a4e58452fb16147f320d7 (patch) | |
tree | 19edc1a3291b06bf1680394bb1a68986ddca6f0c /src/particle.cpp | |
parent | fcc8e48e96f017e4d7551ce7e686dd2e2a1bbcb9 (diff) | |
download | mana-1713f33dbd71b6378c8a4e58452fb16147f320d7.tar.gz mana-1713f33dbd71b6378c8a4e58452fb16147f320d7.tar.bz2 mana-1713f33dbd71b6378c8a4e58452fb16147f320d7.tar.xz mana-1713f33dbd71b6378c8a4e58452fb16147f320d7.zip |
Added a pickup notification as particle effect. Also make a ui option to enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
Diffstat (limited to 'src/particle.cpp')
-rw-r--r-- | src/particle.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/particle.cpp b/src/particle.cpp index 45cbb4c9..6dc45a08 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -326,10 +326,10 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, Particle *Particle::addTextSplashEffect(const std::string &text, int colorR, int colorG, int colorB, - gcn::Font *font, int x, int y) + gcn::Font *font, int x, int y, bool outline) { Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, - font); + font, outline); newParticle->moveTo(x, y); newParticle->setVelocity(((rand() % 100) - 50) / 200.0f, // X ((rand() % 100) - 50) / 200.0f, // Y @@ -346,9 +346,12 @@ Particle *Particle::addTextSplashEffect(const std::string &text, Particle *Particle::addTextRiseFadeOutEffect(const std::string &text, gcn::Font *font, - int x, int y) + int x, int y, + int colorR, int colorG, + int colorB, bool outline) { - Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font); + Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, + font, outline); newParticle->moveTo(x, y); newParticle->setVelocity(0.0f, 0.0f, 0.5f); newParticle->setGravity(0.0015f); |