From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 16 Feb 2009 18:09:53 +0000 (+0000)
Subject: skip interpolation if tagentity changes
X-Git-Tag: xonotic-v0.1.0preview~1880
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16cd2666c46f3cf92021eeae4c07849ae5e704b2;p=xonotic%2Fdarkplaces.git

skip interpolation if tagentity changes


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8714 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index 673a26fc..c21a2594 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1739,7 +1739,10 @@ void CL_MoveLerpEntityStates(entity_t *ent)
 		ent->persistent.muzzleflash = 0;
 		ent->persistent.trail_allowed = false;
 	}
-	else if (DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
+	else if (DotProduct(odelta, odelta) > 1000*1000
+		|| (cl.fixangle[0] && !cl.fixangle[1])
+		|| (ent->state_previous.tagindex != ent->state_current.tagindex)
+		|| (ent->state_previous.tagentity != ent->state_current.tagentity))
 	{
 		// don't interpolate the move
 		// (the fixangle[] check detects teleports, but not constant fixangles