More merging of SERGEEV changes.

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

diff --git a/setup.c b/setup.c
index 8bd5bd190b28143df437eb70ded1a2c29580aa75..55db1d9cbfc2c24554e15c2bf20575f7a5079af6 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -373,6 +373,9 @@ void setup(int needprompt) {
        skip(2);\r
        prout("Good Luck!");\r
        if (game.state.nscrem) prout("  YOU'LL NEED IT.");\r
+#ifdef SERGEEV\r
+        getche();\r
+#endif /* SERGEEV */\r
        newqad(0);\r
         if (nenhere-iqhere-ithere) shldup=1.0;\r
        if (neutz) attack(0);   // bad luck to start in a Romulan Neutral Zone\r
@@ -445,9 +448,10 @@ int choose(int needprompt) {
                else {\r
                        chew();\r
                        if (length==0) proutn("Would you like a Short, Medium, or Long game? ");\r
-                       else if (skill == 0) proutn("Are you a Novice, Fair, Good, Expert, or Emeritus player?");\r
+                       else if (skill == 0) proutn("Are you a Novice, Fair, Good, Expert, or Emeritus player? ");\r
                }\r
        }\r
+#ifndef SERGEEV\r
        while (TRUE) {\r
                scan();\r
                strcpy(game.passwd, citem);\r
@@ -455,6 +459,10 @@ int choose(int needprompt) {
                if (*game.passwd != 0) break;\r
                proutn("Please type in a secret password-");\r
        }\r
+#else\r
+        for(i=0;i<3;i++) game.passwd[i]=(char)(97+(int)(Rand()*25));\r
+        game.passwd[3]=0;\r
+#endif /* SERGEEV */\r
 #ifdef DEBUG\r
        if (strcmp(game.passwd, "debug")==0) idebug = 1;\r
 #endif\r
@@ -492,6 +500,7 @@ void newcnd(void) {
        if (energy < 1000.0) condit = IHYELLOW;\r
        if (game.state.galaxy[quadx][quady] > 99 || game.state.newstuf[quadx][quady] > 9)\r
                condit = IHRED;\r
+        if (!alive) condit=IHDEAD;\r
 }\r
 \r
 \r