From 996757ec23af69295bb433965ae1d2d6c9205ee7 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Fri, 23 Dec 2005 09:31:17 +0000
Subject: [PATCH] step/count extension to handle additional random values

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1740 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/r_part.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/engine/client/r_part.c b/engine/client/r_part.c
index b0b90e03c..2dff8bb64 100644
--- a/engine/client/r_part.c
+++ b/engine/client/r_part.c
@@ -207,6 +207,7 @@ typedef struct part_type_s {
 
 	float scaledelta;
 	float count;
+	float countrand;
 	int texturenum;
 	int assoc;
 	int cliptype;
@@ -538,10 +539,12 @@ void P_ParticleEffect_f(void)
 		else if (!strcmp(var, "scaledelta"))
 			ptype->scaledelta = atof(value);
 
-		else if (!strcmp(var, "step"))
-			ptype->count = 1/atof(value);
-		else if (!strcmp(var, "count"))
+		else if (!strcmp(var, "count") || !strcmp(var, "step"))
+		{
 			ptype->count = atof(value);
+			if (Cmd_Argc()>2)
+				ptype->countrand = atof(Cmd_Argv(2));
+		}
 
 		else if (!strcmp(var, "alpha"))
 			ptype->alpha = atof(value);
@@ -2075,7 +2078,7 @@ int P_RunParticleEffectState (vec3_t org, vec3_t dir, float count, int typenum,
 		// init spawn specific variables
 		b = bfirst = NULL;
 		spawnspc = 8;
-		pcount = count*ptype->count;
+		pcount = count*(ptype->count+ptype->countrand*frandom());
 		if (ptype->flags & PT_INVFRAMETIME)
 			pcount /= host_frametime;
 		if (ts)
@@ -2766,7 +2769,7 @@ static void P_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t *ptype
 		ts = NULL;
 
 	// use ptype step to calc step vector and step size
-	step = 1/ptype->count;
+	step = ptype->count;
 
 	if (step < 0.01)
 		step = 0.01;
@@ -2874,9 +2877,9 @@ static void P_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t *ptype
 
 //		if (ptype->spawnmode == SM_TRACER)
 		if (ptype->spawnparam1)
-			tcount = (int)(len * ptype->count / ptype->spawnparam1);
+			tcount = (int)(len / ptype->count / ptype->spawnparam1);
 		else
-			tcount = (int)(len * ptype->count);
+			tcount = (int)(len / ptype->count);
 
 		if (ptype->colorindex >= 0)
 		{
@@ -2896,8 +2899,6 @@ static void P_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t *ptype
 		else
 			VectorCopy(ptype->rgb, p->rgb);
 
-
-
 		// use org temporarily for rgbsync
 		p->org[2] = frandom();
 		p->org[0] = p->org[2]*ptype->rgbrandsync[0] + frandom()*(1-ptype->rgbrandsync[0]);
@@ -3039,6 +3040,13 @@ static void P_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t *ptype
 
 		VectorAdd (start, vstep, start);
 
+		if (ptype->countrand)
+		{
+			float rstep = ptype->countrand * frandom();
+			VectorMA(start, rstep, vec, start);
+			step += rstep;
+		}
+
 		p->die = particletime + ptype->die - p->die;
 	}