X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=68c77a4a8566ab702be17fb4d583c9ea0e2bfd6e;hp=db2f42824512c7a5aa780705c60f36e50d4e3858;hb=ed4ff736c245071157dc5412edb0218b8cc3e442;hpb=2d2b3b82e471f06e44f22be54cf9b6ffb9f9d259

diff --git a/main.c b/main.c
index db2f428..68c77a4 100644
--- a/main.c
+++ b/main.c
@@ -54,6 +54,8 @@ struct rock_struct {
 	// soon as it isn't we BLOW UP
 	float x,y,xvel,yvel;
 	int active;
+	int dead;  // has been blown out of the way
+	           // to make room for a new ship appearing.
 	SDL_Surface *image;
 	int type_number;
 	float heat;
@@ -1002,10 +1004,9 @@ int gameloop() {
 						// Create a new ship and start all over again
 						state = GAMEPLAY;
 						play_tune(1);
-						xship = 10;
-						yship = YSIZE/2;
-						xvel = 3;
-						yvel = 0;
+						xship -= 50;
+						// xvel = 3;
+						// yvel = 0;
 					break;
 					case GAME_OVER:
 						state = HIGH_SCORE_ENTRY;
@@ -1055,14 +1056,15 @@ int gameloop() {
 					float blast_radius = START_RAD * state_timeout / 50.0;
 					for(i = 0; i<MAXROCKS; i++ ) {
 						float dx, dy, n;
-						dx = rock[i].x + 100;
-						dy = rock[i].y - YSIZE/2;
+						if(rock[i].x <= 0) continue;
+						dx = rock[i].x - xship;
+						dy = rock[i].y - yship;
 						n = sqrt(dx*dx + dy*dy);
-						if(n < blast_radius+100) {
+						if(n < blast_radius) {
 							n *= 50;
 							rock[i].xvel += rockrate*(dx+30)/n;
 							rock[i].yvel += rockrate*dy/n;
-							if(rock[i].xvel <= 0) rock[i].xvel = 1;
+							rock[i].dead = 1;
 						}
 					}
 				}
@@ -1116,6 +1118,7 @@ int gameloop() {
 			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;
@@ -1124,10 +1127,6 @@ int gameloop() {
 					rock[i].y += rock[i].image->w;
 				}
 				if(rock[i].x < -32.0) rock[i].active = 0;
-				if(rock[i].xvel > 0) {
-					if(rock[i].y < 0 || rock[i].y > YSIZE) rock[i].active = 0;
-					if(rock[i].x > XSIZE) rock[i].active = 0;
-				}
 			}
 
 
@@ -1162,6 +1161,8 @@ int gameloop() {
 				else {
 					state = DEAD_PAUSE;
 					state_timeout = 50.0;
+					xvel = 0;
+					yvel = 0;
 				}
 			}
 
@@ -1176,6 +1177,7 @@ int gameloop() {
 
 				for(i = 0; i<MAXROCKS; i++ ) {
 					rock[i].active = 0;
+					rock[i].dead = 0;
 				}
 
 				rockrate = 54.0;
@@ -1287,6 +1289,7 @@ main(int argc, char **argv) {
 	while(1) {
 		for(i = 0; i<MAXROCKS; i++) {
 			rock[i].active = 0;
+			rock[i].dead = 0;
 		}
 		rockrate = 54.0;
 		rockspeed = 5.0;