team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow server cshifts to be disabled when playing back demos. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5788 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-12-02 06:38:32 +00:00
parent d6bae5a2bf
commit 546be5849a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/client/view.c
View File

@ -818,17 +818,17 @@ void V_CalcBlend (float *hw_blend)
//don't apply it to the server, we'll blend the two later if the user has no hardware gamma (if they do have it, we use just the server specified value) This way we avoid winnt users having a cheat with flashbangs and stuff.
for (j=0 ; j<NUM_CSHIFTS ; j++)
{
if (j != CSHIFT_SERVER && j != CSHIFT_BONUS)
if ((j == CSHIFT_SERVER&&!cls.demoplayback) || j == CSHIFT_BONUS)
{
a2 = pv->cshifts[j].percent / 255.0; //don't allow modification of this one.
}
else
{
if (!gl_cshiftpercent.value || !gl_cshiftenabled.ival)
continue;
a2 = ((pv->cshifts[j].percent * gl_cshiftpercent.value) / 100.0) / 255.0;
}
else
{
a2 = pv->cshifts[j].percent / 255.0; //don't allow modification of this one.
}
if (a2 <= 0)
continue;

2
engine/d3d/d3d_backend.c
View File

@ -1658,7 +1658,7 @@ static void GenerateFogTexture(texid_t *tex, float density, float zscale)
if (!TEXVALID(*tex))
*tex = Image_CreateTexture("***fog***", NULL, IF_CLAMP|IF_NOMIPMAP);
Image_Upload(*tex, TF_RGBA32, fogdata, NULL, FOGS, FOGT, IF_CLAMP|IF_NOMIPMAP);
Image_Upload(*tex, TF_RGBA32, fogdata, NULL, FOGS, FOGT, 1, IF_CLAMP|IF_NOMIPMAP);
}