From b1e18056ebc6223d867a536e354000593676c63a Mon Sep 17 00:00:00 2001
From: Joseph Carter <knghtbrd@debian.org>
Date: Thu, 27 Apr 2000 04:30:37 +0000
Subject: [PATCH] gl_particles moved out of gl_vid* since it is common.

new cvar, gl_fires.  Default to 1, set to 0 if you hate the fire effect on
the lavaball and coming off the rocket trail.
---
 common/gl_rmain.c         | 3 +++
 common/gl_rmisc.c         | 5 +++++
 common/gl_rpart.c         | 8 ++++++--
 common/gl_vidglx.c        | 3 ---
 common/gl_vidlinux_3dfx.c | 3 ---
 common/gl_vidnt.c         | 3 ---
 common/glquake.h          | 3 +++
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/gl_rmain.c b/common/gl_rmain.c
index 55e0d67..33f4907 100644
--- a/common/gl_rmain.c
+++ b/common/gl_rmain.c
@@ -124,6 +124,9 @@ cvar_t	*gl_nocolors;
 cvar_t	*gl_keeptjunctions;
 cvar_t	*gl_doubleeyes;
 
+cvar_t	*gl_particles;
+cvar_t	*gl_fires;
+
 extern	cvar_t	*gl_ztrick;
 #ifdef QUAKEWORLD
 extern	cvar_t	*scr_fov;
diff --git a/common/gl_rmisc.c b/common/gl_rmisc.c
index 4abef2d..1b554dc 100644
--- a/common/gl_rmisc.c
+++ b/common/gl_rmisc.c
@@ -231,6 +231,11 @@ void R_Init (void)
 	gl_nocolors = Cvar_Get ("gl_nocolors","0",0,"None");
 	gl_finish = Cvar_Get ("gl_finish","0",0,"None");
 
+	gl_particles = Cvar_Get ("gl_particles", "1", CVAR_NONE,
+			"Sets the size of particles, default 1");
+	gl_fires = Cvar_Get ("gl_fires", "1", CVAR_NONE,
+			"lavaball and rocket fireballs, set to 0 to disable");
+
 #ifdef QUAKEWORLD
 	gl_keeptjunctions = Cvar_Get ("gl_keeptjunctions","1",0,"None");
 #else
diff --git a/common/gl_rpart.c b/common/gl_rpart.c
index 1c76051..b19befb 100644
--- a/common/gl_rpart.c
+++ b/common/gl_rpart.c
@@ -53,8 +53,6 @@ int			r_numparticles;
 vec3_t			r_pright, r_pup, r_ppn;
 
 
-extern cvar_t		*gl_particles;
-
 fire_t		r_fires[MAX_FIRES];
 
 /*
@@ -879,6 +877,9 @@ R_AddFire (vec3_t start, vec3_t end, entity_t *ent)
 	vec3_t		vec;
 	int			key;
 
+	if (!gl_fires->value)
+		return;
+
 	VectorSubtract (end, start, vec);
 	len = VectorNormalize (vec);
 	key = ent-cl_entities+1;
@@ -1009,6 +1010,9 @@ R_UpdateFires (void)
 	int		i;
 	fire_t	*f;
 
+	if (!gl_fires->value)
+		return;
+
 	glDepthMask (0);
 	glDisable (GL_TEXTURE_2D);
 	glShadeModel (GL_SMOOTH);
diff --git a/common/gl_vidglx.c b/common/gl_vidglx.c
index 5874f88..4ec6e91 100644
--- a/common/gl_vidglx.c
+++ b/common/gl_vidglx.c
@@ -96,7 +96,6 @@ cvar_t	*vid_mode;
 cvar_t	*vid_glx_fullscreen;
 extern cvar_t	*gl_triplebuffer;
 extern cvar_t *vid_dga_mouseaccel;
-cvar_t	*gl_particles;
 
 #ifdef HAS_DGA
 static int	nummodes;
@@ -572,8 +571,6 @@ void VID_Init(unsigned char *palette)
 void VID_InitCvars()
 {
 	gl_triplebuffer = Cvar_Get("gl_triplebuffer","1",CVAR_ARCHIVE,"None");
-	gl_particles = Cvar_Get("gl_particles","1",0,
-				"Sets the size of particles");
 }
 
 void
diff --git a/common/gl_vidlinux_3dfx.c b/common/gl_vidlinux_3dfx.c
index d6cffa1..a907f0e 100644
--- a/common/gl_vidlinux_3dfx.c
+++ b/common/gl_vidlinux_3dfx.c
@@ -58,7 +58,6 @@ static cvar_t	*vid_redrawfull;
 static cvar_t	*vid_waitforrefresh;
 cvar_t	*gl_ztrick;
 extern cvar_t	*gl_triplebuffer;
-cvar_t	*gl_particles;
 
 static fxMesaContext fc = NULL;
 static int	scr_width, scr_height;
@@ -517,8 +516,6 @@ void VID_ExtraOptionCmd(int option_cursor)
 void VID_InitCvars ()
 {
 	gl_triplebuffer = Cvar_Get ("gl_triplebuffer","1",CVAR_ARCHIVE,"None");
-	gl_particles = Cvar_Get ("gl_particles","1",0,
-				 "Sets the size of particles");
 }
 
 void
diff --git a/common/gl_vidnt.c b/common/gl_vidnt.c
index 060bf95..91a179d 100644
--- a/common/gl_vidnt.c
+++ b/common/gl_vidnt.c
@@ -158,7 +158,6 @@ qboolean gl_mtexable = false;
 //====================================
 
 cvar_t	*gl_ztrick;
-cvar_t	*gl_particles;
 
 cvar_t	*vid_mode;
 // Note that 0 is MODE_WINDOWED
@@ -1624,8 +1623,6 @@ void	VID_Init (unsigned char *palette)
 					"None");
 	_windowed_mouse = Cvar_Get ("_windowed_mouse","1",CVAR_ARCHIVE,"None");
 	gl_ztrick = Cvar_Get ("gl_ztrick","1",CVAR_ARCHIVE,"None");
-	gl_particles = Cvar_Get ("gl_particles","1",0,
-				"Sets the size of particles");
 
 	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
 	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
diff --git a/common/glquake.h b/common/glquake.h
index cb37ad9..bb716fe 100644
--- a/common/glquake.h
+++ b/common/glquake.h
@@ -209,6 +209,9 @@ extern	cvar_t	*gl_nocolors;
 extern	cvar_t	*gl_finish;
 extern	cvar_t	*gl_doubleeyes;
 
+extern cvar_t	*gl_particles;
+extern cvar_t	*gl_fires;
+
 extern	int		gl_lightmap_format;
 extern	int		gl_solid_format;
 extern	int		gl_alpha_format;