First cut at game-option support.

diff --git a/ai.c b/ai.c
index 762e745dcf4dbe9ff62a0943ebf291506034e3e6..e766e9832d6dfaac210ff7b0fcd6acac7f93d8e3 100644 (file)
--- a/ai.c
+++ b/ai.c
@@ -164,7 +164,7 @@ static void movebaddy(int comx, int comy, int loccom, int ienm)
        /* Limit motion according to skill */
        if (abs(motion) > skill) motion = (motion < 0) ? -skill : skill;
     }
        /* Limit motion according to skill */
        if (abs(motion) > skill) motion = (motion < 0) ? -skill : skill;
     }

-    /* calcuate preferred number of steps */
+    /* calculate preferred number of steps */

     nsteps = motion < 0 ? -motion : motion;
     if (motion > 0 && nsteps > mdist) nsteps = mdist; /* don't overshoot */
     if (nsteps > QUADSIZE) nsteps = QUADSIZE; /* This shouldn't be necessary */
     nsteps = motion < 0 ? -motion : motion;
     if (motion > 0 && nsteps > mdist) nsteps = mdist; /* don't overshoot */
     if (nsteps > QUADSIZE) nsteps = QUADSIZE; /* This shouldn't be necessary */

diff --git a/battle.c b/battle.c
index f539c3fd375eee8ed583aa4b0395a7ee2f8b5d93..f8c81eba6d4b7b4b367514f32cb8c564b063e51b 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -336,7 +336,7 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
            prout(" unaffected by photon blast.");
            return;
        case IHQUEST: /* Hit a thingy */
            prout(" unaffected by photon blast.");
            return;
        case IHQUEST: /* Hit a thingy */

-           if (Rand()>0.7) {   // Used to be certain death 
+           if (!(game.options & OPTION_THINGY) || Rand()>0.7) {

                skip(1);
                prouts("AAAAIIIIEEEEEEEEAAAAAAAAUUUUUGGGGGHHHHHHHHHHHH!!!");
                skip(1);
                skip(1);
                prouts("AAAAIIIIEEEEEEEEAAAAAAAAUUUUUGGGGGHHHHHHHHHHHH!!!");
                skip(1);


@@ -349,7 +349,8 @@ void torpedo(double course, double r, int inx, int iny, double *hit, int wait, i
            } else {
                /*
                 * Stas Sergeev added the possibility that
            } else {
                /*
                 * Stas Sergeev added the possibility that

-                * you can shove the Thingy.
+                * you can shove the Thingy abd piss it off.
+                * It then becomes an enemy and may fire at you.

                 */
                iqengry=1;
                shoved=1;
                 */
                iqengry=1;
                shoved=1;

diff --git a/io.c b/io.c
index 4830ea4595625b4b45bb12184fd6803d1eb06892..5de081916c4716c48a4fb5b0f74492bb3646693a 100644 (file)
--- a/io.c
+++ b/io.c
@@ -10,14 +10,13 @@
 #include "sstlinux.h"
 
 static int linecount;  /* for paging */
 #include "sstlinux.h"
 
 static int linecount;  /* for paging */

-static int curses = TRUE;

 
 WINDOW *curwnd;
 
 static void outro(void)
 /* wrap up, either normally or due to signal */
 {
 
 WINDOW *curwnd;
 
 static void outro(void)
 /* wrap up, either normally or due to signal */
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        clear();
        curs_set(1);
        (void)refresh();
        clear();
        curs_set(1);
        (void)refresh();


@@ -28,9 +27,9 @@ static void outro(void)
     }
 }
 
     }
 }
 

