More merging of SERGEEV changes.

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

diff --git a/sst.c b/sst.c
index b456772c5a9a058e5e71a61c1d5f7feaf7313c32..330d8de7a5256a7e01904014bad5b28ef2d763bf 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -38,7 +38,7 @@ Here are Tom Almy's changes:
    2. deathray improvement (but keeping original failure alternatives)\r
 \r
    3. Tholian Web\r
    2. deathray improvement (but keeping original failure alternatives)\r
 \r
    3. Tholian Web\r

-s\r
+\r

    4. Enemies can ram the Enterprise. Regular Klingons and Romulans can\r
       move in Expert and Emeritus games. This code could use improvement.\r
 \r
    4. Enemies can ram the Enterprise. Regular Klingons and Romulans can\r
       move in Expert and Emeritus games. This code could use improvement.\r
 \r


@@ -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
        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
 \r
    */\r
 \r


@@ -199,9 +200,29 @@ static void helpme(void) {
        fclose(fp);\r
 }\r
 \r
        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
 static void makemoves(void) {\r
        int i, hitme;\r

-       char ch;\r

        while (TRUE) { /* command loop */\r
                hitme = FALSE;\r
                justin = 0;\r
        while (TRUE) { /* command loop */\r
                hitme = FALSE;\r
                justin = 0;\r


@@ -385,9 +406,6 @@ static void makemoves(void) {
 \r
 int main(int argc, char **argv) {\r
     int i, option, usecurses = TRUE;\r
 \r
 int main(int argc, char **argv) {\r
     int i, option, usecurses = TRUE;\r

-       int hitme;\r
-       char ch;\r
-\r

        while ((option = getopt(argc, argv, "t")) != -1) {\r
            switch (option) {\r
            case 't':\r
        while ((option = getopt(argc, argv, "t")) != -1) {\r
            switch (option) {\r
            case 't':\r


@@ -430,6 +448,7 @@ int main(int argc, char **argv) {
        skip(1);\r
        ioend();\r
        puts("May the Great Bird of the Galaxy roost upon your home planet.");\r
        skip(1);\r
        ioend();\r
        puts("May the Great Bird of the Galaxy roost upon your home planet.");\r

+       exit(0);\r

 }\r
 \r
 \r
 }\r
 \r
 \r