summaryrefslogtreecommitdiff
path: root/src/particleemitter.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
commite3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch)
tree494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/particleemitter.cpp
parent703a3c4df3732e3e88559147001260f3355d42d6 (diff)
downloadplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz
plus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/particleemitter.cpp')
-rw-r--r--src/particleemitter.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index fd1f07e16..9cad0864f 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -566,9 +566,9 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
newParticle->setFollow(mParticleFollow);
newParticle->setDestination(mParticleTarget,
- mParticleAcceleration.value(tick),
- mParticleMomentum.value(tick)
- );
+ mParticleAcceleration.value(tick),
+ mParticleMomentum.value(tick));
+
newParticle->setDieDistance(mParticleDieDistance.value(tick));
newParticle->setLifetime(mParticleLifetime.value(tick));
@@ -577,16 +577,14 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
newParticle->setAlpha(mParticleAlpha.value(tick));
for (std::list<ParticleEmitter>::const_iterator
- i = mParticleChildEmitters.begin();
- i != mParticleChildEmitters.end(); ++i)
+ it = mParticleChildEmitters.begin();
+ it != mParticleChildEmitters.end(); ++it)
{
- newParticle->addEmitter(new ParticleEmitter(*i));
+ newParticle->addEmitter(new ParticleEmitter(*it));
}
if (!mDeathEffect.empty())
- {
newParticle->setDeathEffect(mDeathEffect, mDeathEffectConditions);
- }
newParticles.push_back(newParticle);
}