X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.h;h=d58fea381e2faa3141a64dfa612b76cd039dd3e6;hp=2b30d8b17164457d370ee5db6ee39c591a517b8b;hb=2cae1cd3feb922843b40af851f43f9e08bb18f0d;hpb=d48a2567098e4d756e0ca9d4b707bcd5867ac6c9

diff --git a/src/sst.h b/src/sst.h
index 2b30d8b..d58fea3 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -146,6 +146,8 @@ typedef struct {
 #define DDSP    14  // Added deep space probe
 #define NDEVICES (15)	// Number of devices
 
+#define damaged(dev)	game.damage[dev] != 0.0
+
 #define FOREVER	1e30
 
 /* Define future events */
@@ -178,6 +180,7 @@ extern int is_scheduled(int);
 extern event *schedule(int, double);
 extern void postpone(int, double);
 extern double scheduled(int);
+#define findevent(evtype)	&game.future[evtype]
 
 #define SSTMAGIC	"SST2.0\n"
 
@@ -204,6 +207,8 @@ struct game {
 	ididit,		// action taken -- allows enemy to attack
 	alive,		// we are alive (not killed)
 	justin,		// just entered quadrant
+	shldup,		// shields are up
+	resting,	// rest time
 	alldone,	// game is now finished
 	neutz,		// Romulan Neutral Zone
 	isarmed,	// probe is armed
@@ -254,7 +259,6 @@ struct game {
 	indate,		// initial date
 	energy,		// energy level
 	shield,		// shield level
-	shldup,		// shields are up
 	warpfac,	// warp speed
 	wfacsq,		// squared warp factor
 	lsupres,	// life support reserves
@@ -262,7 +266,6 @@ struct game {
 	direc,		// movement direction
 	optime,		// time taken by current operation
 	docfac,		// repair factor when docking (constant?)
-	resting,	// rest time
 	damfac,		// damage factor
 	lastchart,	// time star chart was last updated
 	cryprob,	// probability that crystal will work
@@ -281,9 +284,8 @@ extern double perdate;
 extern double aaitem;
 extern char citem[10];
 extern int seed;
-extern bool randready;
 extern bool idebug;
-extern FILE *logfp;
+extern FILE *logfp, *replayfp;
 
 /* the Space Thingy's global state should *not* be saved! */
 extern coord thing;
@@ -385,7 +387,7 @@ void huh(void);
 void pause_game(int);
 void nova(int, int);
 void snova(int, int);
-void scom(int *);
+void scom(bool *);
 void hittem(double *);
 void prouts(char *, ...);
 int isit(char *);