X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_lerpanim.c;h=f736a11ccc31b3e2b96c9b208c43a9995ca76920;hb=b63e7923de09de541925afd34739f0fd27778e97;hp=91b55bff88e3893e336796f31dc2d0dc0c6d03fd;hpb=db0e59eeca766dc6c747f546a682c56c15db8e32;p=xonotic%2Fdarkplaces.git

diff --git a/r_lerpanim.c b/r_lerpanim.c
index 91b55bff..f736a11c 100644
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -11,7 +11,7 @@ void R_LerpAnimation(entity_render_t *r)
 	animscene_t *scene;
 	frameblend_t *blend;
 
-	if (!r->model)
+	if (!r->model || !r->model->type)
 		return;
 
 	blend = r->frameblend;
@@ -20,13 +20,13 @@ void R_LerpAnimation(entity_render_t *r)
 
 	if (r->frame1 >= numframes)
 	{
-		Con_DPrintf ("CL_LerpAnimation: no such frame %d\n", r->frame1);
+		Con_DPrintf("CL_LerpAnimation: no such frame %d\n", r->frame1);
 		r->frame1 = 0;
 	}
 
 	if (r->frame2 >= numframes)
 	{
-		Con_DPrintf ("CL_LerpAnimation: no such frame %d\n", r->frame2);
+		Con_DPrintf("CL_LerpAnimation: no such frame %d\n", r->frame2);
 		r->frame2 = 0;
 	}
 
@@ -68,13 +68,8 @@ void R_LerpAnimation(entity_render_t *r)
 					sub1 = (sub1 % scene->framecount);
 					sub2 = (sub2 % scene->framecount);
 				}
-				else
-				{
-					sub1 = bound(0, sub1, (scene->framecount - 1));
-					sub2 = bound(0, sub2, (scene->framecount - 1));
-				}
-				sub1 += scene->firstframe;
-				sub2 += scene->firstframe;
+				sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+				sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
 				f = sub1;
 				d = (1 - sublerp) * lerp;
 #define FRAMEBLENDINSERT\
@@ -128,13 +123,8 @@ void R_LerpAnimation(entity_render_t *r)
 					sub1 = (sub1 % scene->framecount);
 					sub2 = (sub2 % scene->framecount);
 				}
-				else
-				{
-					sub1 = bound(0, sub1, (scene->framecount - 1));
-					sub2 = bound(0, sub2, (scene->framecount - 1));
-				}
-				sub1 += scene->firstframe;
-				sub2 += scene->firstframe;
+				sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+				sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
 				f = sub1;
 				d = (1 - sublerp) * lerp;
 				FRAMEBLENDINSERT