X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=moving.c;h=7d3f6dfcbbb52eaca28e37ba13a596cc1fcdb447;hp=fbbe76f004d1a05503fdf3e894ea032d5e0a49a6;hb=9f2406f134c8e82a6ef14943c5eaf6ee2bee3af7;hpb=bdcf85461c171a9263fb0ba0e0ec07661bd082f5

diff --git a/moving.c b/moving.c
index fbbe76f..7d3f6df 100644
--- a/moving.c
+++ b/moving.c
@@ -48,7 +48,7 @@ void imove(void)
 		/* Don't do it if being pushed by Nova */
 		if (nenhere != 0 && iattak != 2) {
 		    newcnd();
-		    for (l = 1; l <= nenhere; l++) {
+		    for_local_enemies(l) {
 			finald = sqrt((ix-game.kx[l])*(double)(ix-game.kx[l]) +
 				      (iy-game.ky[l])*(double)(iy-game.ky[l]));
 			game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
@@ -97,9 +97,10 @@ void imove(void)
 			finish(FNEG3);
 			return;
 		    }
-		    prout("\n\rYOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER\n\r"
-			  "AT THE EDGE OF THE GALAXY.  THE THIRD TIME YOU TRY THIS,\n\r"
-			  "YOU WILL BE DESTROYED.\n\r");
+		    skip(1);
+		    prout("YOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER");
+		    prout("AT THE EDGE OF THE GALAXY.  THE THIRD TIME YOU TRY THIS,");
+		    prout("YOU WILL BE DESTROYED.");
 		}
 		/* Compute final position in new quadrant */
 		if (trbeam) return; /* Don't bother if we are to be beamed */
@@ -107,7 +108,8 @@ void imove(void)
 		quady = (iy+(QUADSIZE-1))/QUADSIZE;
 		sectx = ix - QUADSIZE*(quadx-1);
 		secty = iy - QUADSIZE*(quady-1);
-		prout("\n\rEntering %s.",
+		skip(1);
+		prout("Entering %s.",
 		      cramlc(quadrant, quadx, quady));
 		game.quad[sectx][secty] = ship;
 		newqad(0);
@@ -193,7 +195,7 @@ no_quad_change:
     /* No quadrant change -- compute new avg enemy distances */
     game.quad[sectx][secty] = ship;
     if (nenhere) {
-	for (l = 1; l <= nenhere; l++) {
+	for_local_enemies(l) {
 	    finald = sqrt((ix-game.kx[l])*(double)(ix-game.kx[l]) +
 			  (iy-game.ky[l])*(double)(iy-game.ky[l]));
 	    game.kavgd[l] = 0.5 * (finald+game.kdist[l]);
@@ -202,11 +204,12 @@ no_quad_change:
 	sortkl();
 	if (!game.state.galaxy[quadx][quady].supernova && iattak == 0)
 	    attack(0);
-	for (l = 1 ; l <= nenhere; l++) game.kavgd[l] = game.kdist[l];
+	for_local_enemies(l) game.kavgd[l] = game.kdist[l];
     }
     newcnd();
     iattak = 0;
     drawmaps(0);
+    setwnd(message_window);
     return;
 }
 
@@ -233,8 +236,8 @@ void dock(int l)
     shield = inshld;
     torps = intorps;
     lsupres = inlsr;
-    if (stdamtim != 1e30 &&
-	(game.future[FCDBAS] < 1e30 || isatb == 1) && iseenit == 0) {
+    if (game.damage[DRADIO] == 0.0 &&
+	(game.future[FCDBAS] < FOREVER || isatb == 1) && iseenit == 0) {
 	/* get attack report from base */
 	prout("Lt. Uhura- \"Captain, an important message from the starbase:\"");
 	attakreport(0);
@@ -639,8 +642,8 @@ void setwrp(void)
 	return;
     }
     if (game.damage[DWARPEN] > 0.0 && aaitem > 4.0) {
-	prout("Engineer Scott- \"I'm doing my best, Captain,\n"
-	      "  but right now we can only go warp 4.\"");
+	prout("Engineer Scott- \"I'm doing my best, Captain,");
+	prout("  but right now we can only go warp 4.\"");
 	return;
     }
     if (aaitem > 10.0) {
@@ -760,7 +763,7 @@ void atover(int igrab)
     } while 
 	/* Repeat if another snova */
 	(game.state.galaxy[quadx][quady].supernova);
-    if (game.state.remkl==0) 
+    if (KLINGREM==0) 
 	finish(FWON); /* Snova killed remaining enemy. */
 }
 
@@ -783,7 +786,7 @@ void timwrp()
 										  be sooner */
 	if (game.state.nscrem) game.future[FSCMOVE] = 0.2777;
 	isatb = 0;
-	game.future[FCDBAS] = game.future[FSCDBAS] = 1e30;
+	game.future[FCDBAS] = game.future[FSCDBAS] = FOREVER;
 	batx = baty = 0;
 
 	/* Make sure Galileo is consistant -- Snapshot may have been taken
@@ -842,7 +845,7 @@ void probe(void)
 	prout("Engineer Scott- \"The probe launcher is damaged, Sir.\"");
 	return;
     }
-    if (game.future[FDSPROB] != 1e30) {
+    if (game.future[FDSPROB] != FOREVER) {
 	chew();
 	skip(1);
 	if (game.damage[DRADIO] != 0 && condit != IHDOCKED) {
@@ -928,8 +931,8 @@ void help(void)
 	ddist = sqrt(square(basex-sectx)+square(basey-secty));
     }
     else {
-	ddist = 1e30;
-	for (l = 1; l <= game.state.rembase; l++) {
+	ddist = FOREVER;
+	for_starbases(l) {
 	    xdist=10.0*sqrt(square(game.state.baseqx[l]-quadx)+square(game.state.baseqy[l]-quady));
 	    if (xdist < ddist) {
 		ddist = xdist;
@@ -955,7 +958,6 @@ void help(void)
 	    /* found one -- finish up */
 	    sectx=ix;
 	    secty=iy;
-	    game.quad[ix][iy]=IHMATER0;
 	    break;
 	}
     }
@@ -974,22 +976,26 @@ void help(void)
 	}
 	proutn(" attempt to re-materialize ");
 	crmshp();
-	warble();
-	if (Rand() > probf) break;
 	switch (l){
-	case 1: game.quad[ix][iy]=IHMATER1;
+	case 1: game.quad[ix][iy]=IHMATER0;
 	    break;
-	case 2: game.quad[ix][iy]=IHMATER2;
+	case 2: game.quad[ix][iy]=IHMATER1;
 	    break;
-	case 3: game.quad[ix][iy]=IHQUEST;
+	case 3: game.quad[ix][iy]=IHMATER2;
 	    break;
 	}
 	textcolor(RED);
+	warble();
+	if (Rand() > probf) break;
 	prout("fails.");
 	delay(500);
 	textcolor(DEFAULT);
     }
     if (l > 3) {
+	game.quad[ix][iy]=IHQUEST;
+	alive = 0;
+	drawmaps(1);
+	setwnd(message_window);
 	finish(FMATERIALIZE);
 	return;
     }