From: Joshua Grams <josh@qualdan.com>
Date: Thu, 23 Mar 2006 15:38:29 +0000 (+0000)
Subject: * sprite.c (collide): fixed yov computation.
X-Git-Tag: 0.4~24
X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=commitdiff_plain;h=22c206a9ad669ebf46c38ce78079a6be4238e0d9;hp=44497dc461bc10bc2c4398e5311d4136007b3488

* sprite.c (collide): fixed yov computation.
---

diff --git a/sprite.c b/sprite.c
index 45cd0f9..a772668 100644
--- 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);