From bd038aa1d814d70dd0ea830273e63a28a8fbcce6 Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Wed, 10 Nov 2004 19:28:24 +0000
Subject: [PATCH] cvar cleanup
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@405 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
engine/client/m_options.c | 4 ++--
engine/client/r_part.c | 6 +-----
engine/client/renderer.c | 2 --
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/engine/client/m_options.c b/engine/client/m_options.c
index abf39653a..07a65162e 100644
--- a/engine/client/m_options.c
+++ b/engine/client/m_options.c
@@ -292,7 +292,7 @@ void M_Menu_Particles_f (void)
{
int y = 32;
menu_t *menu;
- extern cvar_t r_bouncysparks, r_particles_in_explosion, r_part_rain, gl_part_torch, gl_part_flame, gl_part_trifansparks;
+ extern cvar_t r_bouncysparks, r_part_rain, gl_part_torch, gl_part_flame, gl_part_trifansparks;
static const char *r_part_rain_options[] = {
"off",
@@ -334,7 +334,7 @@ void M_Menu_Particles_f (void)
menu->selecteditem = (union menuoption_s *)
MC_AddCheckBox(menu, 16, y, " sparks bounce", &r_bouncysparks,0);y+=8;
- MC_AddSlider(menu, 16, y, " exp spark count", &r_particles_in_explosion, 16, 1024);y+=8;
+// MC_AddSlider(menu, 16, y, " exp spark count", &r_particles_in_explosion, 16, 1024);y+=8;
MC_AddCvarCombo(menu, 16, y, " rain effect", &r_part_rain, r_part_rain_options, r_part_rain_values);y+=8;
#ifdef RGLQUAKE
diff --git a/engine/client/r_part.c b/engine/client/r_part.c
index 8866d0ce4..ce80eae63 100644
--- a/engine/client/r_part.c
+++ b/engine/client/r_part.c
@@ -100,11 +100,9 @@ extern cvar_t r_bouncysparks;
extern cvar_t r_part_rain;
extern cvar_t gl_part_explosionheart, gl_part_emp;
extern cvar_t gl_part_trifansparks;
-extern cvar_t r_particles_in_explosion;
-extern cvar_t r_particle_explosion_speed;
extern cvar_t r_bloodstains;
-cvar_t r_particlesdesc = {"r_particlesdesc", "spikeset", NULL, CVAR_LATCH, CVAR_SEMICHEAT};
+cvar_t r_particlesdesc = {"r_particlesdesc", "spikeset", NULL, CVAR_LATCH|CVAR_SEMICHEAT};
cvar_t r_part_rain_quantity = {"r_part_rain_quantity", "1"};
@@ -892,8 +890,6 @@ void R_InitParticles (void)
//particles
Cvar_Register(&r_particlesdesc, particlecvargroupname);
Cvar_Register(&r_bouncysparks, particlecvargroupname);
- Cvar_Register(&r_particles_in_explosion, particlecvargroupname);
- Cvar_Register(&r_particle_explosion_speed, particlecvargroupname);
Cvar_Register(&r_part_rain, particlecvargroupname);
Cvar_Register(&r_part_rain_quantity, particlecvargroupname);
diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index 5490e6f5a..343c70307 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -117,8 +117,6 @@ cvar_t gl_smoothfont = {"gl_smoothfont", "1"};
cvar_t gl_part_flame = {"gl_part_flame", "1"};
cvar_t gl_part_torch = {"gl_part_torch", "1"};
cvar_t r_part_rain = {"r_part_rain", "0"};
-cvar_t r_particles_in_explosion = {"r_particles_in_explosion", "256"};
-cvar_t r_particle_explosion_speed = {"r_particle_explosion_speed", "1"};
cvar_t r_bouncysparks = {"r_bouncysparks", "0"};