Clean up the rather nasty logoc of snova(), and fix a minor navigation bug.

[super-star-trek.git] / src / sst.h

diff --git a/src/sst.h b/src/sst.h
index 8651afd849224e987eff13a79403326a6b2a5c45..a1b8b5e00386dbc4b5fb48e0f29f52b23d97adcb 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -215,6 +215,7 @@ struct game {
        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,7 +238,6 @@ 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
@@ -328,11 +328,11 @@ enum loctype {neither, quadrant, sector};
 
 /* Function prototypes */
 void prelim(void);
-void attack(int);
+void attack(bool);
 bool choose(bool);
-void setup(int);
+void setup(bool);
 void score(void);
-void atover(int);
+void atover(bool);
 int srscan(int);
 void lrscan(void);
 void phasers(void);
@@ -341,7 +341,7 @@ void warp(bool);
 void doshield(int);
 void dock(bool);
 void dreprt(void);
-void chart(int);
+void chart(bool);
 void rechart(void);
 void impuls(void);
 void wait(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);
@@ -367,7 +367,7 @@ void skip(int);
 void prout(char *, ...);
 void proutn(char *, ...);
 void stars(void);
-void newqad(int);
+void newqad(bool);
 bool ja(void);
 void cramen(int);
 void crmshp(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 *, ...);
@@ -397,21 +397,21 @@ int isit(char *);
 void preport(void);
 void orbit(void);
 void sensor(void);
-void drawmaps(short);
+void drawmaps(int);
 void beam(void);
 void mine(void);
 void usecrystals(void);
 void shuttle(void);
 void deathray(void);
 void debugme(void);
-void attakreport(int);
+void attakreport(bool);
 void movetho(void);
 void probe(void);
 void iostart(void);
 void setwnd(WINDOW *);
 void warble(void);
-void boom(int ii, int jj);
-void tracktorpedo(int ix, int iy, int l, int i, int n, int iquad);
+void boom(int, int);
+void tracktorpedo(int, int, int, int, int, int);
 void cgetline(char *, int);
 void waitfor(void);
 void setpassword(void);