eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Make sure glowmod is set properly, even on viewmodels (bug reported by xaGe).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5603 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-01-20 17:58:45 +00:00
parent 4ea233bf8a
commit 3d54173ad1
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/client/cl_ents.c
View file

@ -5330,6 +5330,7 @@ void CL_LinkPlayers (void)
#ifdef PEXT_SCALE
ent->scale = state->scale;
#endif
ent->glowmod[0] = ent->glowmod[1] = ent->glowmod[2] = 1;
ent->shaderRGBAf[0] = state->colourmod[0]/32.0f;
ent->shaderRGBAf[1] = state->colourmod[1]/32.0f;
ent->shaderRGBAf[2] = state->colourmod[2]/32.0f;
@ -5538,9 +5539,8 @@ void CL_LinkViewModel(void)
ent.angles[1] = cl_gunangley.value;
ent.angles[2] = cl_gunanglez.value;
ent.shaderRGBAf[0] = 1;
ent.shaderRGBAf[1] = 1;
ent.shaderRGBAf[2] = 1;
ent.glowmod[0] = ent.glowmod[1] = ent.glowmod[2] = 1;
ent.shaderRGBAf[0] = ent.shaderRGBAf[1] = ent.shaderRGBAf[2] = 1;
ent.shaderRGBAf[3] = alpha;
if (alpha != 1)
{

3
engine/client/cl_parse.c
View file

@ -4699,6 +4699,9 @@ static void CL_ParseStaticProt (int baselinetype)
#ifdef PEXT_SCALE
ent->scale = es.scale/16.0;
#endif
ent->glowmod[0] = (8.0f/256.0f)*es.glowmod[0];
ent->glowmod[1] = (8.0f/256.0f)*es.glowmod[1];
ent->glowmod[2] = (8.0f/256.0f)*es.glowmod[2];
ent->shaderRGBAf[0] = (8.0f/256.0f)*es.colormod[0];
ent->shaderRGBAf[1] = (8.0f/256.0f)*es.colormod[1];
ent->shaderRGBAf[2] = (8.0f/256.0f)*es.colormod[2];