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 2898df656d8e9b2f7b8e1d0efea0cedb9c4d551d..d1d5fc60a2c00e646b2058156e59cbcc667bbac5 100644 (file)
--- 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++)