Merged 0.0 changes from revision 3317 to 3362 to trunk.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 7ba9ddb9..bdb27384 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -535,10 +535,19 @@ Being::logic()
 
     //Update particle effects
     for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
-        i != mChildParticleEffects.end();
-        i++)
+            i != mChildParticleEffects.end();
+
+        )
     {
         (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
+        if (!(*i)->isAlive())
+        {
+            (*i)->kill();
+            i = mChildParticleEffects.erase(i);
+        }
+        else {
+            i++;
+        }
     }
 }