From 93a442003a5b3fe190e7d355cc787a392e4e745d Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sat, 16 May 2015 22:15:15 +0000 Subject: [PATCH] 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1208 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/cl_parse.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c index aa7b3efd..ffcea5a5 100644 --- a/Quake/cl_parse.c +++ b/Quake/cl_parse.c @@ -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 } /*