X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=d2fda299965e1c7648233cd5594ba7ee4c6a7022;hp=59b401646797afd0b39668c6d31b3244e0390821;hb=841f94c4182f8dff0253db9bae4922c3c9039a5f;hpb=d2c7edfd9f15b74baba78b935b555f351b93728c

diff --git a/rocks.c b/rocks.c
index 59b4016..d2fda29 100644
--- a/rocks.c
+++ b/rocks.c
@@ -3,9 +3,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "config.h"
 #include "file.h"
 #include "globals.h"
+#include "mt.h"
 #include "rocks.h"
 #include "shape.h"
 
@@ -25,10 +27,6 @@ struct shape rock_shapes[NROCKS];
 // timers for rock generation.
 float rtimers[4];
 
-int32_t rcnt, lrcnt;
-int32_t rsum, rsamples;
-float ravg;
-
 uint32_t nrocks;
 uint32_t nrocks_timer;
 uint32_t nrocks_inc_ticks = 2*60*1000/(F_ROCKS-I_ROCKS);
@@ -39,11 +37,6 @@ uint32_t nrocks_inc_ticks = 2*60*1000/(F_ROCKS-I_ROCKS);
 #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)
 {
@@ -68,14 +61,12 @@ reset_rocks(void)
 	for(i = 0; i<MAXROCKS; i++) rock[i].active = 0;
 	nrocks = I_ROCKS;
 	nrocks_timer = 0;
-	rcnt = 0; lrcnt = -1;
-	rsum = 0; rsamples = 0;
 }
 
 enum { LEFT, RIGHT, TOP, BOTTOM };
 
 
-// compute the number of rocks/seccond that should be coming from each side
+// compute the number of rocks/second that should be coming from each side
 
 // compute the speed ranges of rocks coming from each side
 void
@@ -88,53 +79,49 @@ rock_sides(float *ti, float *speed_min, float *speed_max)
 	for(i=0; i<4; i++) ti[i] = 0;
 	for(i=0; i<4; i++) speed_min[i] = 0;
 	for(i=0; i<4; i++) speed_max[i] = 0;
-	hfactor = nrocks/KH; vfactor = nrocks/KV;
+	hfactor = (float)nrocks/KH; vfactor = (float)nrocks/KV;
 
 	dx0 = -RDX - screendx; dx1 = RDX - screendx;
 	dy0 = -RDY - screendy; dy1 = RDY - screendy;
 
-	if(dx0 != 0) {
-		if(dx0 < 0) {
-			speed_max[RIGHT] = -dx0;
-			if(dx1 < 0) {
-				// Rocks moving left only. So the RIGHT side of the screen
-				speed_min[RIGHT] = -dx1;
-				ti[RIGHT] = -(dx0+dx1)/2;
-			} else {
-				// Rocks moving left and right
-				speed_max[LEFT] = dx1;
-				ti[RIGHT] = -dx0/2;
-				ti[LEFT] = dx1/2;
-			}
+	if(dx0 < 0) {
+		speed_max[RIGHT] = -dx0;
+		if(dx1 < 0) {
+			// Rocks moving left only. So the RIGHT side of the screen
+			speed_min[RIGHT] = -dx1;
+			ti[RIGHT] = -(dx0+dx1)/2;
 		} else {
-			// Rocks moving right only. So the LEFT side of the screen
-			speed_min[LEFT] = dx0;
+			// Rocks moving left and right
 			speed_max[LEFT] = dx1;
-			ti[LEFT] = (dx0+dx1)/2;
+			ti[RIGHT] = -dx0/2;
+			ti[LEFT] = dx1/2;
 		}
+	} else {
+		// Rocks moving right only. So the LEFT side of the screen
+		speed_min[LEFT] = dx0;
+		speed_max[LEFT] = dx1;
+		ti[LEFT] = (dx0+dx1)/2;
 	}
 	ti[LEFT] *= hfactor;
 	ti[RIGHT] *= hfactor;
 
-	if(dy0 != 0) {
-		if(dy0 < 0) {
-			speed_max[BOTTOM] = -dy0;
-			if(dy1 < 0) {
-				// Rocks moving up only. So the BOTTOM of the screen
-				speed_min[BOTTOM] = -dy1;
-				ti[BOTTOM] = -(dy0+dy1)/2;
-			} else {
-				// Rocks moving up and down
-				speed_max[TOP] = dy1;
-				ti[BOTTOM] = -dy0/2;
-				ti[TOP] = dy1/2;
-			}
+	if(dy0 < 0) {
+		speed_max[BOTTOM] = -dy0;
+		if(dy1 < 0) {
+			// Rocks moving up only. So the BOTTOM of the screen
+			speed_min[BOTTOM] = -dy1;
+			ti[BOTTOM] = -(dy0+dy1)/2;
 		} else {
-			// Rocks moving down only. so the TOP of the screen
-			speed_min[TOP] = dy0;
+			// Rocks moving up and down
 			speed_max[TOP] = dy1;
-			ti[TOP] = (dy0+dy1)/2;
+			ti[BOTTOM] = -dy0/2;
+			ti[TOP] = dy1/2;
 		}
+	} else {
+		// Rocks moving down only. so the TOP of the screen
+		speed_min[TOP] = dy0;
+		speed_max[TOP] = dy1;
+		ti[TOP] = (dy0+dy1)/2;
 	}
 	ti[TOP] *= vfactor;
 	ti[BOTTOM] *= vfactor;
@@ -142,7 +129,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
@@ -154,7 +141,7 @@ new_rocks(void)
 	float rmax[4];
 
 	if(nrocks < F_ROCKS) {
-		nrocks_timer += ticks_since_last;
+		nrocks_timer += ms_frame;
 		if(nrocks_timer >= nrocks_inc_ticks) {
 			nrocks_timer -= nrocks_inc_ticks;
 			nrocks++;
@@ -166,7 +153,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]*gamerate/20;
+		rtimers[i] += ti[i]*s_frame;
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
 			j=0;
@@ -181,27 +168,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();
@@ -210,7 +197,6 @@ new_rocks(void)
 				}
 
 				rockptr->active = 1;
-				rcnt++;
 			}
 		}
 	}
@@ -225,25 +211,15 @@ move_rocks(void)
 	for(i = 0; i < MAXROCKS; i++) {
 		if(rock[i].active) {
 			// move
-			rock[i].x += (rock[i].dx-screendx)*gamerate;
-			rock[i].y += (rock[i].dy-screendy)*gamerate;
+			rock[i].x += (rock[i].dx-screendx)*t_frame;
+			rock[i].y += (rock[i].dy-screendy)*t_frame;
 			// clip
 			if(rock[i].x < -rock[i].image->w || rock[i].x >= XSIZE
 					|| rock[i].y < -rock[i].image->h || rock[i].y >= YSIZE) {
 				rock[i].active = 0;
-				rcnt--;
 			}
 		}
 	}
-	/*
-	if(lrcnt == -1 && rcnt == nrocks) lrcnt = 0;
-	if(rcnt != lrcnt && lrcnt != -1) {
-		lrcnt = rcnt;
-		rsum += rcnt-nrocks; rsamples++;
-		ravg = (float) rsum / rsamples;
-		printf("%.2f%%\n", 100.0 * ravg / nrocks);
-	}
-	*/
 }
 
 void