X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=0b54b04804a59b814569de57ee23dfc2036a573d;hp=e47bc44c044f71984277808ff4a412e8c153d76a;hb=9ffdd66ad5f2c29a2125bbd458a700625f178065;hpb=4461dfec6f8f09b43ec9719523d14978d82bd124

diff --git a/rocks.c b/rocks.c
index e47bc44..0b54b04 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"
 
@@ -35,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)
 {
@@ -53,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;
 }
 
@@ -132,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
@@ -144,7 +142,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++;
@@ -156,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]*gamerate/20;
+		rtimers[i] += ti[i]*s_frame;
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
 			j=0;
@@ -171,27 +169,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();
@@ -214,8 +212,8 @@ 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) {