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

[vor.git] / rocks.c

diff --git a/rocks.c b/rocks.c
index 76663c6..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"
@@ -25,10 +26,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);
@@ -68,14 +65,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
@@ -93,48 +88,44 @@ rock_sides(float *ti, float *speed_min, float *speed_max)
        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;
@@ -154,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++;
@@ -166,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;
@@ -210,7 +201,6 @@ new_rocks(void)
                                }
 
                                rockptr->active = 1;
-                               rcnt++;
                        }
                }
        }
@@ -225,25 +215,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