Make the internal pager actually work. In the process, remove getch()

[super-star-trek.git] / setup.c

diff --git a/setup.c b/setup.c
index 002188291aff1dafc53b7b9cf80c1ddf0dfcbca9..5b8c20d2b65c1798caa07f31aa60e515be3b8dda 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -179,7 +179,7 @@ void abandn(void) {
        return;\r
 }\r
        \r
-void setup(void) {\r
+void setup(int needprompt) {\r
        int i,j, krem, klumper;\r
        int ix, iy;\r
        alldone = gamewon = 0;\r
@@ -187,7 +187,7 @@ void setup(void) {
        idebug = 0;\r
 #endif\r
        //  Decide how many of everything\r
-       if (choose()) return; // frozen game\r
+       if (choose(needprompt)) return; // frozen game\r
        // Prepare the Enterprise\r
        ship = IHE;\r
        energy = inenrg = 5000.0;\r
@@ -372,23 +372,20 @@ void setup(void) {
         proutn(cramlc(sector, sectx, secty));\r
        skip(2);\r
        prout("Good Luck!");\r
-       if (game.state.nscrem) proutn("  YOU'LL NEED IT.");\r
-       skip(1);\r
+       if (game.state.nscrem) prout("  YOU'LL NEED IT.");\r
        newqad(0);\r
        if (nenhere) shldup=1.0;\r
        if (neutz) attack(0);   // bad luck to start in a Romulan Neutral Zone\r
 }\r
 \r
-int choose(void) {\r
+int choose(int needprompt) {\r
        tourn = 0;\r
        thawed = 0;\r
        skill = 0;\r
        length = 0;\r
        while (TRUE) {\r
-               if (fromcommandline) /* Can start with command line options */\r
-                       fromcommandline = 0;\r
-               else\r
-                       proutn("Would you like a regular, tournament, or frozen game?");\r
+               if (needprompt) /* Can start with command line options */\r
+                   proutn("Would you like a regular, tournament, or frozen game?");\r
                scan();\r
                if (strlen(citem)==0) continue; // Try again\r
                if (isit("tournament")) {\r