X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=sprite.c;h=19055106dfe28d7765d9ebce30cdaf0b5b9a7701;hp=0a6ab871bf6c9a4baa0a64bc07fa83881d8209a5;hb=e9eaa65259d7c35d5a9b08aba9016145fa8f118d;hpb=40a38066c8a4b53017bb5f422e126dd2c6b20fd5

diff --git a/sprite.c b/sprite.c
index 0a6ab87..1905510 100644
--- a/sprite.c
+++ b/sprite.c
@@ -198,6 +198,8 @@ collide(Sprite *a, Sprite *b)
 {
 	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;
@@ -212,6 +214,17 @@ collide(Sprite *a, Sprite *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)
 {
@@ -287,11 +300,11 @@ pixel_collides(float x, float y)
 }
 
 
-float
+static float
 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;
 }