X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rocks.c;h=bee1ca58770bda68f6b0f7e34dd5cca11f275f99;hb=1f33a47c0e3b72d6050b72926643812237dc3f49;hp=d2fda299965e1c7648233cd5594ba7ee4c6a7022;hpb=841f94c4182f8dff0253db9bae4922c3c9039a5f;p=vor.git

diff --git a/rocks.c b/rocks.c
index d2fda29..bee1ca5 100644
--- a/rocks.c
+++ b/rocks.c
@@ -28,12 +28,12 @@ struct shape rock_shapes[NROCKS];
 float rtimers[4];
 
 uint32_t nrocks;
-uint32_t nrocks_timer;
-uint32_t nrocks_inc_ticks = 2*60*1000/(F_ROCKS-I_ROCKS);
+float nrocks_timer;
+float nrocks_inc_ticks = 2*60*20/(F_ROCKS-I_ROCKS);
 
 // constants for rock generation.
-#define KH 32.0  // 32 s for a speed=1 rock to cross the screen horizontally.
-#define KV 24.0  // 24 s for a speed=1 rock to cross the screen vertically.
+#define KH (32.0*20)  // 32 s for a speed=1 rock to cross the screen horizontally.
+#define KV (24.0*20)  // 24 s for a speed=1 rock to cross the screen vertically.
 #define RDX 2.5  // range for rock dx values (+/-)
 #define RDY 2.5  // range for rock dy values (+/-)
 
@@ -50,6 +50,7 @@ init_rocks(void)
 		NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
 		get_shape(surf_rock[i], &rock_shapes[i]);
 	}
+	reset_rocks();
 	return 0;
 }
 
@@ -141,7 +142,7 @@ new_rocks(void)
 	float rmax[4];
 
 	if(nrocks < F_ROCKS) {
-		nrocks_timer += ms_frame;
+		nrocks_timer += t_frame;
 		if(nrocks_timer >= nrocks_inc_ticks) {
 			nrocks_timer -= nrocks_inc_ticks;
 			nrocks++;
@@ -153,7 +154,7 @@ new_rocks(void)
 	// loop through the four sides of the screen
 	for(i=0; i<4; i++) {
 		// see if we generate a rock for this side this frame
-		rtimers[i] += ti[i]*s_frame;
+		rtimers[i] += ti[i]*t_frame;
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
 			j=0;
@@ -260,6 +261,22 @@ hit_rocks(float x, float y, struct shape *shape)
 	return 0;
 }
 
+int
+pixel_hit_rocks(float x, float y)
+{
+	int i;
+	float xoff, yoff;
+
+	for(i=0; i<MAXROCKS; i++) {
+		if(rock[i].active) {
+			xoff = x - rock[i].x; if(xoff < 0) continue;
+			yoff = y - rock[i].y; if(yoff < 0) continue;
+			if(pixel_collide(xoff, yoff, rock[i].shape)) return 1;
+		}
+	}
+	return 0;
+}
+
 void
 blast_rocks(float x, float y, float radius, int onlyslow)
 {