fix the unintentional framegroup timing reset that happened when the .frame field...

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

diff --git a/cl_main.c b/cl_main.c
index efbdc0a1a29f76eaafb0d02d0801c263ff4e26ba..6ecfefb19011d58f9a9295bab213fb9feaba0dce 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -619,7 +619,10 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->render.framelerp = 1;
                        if (e->render.frame2time > e->render.frame1time)
                        {
-                               e->render.framelerp = (cl.time - e->render.frame2time) / (e->render.frame2time - e->render.frame1time);
+                               // make sure frame lerp won't last longer than 100ms
+                               // (this mainly helps with models that use framegroups and
+                               // switch between them infrequently)
+                               e->render.framelerp = (cl.time - e->render.frame2time) / min(e->render.frame2time - e->render.frame1time, 0.1);
                                e->render.framelerp = bound(0, e->render.framelerp, 1);
                        }
                }
@@ -631,10 +634,6 @@ void CL_LinkNetworkEntity(entity_t *e)
                        e->render.frame = e->render.frame2 = e->state_current.frame;
                        e->render.frame2time = cl.time;
                        e->render.framelerp = 0;
-                       // make sure frame lerp won't last longer than 100ms
-                       // (this mainly helps with models that use framegroups and
-                       // switch between them infrequently)
-                       e->render.frame1time = max(e->render.frame1time, e->render.frame2time - 0.1f);
                }
                R_LerpAnimation(&e->render);