mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-16 16:51:16 +00:00
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.
This commit is contained in:
parent
e0d55e9c19
commit
b1e18056eb
7 changed files with 17 additions and 11 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue