okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source
This commit is contained in:
Zack Middleton 2013-11-17 19:01:35 -06:00
commit 3736968943
32 changed files with 1002 additions and 1005 deletions
Download patch file Download diff file Expand all files Collapse all files

21
code/renderergl1/tr_flares.c
View file

@ -86,6 +86,19 @@ flare_t *r_activeFlares, *r_inactiveFlares;
int flareCoeff;
/*
==================
R_SetFlareCoeff
==================
*/
static void R_SetFlareCoeff( void ) {
if(r_flareCoeff->value == 0.0f)
flareCoeff = atof(FLARE_STDCOEFF);
else
flareCoeff = r_flareCoeff->value;
}
/*
==================
R_ClearFlares
@ -102,6 +115,8 @@ void R_ClearFlares( void ) {
r_flareStructs[i].next = r_inactiveFlares;
r_inactiveFlares = &r_flareStructs[i];
}
R_SetFlareCoeff();
}
@ -450,11 +465,7 @@ void RB_RenderFlares (void) {
if(r_flareCoeff->modified)
{
if(r_flareCoeff->value == 0.0f)
flareCoeff = atof(FLARE_STDCOEFF);
else
flareCoeff = r_flareCoeff->value;
R_SetFlareCoeff();
r_flareCoeff->modified = qfalse;
}