Fix particle code ignoring return value of std::vector::erase(). Wat.

kahrl · kahrl · commit a5377251e213 · 2013-12-23T15:11:53.000+01:00
diff --git 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);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ void allparticles_step (float dtime, ClientEnvironment &env)`
`221`	`221`	`{`
`222`	`222`	`(*i)->remove();`
`223`	`223`	`delete *i;`
`224`		`- all_particles.erase(i);`
	`224`	`+ i = all_particles.erase(i);`
`225`	`225`	`}`
`226`	`226`	`else`
`227`	`227`	`{`
`@@ -375,7 +375,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment &env)`
`375`	`375`	`m_texture,`
`376`	`376`	`v2f(0.0, 0.0),`
`377`	`377`	`v2f(1.0, 1.0));`
`378`		`- m_spawntimes.erase(i);`
	`378`	`+ i = m_spawntimes.erase(i);`
`379`	`379`	`}`
`380`	`380`	`else`
`381`	`381`	`{`
`@@ -462,6 +462,6 @@ void clear_particles ()`
`462`	`462`	`{`
`463`	`463`	`(*i)->remove();`
`464`	`464`	`delete *i;`
`465`		`- all_particles.erase(i);`
`466`		`- }`
	`465`	`+ i = all_particles.erase(i);`
	`466`	`+ }`
`467`	`467`	`}`