We have the framework of the curses interface working.

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

diff --git a/sst.c b/sst.c
index 2ef4261a62f2183f1c05532379de791cd272fc8a..77fbeb826ba2b4f273df612835c408f13be1827b 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -1,18 +1,13 @@
 #define INCLUDED       // Define externs here\r
 #define INCLUDED       // Define externs here\r

-#include "sst.h"\r

 #include <ctype.h>\r
 #include <ctype.h>\r

-#include <stdarg.h>\r
-#ifdef MSDOS\r
-#include <dos.h>\r
+#include <getopt.h>\r
+#include "sst.h"\r
+\r
+#ifndef SSTDOC\r
+#define SSTDOC "sst.doc"\r

 #endif\r
 #endif\r

-#include <time.h>\r

        \r
        \r

-int getch(void);\r
-\r

 static char line[128], *linep = line;\r
 static char line[128], *linep = line;\r

-static int linecount;  /* for paging */\r
-\r
-static void clearscreen(void);\r

 \r
 /* Compared to original version, I've changed the "help" command to\r
    "call" and the "terminate" command to "quit" to better match\r
 \r
 /* Compared to original version, I've changed the "help" command to\r
    "call" and the "terminate" command to "quit" to better match\r


@@ -39,7 +34,7 @@ static void clearscreen(void);
    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

-\r
+s\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


@@ -103,7 +98,7 @@ static void listCommands(int x) {
 \r
 static void helpme(void) {\r
        int i, j;\r
 \r
 static void helpme(void) {\r
        int i, j;\r

-       char cmdbuf[32];\r
+       char cmdbuf[32], *cp;\r

        char linebuf[132];\r
        FILE *fp;\r
        /* Give help on commands */\r
        char linebuf[132];\r
        FILE *fp;\r
        /* Give help on commands */\r


@@ -130,37 +125,41 @@ static void helpme(void) {
                strcpy(cmdbuf, " ABBREV");\r
        }\r
        else {\r
                strcpy(cmdbuf, " ABBREV");\r
        }\r
        else {\r

-               strcpy(cmdbuf, "  Mnemonic:  ");\r
-               j = 0;\r
-               while ((cmdbuf[j+13] = toupper(commands[i][j])) != 0) j++;\r
+           for (j = 0; commands[i][j]; j++)\r
+               cmdbuf[j] = toupper(commands[i][j]);\r
+           cmdbuf[j] = '\0';\r

        }\r
        }\r

-       fp = fopen("sst.doc", "r");\r
+       fp = fopen(SSTDOC, "r");\r

        if (fp == NULL) {\r
                prout("Spock-  \"Captain, that information is missing from the");\r
                prout("   computer. You need to find SST.DOC and put it in the");\r
                prout("   current directory.\"");\r
                return;\r
        }\r
        if (fp == NULL) {\r
                prout("Spock-  \"Captain, that information is missing from the");\r
                prout("   computer. You need to find SST.DOC and put it in the");\r
                prout("   current directory.\"");\r
                return;\r
        }\r

-       i = strlen(cmdbuf);\r
-       do {\r
-               if (fgets(linebuf, 132, fp) == NULL) {\r
+       for (;;) {\r
+           if (fgets(linebuf, sizeof(linebuf), fp) == NULL) {\r

                        prout("Spock- \"Captain, there is no information on that command.\"");\r
                        fclose(fp);\r
                        return;\r
                }\r
                        prout("Spock- \"Captain, there is no information on that command.\"");\r
                        fclose(fp);\r
                        return;\r
                }\r

-       } while (strncmp(linebuf, cmdbuf, i) != 0);\r
+           if (linebuf[0] == '%' && linebuf[1] == '%'&& linebuf[2] == ' ') {\r
+               for (cp = linebuf+3; isspace(*cp); cp++)\r
+                       continue;\r
+               linebuf[strlen(linebuf)-1] = '\0';\r
+               if (strcmp(cp, cmdbuf) == 0)\r
+                   break;\r
+           }\r
+       }\r

 \r
        skip(1);\r
        prout("Spock- \"Captain, I've found the following information:\"");\r
        skip(1);\r
 \r
 \r
        skip(1);\r
        prout("Spock- \"Captain, I've found the following information:\"");\r
        skip(1);\r
 \r

