qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-07 00:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

while cute, cl_surprise is just way too expensive when gains are measured in

Browse source 
fractions of a percent, and a loss is 3%.

I hate doing this sort of thing :(
This commit is contained in:
Bill Currie 2001-11-15 01:37:57 +00:00
parent 7d9266a3f0
commit 267e51eaaf
3 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/r_cvar.h
View file

@ -1,6 +1,5 @@
extern struct cvar_s *cl_crossx; extern struct cvar_s *cl_crossx;
extern struct cvar_s *cl_crossy; extern struct cvar_s *cl_crossy;
extern struct cvar_s *cl_surprise;
extern struct cvar_s *cl_verstring; extern struct cvar_s *cl_verstring;
extern struct cvar_s *crosshair; extern struct cvar_s *crosshair;
extern struct cvar_s *crosshaircolor; extern struct cvar_s *crosshaircolor;

23
libs/video/renderer/gl/gl_dyn_part.c
View file

@ -428,20 +428,10 @@ R_RocketTrail (entity_t *ent)
VectorAdd (ent->old_origin, subtract, ent->old_origin); VectorAdd (ent->old_origin, subtract, ent->old_origin);
percent = len * origlen; percent = len * origlen;
if (cl_surprise->int_val)
{
particle_new (pt_smoke, part_tex_smoke, ent->old_origin, particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
pscale + percent * 4.0, vec3_origin, pscale + percent * 4.0, vec3_origin,
r_realtime + 2.0 - percent * 2.0, r_realtime + 2.0 - percent * 2.0, 12 + (rand () & 3),
(rand () & 255),
128 + (rand () & 31) - percent * 100.0); 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);
}
if (numparticles >= r_maxparticles) if (numparticles >= r_maxparticles)
break; break;
len += dist; len += dist;
@ -472,19 +462,10 @@ R_GrenadeTrail (entity_t *ent)
VectorAdd (ent->old_origin, subtract, ent->old_origin); VectorAdd (ent->old_origin, subtract, ent->old_origin);
percent = len * origlen; percent = len * origlen;
if (cl_surprise->int_val)
{
particle_new (pt_smoke, part_tex_smoke, ent->old_origin, particle_new (pt_smoke, part_tex_smoke, ent->old_origin,
pscale + percent * 4.0, vec3_origin, pscale + percent * 4.0, vec3_origin,
r_realtime + 2.0 - percent * 2.0, r_realtime + 2.0 - percent * 2.0, (rand () & 3),
(rand () & 255),
160 + (rand () & 31) - percent * 100.0); 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);
}
if (numparticles >= r_maxparticles) if (numparticles >= r_maxparticles)
break; break;
len += dist; len += dist;

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

@ -44,7 +44,6 @@ static const char rcsid[] =
cvar_t *cl_crossx; cvar_t *cl_crossx;
cvar_t *cl_crossy; cvar_t *cl_crossy;
cvar_t *cl_max_particles; cvar_t *cl_max_particles;
cvar_t *cl_surprise;
cvar_t *cl_verstring; cvar_t *cl_verstring;
cvar_t *crosshair; cvar_t *crosshair;
cvar_t *crosshaircolor; cvar_t *crosshaircolor;
@ -157,8 +156,6 @@ R_Init_Cvars (void)
cl_max_particles_f, "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_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, cl_verstring = Cvar_Get ("cl_verstring", PROGRAM " " VERSION, CVAR_NONE,
NULL, "Client version string"); NULL, "Client version string");
crosshair = Cvar_Get ("crosshair", "0", CVAR_ARCHIVE, NULL, "Crosshair " crosshair = Cvar_Get ("crosshair", "0", CVAR_ARCHIVE, NULL, "Crosshair "