X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.h;h=f96ea03bbd1499f0e8f1c388b365911bf2af0395;hp=75e9be9d72859fc459f6fd190d2d6af765d34abc;hb=f2f73e20553ed56a51b878f81098208fb8e5e273;hpb=c94108fede4723af905386473f6435467e96e630

diff --git a/src/sst.h b/src/sst.h
index 75e9be9..f96ea03 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -80,8 +80,8 @@ typedef enum {
 } feature;
 
 typedef struct {
-    int snap,		// snapshot taken
-	crew,		// crew complement
+    bool snap;		// snapshot taken
+    int crew,		// crew complement
 #define FULLCREW	428	/* BSD Trek was 387, that's wrong */
 	remkl,			// remaining klingons
 	remcom,			// remaining commanders
@@ -112,7 +112,7 @@ typedef struct {
     } galaxy[GALSIZE+1][GALSIZE+1]; 	// The Galaxy (subscript 0 not used)
     struct page {
 	int stars;
-	int starbase;
+	bool starbase;
 	int klingons;
     } chart[GALSIZE+1][GALSIZE+1]; 	// the starchart (subscript 0 not used)
 } snapshot;				// Data that is snapshot
@@ -128,13 +128,6 @@ typedef struct {
 #define INKLINGTOT (game.inkling + game.incom + game.inscom)
 #define KLINGKILLED (INKLINGTOT - KLINGREM)
 
-#define SKILL_NONE	0
-#define SKILL_NOVICE	1
-#define SKILL_FAIR	2
-#define SKILL_GOOD	3
-#define SKILL_EXPERT	4
-#define SKILL_EMERITUS	5
-
 /* game options */
 #define OPTION_ALL	0xffffffff
 #define OPTION_TTY	0x00000001	/* old interface */
@@ -165,13 +158,14 @@ typedef struct {
 #define DRADIO  8
 #define DSHUTTL 9
 #define DCOMPTR 10
-#define DTRANSP 11
-#define DSHCTRL 12
-#define DDRAY   13  // Added deathray
-#define DDSP    14  // Added deep space probe
-#define NDEVICES (15)	// Number of devices
+#define DNAVSYS	11
+#define DTRANSP 12
+#define DSHCTRL 13
+#define DDRAY   14
+#define DDSP    15
+#define NDEVICES (16)	// Number of devices
 
-#define damaged(dev)	game.damage[dev] != 0.0
+#define damaged(dev)	(game.damage[dev] != 0.0)
 
 #define FOREVER	1e30
 
@@ -209,6 +203,8 @@ extern double scheduled(int);
 
 #define SSTMAGIC	"SST2.0\n"
 
+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
 struct game {
     char magic[sizeof(SSTMAGIC)];
     unsigned long options;
@@ -233,12 +229,15 @@ struct game {
 	alive,		// we are alive (not killed)
 	justin,		// just entered quadrant
 	shldup,		// shields are up
+	shldchg,	// shield is changing (affects efficiency)
 	comhere,	// commander here
 	ishere,		// super-commander in quadrant
+	iscate,		// super commander is here
 	ientesc,	// attempted escape from supercommander
 	ithere,		// Tholian is here 
 	resting,	// rest time
 	icraft,		// Kirk in Galileo
+	landed,		// party on planet (true), on ship (false)
 	alldone,	// game is now finished
 	neutz,		// Romulan Neutral Zone
 	isarmed,	// probe is armed
@@ -254,32 +253,39 @@ struct game {
 	docked,
 	dead,
     } condition;		// condition (red/yellow/green/docked)
+    enum {
+	onship,
+	offship,
+	removed,
+    } iscraft;		// 'onship' if craft on ship, 'removed' if out of game
+    enum {
+	SKILL_NONE,
+	SKILL_NOVICE,
+	SKILL_FAIR,
+	SKILL_GOOD,
+	SKILL_EXPERT,
+	SKILL_EMERITUS,
+    } skill;		// skill level
     int inkling,	// initial number of klingons
 	inbase,		// initial number of bases
 	incom,		// initial number of commanders
 	inscom,		// initial number of commanders
 	inrom,		// initial number of commanders
 	instar,		// initial stars
-	intorps,	// initial/Max torpedoes
+	intorps,	// initial/max torpedoes
 	torps,		// number of torpedoes
 	ship,		// ship type -- 'E' is Enterprise
 	abandoned,	// count of crew abandoned in space
 	length,		// length of game
-	skill,		// skill level
 	klhere,		// klingons here
 	casual,		// causalties
 	nhelp,		// calls for help
 	nkinks,		// count of energy-barrier crossings
-	shldchg,	// shield is changing (affects efficiency)
-	landed,		// party on planet (1), on ship (-1)
 	iplnet,		// planet # in quadrant
 	inplan,		// initial planets
 	nenhere,	// number of enemies in quadrant
 	irhere,		// Romulans in quadrant
-	iscraft,	// =1 if craft on ship, -1 if removed from game
 	isatb,		// =1 if super commander is attacking base
-	iscate,		// super commander is here
-	iattak,		// attack recursion elimination (was cracks[4])
 	tourn,		// tournament number
 	proben,		// number of moves for probe
 	nprobes;	// number of probes available
@@ -311,6 +317,7 @@ extern struct game game;
 
 /* the following global state doesn't need to be saved */
 extern char *device[NDEVICES];
+extern char *systnames[NINHAB + 1];
 extern int iscore, iskill; // Common PLAQ
 extern double perdate;
 extern double aaitem;
@@ -392,7 +399,7 @@ coord randplace(int);
 coord dropin(feature);
 void newcnd(void);
 void sortkl(void);
-void imove(void);
+void imove(bool);
 void ram(bool, feature, coord);
 void crmena(bool, feature, enum loctype, coord w);
 void deadkl(coord, feature, coord);
@@ -431,8 +438,10 @@ void setpassword(void);
 void commandhook(char *, bool);
 void makechart(void);
 void enqueue(char *);
-char *systemname(int);
 coord newkling(int);
+#if BSD_BUG_FOR_BUG
+void visual(void);
+#endif
 
 extern WINDOW *curwnd;
 extern WINDOW *fullscreen_window;