slight safety improvement in frameblend generation, may fix a crash Willis reported...

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

diff --git a/r_lerpanim.c b/r_lerpanim.c
index b9f30a7f12a0d28b8414db56a5906c03be053dab..f736a11ccc31b3e2b96c9b208c43a9995ca76920 100644 (file)
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -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