-void iostart(int usecurses) 
+void iostart(void) 

 {
 {

-    if ((curses = usecurses)) {
+    if (game.options & OPTION_CURSES) {

 
        if (atexit(outro)){
            fprintf(stderr,"Unable to register outro(), exiting...\n");
 
        if (atexit(outro)){
            fprintf(stderr,"Unable to register outro(), exiting...\n");


@@ -73,7 +72,7 @@ void iostart(int usecurses)
 void waitfor(void)
 /* wait for user action -- OK to do nothing if on a TTY */
 {
 void waitfor(void)
 /* wait for user action -- OK to do nothing if on a TTY */
 {

-    if (curses)
+    if (game.options & OPTION_CURSES)

        getch();
 }
 
        getch();
 }
 


@@ -94,7 +93,7 @@ void pause_game(int i)
            prompt = "[PRESS ENTER TO CONTINUE]";
 
     }
            prompt = "[PRESS ENTER TO CONTINUE]";
 
     }

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        drawmaps(0);
        setwnd(prompt_window);
        wclear(prompt_window);
        drawmaps(0);
        setwnd(prompt_window);
        wclear(prompt_window);


@@ -120,7 +119,7 @@ void pause_game(int i)
 void skip(int i) 
 {
     while (i-- > 0) {
 void skip(int i) 
 {
     while (i-- > 0) {

-       if (curses) {
+       if (game.options & OPTION_CURSES) {

            proutn("\n\r");
        } else {
            linecount++;
            proutn("\n\r");
        } else {
            linecount++;


@@ -134,7 +133,7 @@ void skip(int i)
 
 static void vproutn(char *fmt, va_list ap) 
 {
 
 static void vproutn(char *fmt, va_list ap) 
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        vwprintw(curwnd, fmt, ap);
        wrefresh(curwnd);
     }
        vwprintw(curwnd, fmt, ap);
        wrefresh(curwnd);
     }


@@ -170,7 +169,7 @@ void prouts(char *fmt, ...)
     skip(1);
     for (s = buf; *s; s++) {
        delay(500);
     skip(1);
     for (s = buf; *s; s++) {
        delay(500);

-       if (curses) {
+       if (game.options & OPTION_CURSES) {

            waddch(curwnd, *s);
            wrefresh(curwnd);
        }
            waddch(curwnd, *s);
            wrefresh(curwnd);
        }


@@ -183,7 +182,7 @@ void prouts(char *fmt, ...)
 
 void cgetline(char *line, int max)
 {
 
 void cgetline(char *line, int max)
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        wgetnstr(curwnd, line, max);
        strcat(line, "\n");
        wrefresh(curwnd);
        wgetnstr(curwnd, line, max);
        strcat(line, "\n");
        wrefresh(curwnd);


@@ -196,7 +195,7 @@ void cgetline(char *line, int max)
 void setwnd(WINDOW *wnd)
 /* change windows -- OK for this to be a no-op in tty mode */
 {
 void setwnd(WINDOW *wnd)
 /* change windows -- OK for this to be a no-op in tty mode */
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

      curwnd=wnd;
      curs_set(wnd == fullscreen_window || wnd == message_window || wnd == prompt_window);
     }
      curwnd=wnd;
      curs_set(wnd == fullscreen_window || wnd == message_window || wnd == prompt_window);
     }


@@ -205,7 +204,7 @@ void setwnd(WINDOW *wnd)
 void clreol (void)
 /* clear to end of line -- can be a no-op in tty mode */
 {
 void clreol (void)
 /* clear to end of line -- can be a no-op in tty mode */
 {

-   if (curses) {
+   if (game.options & OPTION_CURSES) {

        wclrtoeol(curwnd);
        wrefresh(curwnd);
    }
        wclrtoeol(curwnd);
        wrefresh(curwnd);
    }


@@ -214,7 +213,7 @@ void clreol (void)
 void clrscr (void)
 /* clear screen -- can be a no-op in tty mode */
 {
 void clrscr (void)
 /* clear screen -- can be a no-op in tty mode */
 {

-   if (curses) {
+   if (game.options & OPTION_CURSES) {

        wclear(curwnd);
        wmove(curwnd,0,0);
        wrefresh(curwnd);
        wclear(curwnd);
        wmove(curwnd,0,0);
        wrefresh(curwnd);


@@ -224,7 +223,7 @@ void clrscr (void)
 void textcolor (int color)
 {
 #ifdef A_COLOR
 void textcolor (int color)
 {
 #ifdef A_COLOR

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        switch(color) {
        case DEFAULT: 
            wattrset(curwnd, 0);
        switch(color) {
        case DEFAULT: 
            wattrset(curwnd, 0);


@@ -284,7 +283,7 @@ void textcolor (int color)
 
 void highvideo (void)
 {
 
 void highvideo (void)
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        wattron(curwnd, A_REVERSE);
     }
 }
        wattron(curwnd, A_REVERSE);
     }
 }


@@ -299,7 +298,7 @@ void commandhook(char *cmd, int before) {
 void drawmaps(short l)
 /* hook to be called after moving to redraw maps */
 {
 void drawmaps(short l)
 /* hook to be called after moving to redraw maps */
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        if (l == 1)
            sensor(FALSE);
        if (l != 2) {
        if (l == 1)
            sensor(FALSE);
        if (l != 2) {


@@ -323,7 +322,7 @@ void drawmaps(short l)
 void boom(int ii, int jj)
 /* enemy fall down, go boom */ 
 {
 void boom(int ii, int jj)
 /* enemy fall down, go boom */ 
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        setwnd(srscan_window);
        drawmaps(2);
        wmove(srscan_window, ii*2+3, jj+2);
        setwnd(srscan_window);
        drawmaps(2);
        wmove(srscan_window, ii*2+3, jj+2);


@@ -345,7 +344,7 @@ void boom(int ii, int jj)
 void warble(void)
 /* sound and visual effects for teleportation */
 {
 void warble(void)
 /* sound and visual effects for teleportation */
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        drawmaps(1);
        setwnd(message_window);
        sound(50);
        drawmaps(1);
        setwnd(message_window);
        sound(50);


@@ -358,7 +357,7 @@ void warble(void)
 void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, int iquad)
 /* torpedo-track animation */
 {
 void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, int iquad)
 /* torpedo-track animation */
 {

-    if (!curses) {
+    if (!game.options & OPTION_CURSES) {

        if (l == 1) {
            if (n != 1) {
                skip(1);
        if (l == 1) {
            if (n != 1) {
                skip(1);


@@ -400,7 +399,7 @@ void tracktorpedo(int x, int y, int ix, int iy, int wait, int l, int i, int n, i
 
 void makechart(void) 
 {
 
 void makechart(void) 
 {

-    if (curses) {
+    if (game.options & OPTION_CURSES) {

        setwnd(message_window);
        wclear(message_window);
        chart(0);
        setwnd(message_window);
        wclear(message_window);
        chart(0);


@@ -409,7 +408,7 @@ void makechart(void)
 
 void setpassword(void) 
 {
 
 void setpassword(void) 
 {

-    if (!curses) {
+    if (!game.options & OPTION_CURSES) {

        while (TRUE) {
            scan();
            strcpy(game.passwd, citem);
        while (TRUE) {
            scan();
            strcpy(game.passwd, citem);

diff --git a/makefile b/makefile
index 7745e7319030f9969f1df26fd4db705dc8b6b39a..f9c7d5a72e0873692ab9422768d4cc907925fc2d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 
 VERS=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
 
 
 VERS=$(shell sed <sst.spec -n -e '/Version: \(.*\)/s//\1/p')
 

-CFLAGS= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"'
+CFLAGS= -O1 -g -Wall -DSSTDOC='"/usr/share/doc/sst/sst.doc"' -DDEBUG

 
 .c.o:
        $(CC) $(CFLAGS) -c $<
 
 .c.o:
        $(CC) $(CFLAGS) -c $<

diff --git a/setup.c b/setup.c
index 7509711e16d65755d605532b30e2bd0a43b48b90..30666512adb62b65585f75c57c8add5d226a8d47 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -468,7 +468,8 @@ int choose(int needprompt)
     damfac = 0.5 * skill;
     game.state.rembase = 3.0*Rand()+2.0;
     inbase = game.state.rembase;
     damfac = 0.5 * skill;
     game.state.rembase = 3.0*Rand()+2.0;
     inbase = game.state.rembase;

-    inplan = (PLNETMAX/2) + (PLNETMAX/2+1)*Rand();
+    if (game.options & OPTION_PLANETS)
+       inplan = (PLNETMAX/2) + (PLNETMAX/2+1)*Rand();

     game.state.nromrem = (2.0+Rand())*skill;
     game.state.nscrem = (skill > SKILL_FAIR ? 1 : 0);
     game.state.remtime = 7.0 * length;
     game.state.nromrem = (2.0+Rand())*skill;
     game.state.nscrem = (skill > SKILL_FAIR ? 1 : 0);
     game.state.remtime = 7.0 * length;


@@ -637,31 +638,34 @@ void newqad(int shutup)
     }
 
     // Decide if quadrant needs a Tholian
     }
 
     // Decide if quadrant needs a Tholian

-    if ((skill < SKILL_GOOD && Rand() <= 0.02) ||   /* Lighten up if skill is low */
-       (skill == SKILL_GOOD && Rand() <= 0.05) ||
-       (skill > SKILL_GOOD && Rand() <= 0.08)
-#ifdef DEBUG
-       || strcmp(passwd, "tholianx")==0
-#endif
-       ) {
-       do {
-           ithx = Rand() > 0.5 ? QUADSIZE : 1;
-           ithy = Rand() > 0.5 ? QUADSIZE : 1;
-       } while (game.quad[ithx][ithy] != IHDOT);
-       game.quad[ithx][ithy] = IHT;
-       ithere = 1;
-       nenhere++;
-       game.kx[nenhere] = ithx;
-       game.ky[nenhere] = ithy;
-       game.kdist[nenhere] = game.kavgd[nenhere] =
-           sqrt(square(sectx-ithx) + square(secty-ithy));
-       game.kpower[nenhere] = Rand()*400.0 +100.0 +25.0*skill;
-       /* Reserve unocupied corners */
-       if (game.quad[1][1]==IHDOT) game.quad[1][1] = 'X';
-       if (game.quad[1][QUADSIZE]==IHDOT) game.quad[1][QUADSIZE] = 'X';
-       if (game.quad[QUADSIZE][1]==IHDOT) game.quad[QUADSIZE][1] = 'X';
-       if (game.quad[QUADSIZE][QUADSIZE]==IHDOT) game.quad[QUADSIZE][QUADSIZE] = 'X';
+    if (game.options & OPTION_THOLIAN) {
+       if ((skill < SKILL_GOOD && Rand() <= 0.02) ||   /* Lighten up if skill is low */
+           (skill == SKILL_GOOD && Rand() <= 0.05) ||
+           (skill > SKILL_GOOD && Rand() <= 0.08)
+    #ifdef DEBUG
+           || strcmp(game.passwd, "tholianx")==0
+    #endif
+           ) {
+           do {
+               ithx = Rand() > 0.5 ? QUADSIZE : 1;
+               ithy = Rand() > 0.5 ? QUADSIZE : 1;
+           } while (game.quad[ithx][ithy] != IHDOT);
+           game.quad[ithx][ithy] = IHT;
+           ithere = 1;
+           nenhere++;
+           game.kx[nenhere] = ithx;
+           game.ky[nenhere] = ithy;
+           game.kdist[nenhere] = game.kavgd[nenhere] =
+               sqrt(square(sectx-ithx) + square(secty-ithy));
+           game.kpower[nenhere] = Rand()*400.0 +100.0 +25.0*skill;
+           /* Reserve unocupied corners */
+           if (game.quad[1][1]==IHDOT) game.quad[1][1] = 'X';
+           if (game.quad[1][QUADSIZE]==IHDOT) game.quad[1][QUADSIZE] = 'X';
+           if (game.quad[QUADSIZE][1]==IHDOT) game.quad[QUADSIZE][1] = 'X';
+           if (game.quad[QUADSIZE][QUADSIZE]==IHDOT) game.quad[QUADSIZE][QUADSIZE] = 'X';
+       }

     }
     }

+

     sortkl();
 
     // Put in a few black holes
     sortkl();
 
     // Put in a few black holes

diff --git a/sst.c b/sst.c
index 7c238fe28f39c3ddb35345673924c30bdb9cc7d2..c97204b0c1ccdec6a25cdec2ef8918a74c62fbab 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -1,4 +1,4 @@
-]#define INCLUDED      // Define externs here
+#define INCLUDED       // Define externs here

 #include <ctype.h>
 #include <getopt.h>
 #include <time.h>
 #include <ctype.h>
 #include <getopt.h>
 #include <time.h>


@@ -68,7 +68,7 @@ Here are Tom Almy's changes:
 
 Here are Stas Sergeev's changes:
 
 
 Here are Stas Sergeev's changes:
 

-   1. The Space Thingy can be shoved, if you it ram, and can fire back if 
+   1. The Space Thingy can be shoved, if you ram it, and can fire back if 

       fired upon.
 
    2. The Tholian can be hit with phasers
       fired upon.
 
    2. The Tholian can be hit with phasers


@@ -108,7 +108,7 @@ Here are Stas Sergeev's changes:
 Eric Raymond's changes:
 
  Mainly, I translated this C code out of FORTRAN into C -- created #defines
 Eric Raymond's changes:
 
  Mainly, I translated this C code out of FORTRAN into C -- created #defines

-   for a lot of magic numbers.
+   for a lot of magic numbers and refactored the heck out of it.

 
    1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
 
 
    1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
 


@@ -120,98 +120,98 @@ Eric Raymond's changes:
 
 /* the input queue */
 static char line[128], *linep = line;
 
 /* the input queue */
 static char line[128], *linep = line;

-static int usecurses = TRUE;

 
 static struct 
 {
     char *name;
     int value;
 
 static struct 
 {
     char *name;
     int value;

+    unsigned long option;

 }
 commands[] = {
 #define SRSCAN 0
 }
 commands[] = {
 #define SRSCAN 0

-       {"SRSCAN",      SRSCAN},
+       {"SRSCAN",      SRSCAN,         OPTION_TTY},

 #define STATUS 1
 #define STATUS 1

-       {"STATUS",      STATUS},
+       {"STATUS",      STATUS,         OPTION_TTY},

 #define REQUEST        2
 #define REQUEST        2

-       {"REQUEST",     REQUEST},
+       {"REQUEST",     REQUEST,        OPTION_TTY},

 #define LRSCAN 3
 #define LRSCAN 3

-       {"LRSCAN",      LRSCAN},
+       {"LRSCAN",      LRSCAN,         OPTION_TTY},

 #define PHASERS        4
 #define PHASERS        4

-       {"PHASERS",     PHASERS},
+       {"PHASERS",     PHASERS,        0},

 #define TORPEDO        5
 #define TORPEDO        5

-        {"TORPEDO",    TORPEDO},
-       {"PHOTONS",     TORPEDO},
+        {"TORPEDO",    TORPEDO,        0},
+       {"PHOTONS",     TORPEDO,        0},

 #define MOVE   6
 #define MOVE   6

-       {"MOVE",        MOVE},
+       {"MOVE",        MOVE,           0},

 #define SHIELDS        7
 #define SHIELDS        7

-       {"SHIELDS",     SHIELDS},
+       {"SHIELDS",     SHIELDS,        0},

 #define DOCK   8
 #define DOCK   8

-       {"DOCK",        DOCK},
+       {"DOCK",        DOCK,           0},

 #define DAMAGES        9
 #define DAMAGES        9

-       {"DAMAGES",     DAMAGES},
+       {"DAMAGES",     DAMAGES,        0},

 #define CHART  10
 #define CHART  10

-       {"CHART",       CHART},
+       {"CHART",       CHART,          0},

 #define IMPULSE        11
 #define IMPULSE        11

-       {"IMPULSE",     IMPULSE},
+       {"IMPULSE",     IMPULSE,        0},

 #define REST   12
 #define REST   12

-       {"REST",        REST},
+       {"REST",        REST,           0},

 #define WARP   13
 #define WARP   13

-       {"WARP",        WARP},
+       {"WARP",        WARP,           0},

 #define SCORE  14
 #define SCORE  14

-       {"SCORE",       SCORE},
+       {"SCORE",       SCORE,          0},

 #define SENSORS        15
 #define SENSORS        15

-       {"SENSORS",     SENSORS},
+       {"SENSORS",     SENSORS,        OPTION_PLANETS},

 #define ORBIT  16
 #define ORBIT  16

-       {"ORBIT",       ORBIT},
+       {"ORBIT",       ORBIT,          OPTION_PLANETS},

 #define TRANSPORT      17
 #define TRANSPORT      17

-       {"TRANSPORT",   TRANSPORT},
+       {"TRANSPORT",   TRANSPORT,      OPTION_PLANETS},

 #define MINE   18
 #define MINE   18

-       {"MINE",        MINE},
+       {"MINE",        MINE,           OPTION_PLANETS},

 #define CRYSTALS       19
 #define CRYSTALS       19

-       {"CRYSTALS",    CRYSTALS},
+       {"CRYSTALS",    CRYSTALS,       OPTION_PLANETS},

 #define SHUTTLE        20
 #define SHUTTLE        20

-       {"SHUTTLE",     SHUTTLE},
+       {"SHUTTLE",     SHUTTLE,        OPTION_PLANETS},

 #define PLANETS        21
 #define PLANETS        21

-       {"PLANETS",     PLANETS},
+       {"PLANETS",     PLANETS,        OPTION_PLANETS},

 #define REPORT 22
 #define REPORT 22

-       {"REPORT",      REPORT},
+       {"REPORT",      REPORT,         0},

 #define COMPUTER       23
 #define COMPUTER       23

-       {"COMPUTER",    COMPUTER},
+       {"COMPUTER",    COMPUTER,       0},

 #define COMMANDS       24
 #define COMMANDS       24

-       {"COMMANDS",    COMMANDS},
+       {"COMMANDS",    COMMANDS,       0},

 #define EMEXIT 25
 #define EMEXIT 25

-       {"EMEXIT",      EMEXIT},
+       {"EMEXIT",      EMEXIT,         0},

 #define PROBE  26
 #define PROBE  26

-       {"PROBE",       PROBE},
+       {"PROBE",       PROBE,          OPTION_PROBE},

 #define SAVE   27
 #define SAVE   27

-       {"SAVE",        SAVE},
-       {"FREEZE",      SAVE},
+       {"SAVE",        SAVE,           0},
+       {"FREEZE",      SAVE,           0},

 #define ABANDON        28
 #define ABANDON        28

-       {"ABANDON",     ABANDON},
+       {"ABANDON",     ABANDON,        0},

 #define DESTRUCT       29
 #define DESTRUCT       29

-       {"DESTRUCT",    DESTRUCT},
+       {"DESTRUCT",    DESTRUCT,       0},

 #define DEATHRAY       30
 #define DEATHRAY       30

-       {"DEATHRAY",    DEATHRAY},
+       {"DEATHRAY",    DEATHRAY,       0},

 #define DEBUGCMD       31
 #define DEBUGCMD       31

-       {"DEBUG",       DEBUGCMD},
+       {"DEBUG",       DEBUGCMD,       0},

 #define MAYDAY 32
 #define MAYDAY 32

-       {"MAYDAY",      MAYDAY},
-       {"SOS",         MAYDAY},
-       {"CALL",        MAYDAY},
+       {"MAYDAY",      MAYDAY,         0},
+       {"SOS",         MAYDAY,         0},
+       {"CALL",        MAYDAY,         0},

 #define QUIT   33
 #define QUIT   33

-       {"QUIT",        QUIT},
+       {"QUIT",        QUIT,           0},

 #define HELP   34
 #define HELP   34

-       {"HELP",        HELP},
+       {"HELP",        HELP,           0},

 };
 
 #define NUMCOMMANDS    sizeof(commands)/sizeof(commands[0])
 
 };
 
 #define NUMCOMMANDS    sizeof(commands)/sizeof(commands[0])
 

-#define MIN_CURSES_COMMAND     PHASERS         /* might change someday */
-
-static void listCommands(int usecurses) {
+static void listCommands(void) {

     int i, k = 0;
     proutn("LEGAL COMMANDS ARE:");
     int i, k = 0;
     proutn("LEGAL COMMANDS ARE:");

-    for (i = usecurses ? MIN_CURSES_COMMAND : 0; i < NUMCOMMANDS; i++) {
+    for (i = 0; i < NUMCOMMANDS; i++) {
+       if (commands[i].option && !(commands[i].option & game.options))
+           continue;

        if (k % 5 == 0)
            skip(1);
        proutn("%-12s ", commands[i].name); 
        if (k % 5 == 0)
            skip(1);
        proutn("%-12s ", commands[i].name); 


@@ -220,554 +220,583 @@ static void listCommands(int usecurses) {
     skip(1);
 }
 
     skip(1);
 }
 

-static void helpme(void) {
-       int i, j;
-       char cmdbuf[32], *cp;
-       char linebuf[132];
-       FILE *fp;
-       /* Give help on commands */
-       int key;
-       key = scan();
-       while (TRUE) {
-               if (key == IHEOL) {
-                        setwnd(prompt_window);
-                        proutn("Help on what command? ");
-                       key = scan();
-               }
-                setwnd(message_window);
-               if (key == IHEOL) return;
-               for (i = 0; i < NUMCOMMANDS; i++) {
-                   if (strcasecmp(commands[i].name, citem)==0) {
-                       i = commands[i].value;
-                       break;
-                   }
-               }
-               if (i != NUMCOMMANDS) break;
-               skip(1);
-               prout("Valid commands:");
-               listCommands(usecurses);
-               key = IHEOL;
-               chew();
-               skip(1);
-       }
-       if (i == COMMANDS) {
-               strcpy(cmdbuf, " ABBREV");
-       }
-       else {
-           for (j = 0; commands[i].name[j]; j++)
-               cmdbuf[j] = toupper(commands[i].name[j]);
-           cmdbuf[j] = '\0';
-       }
-       fp = fopen(SSTDOC, "r");
-       if (fp == NULL) {
-               prout("Spock-  \"Captain, that information is missing from the");
-               prout("   computer.\"");
-               /*
-                * This used to continue: "You need to find SST.DOC and put 
-                * it in the current directory."
-                */
-               return;
+static void helpme(void) 
+{
+    int i, j;
+    char cmdbuf[32], *cp;
+    char linebuf[132];
+    FILE *fp;
+    /* Give help on commands */
+    int key;
+    key = scan();
+    while (TRUE) {
+       if (key == IHEOL) {
+           setwnd(prompt_window);
+           proutn("Help on what command? ");
+           key = scan();

        }
        }

-       for (;;) {
-           if (fgets(linebuf, sizeof(linebuf), fp) == NULL) {
-                       prout("Spock- \"Captain, there is no information on that command.\"");
-                       fclose(fp);
-                       return;
-               }
-           if (linebuf[0] == '%' && linebuf[1] == '%'&& linebuf[2] == ' ') {
-               for (cp = linebuf+3; isspace(*cp); cp++)
-                       continue;
-               linebuf[strlen(linebuf)-1] = '\0';
-               if (strcasecmp(cp, cmdbuf) == 0)
-                   break;
+       setwnd(message_window);
+       if (key == IHEOL) return;
+       for (i = 0; i < NUMCOMMANDS; i++) {
+           if (strcasecmp(commands[i].name, citem)==0) {
+               i = commands[i].value;
+               break;

            }
        }
            }
        }

-
+       if (i != NUMCOMMANDS) break;

        skip(1);
        skip(1);

-       prout("Spock- \"Captain, I've found the following information:\"");
+       prout("Valid commands:");
+       listCommands();
+       key = IHEOL;
+       chew();

        skip(1);
        skip(1);

-
-       while (fgets(linebuf, sizeof(linebuf),fp)) {
-               if (strstr(linebuf, "******"))
-                       break;
-               proutn(linebuf);
+    }
+    if (i == COMMANDS) {
+       strcpy(cmdbuf, " ABBREV");
+    }
+    else {
+       for (j = 0; commands[i].name[j]; j++)
+           cmdbuf[j] = toupper(commands[i].name[j]);
+       cmdbuf[j] = '\0';
+    }
+    fp = fopen(SSTDOC, "r");
+    if (fp == NULL) {
+       prout("Spock-  \"Captain, that information is missing from the");
+       prout("   computer.\"");
+       /*
+        * This used to continue: "You need to find SST.DOC and put 
+        * it in the current directory."
+        */
+       return;
+    }
+    for (;;) {
+       if (fgets(linebuf, sizeof(linebuf), fp) == NULL) {
+           prout("Spock- \"Captain, there is no information on that command.\"");
+           fclose(fp);
+           return;

        }
        }

-       fclose(fp);
+       if (linebuf[0] == '%' && linebuf[1] == '%'&& linebuf[2] == ' ') {
+           for (cp = linebuf+3; isspace(*cp); cp++)
+               continue;
+           linebuf[strlen(linebuf)-1] = '\0';
+           if (strcasecmp(cp, cmdbuf) == 0)
+               break;
+       }
+    }
+
+    skip(1);
+    prout("Spock- \"Captain, I've found the following information:\"");
+    skip(1);
+
+    while (fgets(linebuf, sizeof(linebuf),fp)) {
+       if (strstr(linebuf, "******"))
+           break;
+       proutn(linebuf);
+    }
+    fclose(fp);

 }
 
 }
 

-void enqueue(char *s) {
+void enqueue(char *s) 
+{

     strcpy(line, s);
 }
 
     strcpy(line, s);
 }
 

-static void makemoves(void) {
-       int i, hitme;
-        clrscr();
-        setwnd(message_window);
-       while (TRUE) { /* command loop */
-                drawmaps(1);
-                while (TRUE)  { /* get a command */
-                       hitme = FALSE;
-                       justin = 0;
-                       Time = 0.0;
-                       i = -1;
-                       chew();
-                        setwnd(prompt_window);
-                        clrscr();
-                       proutn("COMMAND> ");
-                        if (scan() == IHEOL) {
-                           makechart();
-                            continue;
-                        }
-                        ididit=0;
-                        clrscr();
-                        setwnd(message_window);
-                        clrscr();
-                       for (i=0; i < ABANDON; i++)
-                           if (isit(commands[i].name)) {
-                               i = commands[i].value;
-                               break;
-                           }
-                       if (i < ABANDON) break;
-                       for (; i < NUMCOMMANDS; i++)
-                           if (strcasecmp(commands[i].name, citem) == 0) {
-                                   i = commands[i].value;
-                                   break;
-                           }
-                       if (i < NUMCOMMANDS) break;
-                       listCommands(usecurses);
+static void makemoves(void) 
+{
+    int i, v, hitme;
+    clrscr();
+    setwnd(message_window);
+    while (TRUE) { /* command loop */
+       drawmaps(1);
+       while (TRUE)  { /* get a command */
+           hitme = FALSE;
+           justin = 0;
+           Time = 0.0;
+           i = -1;
+           chew();
+           setwnd(prompt_window);
+           clrscr();
+           proutn("COMMAND> ");
+           if (scan() == IHEOL) {
+               makechart();
+               continue;
+           }
+           ididit=0;
+           clrscr();
+           setwnd(message_window);
+           clrscr();
+           for (i=0; i < ABANDON; i++)
+               if (isit(commands[i].name)) {
+                   v = commands[i].value;
+                   break;
+               }
+           if (i < ABANDON) break;
+           for (; i < NUMCOMMANDS; i++)
+               if (strcasecmp(commands[i].name, citem) == 0) {
+                   v = commands[i].value;
+                   break;

                }
                }

-               commandhook(commands[i].name, TRUE);
-               switch (i) { /* command switch */
-                        case SRSCAN:                 // srscan
-                               srscan(SCAN_FULL);
-                               break;
-                        case STATUS:                 // status
-                               srscan(SCAN_STATUS);
-                               break;
-                       case REQUEST:                   // status request 
-                               srscan(SCAN_REQUEST);
-                               break;
-                       case LRSCAN:                    // lrscan
-                               lrscan();
-                                break;
-                       case PHASERS:                   // phasers
-                               phasers();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case TORPEDO:                   // photons
-                               photon();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case MOVE:                      // move
-                               warp(1);
-                               break;
-                       case SHIELDS:                   // shields
-                               doshield(1);
-                               if (ididit) {
-                                       hitme=TRUE;
-                                       shldchg = 0;
-                               }
-                               break;
-                       case DOCK:                      // dock
-                                dock(1);
-                                if (ididit) attack(0);
-                               break;
-                       case DAMAGES:                   // damages
-                               dreprt();
-                               break;
-                       case CHART:                     // chart
-                               chart(0);
-                               break;
-                       case IMPULSE:                   // impulse
-                               impuls();
-                               break;
-                       case REST:              // rest
-                               wait();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case WARP:              // warp
-                               setwrp();
-                               break;
-                        case SCORE:                // score
-                                score();
-                               break;
-                       case SENSORS:                   // sensors
-                               sensor(TRUE);
-                               break;
-                       case ORBIT:                     // orbit
-                               orbit();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case TRANSPORT:                 // transport "beam"
-                               beam();
-                               break;
-                       case MINE:                      // mine
-                               mine();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case CRYSTALS:                  // crystals
-                               usecrystals();
-                                if (ididit) hitme = TRUE;
-                               break;
-                       case SHUTTLE:                   // shuttle
-                               shuttle();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case PLANETS:                   // Planet list
-                               preport();
-                               break;
-                       case REPORT:                    // Game Report 
-                               report();
-                               break;
-                       case COMPUTER:                  // use COMPUTER!
-                               eta();
-                               break;
-                       case COMMANDS:
-                               listCommands(usecurses);
-                               break;
-                       case EMEXIT:            // Emergency exit
-                               clrscr();       // Hide screen
-                               freeze(TRUE);   // forced save
-                               exit(1);                // And quick exit
-                               break;
-                       case PROBE:
-                               probe();                // Launch probe
-                                if (ididit) hitme = TRUE;
-                               break;
-                       case ABANDON:                   // Abandon Ship
-                               abandn();
-                               break;
-                       case DESTRUCT:                  // Self Destruct
-                               dstrct();
-                               break;
-                       case SAVE:                      // Save Game
-                               freeze(FALSE);
-                                clrscr();
-                               if (skill > SKILL_GOOD)
-                                        prout("WARNING--Saved games produce no plaques!");
-                               break;
-                       case DEATHRAY:          // Try a desparation measure
-                               deathray();
-                               if (ididit) hitme = TRUE;
-                               break;
-                       case DEBUGCMD:          // What do we want for debug???
+           if (i < NUMCOMMANDS && (!commands[i].option || (commands[i].option & game.options))) 
+               break;
+           listCommands();
+       }
+       commandhook(commands[i].name, TRUE);
+       switch (v) { /* command switch */
+       case SRSCAN:                 // srscan
+           srscan(SCAN_FULL);
+           break;
+       case STATUS:                 // status
+           srscan(SCAN_STATUS);
+           break;
+       case REQUEST:                   // status request 
+           srscan(SCAN_REQUEST);
+           break;
+       case LRSCAN:                    // lrscan
+           lrscan();
+           break;
+       case PHASERS:                   // phasers
+           phasers();
+           if (ididit) hitme = TRUE;
+           break;
+       case TORPEDO:                   // photons
+           photon();
+           if (ididit) hitme = TRUE;
+           break;
+       case MOVE:                      // move
+           warp(1);
+           break;
+       case SHIELDS:                   // shields
+           doshield(1);
+           if (ididit) {
+               hitme=TRUE;
+               shldchg = 0;
+           }
+           break;
+       case DOCK:                      // dock
+           dock(1);
+           if (ididit) attack(0);
+           break;
+       case DAMAGES:                   // damages
+           dreprt();
+           break;
+       case CHART:                     // chart
+           chart(0);
+           break;
+       case IMPULSE:                   // impulse
+           impuls();
+           break;
+       case REST:              // rest
+           wait();
+           if (ididit) hitme = TRUE;
+           break;
+       case WARP:              // warp
+           setwrp();
+           break;
+       case SCORE:                // score
+           score();
+           break;
+       case SENSORS:                   // sensors
+           sensor(TRUE);
+           break;
+       case ORBIT:                     // orbit
+           orbit();
+           if (ididit) hitme = TRUE;
+           break;
+       case TRANSPORT:                 // transport "beam"
+           beam();
+           break;
+       case MINE:                      // mine
+           mine();
+           if (ididit) hitme = TRUE;
+           break;
+       case CRYSTALS:                  // crystals
+           usecrystals();
+           if (ididit) hitme = TRUE;
+           break;
+       case SHUTTLE:                   // shuttle
+           shuttle();
+           if (ididit) hitme = TRUE;
+           break;
+       case PLANETS:                   // Planet list
+           preport();
+           break;
+       case REPORT:                    // Game Report 
+           report();
+           break;
+       case COMPUTER:                  // use COMPUTER!
+           eta();
+           break;
+       case COMMANDS:
+           listCommands();
+           break;
+       case EMEXIT:            // Emergency exit
+           clrscr();   // Hide screen
+           freeze(TRUE);       // forced save
+           exit(1);            // And quick exit
+           break;
+       case PROBE:
+           probe();            // Launch probe
+           if (ididit) hitme = TRUE;
+           break;
+       case ABANDON:                   // Abandon Ship
+           abandn();
+           break;
+       case DESTRUCT:                  // Self Destruct
+           dstrct();
+           break;
+       case SAVE:                      // Save Game
+           freeze(FALSE);
+           clrscr();
+           if (skill > SKILL_GOOD)
+               prout("WARNING--Saved games produce no plaques!");
+           break;
+       case DEATHRAY:          // Try a desparation measure
+           deathray();
+           if (ididit) hitme = TRUE;
+           break;
+       case DEBUGCMD:          // What do we want for debug???

 #ifdef DEBUG
 #ifdef DEBUG

-                               debugme();
+           debugme();

 #endif
 #endif

-                               break;
-                       case MAYDAY:            // Call for help
-                               help();
-                                if (ididit) hitme = TRUE;
-                               break;
-                       case QUIT:
-                               alldone = 1;    // quit the game
+           break;
+       case MAYDAY:            // Call for help
+           help();
+           if (ididit) hitme = TRUE;
+           break;
+       case QUIT:
+           alldone = 1;        // quit the game

 #ifdef DEBUG
 #ifdef DEBUG

-                               if (idebug) score();
+           if (idebug) score();

 #endif
 #endif

-                               break;
-                       case HELP:
-                               helpme();       // get help
-                               break;
-               }
-               commandhook(commands[i].name, FALSE);
-               for (;;) {
-                       if (alldone) break;             // Game has ended
+           break;
+       case HELP:
+           helpme();   // get help
+           break;
+       }
+       commandhook(commands[i].name, FALSE);
+       for (;;) {
+           if (alldone) break;         // Game has ended

 #ifdef DEBUG
 #ifdef DEBUG

-                       if (idebug) prout("2500");
+           if (idebug) prout("2500");

 #endif
 #endif

-                       if (Time != 0.0) {
-                               events();
-                               if (alldone) break;             // Events did us in
-                       }
-                       if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) { // Galaxy went Nova!
-                               atover(0);
-                               continue;
-                       }
-                       if (hitme && justin==0) {
-                               attack(2);
-                               if (alldone) break;
-                               if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) {       // went NOVA! 
-                                       atover(0);
-                                       hitme = TRUE;
-                                       continue;
-                               }
-                       }
-                       break;
-               }
+           if (Time != 0.0) {
+               events();
+               if (alldone) break;             // Events did us in
+           }
+           if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) { // Galaxy went Nova!
+               atover(0);
+               continue;
+           }
+           if (hitme && justin==0) {
+               attack(2);

                if (alldone) break;
                if (alldone) break;

+               if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) {       // went NOVA! 
+                   atover(0);
+                   hitme = TRUE;
+                   continue;
+               }
+           }
+           break;

        }
        }

+       if (alldone) break;
+    }

 }
 
 
 }
 
 

-int main(int argc, char **argv) {
+int main(int argc, char **argv) 
+{

     int i, option;
 
     int i, option;
 

-       while ((option = getopt(argc, argv, "t")) != -1) {
-           switch (option) {
-           case 't':
-               usecurses = FALSE;
-               break;
-           default:
-               fprintf(stderr, "usage: sst [-t] [startcommand...].\n");
-               exit(0);
-           }
+    game.options = OPTION_ALL &~ OPTION_IOMODES;
+    if (getenv("TERM"))
+       game.options |= OPTION_CURSES;
+    else
+       game.options |= OPTION_TTY;
+
+    while ((option = getopt(argc, argv, "t")) != -1) {
+       switch (option) {
+       case 't':
+           game.options |= OPTION_TTY;
+           game.options &=~ OPTION_CURSES;
+           break;
+       default:
+           fprintf(stderr, "usage: sst [-t] [startcommand...].\n");
+           exit(0);

        }
        }

+    }

 
 

-       randomize();
-       iostart(usecurses);
+    randomize();
+    iostart();

 
 

-       line[0] = '\0';
-       for (i = optind; i < argc;  i++) {
-               strcat(line, argv[i]);
-               strcat(line, " ");
-       }
-       while (TRUE) { /* Play a game */
-               setwnd(fullscreen_window);
-               clrscr();
-               prelim();
-               setup(line[0] == '\0');
-               if (alldone) {
-                       score();
-                       alldone = 0;
-               }
-               else makemoves();
-               skip(1);
-               stars();
-               skip(1);
-
-               if (tourn && alldone) {
-                       proutn("Do you want your score recorded?");
-                       if (ja()) {
-                               chew2();
-                               freeze(FALSE);
-                       }
-               }
-               proutn("Do you want to play again? ");
-               if (!ja()) break;
+    line[0] = '\0';
+    for (i = optind; i < argc;  i++) {
+       strcat(line, argv[i]);
+       strcat(line, " ");
+    }
+    while (TRUE) { /* Play a game */
+       setwnd(fullscreen_window);
+#ifdef DEBUG
+       prout("INITIAL OPTIONS: %0lx\n", game.options);
+#endif /* DEBUG */
+       clrscr();
+       prelim();
+       setup(line[0] == '\0');
+       if (alldone) {
+           score();
+           alldone = 0;

        }
        }

+       else makemoves();
+       skip(1);
+       stars();

        skip(1);
        skip(1);

-       prout("May the Great Bird of the Galaxy roost upon your home planet.");
-       return 0;
+
+       if (tourn && alldone) {
+           proutn("Do you want your score recorded?");
+           if (ja()) {
+               chew2();
+               freeze(FALSE);
+           }
+       }
+       proutn("Do you want to play again? ");
+       if (!ja()) break;
+    }
+    skip(1);
+    prout("May the Great Bird of the Galaxy roost upon your home planet.");
+    return 0;

 }
 
 
 }
 
 

-void cramen(int i) {
-       /* return an enemy */
-       char *s;
+void cramen(int i) 
+{
+    /* return an enemy */
+    char *s;

        
        

-       switch (i) {
-               case IHR: s = "Romulan"; break;
-               case IHK: s = "Klingon"; break;
-               case IHC: s = "Commander"; break;
-               case IHS: s = "Super-commander"; break;
-               case IHSTAR: s = "Star"; break;
-               case IHP: s = "Planet"; break;
-               case IHB: s = "Starbase"; break;
-               case IHBLANK: s = "Black hole"; break;
-               case IHT: s = "Tholian"; break;
-               case IHWEB: s = "Tholian web"; break;
-                case IHQUEST: s = "Stranger"; break;
-               default: s = "Unknown??"; break;
-       }
-       proutn(s);
+    switch (i) {
+    case IHR: s = "Romulan"; break;
+    case IHK: s = "Klingon"; break;
+    case IHC: s = "Commander"; break;
+    case IHS: s = "Super-commander"; break;
+    case IHSTAR: s = "Star"; break;
+    case IHP: s = "Planet"; break;
+    case IHB: s = "Starbase"; break;
+    case IHBLANK: s = "Black hole"; break;
+    case IHT: s = "Tholian"; break;
+    case IHWEB: s = "Tholian web"; break;
+    case IHQUEST: s = "Stranger"; break;
+    default: s = "Unknown??"; break;
+    }
+    proutn(s);

 }
 
 }
 

-char *cramlc(enum loctype key, int x, int y) {
-       static char buf[32];
-       buf[0] = '\0';
-       if (key == quadrant) strcpy(buf, "Quadrant ");
-       else if (key == sector) strcpy(buf, "Sector ");
-       sprintf(buf+strlen(buf), "%d - %d", x, y);
-       return buf;
+char *cramlc(enum loctype key, int x, int y)
+{
+    static char buf[32];
+    buf[0] = '\0';
+    if (key == quadrant) strcpy(buf, "Quadrant ");
+    else if (key == sector) strcpy(buf, "Sector ");
+    sprintf(buf+strlen(buf), "%d - %d", x, y);
+    return buf;

 }
 
 }
 

-void crmena(int i, int enemy, int key, int x, int y) {
-       if (i == 1) proutn("***");
-       cramen(enemy);
-       proutn(" at ");
-       proutn(cramlc(key, x, y));
+void crmena(int i, int enemy, int key, int x, int y) 
+{
+    if (i == 1) proutn("***");
+    cramen(enemy);
+    proutn(" at ");
+    proutn(cramlc(key, x, y));

 }
 
 }
 

-void crmshp(void) {
-       char *s;
-       switch (ship) {
-               case IHE: s = "Enterprise"; break;
-               case IHF: s = "Faerie Queene"; break;
-               default:  s = "Ship???"; break;
-       }
-       proutn(s);
+void crmshp(void) 
+{
+    char *s;
+    switch (ship) {
+    case IHE: s = "Enterprise"; break;
+    case IHF: s = "Faerie Queene"; break;
+    default:  s = "Ship???"; break;
+    }
+    proutn(s);

 }
 
 }
 

-void stars(void) {
-       prouts("******************************************************");
-       skip(1);
+void stars(void) 
+{
+    prouts("******************************************************");
+    skip(1);

 }
 
 }
 

-double expran(double avrage) {
-       return -avrage*log(1e-7 + Rand());
+double expran(double avrage) 
+{
+    return -avrage*log(1e-7 + Rand());

 }
 
 double Rand(void) {
        return rand()/(1.0 + (double)RAND_MAX);
 }
 
 }
 
 double Rand(void) {
        return rand()/(1.0 + (double)RAND_MAX);
 }
 

-void iran(int size, int *i, int *j) {
+void iran(int size, int *i, int *j) 
+{

     *i = Rand()*(size*1.0) + 1.0;
     *j = Rand()*(size*1.0) + 1.0;
 }
 
     *i = Rand()*(size*1.0) + 1.0;
     *j = Rand()*(size*1.0) + 1.0;
 }
 

-void chew(void) {
-       linep = line;
-       *linep = 0;
+void chew(void)
+{
+    linep = line;
+    *linep = 0;

 }
 
 }
 

-void chew2(void) {
-       /* return IHEOL next time */
-       linep = line+1;
-       *linep = 0;
+void chew2(void) 
+{
+    /* return IHEOL next time */
+    linep = line+1;
+    *linep = 0;

 }
 
 }
 

-int scan(void) {
-       int i;
-       char *cp;
-
-       // Init result
-       aaitem = 0.0;
-       *citem = 0;
-
-       // Read a line if nothing here
-       if (*linep == 0) {
-               if (linep != line) {
-                       chew();
-                       return IHEOL;
-               }
-               cgetline(line, sizeof(line));
-                fflush(stdin);
-                if (curwnd==prompt_window){
-                   clrscr();
-                   setwnd(message_window);
-                   clrscr();
-                }
-               linep = line;
+int scan(void) 
+{
+    int i;
+    char *cp;
+
+    // Init result
+    aaitem = 0.0;
+    *citem = 0;
+
+    // Read a line if nothing here
+    if (*linep == 0) {
+       if (linep != line) {
+           chew();
+           return IHEOL;

        }
        }

-       // Skip leading white space
-       while (*linep == ' ') linep++;
-       // Nothing left
-       if (*linep == 0) {
-               chew();
-               return IHEOL;
+       cgetline(line, sizeof(line));
+       fflush(stdin);
+       if (curwnd==prompt_window){
+           clrscr();
+           setwnd(message_window);
+           clrscr();

        }
        }

-       if (isdigit(*linep) || *linep=='+' || *linep=='-' || *linep=='.') {
-               // treat as a number
-           i = 0;
-           if (sscanf(linep, "%lf%n", &aaitem, &i) < 1) {
-               linep = line; // Invalid numbers are ignored
-               *linep = 0;
-               return IHEOL;
-           }
-           else {
-               // skip to end
-               linep += i;
-               return IHREAL;
-           }
+       linep = line;
+    }
+    // Skip leading white space
+    while (*linep == ' ') linep++;
+    // Nothing left
+    if (*linep == 0) {
+       chew();
+       return IHEOL;
+    }
+    if (isdigit(*linep) || *linep=='+' || *linep=='-' || *linep=='.') {
+       // treat as a number
+       i = 0;
+       if (sscanf(linep, "%lf%n", &aaitem, &i) < 1) {
+           linep = line; // Invalid numbers are ignored
+           *linep = 0;
+           return IHEOL;

        }
        }

-       // Treat as alpha
-       cp = citem;
-       while (*linep && *linep!=' ') {
-               if ((cp - citem) < 9) *cp++ = tolower(*linep);
-               linep++;
+       else {
+           // skip to end
+           linep += i;
+           return IHREAL;

        }
        }

-       *cp = 0;
-       return IHALPHA;
+    }
+    // Treat as alpha
+    cp = citem;
+    while (*linep && *linep!=' ') {
+       if ((cp - citem) < 9) *cp++ = tolower(*linep);
+       linep++;
+    }
+    *cp = 0;
+    return IHALPHA;

 }
 
 }
 

-int ja(void) {
+int ja(void) 
+{
+    chew();
+    while (TRUE) {
+       scan();

        chew();
        chew();

-       while (TRUE) {
-               scan();
-               chew();
-               if (*citem == 'y') return TRUE;
-               if (*citem == 'n') return FALSE;
-               proutn("Please answer with \"Y\" or \"N\": ");
-       }
+       if (*citem == 'y') return TRUE;
+       if (*citem == 'n') return FALSE;
+       proutn("Please answer with \"Y\" or \"N\": ");
+    }

 }
 
 }
 

-void huh(void) {
-       chew();
-       skip(1);
-       prout("Beg your pardon, Captain?");
+void huh(void) 
+{
+    chew();
+    skip(1);
+    prout("Beg your pardon, Captain?");

 }
 
 }
 

-int isit(char *s) {
-       /* New function -- compares s to scaned citem and returns true if it
-          matches to the length of s */
+int isit(char *s) 
+{
+    /* New function -- compares s to scanned citem and returns true if it
+       matches to the length of s */

 
 

-       return strncasecmp(s, citem, max(1, strlen(citem))) == 0;
+    return strncasecmp(s, citem, max(1, strlen(citem))) == 0;

 
 }
 
 #ifdef DEBUG
 
 }
 
 #ifdef DEBUG

-void debugme(void) {
-       proutn("Reset levels? ");
-       if (ja() != 0) {
-               if (energy < inenrg) energy = inenrg;
-               shield = inshld;
-               torps = intorps;
-               lsupres = inlsr;
-       }
-       proutn("Reset damage? ");
-       if (ja() != 0) {
-               int i;
-               for (i=0; i <= NDEVICES; i++) if (damage[i] > 0.0) damage[i] = 0.0;
-               stdamtim = 1e30;
-       }
-       proutn("Toggle idebug? ");
-       if (ja() != 0) {
-               idebug = !idebug;
-               if (idebug) prout("Debug output ON");
-               else prout("Debug output OFF");
-       }
-       proutn("Cause selective damage? ");
-       if (ja() != 0) {
-               int i, key;
-               for (i=1; i <= NDEVICES; i++) {
-                       proutn("Kill ");
-                       proutn(device[i]);
-                       proutn("? ");
-                       chew();
-                       key = scan();
-                       if (key == IHALPHA &&  isit("y")) {
-                               damage[i] = 10.0;
-                               if (i == DRADIO) stdamtim = game.state.date;
-                       }
-               }
+void debugme(void) 
+{
+    proutn("Reset levels? ");
+    if (ja() != 0) {
+       if (energy < inenrg) energy = inenrg;
+       shield = inshld;
+       torps = intorps;
+       lsupres = inlsr;
+    }
+    proutn("Reset damage? ");
+    if (ja() != 0) {
+       int i;
+       for (i=0; i <= NDEVICES; i++) 
+           if (game.damage[i] > 0.0) 
+               game.damage[i] = 0.0;
+       stdamtim = 1e30;
+    }
+    proutn("Toggle idebug? ");
+    if (ja() != 0) {
+       idebug = !idebug;
+       if (idebug) prout("Debug output ON");
+       else prout("Debug output OFF");
+    }
+    proutn("Cause selective damage? ");
+    if (ja() != 0) {
+       int i, key;
+       for (i=1; i <= NDEVICES; i++) {
+           proutn("Kill ");
+           proutn(device[i]);
+           proutn("? ");
+           chew();
+           key = scan();
+           if (key == IHALPHA &&  isit("y")) {
+               game.damage[i] = 10.0;
+               if (i == DRADIO) stdamtim = game.state.date;
+           }

        }
        }

-       proutn("Examine/change events? ");
-       if (ja() != 0) {
-               int i;
-               for (i = 1; i < NEVENTS; i++) {
-                       int key;
-                       if (future[i] == 1e30) continue;
-                       switch (i) {
-                               case FSNOVA:  proutn("Supernova       "); break;
-                               case FTBEAM:  proutn("T Beam          "); break;
-                               case FSNAP:   proutn("Snapshot        "); break;
-                               case FBATTAK: proutn("Base Attack     "); break;
-                               case FCDBAS:  proutn("Base Destroy    "); break;
-                               case FSCMOVE: proutn("SC Move         "); break;
-                               case FSCDBAS: proutn("SC Base Destroy "); break;
-                       }
-                       proutn("%.2f", future[i]-game.state.date);
-                       chew();
-                       proutn("  ?");
-                       key = scan();
-                       if (key == IHREAL) {
-                               future[i] = game.state.date + aaitem;
-                       }
-               }
-               chew();
+    }
+    proutn("Examine/change events? ");
+    if (ja() != 0) {
+       int i;
+       for (i = 1; i < NEVENTS; i++) {
+           int key;
+           if (game.future[i] == 1e30) continue;
+           switch (i) {
+           case FSNOVA:  proutn("Supernova       "); break;
+           case FTBEAM:  proutn("T Beam          "); break;
+           case FSNAP:   proutn("Snapshot        "); break;
+           case FBATTAK: proutn("Base Attack     "); break;
+           case FCDBAS:  proutn("Base Destroy    "); break;
+           case FSCMOVE: proutn("SC Move         "); break;
+           case FSCDBAS: proutn("SC Base Destroy "); break;
+           }
+           proutn("%.2f", game.future[i]-game.state.date);
+           chew();
+           proutn("  ?");
+           key = scan();
+           if (key == IHREAL) {
+               game.future[i] = game.state.date + aaitem;
+           }

        }
        }

+       chew();
+    }

 }
 }

-                       
-

 #endif
 #endif

diff --git a/sst.h b/sst.h
index 4a530631d9110719a973fdafe8d2fe6cc3f4a927..f32d8559ec3fc2f002d828176b3757addb24f533 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -85,6 +85,16 @@ typedef struct {
 #define SKILL_EXPERT   4
 #define SKILL_EMERITUS 5
 
 #define SKILL_EXPERT   4
 #define SKILL_EMERITUS 5
 

+/* game options */
+#define OPTION_ALL     0xffffffff
+#define OPTION_TTY     0x00000001      /* old interface */
+#define OPTION_CURSES  0x00000002      /* new interface */
+#define OPTION_IOMODES 0x00000003      /* cover both interfaces */
+#define OPTION_PLANETS 0x00000004      /* planets and mining */
+#define OPTION_THOLIAN 0x00000008      /* Tholians and their webs */
+#define OPTION_THINGY  0x00000010      /* Space Thingy can shoot back */
+#define OPTION_PROBE   0x00000020      /* deep-space probes */
+

 // Scalar variables that are needed for freezing the game
 // are placed in a structure. #defines are used to access by their
 // original names. Gee, I could have done this with the d structure,
 // Scalar variables that are needed for freezing the game
 // are placed in a structure. #defines are used to access by their
 // original names. Gee, I could have done this with the d structure,


@@ -96,6 +106,7 @@ EXTERN WINDOW *curwnd;
 
 EXTERN struct {
     char magic[sizeof(SSTMAGIC)];
 
 EXTERN struct {
     char magic[sizeof(SSTMAGIC)];

+    unsigned long options;

     snapshot state;
     snapshot snapsht;
     char quad[QUADSIZE+1][QUADSIZE+1];         // contents of our quadrant
     snapshot state;
     snapshot snapsht;
     char quad[QUADSIZE+1][QUADSIZE+1];         // contents of our quadrant


@@ -462,7 +473,7 @@ void debugme(void);
 void attakreport(int);
 void movetho(void);
 void probe(void);
 void attakreport(int);
 void movetho(void);
 void probe(void);

-void iostart(int);
+void iostart(void);

 void setwnd(WINDOW *);
 void warble(void);
 void boom(int ii, int jj);
 void setwnd(WINDOW *);
 void warble(void);
 void boom(int ii, int jj);