summaryrefslogtreecommitdiff
path: root/src/particleemitter.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-01-26 16:07:54 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-01-26 16:07:54 +0100
commit5afe88df2538274859a162ffd63ed52118e80c19 (patch)
treeb610dfd58dc748fd63f49565b2a43eea2316714f /src/particleemitter.cpp
parent73ba2a95f5bd4a0dd09af52d5864800be2b0a4c6 (diff)
downloadmana-5afe88df2538274859a162ffd63ed52118e80c19.tar.gz
mana-5afe88df2538274859a162ffd63ed52118e80c19.tar.bz2
mana-5afe88df2538274859a162ffd63ed52118e80c19.tar.xz
mana-5afe88df2538274859a162ffd63ed52118e80c19.zip
Apply C++11 fixits
modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using
Diffstat (limited to 'src/particleemitter.cpp')
-rw-r--r--src/particleemitter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index a8b22e97..ec646f97 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -43,7 +43,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target,
Map *map, int rotation,
const std::string& dyePalettes):
mOutputPauseLeft(0),
- mParticleImage(0)
+ mParticleImage(nullptr)
{
mMap = map;
mParticleTarget = target;
@@ -464,12 +464,12 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
}
else if (mParticleRotation.getLength() > 0)
{
- Animation *newAnimation = new Animation(mParticleRotation);
+ auto *newAnimation = new Animation(mParticleRotation);
newParticle = new RotationalParticle(mMap, newAnimation);
}
else if (mParticleAnimation.getLength() > 0)
{
- Animation *newAnimation = new Animation(mParticleAnimation);
+ auto *newAnimation = new Animation(mParticleAnimation);
newParticle = new AnimationParticle(mMap, newAnimation);
}
else
@@ -506,7 +506,7 @@ std::list<Particle *> ParticleEmitter::createParticles(int tick)
newParticle->setFadeIn(mParticleFadeIn.value(tick));
newParticle->setAlpha(mParticleAlpha.value(tick));
- for (std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
+ for (auto i = mParticleChildEmitters.begin();
i != mParticleChildEmitters.end();
i++)
{