Added support for particles minimum/maximum speed,

renamed [ejector] sections in particle ini files,
resolved the issue where only 1 particle per frame could be ejected.

1 files changed, 2 insertions, 29 deletions

diff --git a/src/render/draw.cc b/src/render/draw.cc
index 0d77c7b..87c25e2 100644
--- a/src/render/draw.cc
+++ b/src/render/draw.cc
@@ -932,6 +932,8 @@ void draw_model_lights(model::Model *model, const float scale,
 		}
 
 		// draw the quad
+		
+		// FIXME add random per-light rotation
 		gl::color(color);
 
 		gl::texcoord(1, 0);
@@ -1087,36 +1089,7 @@ void draw_pass_model_fx(float elapsed)
 		
 			// draw particle systems
 			if (draw_particles && ext_render(entity)->particles().size()) {
-				/*
-				gl::disable(GL_CULL_FACE);
-				
-				model::Cull current_cull = model::CullNone;
-	
-				for (RenderExt::ParticleSystems::iterator it = ext_render(entity)->particles().begin(); it != ext_render(entity)->particles().end(); it++) {
-					ParticleSystem *particlesystem = (*it);
-
-					if (current_cull != particlesystem->cull()) {
-						if (particlesystem->cull() == model::CullNone) {
-							gl::disable(GL_CULL_FACE);
-							current_cull = model::CullNone;
-						} else {
-							if (current_cull == model::CullNone) {
-								gl::enable(GL_CULL_FACE);
-							}
-
-							if (particlesystem->cull() == model::CullBack) {
-								gl::cullface(GL_BACK);
-								current_cull = model::CullBack;
-							} else {
-								gl::cullface(GL_FRONT);
-								current_cull = model::CullFront;
-							}
-						}
-					}
 
-					particlesystem->draw(elapsed);
-				}
-				*/
 				for (RenderExt::ParticleSystems::iterator it = ext_render(entity)->particles().begin(); it != ext_render(entity)->particles().end(); ++it) {
 					(*it)->draw(elapsed);
 				}