summaryrefslogtreecommitdiff
path: root/src/particleemitter.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-01-15 01:07:47 +0200
committerAndrei Karas <akaras@inbox.ru>2011-01-15 02:05:50 +0200
commite2150d04662a4ba8b5304dabcc74be0bacded5b7 (patch)
treecbeb05c2f056a7d5ac4a08e7b80799b5cfd4785b /src/particleemitter.cpp
parentedda37acb9d66f2751ef712c83dced62428fa685 (diff)
downloadmanaverse-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.gz
manaverse-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.bz2
manaverse-e2150d04662a4ba8b5304dabcc74be0bacded5b7.tar.xz
manaverse-e2150d04662a4ba8b5304dabcc74be0bacded5b7.zip
Fix code style, apply some fixes after checking with cppcheck from git.
Diffstat (limited to 'src/particleemitter.cpp')
-rw-r--r--src/particleemitter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 90b29422f..e786e7491 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -401,6 +401,7 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o)
mParticleRotation = o.mParticleRotation;
mParticleChildEmitters = o.mParticleChildEmitters;
mDeathEffectConditions = o.mDeathEffectConditions;
+ mDeathEffect = o.mDeathEffect;
mOutputPauseLeft = 0;
@@ -523,7 +524,7 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
for (std::list<ParticleEmitter>::iterator
i = mParticleChildEmitters.begin();
- i != mParticleChildEmitters.end(); i++)
+ i != mParticleChildEmitters.end(); ++i)
{
newParticle->addEmitter(new ParticleEmitter(*i));
}