diff options
| author | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-02-11 09:30:26 +0000 |
| commit | 91111ca5d13072ea3b834e23835df9c077329e39 (patch) | |
| tree | f0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/particle.cpp | |
| parent | 8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2 mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/particle.cpp')
| -rw-r--r-- | src/particle.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/particle.cpp b/src/particle.cpp index 99a4dd36..45cbb4c9 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -22,13 +22,14 @@ #include <algorithm> #include <cmath> -#include "particle.h" +#include <guichan/color.hpp> #include "animationparticle.h" #include "configuration.h" #include "imageparticle.h" #include "log.h" #include "map.h" +#include "particle.h" #include "particleemitter.h" #include "textparticle.h" @@ -251,7 +252,7 @@ void Particle::moveTo(float x, float y) } Particle *Particle::addEffect(const std::string &particleEffectFile, - int pixelX, int pixelY) + int pixelX, int pixelY, int rotation) { Particle *newParticle = NULL; @@ -313,7 +314,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, continue; ParticleEmitter *newEmitter; - newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap); + newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap, rotation); newParticle->addEmitter(newEmitter); } |