void particle_move_all(float frametime)
{
	MONITOR_INC( NumParticles, Num_particles );	

	if ( !Particles_enabled )
		return;

	if ( Particles.empty() )
		return;

//MOD	for (SCP_vector<particle>::iterator p = Particles.begin(); p != Particles.end(); ) {
	for ( uint i = 0; i < Particles.size(); )
	{
// ADDED
		particle * p = &Particles[i];

		if (p->age == 0.0f) {
			p->age = 0.00001f;
		} else {
			p->age += frametime;
		}

		// if it's time expired, remove it
		if (p->age > p->max_life) {
			// special case, if max_life is 0 then we want it to render at least once
			if ( (p->age > frametime) || (p->max_life > 0.0f) ) {
				*p = Particles.back();
				Particles.pop_back();
				continue;
			}
		}

		// if the particle is attached to an object which has become invalid, kill it
		if (p->attached_objnum >= 0) {
			// if the signature has changed, or it's bogus, kill it
			if ( (p->attached_objnum >= MAX_OBJECTS)
				|| (p->attached_sig != Objects[p->attached_objnum].signature) )
			{
				*p = Particles.back();
				Particles.pop_back();
				continue;
			}
		}
		// move as a regular particle
		else {
			vm_vec_scale_add2( &p->pos, &p->velocity, frametime );
		}

		// next particle
//MOD		++p;
		i ++;
	}
}

Index: code/particle/particle.cpp
===================================================================
--- code/particle/particle.cpp	(revision 6028)
+++ code/particle/particle.cpp	(working copy)
@@ -262,7 +262,10 @@
 	if ( Particles.empty() )
 		return;
 
-	for (SCP_vector<particle>::iterator p = Particles.begin(); p != Particles.end(); ) {
+	for ( uint i = 0; i < Particles.size(); )
+	{
+		particle * p = &Particles[i];
+
 		if (p->age == 0.0f) {
 			p->age = 0.00001f;
 		} else {
@@ -296,10 +299,9 @@
 		}
 
 		// next particle
-		++p;
+		++i;
 	}
 }
-
 // kill all active particles
 void particle_kill_all()
 {

Index: code/particle/particle.cpp
===================================================================
--- code/particle/particle.cpp	(revision 9388)
+++ code/particle/particle.cpp	(working copy)
@@ -23,7 +23,7 @@
 #endif
 
 int Num_particles = 0;
-static SCP_vector<particle*> Particles;
+static SCP_list<particle*> Particles;
 
 int Anim_bitmap_id_fire = -1;
 int Anim_num_frames_fire = -1;
@@ -75,14 +75,10 @@
 // only call from game_shutdown()!!!
 void particle_close()
 {
-	while (!Particles.empty())
-	{		
-		particle* part = Particles.back();
-		part->signature = 0;
-		delete part;
-
-		Particles.pop_back();
+	for (SCP_list<particle*>::iterator p = Particles.begin(); p != Particles.end(); ++p) {		
+		delete *p;
 	}
+	Particles.clear();
 }
 
 void particle_page_in()
@@ -252,7 +248,7 @@
 	if ( Particles.empty() )
 		return;
 
-	for (SCP_vector<particle*>::iterator p = Particles.begin(); p != Particles.end(); ) {	
+	for (SCP_list<particle*>::iterator p = Particles.begin(); p != Particles.end(); ++p) {	
 		particle* part = *p;
 		if (part->age == 0.0f) {
 			part->age = 0.00001f;
@@ -266,10 +262,7 @@
 			if ( (part->age > frametime) || (part->max_life > 0.0f) ) {
 				part->signature = 0;
 				delete *p;
-				*p = NULL;
-
-				*p = Particles.back();
-				Particles.pop_back();
+				p = Particles.erase(p);
 				continue;
 			}
 		}
@@ -282,10 +275,7 @@
 			{
 				part->signature = 0;
 				delete *p;
-				*p = NULL;
-
-				*p = Particles.back();
-				Particles.pop_back();
+				p = Particles.erase(p);
 				continue;
 			}
 		}
@@ -293,9 +283,6 @@
 		else {
 			vm_vec_scale_add2( &part->pos, &part->velocity, frametime );
 		}
-
-		// next particle
-		++p;
 	}
 }
 
@@ -306,13 +293,10 @@
 	Num_particles = 0;
 	Num_particles_hwm = 0;
 
-	while (!Particles.empty())
-	{
-		particle* part = Particles.back();
-		part->signature = 0;
-		delete part;
-		Particles.pop_back();
+	for (SCP_list<particle*>::iterator p = Particles.begin(); p != Particles.end(); ++p) {		
+		delete *p;
 	}
+	Particles.clear();
 }
 
 MONITOR( NumParticlesRend )
@@ -363,7 +347,7 @@
 	if ( Particles.empty() )
 		return;
 
-	for (SCP_vector<particle*>::iterator p = Particles.begin(); p != Particles.end(); ++p) {
+	for (SCP_list<particle*>::iterator p = Particles.begin(); p != Particles.end(); ++p) {
 		particle* part = *p;
 		// skip back-facing particles (ripped from fullneb code)
 		// Wanderer - add support for attached particles