From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 7 Feb 2005 06:34:38 +0000 (+0000)
Subject: Do Thingy as Dave suggests, not retained in saved games.
X-Git-Tag: 2.0~343
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=64f8a6155517ae8b894617ebd93e5eb48cdf4c0e

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

diff --git a/TODO b/TODO
index 7d8cc98..dc76924 100644
--- 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 dd73713..5dfdabd 100644
--- 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 f32d855..64dd1bc 100644
--- 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,