X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fsst.h;h=a397ed25633ad63db6a05fad108280b8c47ae0b6;hb=f5a89916bc70a66b6fa6a3abc4c36023503cd380;hp=83e74551da01625dd5bb87e411976f3bb0d4c938;hpb=ad6b6f3e8316dc43c8f80ca8bc57be091b0076c6;p=super-star-trek.git diff --git a/src/sst.h b/src/sst.h index 83e7455..a397ed2 100644 --- a/src/sst.h +++ b/src/sst.h @@ -51,8 +51,7 @@ typedef struct { enum {M=0, N=1, O=2} pclass; int inhabited; /* if NZ, an index into a name array */ #define UNINHABITED -1 - int crystals; /* has crystals */ -#define MINED -1 /* used to have crystals, but they were mined out */ + enum {mined=-1, present=0, absent=1} crystals; /* has crystals */ enum {unknown, known, shuttle_down} known; } planet; @@ -203,6 +202,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; @@ -284,7 +285,6 @@ struct game { nenhere, // number of enemies in quadrant irhere, // Romulans in quadrant isatb, // =1 if super commander is attacking base - iattak, // attack recursion elimination (was cracks[4]) tourn, // tournament number proben, // number of moves for probe nprobes; // number of probes available @@ -398,7 +398,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);