renamed *_SPRITE to *, made rocks bounce off each other.

[vor.git] / sprite.c

diff --git a/sprite.c b/sprite.c
index 0a6ab87..1905510 100644 (file)
--- a/sprite.c
+++ b/sprite.c
@@ -198,6 +198,8 @@ collide(Sprite *a, Sprite *b)
 {
        int dx, dy, xov, yov;
 
 {
        int dx, dy, xov, yov;
 

+       if(a->type < 0 || b->type < 0) return false;
+

        if(b->x < a->x) { Sprite *tmp = a; a = b; b = tmp; }
 
        dx = b->x - a->x;
        if(b->x < a->x) { Sprite *tmp = a; a = b; b = tmp; }
 
        dx = b->x - a->x;

@@ -212,6 +214,17 @@ collide(Sprite *a, Sprite *b)
        else return mask_collide(xov, yov, a, b);
 }
 
        else return mask_collide(xov, yov, a, b);
 }
 

+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);
+}
+

 Sprite *
 hit_in_square(Sprite *r, Sprite *s)
 {
 Sprite *
 hit_in_square(Sprite *r, Sprite *s)
 {

@@ -287,11 +300,11 @@ pixel_collides(float x, float y)
 }
 
 
 }
 
 

-float
+static float

 sprite_mass(Sprite *s)
 {
 sprite_mass(Sprite *s)
 {

-       if(s->type == SHIP_SPRITE) return s->area;
-       else if(s->type == ROCK_SPRITE) return 3*s->area;
+       if(s->type == SHIP) return s->area;
+       else if(s->type == ROCK) return 3*s->area;

        else return 0;
 }
 
        else return 0;
 }