X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sprite.c;h=923e967eff1f6cf2d17a8df6829fc5ec10ae4ed5;hp=4e249c3716142026cecccfb38b3890a5f7b87da8;hb=HEAD;hpb=dec36530097c5de6981ca8a302d22523a1cf6f44

diff --git a/sprite.c b/sprite.c
index 4e249c3..923e967 100644
--- a/sprite.c
+++ b/sprite.c
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
+#include "vorconfig.h"
 #include "common.h"
 #include "globals.h"
 #include "sprite.h"
@@ -203,8 +203,8 @@ mask_collide(int xov, int yov, Sprite *a, Sprite *b)
 		bmask = b->mask;
 	} else {
 		yov = -yov;
-		amask = a->mask;
-		bmask = b->mask + ((b->h - yov) * b->mask_w) + word;
+		amask = a->mask + word;
+		bmask = b->mask + ((b->h - yov) * b->mask_w);
 	}
 
 	for(y=0; y<yov; y++) {