There is a separate STATUS command.

diff --git a/sst.c b/sst.c
index 3352316c823ef74ba3a55aeae740ace684c78af2..9e48a03c7d3f05c3c5e223644b544c877c0b0d89 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -103,77 +103,78 @@ static struct
 commands[] = {
 #define SRSCAN 1
        {"SRSCAN",      SRSCAN},
 commands[] = {
 #define SRSCAN 1
        {"SRSCAN",      SRSCAN},

-       {"STATUS",      SRSCAN},
-#define LRSCAN 2
+#define STATUS 2
+       {"STATUS",      STATUS},
+#define REQUEST        3
+       {"REQUEST",     REQUEST},
+#define LRSCAN 4

        {"LRSCAN",      LRSCAN},
        {"LRSCAN",      LRSCAN},

-#define PHASERS        3
+#define PHASERS        5

        {"PHASERS",     PHASERS},
        {"PHASERS",     PHASERS},

-#define TORPEDO        4
+#define TORPEDO        6

         {"TORPEDO",    TORPEDO},
        {"PHOTONS",     TORPEDO},
         {"TORPEDO",    TORPEDO},
        {"PHOTONS",     TORPEDO},

-#define MOVE   5
+#define MOVE   7

        {"MOVE",        MOVE},
        {"MOVE",        MOVE},

-#define SHIELDS        6
+#define SHIELDS        8

        {"SHIELDS",     SHIELDS},
        {"SHIELDS",     SHIELDS},

-#define DOCK   7
+#define DOCK   9

        {"DOCK",        DOCK},
        {"DOCK",        DOCK},

-#define DAMAGES        8
+#define DAMAGES        10

        {"DAMAGES",     DAMAGES},
        {"DAMAGES",     DAMAGES},

-#define CHART  9
+#define CHART  11

        {"CHART",       CHART},
        {"CHART",       CHART},

-#define IMPULSE        10
+#define IMPULSE        12

        {"IMPULSE",     IMPULSE},
        {"IMPULSE",     IMPULSE},

-#define REST   11
+#define REST   13

        {"REST",        REST},
        {"REST",        REST},

-#define WARP   12
+#define WARP   14

        {"WARP",        WARP},
        {"WARP",        WARP},

-#define SCORE  13
+#define SCORE  15

        {"SCORE",       SCORE},
        {"SCORE",       SCORE},

-#define SENSORS        14
+#define SENSORS        16

        {"SENSORS",     SENSORS},
        {"SENSORS",     SENSORS},

-#define ORBIT  15
+#define ORBIT  17

        {"ORBIT",       ORBIT},
        {"ORBIT",       ORBIT},

-#define TRANSPORT      16
+#define TRANSPORT      18

        {"TRANSPORT",   TRANSPORT},
        {"TRANSPORT",   TRANSPORT},

-#define MINE   17
+#define MINE   19

        {"MINE",        MINE},
        {"MINE",        MINE},

-#define CRYSTALS 18
+#define CRYSTALS       20

        {"CRYSTALS",    CRYSTALS},
        {"CRYSTALS",    CRYSTALS},

-#define SHUTTLE        19
+#define SHUTTLE        21

        {"SHUTTLE",     SHUTTLE},
        {"SHUTTLE",     SHUTTLE},

-#define PLANETS        20
+#define PLANETS        22

        {"PLANETS",     PLANETS},
        {"PLANETS",     PLANETS},

-#define REPORT 21
+#define REPORT 23

        {"REPORT",      REPORT},
        {"REPORT",      REPORT},

-#define COMPUTER       23
+#define COMPUTER       24

        {"COMPUTER",    COMPUTER},
        {"COMPUTER",    COMPUTER},

-#define COMMANDS       24
+#define COMMANDS       25

        {"COMMANDS",    COMMANDS},
        {"COMMANDS",    COMMANDS},

-#define EMEXIT 25
+#define EMEXIT 26

        {"EMEXIT",      EMEXIT},
        {"EMEXIT",      EMEXIT},

-#define PROBE  26
+#define PROBE  27

        {"PROBE",       PROBE},
        {"PROBE",       PROBE},

-#define SAVE   27
+#define SAVE   28

        {"SAVE",        SAVE},
        {"FREEZE",      SAVE},
        {"SAVE",        SAVE},
        {"FREEZE",      SAVE},

-#define ABANDON        28
+#define ABANDON        29

        {"ABANDON",     ABANDON},
        {"ABANDON",     ABANDON},

-#define DESTRUCT 29
+#define DESTRUCT       30

        {"DESTRUCT",    DESTRUCT},
        {"DESTRUCT",    DESTRUCT},

-#define DEATHRAY 30
+#define DEATHRAY       31

        {"DEATHRAY",    DEATHRAY},
        {"DEATHRAY",    DEATHRAY},

-#define DEBUGCMD       31
+#define DEBUGCMD       32

        {"DEBUG",       DEBUGCMD},
        {"DEBUG",       DEBUGCMD},

-#define MAYDAY 32
+#define MAYDAY 33

        {"MAYDAY",      MAYDAY},
        {"SOS",         MAYDAY},
        {"CALL",        MAYDAY},
        {"MAYDAY",      MAYDAY},
        {"SOS",         MAYDAY},
        {"CALL",        MAYDAY},

-#define QUIT   33
+#define QUIT   34

        {"QUIT",        QUIT},
        {"QUIT",        QUIT},

-#define HELP   34
+#define HELP   35

        {"HELP",        HELP},
        {"HELP",        HELP},

-#define REQUEST        35
-       {"REQUEST",     REQUEST},

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


@@ -311,6 +312,12 @@ static void makemoves(void) {
                         case SRSCAN:                 // srscan
                                srscan(SCAN_FULL);
                                break;
                         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 LRSCAN:                    // lrscan
                                lrscan();
                                 break;


@@ -383,9 +390,6 @@ static void makemoves(void) {
                        case REPORT:                    // Game Report 
                                report();
                                break;
                        case REPORT:                    // Game Report 
                                report();
                                break;

-                       case REQUEST:                   // status request 
-                               srscan(SCAN_REQUEST);
-                               break;

                        case COMPUTER:                  // use COMPUTER!
                                eta();
                                break;
                        case COMPUTER:                  // use COMPUTER!
                                eta();
                                break;