More merging of SERGEEV changes.

diff --git a/events.c b/events.c
index 10c030ae0bb25abe52ed964040b82b26f4a90e35..641b77ad65f325944a9842f0ca345f7a8b052cb9 100644 (file)
--- a/events.c
+++ b/events.c
@@ -222,7 +222,7 @@ void events(void) {
                                prout(".\"");\r
                                if (resting) {\r
                                        skip(1);\r
-                                       proutn("Mr. Spock-  \"Captain, shall we cancel the rest period?\"");\r
+                                       proutn("Mr. Spock-  \"Captain, shall we cancel the rest period?\" ");\r
                                        if (ja()) {\r
                                                resting = 0;\r
                                                Time = 0.0;\r

diff --git a/moving.c b/moving.c
index 0690ac82f31d1b16434786c4a7e42f3a5836d62d..b0e68cded51fbcd3ff6792e8a38ed02367864161 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -201,6 +201,9 @@ label100:
        }\r
        newcnd();\r
        iattak = 0;\r
+#ifdef SERGEEV\r
+       drawmaps(0);\r
+#endif /* SERGEEV */\r
        return;\r
 }\r
 \r
@@ -812,6 +815,9 @@ void timwrp() {
                game.damage[DRADIO] += Time;\r
        }\r
        newqad(0);\r
+#ifdef SERGEEV\r
+        events();\r
+#endif /* SERGEEV */\r
 }\r
 \r
 void probe(void) {\r
@@ -882,6 +888,7 @@ void probe(void) {
        probecy = quady;\r
        game.future[FDSPROB] = game.state.date + 0.01; // Time to move one sector\r
        prout("Ensign Chekov-  \"The deep space probe is launched, Captain.\"");\r
+       ididit = 1;\r
        return;\r
 }\r
 \r

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

diff --git a/sst.c b/sst.c
index 050f670edea5668ecae1469b4fe95ad5f9e115f9..330d8de7a5256a7e01904014bad5b28ef2d763bf 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -78,7 +78,8 @@ SERGEEV, not yet merged):
        There are other minor adjustments to what yields an attack\r
        and what does not.\r
 \r
-    10. Ramming a black hole is no longer instant death.  \r
+    10. Ramming a black hole is no longer instant death.  There is a\r
+        chance you might get timewarped instead.\r
 \r
    */\r
 \r
@@ -199,6 +200,27 @@ static void helpme(void) {
        fclose(fp);\r
 }\r
 \r
+#ifdef SERGEEV\r
+void drawmaps(short l){\r
+     _setcursortype(_NOCURSOR);\r
+     if (l==1) sensor();\r
+     if (l!=2) setwnd(1);\r
+     gotoxy(1,1);\r
+     strcpy(line,"s");\r
+     srscan(1);\r
+     if (l!=2){\r
+        setwnd(2);\r
+        clrscr();\r
+        srscan(2);\r
+        setwnd(3);\r
+        clrscr();\r
+        strcpy(line,"l");\r
+        lrscan();\r
+        _setcursortype(_NORMALCURSOR);\r
+     }\r
+}\r
+#endif /* SERGEEV */\r
+\r
 static void makemoves(void) {\r
        int i, hitme;\r
        while (TRUE) { /* command loop */\r

diff --git a/sst.h b/sst.h
index 49cd2179c0818d4798a5285f6b5d6312ae71699a..0e198f4921e41042e7ea8e540a71ad60cec2ca4f 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -421,6 +421,9 @@ int isit(char *);
 void preport(void);\r
 void orbit(void);\r
 void sensor(void);\r
+#ifdef SERGEEV\r
+void drawmaps(short);\r
+#endif /* SERGEEV */\r
 void beam(void);\r
 void mine(void);\r
 void usecrystals(void);\r