X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=ceddd4bf755db09667d987a6b10856133431a591;hp=5518c4197c406d8aa428a536cd0484bf5466e473;hb=1aa8a0df26ef582dee4ffe3aa2f17f1f1a42b3c9;hpb=286cb1818d7d2787c8a19f5cf34947e7300bc536

diff --git a/rocks.c b/rocks.c
index 5518c41..ceddd4b 100644
--- a/rocks.c
+++ b/rocks.c
@@ -7,6 +7,7 @@
 #include "config.h"
 #include "file.h"
 #include "globals.h"
+#include "mt.h"
 #include "rocks.h"
 #include "shape.h"
 
@@ -27,20 +28,15 @@ 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 (+/-)
 
-float rnd(void);
-
-#define crnd() (2*(rnd()-0.5))
-
-
 int
 init_rocks(void)
 {
@@ -54,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;
 }
 
@@ -133,7 +130,7 @@ rock_sides(float *ti, float *speed_min, float *speed_max)
 
 float
 weighted_rnd_range(float min, float max) {
-	return sqrt(min * min + rnd() * (max * max - min * min));
+	return sqrt(min * min + frnd() * (max * max - min * min));
 }
 
 void
@@ -145,10 +142,11 @@ 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++;
+			printf("nrocks = %d.\n", nrocks);
 		}
 	}
 
@@ -157,7 +155,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]*t_frame/20;
+		rtimers[i] += ti[i]*t_frame;
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
 			j=0;
@@ -172,27 +170,27 @@ new_rocks(void)
 				switch(i) {
 					case RIGHT:
 						rockptr->x = XSIZE;
-						rockptr->y = rnd()*(YSIZE + rockptr->image->h);
+						rockptr->y = frnd()*(YSIZE + rockptr->image->h);
 
 						rockptr->dx = -weighted_rnd_range(rmin[i], rmax[i]) + screendx;
 						rockptr->dy = RDY*crnd();
 						break;
 					case LEFT:
 						rockptr->x = -rockptr->image->w;
-						rockptr->y = rnd()*(YSIZE + rockptr->image->h);
+						rockptr->y = frnd()*(YSIZE + rockptr->image->h);
 
 						rockptr->dx = weighted_rnd_range(rmin[i], rmax[i]) + screendx;
 						rockptr->dy = RDY*crnd();
 						break;
 					case BOTTOM:
-						rockptr->x = rnd()*(XSIZE + rockptr->image->w);
+						rockptr->x = frnd()*(XSIZE + rockptr->image->w);
 						rockptr->y = YSIZE;
 
 						rockptr->dx = RDX*crnd();
 						rockptr->dy = -weighted_rnd_range(rmin[i], rmax[i]) + screendy;
 						break;
 					case TOP:
-						rockptr->x = rnd()*(XSIZE + rockptr->image->w);
+						rockptr->x = frnd()*(XSIZE + rockptr->image->w);
 						rockptr->y = -rockptr->image->h;
 
 						rockptr->dx = RDX*crnd();