Do Thingy as Dave suggests, not retained in saved games.

diff --git a/TODO b/TODO
index 7d8cc981dcd29dc7701678162e7137a93df82550..dc76924bece82c8c70e73491b5f21fa870188a1b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,3 +7,4 @@
 * Code to hurl you out of quadrant if a supernova occurs as you warp in 
   seems to hang.
 
+* Regenerate Thingy at random location when unfreezing a game.

diff --git a/sst.c b/sst.c
index dd73713dc7a3d1ac8a56cff1d8b5b0d7d35a7893..5dfdabdca07321ce3bfda7d8688840a98c5a97c9 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -116,6 +116,7 @@ Eric Raymond's changes:
 
    3. Can now report starbases left in scrscan.
 
+   4. Per Dave Matuszek's remarks, Thingy state is not saved across games.
    */
 
 /* the input queue */

diff --git a/sst.h b/sst.h
index f32d8559ec3fc2f002d828176b3757addb24f533..64dd1bc9845c36c61ed8d844fdd1e1d824748433 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -147,8 +147,6 @@ EXTERN struct {
        justin,
        alldone,
        shldchg,
-       thingx,
-       thingy,
        plnetx,
        plnety,
        inorbit,
@@ -175,8 +173,6 @@ EXTERN struct {
        batx,
        baty,
        ithere,
-        iqhere,
-        iqengry,
        ithx,
        ithy,
        iseenit,
@@ -238,8 +234,6 @@ EXTERN struct {
 #define justin game.justin                     // just entered quadrant
 #define alldone game.alldone           // game is now finished
 #define shldchg game.shldchg           // shield is changing (affects efficiency)
-#define thingx game.thingx                     // location of strange object in galaxy
-#define thingy game.thingy                     //
 #define plnetx game.plnetx                     // location of planet in quadrant
 #define plnety game.plnety                     //
 #define inorbit game.inorbit           // orbiting
@@ -251,8 +245,6 @@ EXTERN struct {
 #define ishere game.ishere                     // Super-commander in quandrant
 #define neutz game.neutz                       // Romulan Neutral Zone
 #define irhere game.irhere                     // Romulans in quadrant
-#define iqhere game.iqhere                     // Thing in quadrant
-#define iqengry game.iqengry                   // Thing attacking
 #define icraft game.icraft                     // Kirk in Galileo
 #define ientesc game.ientesc           // Attempted escape from supercommander
 #define iscraft game.iscraft           // =1 if craft on ship, -1 if removed from game
@@ -308,6 +300,9 @@ EXTERN double perdate;
 EXTERN double aaitem;
 EXTERN char citem[10];
 
+/* the Space Thingy's global state should *not* be saved! */
+EXTERN int thingx, thingy, iqhere, iqengry;
+
 typedef enum {FWON, FDEPLETE, FLIFESUP, FNRG, FBATTLE,
               FNEG3, FNOVA, FSNOVAED, FABANDN, FDILITHIUM,
                          FMATERIALIZE, FPHASER, FLOST, FMINING, FDPLANET,