qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the minor breakage were /no/ particles were being generated

Browse source
This commit is contained in:
Bill Currie 2001-10-27 21:39:58 +00:00
parent 74d3499f74
commit 3601b5ba35
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/video/renderer/r_cvar.c
View file

@ -132,20 +132,20 @@ cvar_t *scr_viewsize;
extern unsigned int r_maxparticles; extern unsigned int r_maxparticles;
extern cvar_t *gl_sky_divide; // FIXME extern cvar_t *gl_sky_divide; // FIXME
extern void R_MaxParticlesCheck (cvar_t *var); extern void R_MaxParticlesCheck (cvar_t *r_particles, cvar_t *cl_max_particles);
extern void R_MaxDlightsCheck (cvar_t *var); extern void R_MaxDlightsCheck (cvar_t *var);
static void static void
r_particles_f (cvar_t *var) r_particles_f (cvar_t *var)
{ {
if (!var->int_val) R_MaxParticlesCheck (var, cl_max_particles);
R_ClearParticles (); }
r_maxparticles = 0;
if (var->int_val && cl_max_particles) static void
r_maxparticles = cl_max_particles->int_val; cl_max_particles_f (cvar_t *var)
if (cl_max_particles) {
R_MaxParticlesCheck (cl_max_particles); R_MaxParticlesCheck (r_particles, var);
} }
void void
@ -156,7 +156,7 @@ R_Init_Cvars (void)
cl_crossy = Cvar_Get ("cl_crossy", "0", CVAR_ARCHIVE, NULL, cl_crossy = Cvar_Get ("cl_crossy", "0", CVAR_ARCHIVE, NULL,
"Sets the position of the crosshair on the Y-axis."); "Sets the position of the crosshair on the Y-axis.");
cl_max_particles = Cvar_Get ("cl_max_particles", "2048", CVAR_ARCHIVE, cl_max_particles = Cvar_Get ("cl_max_particles", "2048", CVAR_ARCHIVE,
R_MaxParticlesCheck, "Maximum amount of " cl_max_particles_f, "Maximum amount of "
"particles to display. No maximum, minimum " "particles to display. No maximum, minimum "
"is 0."); "is 0.");
cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE, cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE,

4
libs/video/renderer/r_part.c
View file

@ -56,7 +56,7 @@ extern cvar_t *r_particles;
others. others.
*/ */
void void
R_MaxParticlesCheck (cvar_t *var) R_MaxParticlesCheck (cvar_t *r_particles, cvar_t *cl_max_particles)
{ {
/* /*
Catchall. If the user changed the setting to a number less than zero *or* Catchall. If the user changed the setting to a number less than zero *or*
@ -66,7 +66,7 @@ R_MaxParticlesCheck (cvar_t *var)
we'd sig11 right here at startup. we'd sig11 right here at startup.
*/ */
if (r_particles && r_particles->int_val) if (r_particles && r_particles->int_val)
r_maxparticles = var->int_val; r_maxparticles = cl_max_particles ? cl_max_particles->int_val : 0;
else else
r_maxparticles = 0; r_maxparticles = 0;