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

diff --git a/rocks.c b/rocks.c
index 9c2728c..5518c41 100644
--- a/rocks.c
+++ b/rocks.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "common.h"
 #include "config.h"
 #include "file.h"
 #include "globals.h"
@@ -144,7 +145,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 +157,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]*framelen/20;
+		rtimers[i] += ti[i]*t_frame/20;
 		while(rtimers[i] >= 1) {
 			rtimers[i] -= 1;
 			j=0;
@@ -214,8 +215,8 @@ move_rocks(void)
 	for(i = 0; i < MAXROCKS; i++) {
 		if(rock[i].active) {
 			// move
-			rock[i].x += (rock[i].dx-screendx)*framelen;
-			rock[i].y += (rock[i].dy-screendy)*framelen;
+			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) {