X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=rocks.c;h=e47bc44c044f71984277808ff4a412e8c153d76a;hp=94df49954866645c95e4cb967f1a6e89a48b9abe;hb=4461dfec6f8f09b43ec9719523d14978d82bd124;hpb=28d859440d40ee2d7d54500f4687e86168137cb8

diff --git a/rocks.c b/rocks.c
index 94df499..e47bc44 100644
--- a/rocks.c
+++ b/rocks.c
@@ -69,7 +69,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
@@ -82,53 +82,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;
@@ -191,14 +187,14 @@ new_rocks(void)
 						rockptr->x = rnd()*(XSIZE + rockptr->image->w);
 						rockptr->y = YSIZE;
 
-						rockptr->dx = RDY*crnd();
+						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->y = -rockptr->image->h;
 
-						rockptr->dx = RDY*crnd();
+						rockptr->dx = RDX*crnd();
 						rockptr->dy = weighted_rnd_range(rmin[i], rmax[i]) + screendy;
 						break;
 				}