Friction doesn't make sense any more, dropped that.

[vor.git] / rocks.c

diff --git a/rocks.c b/rocks.c
index 89fe3a2..fc18bf3 100644 (file)
--- 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"
@@ -69,7 +70,7 @@ reset_rocks(void)
 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
@@ -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]*gamerate/20;
+               rtimers[i] += ti[i]*s_frame;
                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)*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) {