From a5377251e213803f61752594b7b52d31ac410bb2 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Mon, 23 Dec 2013 15:11:53 +0100 Subject: [PATCH] Fix particle code ignoring return value of std::vector::erase(). Wat. --- src/particles.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/particles.cpp b/src/particles.cpp index 88905d40d..ce5a4013f 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -221,7 +221,7 @@ void allparticles_step (float dtime, ClientEnvironment &env) { (*i)->remove(); delete *i; - all_particles.erase(i); + i = all_particles.erase(i); } else { @@ -375,7 +375,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment &env) m_texture, v2f(0.0, 0.0), v2f(1.0, 1.0)); - m_spawntimes.erase(i); + i = m_spawntimes.erase(i); } else { @@ -462,6 +462,6 @@ void clear_particles () { (*i)->remove(); delete *i; - all_particles.erase(i); - } + i = all_particles.erase(i); + } }