fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 01:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

cl_parse.c: fix viewmodel lerping on large maps (e.g. zendar, warpd)

Browse source 
cl.stats[STAT_WEAPON] was being used before the high 8 bits were filled in, which is done with the SU_WEAPON2 byte.
Moved the block which clears the viewmodel lerp state to be after handling SU_WEAPON2.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1208 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Eric Wasylishen 2015-05-16 22:15:15 +00:00
parent 1f29972017
commit 93a442003a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Quake/cl_parse.c
View file

@ -733,11 +733,6 @@ void CL_ParseClientdata (void)
{ {
cl.stats[STAT_WEAPON] = i; cl.stats[STAT_WEAPON] = i;
Sbar_Changed (); Sbar_Changed ();
//johnfitz -- lerping
if (cl.viewent.model != cl.model_precache[cl.stats[STAT_WEAPON]])
cl.viewent.lerpflags |= LERP_RESETANIM; //don't lerp animation across model changes
//johnfitz
} }
i = MSG_ReadShort (); i = MSG_ReadShort ();
@ -805,6 +800,14 @@ void CL_ParseClientdata (void)
else else
cl.viewent.alpha = ENTALPHA_DEFAULT; cl.viewent.alpha = ENTALPHA_DEFAULT;
//johnfitz //johnfitz
//johnfitz -- lerping
//ericw -- this was done before the upper 8 bits of cl.stats[STAT_WEAPON] were filled in, breaking on large maps like zendar.bsp
if (cl.viewent.model != cl.model_precache[cl.stats[STAT_WEAPON]])
{
cl.viewent.lerpflags |= LERP_RESETANIM; //don't lerp animation across model changes
}
//johnfitz
} }
/* /*