Corrected default light and flare radius.

Suppoort for entity, engine and color keys in fx_particles and particle scripts.
Have light, fx_flare and fx_particles color override engine color if the engine spawnflag is set.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/render/particles.h b/src/render/particles.h
index 909d027..a41065c 100644
--- a/src/render/particles.h
+++ b/src/render/particles.h
@@ -72,11 +72,25 @@ public:
 		return particlescript_color;
 	}
 	
+	inline bool has_color() const {
+		return particlescript_has_color;
+	}
+	
 	/// axis transformation relative to the ejector
 	inline const math::Axis &axis() const {
 		return particlescript_axis;
 	}
 
+	/// true if entity color is to be applied
+	inline bool engine() const {
+		return particlescript_engine;
+	}
+	
+	/// true if engine color is to be applied
+	inline bool entity() const {
+		return particlescript_entity;
+	}
+	
 	inline float radius() const {
 		return particlescript_radius;
 	}
@@ -125,6 +139,10 @@ private:
 	Type		particlescript_type;
 	math::Color	particlescript_color;
 	math::Axis	particlescript_axis;
+	
+	bool		particlescript_entity;
+	bool		particlescript_engine;
+	bool		particlescript_has_color;
 
 	float 		particlescript_radius;
 	float		particlescript_timeout;