-       do {\r
-               if (linebuf[0]!=12) { // ignore page break lines \r
-                       linebuf[strlen(linebuf)-1] = '\0'; // No \n at end\r
-                       prout(linebuf);\r
-               }\r
-               fgets(linebuf,132,fp);\r
-       } while (strstr(linebuf, "******")==NULL);\r
+       while (fgets(linebuf, sizeof(linebuf),fp)) {\r
+               if (strstr(linebuf, "******"))\r
+                       break;\r
+               proutc(linebuf);\r
+       }\r

        fclose(fp);\r
 }\r
 \r
        fclose(fp);\r
 }\r
 \r


@@ -346,24 +345,30 @@ static void makemoves(void) {
 \r
 \r
 int main(int argc, char **argv) {\r
 \r
 \r
 int main(int argc, char **argv) {\r

-       int i;\r
+    int i, option, usecurses = TRUE;\r

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

-       prelim();\r
-\r
-       if (argc > 1) {\r
-               fromcommandline = 1;\r
-               line[0] = '\0';\r
-               while (--argc > 0) {\r
-                       strcat(line, *(++argv));\r
-                       strcat(line, " ");\r
-               }\r
-       }\r
-       else fromcommandline = 0;\r

 \r
 \r

+       while ((option = getopt(argc, argv, "t")) != -1) {\r
+           switch (option) {\r
+           case 't':\r
+               usecurses = FALSE;\r
+               break;\r
+           default:\r
+               fprintf(stderr, "usage: sst [-t] [startcommand...].\n");\r
+               exit(0);\r
+           }\r
+       }\r

 \r
 \r

+       iostart(usecurses);\r
+       prelim(); \r
+       line[0] = '\0';\r
+       for (i = optind; i < argc;  i++) {\r
+               strcat(line, argv[i]);\r
+               strcat(line, " ");\r
+       }\r

        while (TRUE) { /* Play a game */\r
        while (TRUE) { /* Play a game */\r

-               setup();\r
+               setup(line[0] == '\0');\r

                if (alldone) {\r
                        score();\r
                        alldone = 0;\r
                if (alldone) {\r
                        score();\r
                        alldone = 0;\r


@@ -384,7 +389,8 @@ int main(int argc, char **argv) {
                if (!ja()) break;\r
        }\r
        skip(1);\r
                if (!ja()) break;\r
        }\r
        skip(1);\r

-       prout("May the Great Bird of the Galaxy roost upon your home planet.");\r
+       ioend();\r
+       puts("May the Great Bird of the Galaxy roost upon your home planet.");\r

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


@@ -420,7 +426,7 @@ char *cramlc(enum loctype key, int x, int y) {
 void crmena(int i, int enemy, int key, int x, int y) {\r
        if (i == 1) proutn("***");\r
        cramen(enemy);\r
 void crmena(int i, int enemy, int key, int x, int y) {\r
        if (i == 1) proutn("***");\r
        cramen(enemy);\r

-       proutn(" at");\r
+       proutn(" at ");\r

        proutn(cramlc(key, x, y));\r
 }\r
 \r
        proutn(cramlc(key, x, y));\r
 }\r
 \r


@@ -458,14 +464,12 @@ void iran10(int *i, int *j) {
 }\r
 \r
 void chew(void) {\r
 }\r
 \r
 void chew(void) {\r

-       linecount = 0;\r

        linep = line;\r
        *linep = 0;\r
 }\r
 \r
 void chew2(void) {\r
        /* return IHEOL next time */\r
        linep = line;\r
        *linep = 0;\r
 }\r
 \r
 void chew2(void) {\r
        /* return IHEOL next time */\r

-       linecount = 0;\r

        linep = line+1;\r
        *linep = 0;\r
 }\r
        linep = line+1;\r
        *linep = 0;\r
 }\r


@@ -474,8 +478,6 @@ int scan(void) {
        int i;\r
        char *cp;\r
 \r
        int i;\r
        char *cp;\r
 \r

-       linecount = 0;\r
-\r

        // Init result\r
        aaitem = 0.0;\r
        *citem = 0;\r
        // Init result\r
        aaitem = 0.0;\r
        *citem = 0;\r


@@ -486,8 +488,7 @@ int scan(void) {
                        chew();\r
                        return IHEOL;\r
                }\r
                        chew();\r
                        return IHEOL;\r
                }\r

-               fgets(line, sizeof(line), stdin);\r
-               line[strlen(line)-1] = '\0';\r
+               getline(line, sizeof(line));\r

                linep = line;\r
        }\r
        // Skip leading white space\r
                linep = line;\r
        }\r
        // Skip leading white space\r


@@ -533,85 +534,6 @@ int ja(void) {
 \r
 double square(double i) { return i*i; }\r
                                                                        \r
 \r
 double square(double i) { return i*i; }\r
                                                                        \r

-static void clearscreen(void) {\r
-       /* Somehow we need to clear the screen */\r
-#ifdef __BORLANDC__\r
-       extern void clrscr(void);\r
-       clrscr();\r
-#else\r
-       proutn("\033[2J");      /* Hope for an ANSI display */\r
-#endif\r
-}\r
-\r
-/* We will pull these out in case we want to do something special later */\r
-\r
-void pause(int i) {\r
-       putchar('\n');\r
-       if (i==1) {\r
-               if (skill > 2)\r
-                       prout("[ANOUNCEMENT ARRIVING...]");\r
-               else\r
-                       prout("[IMPORTANT ANNOUNCEMENT ARRIVING -- HIT SPACE BAR TO CONTINUE]");\r
-               getch();\r
-       }\r
-       else {\r
-               if (skill > 2)\r
-                       proutn("[CONTINUE?]");\r
-               else\r
-                       proutn("[HIT SPACE BAR TO CONTINUE]");\r
-               getch();\r
-               proutn("\r                           \r");\r
-       }\r
-       if (i != 0) {\r
-               clearscreen();\r
-       }\r
-       linecount = 0;\r
-}\r
-\r
-\r
-void skip(int i) {\r
-       while (i-- > 0) {\r
-               linecount++;\r
-               if (linecount >= 23)\r
-                       pause(0);\r
-               else\r
-                       putchar('\n');\r
-       }\r
-}\r
-\r
-\r
-void proutn(char *fmt, ...) {\r
-    va_list ap;\r
-    va_start(ap, fmt);\r
-    vprintf(fmt, ap);\r
-    va_end(ap);\r
-}\r
-\r
-void prout(char *fmt, ...) {\r
-    va_list ap;\r
-    va_start(ap, fmt);\r
-    vprintf(fmt, ap);\r
-    va_end(ap);\r
-    skip(1);\r
-}\r
-\r
-void prouts(char *fmt, ...) {\r
-       clock_t endTime;\r
-       char *s, buf[BUFSIZ];\r
-       /* print slowly! */\r
-       va_list ap;\r
-       va_start(ap, fmt);\r
-       vsprintf(buf, fmt, ap);\r
-       va_end(ap);\r
-       skip(1);\r
-       for (s = buf; *s; s++) {\r
-               endTime = clock() + CLOCKS_PER_SEC*0.05;\r
-               while (clock() < endTime) ;\r
-               putchar(*s);\r
-               fflush(stdout);\r
-       }\r
-}\r
-\r

 void huh(void) {\r
        chew();\r
        skip(1);\r
 void huh(void) {\r
        chew();\r
        skip(1);\r