X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_lerpanim.c;h=831a16e42380f33b4323cd66d4819bd7077527bc;hp=b9f30a7f12a0d28b8414db56a5906c03be053dab;hb=853574d7d26a8a15bee1ea0fc88b08f77084e38a;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2

diff --git a/r_lerpanim.c b/r_lerpanim.c
index b9f30a7f..831a16e4 100644
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -32,7 +32,10 @@ void R_LerpAnimation(entity_render_t *r)
 
 	// note: this could be removed, if the rendering code allows an empty blend array
 	if (r->frame1 < 0)
-		Host_Error ("CL_LerpAnimation: frame1 is NULL\n");
+	{
+		Con_Printf ("CL_LerpAnimation: frame1 is NULL\n");
+		r->frame1 = 0;
+	}
 
 	// check r_lerpmodels and round off very close blend percentages
 	if (!r_lerpmodels.integer)
@@ -68,13 +71,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 +126,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