X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=setup.c;h=6ea71b53166729ef5c50e9d40767a06909a24de5;hb=c437361d4783bf98fd275926ab7abec85bf84968;hp=fb03bde96be24a742fe96852a8b7d53b536c8560;hpb=8bd7aca563c3a40239992666394fe8ff3f2fd5e3;p=super-star-trek.git

diff --git a/setup.c b/setup.c
index fb03bde..6ea71b5 100644
--- a/setup.c
+++ b/setup.c
@@ -237,12 +237,12 @@ void setup(int needprompt)
     game.future[FTBEAM] = game.state.date + expran(1.5 * (intime / game.state.remcom));
     game.future[FSNAP] = game.state.date + 1.0 + Rand(); // Force an early snapshot
     game.future[FBATTAK] = game.state.date + expran(0.3*intime);
-    game.future[FCDBAS] = 1e30;
-    game.future[FSCMOVE] = game.state.nscrem ? game.state.date+0.2777 : 1e30;
-    game.future[FSCDBAS] = 1e30;
-    game.future[FDSPROB] = 1e30;
-    // Starchart is functional
-    stdamtim = 1e30;
+    game.future[FCDBAS] = FOREVER;
+    game.future[FSCMOVE] = game.state.nscrem ? game.state.date+0.2777 : FOREVER;
+    game.future[FSCDBAS] = FOREVER;
+    game.future[FDSPROB] = FOREVER;
+    // Starchart is functional but we've never seen it
+    lastchart = FOREVER;
     // Put stars in the galaxy
     instar = 0;
     for_quadrants(i)
@@ -264,13 +264,13 @@ void setup(int needprompt)
 		if (distq < 6.0*(BASEMAX+1-inbase) && Rand() < 0.75) {
 		    contflag = TRUE;
 #ifdef DEBUG
-		    proutn("DEBUG: Abandoning base #%d at %d-%d\n", i, ix, iy);
+		    prout("DEBUG: Abandoning base #%d at %d-%d", i, ix, iy);
 #endif
 		    break;
 		}
 #ifdef DEBUG
 		else if (distq < 6.0 * (BASEMAX+1-inbase)) {
-		    proutn("DEBUG: saving base #%d, close to #%d\n", i, j);
+		    prout("DEBUG: saving base #%d, close to #%d", i, j);
 		}
 #endif
 	    }
@@ -290,7 +290,9 @@ void setup(int needprompt)
 	int klump = (1.0 - r*r)*klumper;
 	if (klump > krem) klump = krem;
 	krem -= klump;
-	do iran(GALSIZE,&ix,&iy); while (game.state.galaxy[ix][iy].supernova);
+	do iran(GALSIZE,&ix,&iy);
+	while (game.state.galaxy[ix][iy].supernova ||
+		game.state.galaxy[ix][iy].klingons + klump > 9);
 	game.state.galaxy[ix][iy].klingons += klump;
     } while (krem > 0);
     // Position Klingon Commander Ships