1 files changed, 5 insertions, 8 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index d4266df2..f1896ae2 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -22,13 +22,12 @@
 #include <algorithm>
 #include <cmath>
 
-#include "particle.h"
-
 #include "animationparticle.h"
 #include "configuration.h"
 #include "imageparticle.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 #include "particleemitter.h"
 #include "textparticle.h"
 
@@ -224,7 +223,7 @@ Particle::update()
 
 Particle*
 Particle::addEffect(const std::string &particleEffectFile,
-                    int pixelX, int pixelY)
+                    int pixelX, int pixelY, int rotation)
 {
     Particle *newParticle = NULL;
 
@@ -288,7 +287,7 @@ 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);
         }
 
@@ -358,11 +357,9 @@ Particle::~Particle()
 void
 Particle::clear()
 {
-    std::for_each(mChildEmitters.begin(), mChildEmitters.end(),
-            make_dtor(mChildEmitters));
+    delete_all(mChildEmitters);
     mChildEmitters.clear();
 
-    std::for_each(mChildParticles.begin(), mChildParticles.end(),
-            make_dtor(mChildParticles));
+    delete_all(mChildParticles);
     mChildParticles.clear();
 }