merged model classes into one file, classname cleanup, fx_particles

1 files changed, 6 insertions, 6 deletions

diff --git a/src/model/model.cc b/src/model/model.cc
index 3329afe..8fadb33 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -40,11 +40,11 @@ Model::~Model()
 		delete (*dit);
 	}
 
-	// delete all engines
-	for (Engines::iterator eit = model_engines.begin(); eit != model_engines.end(); eit++) {
-		delete(*eit);
+	// delete all particle systems
+	for (Model::ParticleSystems::iterator pit = model_particles.begin(); pit != model_particles.end(); pit++) {
+		delete (*pit);
 	}
-	model_engines.clear();
+	model_particles.clear();
 	
 	// delete all lights
 	for (Lights::iterator lit = model_lights.begin(); lit != model_lights.end(); lit++) {
@@ -59,9 +59,9 @@ Model::~Model()
 	model_flares.clear();
 }
 
-void Model::add_engine(Engine *engine)
+void Model::add_particles(Particles *particles)
 {
-	model_engines.push_back(engine);
+	model_particles.push_back(particles);
 }
 
 void Model::add_light(Light *light)