mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
cl_parse.c: fix viewmodel lerping on large maps (e.g. zendar, warpd)
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+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1208 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
f0b0851885
commit
de90e2c4ea
1 changed files with 8 additions and 5 deletions
|
@ -733,11 +733,6 @@ void CL_ParseClientdata (void)
|
|||
{
|
||||
cl.stats[STAT_WEAPON] = i;
|
||||
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 ();
|
||||
|
@ -805,6 +800,14 @@ void CL_ParseClientdata (void)
|
|||
else
|
||||
cl.viewent.alpha = ENTALPHA_DEFAULT;
|
||||
//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
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue