From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 6 Feb 2009 14:48:41 +0000 (+0000)
Subject: fix a possible bug with zym model animation (this looks like a typo, and fixing it... 
X-Git-Tag: xonotic-v0.1.0preview~1900
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b678677fe374b9ae4f591cbf23ca62a19f890722;p=xonotic%2Fdarkplaces.git

fix a possible bug with zym model animation (this looks like a typo, and fixing it makes the shotgun anim in nexuiz appear more consistent)


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

diff --git a/r_lerpanim.c b/r_lerpanim.c
index 646033e1..9497ccf9 100644
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -112,7 +112,7 @@ void R_LerpAnimation(entity_render_t *r)
 
 			if (scene->framecount > 1)
 			{
-				sublerp = scene->framerate * (cl.time - r->frame1time);
+				sublerp = scene->framerate * (cl.time - r->frame2time);
 				sub1 = (int) (sublerp);
 				sub2 = sub1 + 1;
 				sublerp -= sub1;