X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fsst.h;h=1c40d1b946d43a3e932b0814c363decca37f4e49;hb=ad1478c7cc24b761592a1e355015b44b243aeeda;hp=bccb6c27609f94247ee2611ca361e103ca4ae526;hpb=a0afd227763655ee0ecd7ef5faea92d63d5c5ba6;p=super-star-trek.git

diff --git a/src/sst.h b/src/sst.h
index bccb6c2..1c40d1b 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -210,11 +210,16 @@ struct game {
 	alive,		// we are alive (not killed)
 	justin,		// just entered quadrant
 	shldup,		// shields are up
+	ishere,		// super-commander in quadrant
+	ientesc,	// attempted escape from supercommander
+	ithere,		// Tholian is here 
 	resting,	// rest time
+	icraft,		// Kirk in Galileo
 	alldone,	// game is now finished
 	neutz,		// Romulan Neutral Zone
 	isarmed,	// probe is armed
 	inorbit,	// orbiting a planet
+	imine,		// mining
 	thawed;		// thawed game
     int inkling,	// initial number of klingons
 	inbase,		// initial number of bases
@@ -237,20 +242,15 @@ struct game {
 	shldchg,	// shield is changing (affects efficiency)
 	landed,		// party on planet (1), on ship (-1)
 	iplnet,		// planet # in quadrant
-	imine,		// mining
 	inplan,		// initial planets
 	nenhere,	// number of enemies in quadrant
-	ishere,		// super-commander in quandrant
 	irhere,		// Romulans in quadrant
-	icraft,		// Kirk in Galileo
-	ientesc,	// attempted escape from supercommander
 	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])
 	icrystl,	// dilithium crystals aboard
 	tourn,		// tournament number
-	ithere,		// Tholian is here 
 	iseenit,	// seen base attack report
 	proben,		// number of moves for probe
 	nprobes;	// number of probes available
@@ -292,7 +292,7 @@ extern FILE *logfp, *replayfp;
 
 /* the Space Thingy's global state should *not* be saved! */
 extern coord thing;
-extern int iqhere, iqengry;
+extern bool iqhere, iqengry;
 
 typedef enum {FWON, FDEPLETE, FLIFESUP, FNRG, FBATTLE,
               FNEG3, FNOVA, FSNOVAED, FABANDN, FDILITHIUM,
@@ -328,7 +328,7 @@ enum loctype {neither, quadrant, sector};
 
 /* Function prototypes */
 void prelim(void);
-void attack(int);
+void attack(bool);
 bool choose(bool);
 void setup(bool);
 void score(void);
@@ -352,7 +352,7 @@ void eta(void);
 void mayday(void);
 void abandn(void);
 void finish(FINTYPE);
-void dstrct(void);
+void selfdestruct(void);
 void kaboom(void);
 void freeze(bool);
 int thaw(void);
@@ -380,16 +380,16 @@ void dropin(int, coord*);
 void newcnd(void);
 void sortkl(void);
 void imove(void);
-void ram(int, int, coord);
-void crmena(int, int, int, coord w);
+void ram(bool, int, coord);
+void crmena(bool, int, enum loctype, coord w);
 void deadkl(coord, int, int, int);
 void timwrp(void);
 void movcom(void);
 void torpedo(double, double, int, int, double *, int, int);
 void huh(void);
 void pause_game(int);
-void nova(int, int);
-void snova(int, int);
+void nova(coord);
+void snova(bool, coord *);
 void scom(bool *);
 void hittem(double *);
 void prouts(char *, ...);