removed new ship fade, blast leaves rocks collidable, some refactoring.

[vor.git] / sprite.c

diff --git a/sprite.c b/sprite.c
index 1905510..809547b 100644 (file)
--- a/sprite.c
+++ b/sprite.c
@@ -115,11 +115,25 @@ add_sprite(Sprite *s)
 }
 
 void
+reset_sprites(void)
+{
+       int i;
+
+       for(i=0; i<gw*gh; i++)
+               while(sprites[set][i]) {
+                       Sprite *s = remove_sprite(&sprites[set][i]);
+                       insert_sprite(&free_sprites[s->type], s);
+                       s->flags = 0;
+               }
+}
+
+void
 move_sprite(Sprite *s)
 {
-       // move it.
-       s->x += (s->dx - screendx)*t_frame;
-       s->y += (s->dy - screendy)*t_frame;
+       if(s->flags & MOVE) {
+               s->x += (s->dx - screendx)*t_frame;
+               s->y += (s->dy - screendy)*t_frame;
+       }
 }
 
 void
@@ -129,7 +143,7 @@ sort_sprite(Sprite *s)
        if(s->x + s->w < 0 || s->x >= XSIZE
           || s->y + s->h < 0 || s->y >= YSIZE) {
                insert_sprite(&free_sprites[s->type], s);
-               s->type = NONE;
+               s->flags = 0;
        } else insert_sprite(square(s->x, s->y, 1-set), s);
 }
 
@@ -139,7 +153,7 @@ move_sprites(void)
        int sq;
        Sprite **head;
 
-       // Move all the sprites (position and set)
+       // Move all the sprites
        for(sq=0; sq<gw*gh; sq++) {
                head=&sprites[set][sq];
                while(*head) {
@@ -198,7 +212,7 @@ collide(Sprite *a, Sprite *b)
 {
        int dx, dy, xov, yov;
 
-       if(a->type < 0 || b->type < 0) return false;
+       if(!COLLIDES(a) || !COLLIDES(b)) return false;
 
        if(b->x < a->x) { Sprite *tmp = a; a = b; b = tmp; }
 
@@ -215,14 +229,25 @@ collide(Sprite *a, Sprite *b)
 }
 
 void
+collide_with_list(Sprite *s, Sprite *list)
+{
+       for(; list; list=list->next)
+               if(collide(s, list)) do_collision(s, list);
+}
+
+void
 collisions(void)
 {
-       int i;
-       Sprite *a, *b;
-       for(i=0; i<gw*gh; i++)
-               for(a=sprites[set][i]; a; a=a->next)
-                       for(b=a->next; b; b=b->next)
-                               if(collide(a, b)) do_collision(a, b);
+       int i, end = gw*gh;
+       Sprite *s;
+       for(i=0; i<end; i++) {
+               for(s=sprites[set][i]; s; s=s->next) {
+                       collide_with_list(s, s->next);
+                       if(i+1 < end) collide_with_list(s, sprites[set][i+1]);
+                       if(i+gw < end) collide_with_list(s, sprites[set][i+gw]);
+                       if(i+gw+1 < end) collide_with_list(s, sprites[set][i+gw+1]);
+               }
+       }
 }
 
 Sprite *
@@ -267,6 +292,8 @@ int
 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;
 
@@ -279,7 +306,7 @@ int
 pixel_hit_in_square(Sprite *r, float x, float y)
 {
        for(; r; r=r->next) {
-               if(pixel_collide(r, x, y)) return 1;
+               if(COLLIDES(r) && pixel_collide(r, x, y)) return 1;
        }
        return 0;
 }