Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Marked version 0.5.3.
[vor.git]
/
sprite.c
diff --git
a/sprite.c
b/sprite.c
index
4e249c3
..
742cbc4
100644
(file)
--- a/
sprite.c
+++ b/
sprite.c
@@
-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++) {