From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 1 Dec 2004 07:40:36 +0000 (+0000)
Subject: reset animation interpolation on weaponmodel when model changes (thanks Elric)
X-Git-Tag: xonotic-v0.1.0preview~5331
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4256a0bc028590ccced84c0ba827b480e519dda;p=xonotic%2Fdarkplaces.git

reset animation interpolation on weaponmodel when model changes (thanks Elric)


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

diff --git a/cl_main.c b/cl_main.c
index 2898df65..d1d5fc60 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -947,6 +947,14 @@ static void CL_RelinkNetworkEntities(void)
 			ent->state_current.modelindex = 0;
 	}
 
+	// reset animation interpolation on weaponmodel if model changed
+	if (ent->state_previous.modelindex != ent->state_current.modelindex)
+	{
+		ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+		ent->render.frame1time = ent->render.frame2time = cl.time;
+		ent->render.framelerp = 1;
+	}
+
 	// start on the entity after the world
 	entitylinkframenumber++;
 	for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS;i++, ent++)