X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=sst.h;h=b0da117e2b880915c6927346f49cacf9e606ded0;hb=998ff9c48426dd89c25b56ab59a0c8e2b6986355;hp=255e5cc41f0050407fed56b709086470a974e665;hpb=942f187b68be75931f4bd35015d74d284ef802c4;p=super-star-trek.git

diff --git a/sst.h b/sst.h
index 255e5cc..b0da117 100644
--- a/sst.h
+++ b/sst.h
@@ -8,6 +8,9 @@
 #define EXTERN
 #endif
 
+#define min(x, y)	((x)<(y)?(x):(y))
+#define max(x, y)	((x)>(y)?(x):(y))
+
 // #define DEBUG
 
 #define NDEVICES (15)	// Number of devices
@@ -251,7 +254,6 @@ EXTERN struct {
 #define nprobes game.nprobes		// number of probes available
 
 /* the following global state doesn't need to be saved */
-EXTERN int fromcommandline; // Game start from command line options
 EXTERN char	*device[NDEVICES+1];
 EXTERN int iscore, iskill; // Common PLAQ
 EXTERN double perdate;
@@ -263,6 +265,7 @@ typedef enum {FWON, FDEPLETE, FLIFESUP, FNRG, FBATTLE,
 			  FMATERIALIZE, FPHASER, FLOST, FMINING, FDPLANET,
 			  FPNOVA, FSSC, FSTRACTOR, FDRAY, FTRIBBLE,
 			  FHOLE} FINTYPE ;
+enum loctype {neither, quadrant, sector};
 
 /* Define devices */
 #define DSRSENS 1
@@ -313,8 +316,10 @@ char *device[NDEVICES+1] = {
     "D. S. Probe"};									
 #endif
 
+#ifndef TRUE
 #define TRUE (1)
 #define FALSE (0)
+#endif
 
 #define IHR 'R'
 #define IHK 'K'
@@ -339,8 +344,8 @@ char *device[NDEVICES+1] = {
 /* Function prototypes */
 void prelim(void);
 void attack(int);
-int choose(void);
-void setup(void);
+int choose(int);
+void setup(int);
 void score(void);
 void atover(int);
 void srscan(int);
@@ -380,7 +385,7 @@ void newqad(int);
 int ja(void);
 void cramen(int);
 void crmshp(void);
-void cramlc(int, int, int);
+char *cramlc(enum loctype, int, int);
 double expran(double);
 double Rand(void);
 void iran8(int *, int *);
@@ -389,14 +394,13 @@ double square(double);
 void dropin(int, int*, int*);
 void newcnd(void);
 void sortkl(void);
-void move(void);
+void imove(void);
 void ram(int, int, int, int);
 void crmena(int, int, int, int, int);
 void deadkl(int, int, int, int, int);
 void timwrp(void);
 void movcom(void);
 void torpedo(double, double, int, int, double *);
-void cramf(double, int, int);
 void huh(void);
 void pause(int);
 void nova(int, int);
@@ -404,6 +408,7 @@ void snova(int, int);
 void scom(int *);
 void hittem(double *);
 void prouts(char *, ...);
+void proutc(char *);
 int isit(char *);
 void preport(void);
 void orbit(void);
@@ -417,3 +422,7 @@ void debugme(void);
 void attakreport(void);
 void movetho(void);
 void probe(void);
+void clearscreen(void);
+void iostart(int);
+void ioend(void);
+void getline(char *, int);