X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=5724a1af6f2c27ca7e06ff612e3abe14e094f268;hp=de9534733e5d3623f79c475bc438b2193f4b6675;hb=7a05bb4e3cd9cfa9d949e26ee6c0b447d687179e;hpb=0b36c07b7161b0f4d5f1ffe7dceb16b759395672

diff --git a/main.c b/main.c
index de95347..5724a1a 100644
--- a/main.c
+++ b/main.c
@@ -1051,7 +1051,7 @@ int gameloop() {
 				}
 			} else {
 				if(state == DEAD_PAUSE) {
-					float blast_radius = START_RAD * state_timeout / 50.0;
+					float blast_radius = START_RAD * state_timeout / 20.0;
 					if(xship < 60) xship = 60;
 					for(i = 0; i<MAXROCKS; i++ ) {
 						float dx, dy, n;
@@ -1060,7 +1060,7 @@ int gameloop() {
 						dy = rock[i].y - yship;
 						n = sqrt(dx*dx + dy*dy);
 						if(n < blast_radius) {
-							n *= 50;
+							n *= 20;
 							rock[i].xvel += rockrate*(dx+30)/n;
 							rock[i].yvel += rockrate*dy/n;
 							rock[i].dead = 1;
@@ -1114,18 +1114,25 @@ int gameloop() {
 			yship += yscroll;
 			
 			// Move all the rocks
-			for(i = 0; i<MAXROCKS; i++) if(rock[i].active) {
-				rock[i].x += rock[i].xvel*movementrate;
-				rock[i].y += rock[i].yvel*movementrate + yscroll;
-				if(rock[i].dead && (rock[i].y < 0 || rock[i].y > YSIZE)) rock[i].active = 0;
-				if(rock[i].y > YSIZE) {
-					rock[i].y -= YSIZE;
-					rock[i].y -= rock[i].image->w;
-				} else if(rock[i].y < -rock[i].image->w) {
-					rock[i].y += YSIZE;
-					rock[i].y += rock[i].image->w;
+			for(i = 0; i < MAXROCKS; i++) {
+				if(rock[i].active) {
+					rock[i].x += rock[i].xvel*movementrate;
+					rock[i].y += rock[i].yvel*movementrate + yscroll;
+					if((rock[i].y > YSIZE && rock[i].y > 0) || (rock[i].y < -rock[i].image->h && rock[i].y < 0)) {
+						if(rock[i].dead) {
+							rock[i].dead = 0;
+							rock[i].active = 0;
+						} else {
+							// wrap
+							rock[i].y = (YSIZE - rock[i].image->h) - rock[i].y;
+							rock[i].y += (rock[i].yvel*movementrate + yscroll) * 2;
+						}
+					}
+					if(rock[i].x < -32.0 || rock[i].x > XSIZE + 32.0) {
+						rock[i].active = 0;
+						rock[i].dead = 0;
+					}
 				}
-				if(rock[i].x < -32.0) rock[i].active = 0;
 			}
 
 
@@ -1159,7 +1166,7 @@ int gameloop() {
 				}
 				else {
 					state = DEAD_PAUSE;
-					state_timeout = 50.0;
+					state_timeout = 20.0;
 					xvel = 0;
 					yvel = 0;
 				}