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

diff --git a/main.c b/main.c
index 97f7a67..5724a1a 100644
--- a/main.c
+++ b/main.c
@@ -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;
 			}