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
removed new ship fade, blast leaves rocks collidable, some refactoring.
[vor.git]
/
sprite.c
diff --git
a/sprite.c
b/sprite.c
index
db5ac8d
..
809547b
100644
(file)
--- a/
sprite.c
+++ b/
sprite.c
@@
-130,8
+130,7
@@
reset_sprites(void)
void
move_sprite(Sprite *s)
{
void
move_sprite(Sprite *s)
{
- if(s->flags & DRAW_FLAG) {
- // move it.
+ if(s->flags & MOVE) {
s->x += (s->dx - screendx)*t_frame;
s->y += (s->dy - screendy)*t_frame;
}
s->x += (s->dx - screendx)*t_frame;
s->y += (s->dy - screendy)*t_frame;
}
@@
-293,6
+292,8
@@
int
pixel_collide(Sprite *s, int x, int y)
{
uint32_t pmask;
pixel_collide(Sprite *s, int x, int y)
{
uint32_t pmask;
+
+ if(!COLLIDES(s)) return false;
if(x < s->x || y < s->y || x >= s->x + s->w || y >= s->y + s->h) return 0;
if(x < s->x || y < s->y || x >= s->x + s->w || y >= s->y + s->h) return 0;