diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-08 13:39:11 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-08 13:39:11 +0000 |
commit | 016faf8449aeb7dba2738da4fefa3609b3af589c (patch) | |
tree | bc25d08ff2df0ad2ba8f50886c83c06d78b6d11a /src/being.cpp | |
parent | 1dab7893195814ba916bb9ec212a7084fd67fb97 (diff) | |
download | mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.gz mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.bz2 mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.xz mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.zip |
Merged 0.0 changes from revision 3317 to 3362 to trunk.
Diffstat (limited to 'src/being.cpp')
-rw-r--r-- | src/being.cpp | 13 |
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++; + } } } |