Another step in coalescing all the globals.

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

diff --git a/sst.h b/sst.h
index c6a1c87479a0951376a2b655a31d53c0864bf9a0..e0f9bd5d00e87d61309df3997c0cff4ddf1d1947 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -55,8 +55,18 @@ EXTERN struct foo {
 // but I just didn't think of it back when I started.\r
 \r
 EXTERN struct foo2 {\r
-        char quad[11][11];     // contents of our quadrant\r
-       int inkling,\r
+    char quad[11][11];         // contents of our quadrant\r
+    double kpower[21];         // enemy energy levels\r
+    double kdist[21];          // enemy distances\r
+    double kavgd[21];          // average distances\r
+    double damage[ndevice+1];  // damage encountered\r
+    double future[NEVENTS+1];  // future events\r
+    char passwd[10];           // Self Destruct password\r
+    int kx[21];                        // enemy sector locations\r
+    int ky[21];\r
+    int starch[9][9];          // star chart\r
+    /* members with macro definitions start here */\r
+    int inkling,\r
        inbase,\r
        incom,\r
        instar,\r
@@ -233,26 +243,10 @@ EXTERN struct foo2 {
 #define isarmed frozen.isarmed         // Probe is armed\r
 #define nprobes frozen.nprobes         // number of probes available\r
 \r
-EXTERN int\r
-               kx[21],                 // enemy sector locations\r
-               ky[21],\r
-               starch[9][9];   // star chart\r
-\r
+/* the following global state doesn't need to be saved */\r
 EXTERN int fromcommandline; // Game start from command line options\r
-\r
-\r
-EXTERN char    passwd[10],             // Self Destruct password\r
-               *device[ndevice+1];\r
-\r
+EXTERN char    *device[ndevice+1];\r
 EXTERN PLANETS nulplanet;      // zeroed planet structure\r
-\r
-EXTERN double\r
-               kpower[21],             // enemy energy levels\r
-               kdist[21],              // enemy distances\r
-               kavgd[21],              // average distances\r
-               damage[ndevice+1],              // damage encountered\r
-               future[NEVENTS+1];              // future events\r
-\r
 EXTERN int iscore, iskill; // Common PLAQ\r
 EXTERN double perdate;\r
 \r