JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
* sprite.c (collide): fixed yov computation.
authorJoshua Grams <josh@qualdan.com>
Thu, 23 Mar 2006 15:38:29 +0000 (15:38 +0000)
committerJoshua Grams <josh@qualdan.com>
Thu, 23 Mar 2006 15:38:29 +0000 (15:38 +0000)
sprite.c

index 45cd0f9..a772668 100644 (file)
--- a/sprite.c
+++ b/sprite.c
@@ -205,7 +205,7 @@ collide(Sprite *a, Sprite *b)
        xov = max(min(a->w - dx, b->w), 0);
 
        if(dy >= 0) yov = max(min(a->h - dy, b->h), 0);
-       else yov = -max(min(a->h - -dy, b->h), 0);
+       else yov = -max(min(b->h - -dy, a->h), 0);
 
        if(xov == 0 || yov == 0) return false;
        else return mask_collide(xov, yov, a, b);