X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=setup.c;h=5b8c20d2b65c1798caa07f31aa60e515be3b8dda;hp=747618c4bde4f7fae9a656798c1b9e28e3901837;hb=03ea69145938e4b01e7efc6be80a543bad1739c7;hpb=942f187b68be75931f4bd35015d74d284ef802c4

diff --git a/setup.c b/setup.c
index 747618c..5b8c20d 100644
--- a/setup.c
+++ b/setup.c
@@ -179,7 +179,7 @@ void abandn(void) {
 	return;
 }
 	
-void setup(void) {
+void setup(int needprompt) {
 	int i,j, krem, klumper;
 	int ix, iy;
 	alldone = gamewon = 0;
@@ -187,7 +187,7 @@ void setup(void) {
 	idebug = 0;
 #endif
 	//  Decide how many of everything
-	if (choose()) return; // frozen game
+	if (choose(needprompt)) return; // frozen game
 	// Prepare the Enterprise
 	ship = IHE;
 	energy = inenrg = 5000.0;
@@ -359,36 +359,33 @@ void setup(void) {
 		prout("An unknown number of Romulans.");
 		if (game.state.nscrem) prout("and one (GULP) Super-Commander.");
 			prout("%d stardates.",(int)intime);
-			proutn("%d starbases in  ", inbase);
+			proutn("%d starbases in ", inbase);
 	}
 	for (i = 1; i <= inbase; i++) {
-		cramlc(0, game.state.baseqx[i], game.state.baseqy[i]);
-		if (i < inbase) proutn("  ");
+	    	proutn(cramlc(0, game.state.baseqx[i], game.state.baseqy[i]));
+		proutn("  ");
 	}
 	skip(2);
-	proutn("The Enterprise is currently in");
-	cramlc(1, quadx, quady);
+	proutn("The Enterprise is currently in ");
+	proutn(cramlc(quadrant, quadx, quady));
 	proutn(" ");
-	cramlc(2, sectx, secty);
+        proutn(cramlc(sector, sectx, secty));
 	skip(2);
 	prout("Good Luck!");
-	if (game.state.nscrem) proutn("  YOU'LL NEED IT.");
-	skip(1);
+	if (game.state.nscrem) prout("  YOU'LL NEED IT.");
 	newqad(0);
 	if (nenhere) shldup=1.0;
 	if (neutz) attack(0);	// bad luck to start in a Romulan Neutral Zone
 }
 
-int choose(void) {
+int choose(int needprompt) {
 	tourn = 0;
 	thawed = 0;
 	skill = 0;
 	length = 0;
 	while (TRUE) {
-		if (fromcommandline) /* Can start with command line options */
-			fromcommandline = 0;
-		else
-			proutn("Would you like a regular, tournament, or frozen game?");
+		if (needprompt) /* Can start with command line options */
+		    proutn("Would you like a regular, tournament, or frozen game?");
 		scan();
 		if (strlen(citem)==0) continue; // Try again
 		if (isit("tournament")) {