X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=7285d3beb85d2f3dab9b2cb0a3ffb059a1d384de;hp=89efb6ec5172b3733a4387a46b8b2abcba066709;hb=0978da8f14d855eecae9882b559d6e8b0533e78e;hpb=5c8f059629c2127848ce4051296d2f5897bf5c0f

diff --git a/rocks.c b/rocks.c
index 89efb6e..7285d3b 100644
--- a/rocks.c
+++ b/rocks.c
@@ -45,13 +45,14 @@ load_rocks(void)
 	for(i=0; i<NROCKS; i++) {
 		snprintf(a, ROCK_LEN, "sprites/rock%02d.png", i);
 		load_sprite(SPRITE(&prototypes[i]), a);
-		prototypes[i].sprite_type = ROCK_SPRITE;
+		prototypes[i].sprite_type = ROCK;
+		prototypes[i].flags = ALL_FLAGS;
 	}
 
 	memset(rocks, 0, MAXROCKS*sizeof(struct rock));
 
 	for(i=1; i<MAXROCKS; i++) rocks[i].next = &rocks[i-1];
-	free_sprites[ROCK_SPRITE] = SPRITE(&rocks[MAXROCKS-1]);
+	free_sprites[ROCK] = SPRITE(&rocks[MAXROCKS-1]);
 
 	reset_rocks();
 }
@@ -150,8 +151,8 @@ new_rocks(void)
 	for(i=0; i<4; i++) {
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
-			if(!free_sprites[ROCK_SPRITE]) return;  // sorry, we ran out of rocks!
-			r = (struct rock *) remove_sprite(&free_sprites[ROCK_SPRITE]);
+			if(!free_sprites[ROCK]) return;  // sorry, we ran out of rocks!
+			r = (struct rock *) remove_sprite(&free_sprites[ROCK]);
 			type = urnd() % NROCKS;
 			*r = prototypes[type];
 			r->type = type;
@@ -206,7 +207,7 @@ blast_rocks(float x, float y, float radius)
 	float dx, dy, n;
 
 	for(i=0; i<MAXROCKS; i++) {
-		if(rocks[i].sprite_type == NONE) continue;
+		if(!rocks[i].flags) continue;
 		r = SPRITE(&rocks[i]);
 		if(r->x <= 0) continue;
 
@@ -218,6 +219,7 @@ blast_rocks(float x, float y, float radius)
 			n *= 15;
 			r->dx += 54.0*dx/n;
 			r->dy += 54.0*dy/n;
+			r->flags &= ~COLLIDE_FLAG;
 		}
 	}
 }