X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=moving.c;h=7dee9e5f8089b3f521b8ec54c6751f9b5c679678;hb=665b7ab04d99076511156ac4da537f0fa144d268;hp=f44aff4c2bd98f98ac10409bfd9b1a9f8e2d9464;hpb=797f0f77ccdfd001fff39396ceae760478c2b920;p=super-star-trek.git

diff --git a/moving.c b/moving.c
index f44aff4..7dee9e5 100644
--- a/moving.c
+++ b/moving.c
@@ -233,8 +233,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);
@@ -783,7 +783,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 +842,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,7 +928,7 @@ void help(void)
 	ddist = sqrt(square(basex-sectx)+square(basey-secty));
     }
     else {
-	ddist = 1e30;
+	ddist = FOREVER;
 	for_starbases(l) {
 	    xdist=10.0*sqrt(square(game.state.baseqx[l]-quadx)+square(game.state.baseqy[l]-quady));
 	    if (xdist < ddist) {