JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
bump version to 0.5.8
[vor.git] / sprite.c
index 4e249c3..923e967 100644 (file)
--- 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++) {