From 784e5c24d505aab001ae398cd53b039baed59f1f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 12 Jan 2009 20:25:28 +0000
Subject: radius key for fx_particles, overrules the script value

---
 src/render/particles.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/render/particles.h')

diff --git a/src/render/particles.h b/src/render/particles.h
index 88789a5..096833c 100644
--- a/src/render/particles.h
+++ b/src/render/particles.h
@@ -111,7 +111,7 @@ public:
 
 	/// axis of the particle system within the entity
 	inline const math::Axis &axis() const { return particlesystem_axis; }
-
+	
 	virtual void draw(float elapsed);
 
 	void set_timeout(float timeout);
@@ -141,7 +141,7 @@ protected:
 
 	math::Vector3f  ejector_location;
 	bool		ejector_active;
-	float		radius;
+	float		particlesystem_radius;
 	float		now;
 	math::Color	color;
 	
-- 
cgit v1.2.3