From 267e51eaaf9c1c1d7961f27f7a15e89c74330a6a Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 15 Nov 2001 01:37:57 +0000
Subject: [PATCH] while cute, cl_surprise is just way too expensive when gains
 are measured in fractions of a percent, and a loss is 3%.

I hate doing this sort of thing :(
---
 include/r_cvar.h                     |  1 -
 libs/video/renderer/gl/gl_dyn_part.c | 35 +++++++---------------------
 libs/video/renderer/r_cvar.c         |  3 ---
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/include/r_cvar.h b/include/r_cvar.h
index 80c765204..f8236f00f 100644
--- a/include/r_cvar.h
+++ b/include/r_cvar.h
@@ -1,6 +1,5 @@
 extern struct cvar_s     *cl_crossx;
 extern struct cvar_s     *cl_crossy;
-extern struct cvar_s     *cl_surprise;
 extern struct cvar_s     *cl_verstring;
 extern struct cvar_s     *crosshair;
 extern struct cvar_s     *crosshaircolor;
diff --git a/libs/video/renderer/gl/gl_dyn_part.c b/libs/video/renderer/gl/gl_dyn_part.c
index b080e170f..fb87a1cab 100644
--- a/libs/video/renderer/gl/gl_dyn_part.c
+++ b/libs/video/renderer/gl/gl_dyn_part.c
@@ -428,20 +428,10 @@ R_RocketTrail (entity_t *ent)
 		VectorAdd (ent->old_origin, subtract, ent->old_origin);
 		percent = len * origlen;
 
-		if (cl_surprise->int_val)
-		{
-			particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
-					pscale + percent * 4.0, vec3_origin,
-					r_realtime + 2.0 - percent * 2.0, 
-					(rand () & 255),
-					128 + (rand () & 31) - percent * 100.0);
-		} else {
-			particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
-					pscale + percent * 4.0, vec3_origin,
-					r_realtime + 2.0 - percent * 2.0,
-					12 + (rand () & 3),
-					128 + (rand () & 31) - percent * 100.0);
-		}
+		particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
+					  pscale + percent * 4.0, vec3_origin,
+					  r_realtime + 2.0 - percent * 2.0, 12 + (rand () & 3),
+					  128 + (rand () & 31) - percent * 100.0);
 		if (numparticles >= r_maxparticles)
 			break;
 		len += dist;
@@ -472,19 +462,10 @@ R_GrenadeTrail (entity_t *ent)
 		VectorAdd (ent->old_origin, subtract, ent->old_origin);
 		percent = len * origlen;
 
-		if (cl_surprise->int_val)
-		{
-			particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
-					pscale + percent * 4.0, vec3_origin,
-					r_realtime + 2.0 - percent * 2.0,
-					(rand () & 255),
-					160 + (rand () & 31) - percent * 100.0);
-		} else {
-			particle_new (pt_smoke, part_tex_smoke, ent->old_origin,                                        pscale + percent * 4.0, vec3_origin,
-					r_realtime + 2.0 - percent * 2.0,
-					(rand () & 3),
-					160 + (rand () & 31) - percent * 100.0);
-		}
+		particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
+					  pscale + percent * 4.0, vec3_origin,
+					  r_realtime + 2.0 - percent * 2.0, (rand () & 3),
+					  160 + (rand () & 31) - percent * 100.0);
 		if (numparticles >= r_maxparticles)
 			break;
 		len += dist;
diff --git a/libs/video/renderer/r_cvar.c b/libs/video/renderer/r_cvar.c
index 5aa7e7d20..ae17896ee 100644
--- a/libs/video/renderer/r_cvar.c
+++ b/libs/video/renderer/r_cvar.c
@@ -44,7 +44,6 @@ static const char rcsid[] =
 cvar_t     *cl_crossx;
 cvar_t     *cl_crossy;
 cvar_t	   *cl_max_particles;
-cvar_t     *cl_surprise;
 cvar_t     *cl_verstring;   
 cvar_t     *crosshair;
 cvar_t     *crosshaircolor;
@@ -157,8 +156,6 @@ R_Init_Cvars (void)
 								 cl_max_particles_f, "Maximum amount of "
 								 "particles to display. No maximum, minimum " 
 								 "is 0.");
-	cl_surprise = Cvar_Get ("cl_surprise", "0", CVAR_NONE, NULL,
-							"Its a surprise, set to 1");
 	cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE,
 							 NULL, "Client version string");
 	crosshair = Cvar_Get ("crosshair", "0", CVAR_ARCHIVE, NULL, "Crosshair "