summaryrefslogtreecommitdiff
path: root/src/actorsprite.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/actorsprite.cpp')
-rw-r--r--src/actorsprite.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 67b086ca..db9f274f 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -321,13 +321,10 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
{
clear();
- SpriteRefs it, it_end;
-
- for (it = display.sprites.begin(), it_end = display.sprites.end();
- it != it_end; it++)
+ for (const auto &sprite : display.sprites)
{
- std::string file = paths.getStringValue("sprites") + it->sprite;
- int variant = it->variant;
+ std::string file = paths.getStringValue("sprites") + sprite.sprite;
+ int variant = sprite.variant;
addSprite(AnimatedSprite::load(file, variant));
}
@@ -359,11 +356,9 @@ void ActorSprite::setupSpriteDisplay(const SpriteDisplay &display,
//setup particle effects
if (Particle::enabled)
{
- std::list<std::string>::const_iterator it, it_end;
- for (it = display.particles.begin(), it_end = display.particles.end();
- it != it_end; it++)
+ for (const auto &particle : display.particles)
{
- Particle *p = particleEngine->addEffect(*it, 0, 0);
+ Particle *p = particleEngine->addEffect(particle, 0, 0);
controlParticle(p);
}
}