More merging of SERGEEV changes.

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

diff --git a/sst.h b/sst.h
index 255e5cc41f0050407fed56b709086470a974e665..0e198f4921e41042e7ea8e540a71ad60cec2ca4f 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -8,6 +8,9 @@
 #define EXTERN\r
 #endif\r
 \r
+#define min(x, y)      ((x)<(y)?(x):(y))\r
+#define max(x, y)      ((x)>(y)?(x):(y))\r
+\r
 // #define DEBUG\r
 \r
 #define NDEVICES (15)  // Number of devices\r
@@ -128,6 +131,8 @@ EXTERN struct {
        batx,\r
        baty,\r
        ithere,\r
+        iqhere,\r
+        iqengry,\r
        ithx,\r
        ithy,\r
        iseenit,\r
@@ -202,6 +207,8 @@ EXTERN struct {
 #define ishere game.ishere                     // Super-commander in quandrant\r
 #define neutz game.neutz                       // Romulan Neutral Zone\r
 #define irhere game.irhere                     // Romulans in quadrant\r
+#define iqhere game.iqhere                     // Thing in quadrant\r
+#define iqengry game.iqengry                   // Thing attacking\r
 #define icraft game.icraft                     // Kirk in Galileo\r
 #define ientesc game.ientesc           // Attempted escape from supercommander\r
 #define iscraft game.iscraft           // =1 if craft on ship, -1 if removed from game\r
@@ -251,7 +258,6 @@ EXTERN struct {
 #define nprobes game.nprobes           // number of probes available\r
 \r
 /* the following global state doesn't need to be saved */\r
-EXTERN int fromcommandline; // Game start from command line options\r
 EXTERN char    *device[NDEVICES+1];\r
 EXTERN int iscore, iskill; // Common PLAQ\r
 EXTERN double perdate;\r
@@ -263,6 +269,7 @@ typedef enum {FWON, FDEPLETE, FLIFESUP, FNRG, FBATTLE,
                          FMATERIALIZE, FPHASER, FLOST, FMINING, FDPLANET,\r
                          FPNOVA, FSSC, FSTRACTOR, FDRAY, FTRIBBLE,\r
                          FHOLE} FINTYPE ;\r
+enum loctype {neither, quadrant, sector};\r
 \r
 /* Define devices */\r
 #define DSRSENS 1\r
@@ -313,8 +320,10 @@ char *device[NDEVICES+1] = {
     "D. S. Probe"};                                                                    \r
 #endif\r
 \r
+#ifndef TRUE\r
 #define TRUE (1)\r
 #define FALSE (0)\r
+#endif\r
 \r
 #define IHR 'R'\r
 #define IHK 'K'\r
@@ -334,13 +343,17 @@ char *device[NDEVICES+1] = {
 #define IHYELLOW 'Y'\r
 #define IHRED 'R'\r
 #define IHDOCKED 'D'\r
+#define IHDEAD 'Z'\r
+#define IHMATER0 '-'\r
+#define IHMATER1 'o'\r
+#define IHMATER2 '0'\r
 \r
 \r
 /* Function prototypes */\r
 void prelim(void);\r
 void attack(int);\r
-int choose(void);\r
-void setup(void);\r
+int choose(int);\r
+void setup(int);\r
 void score(void);\r
 void atover(int);\r
 void srscan(int);\r
@@ -349,7 +362,7 @@ void phasers(void);
 void photon(void);\r
 void warp(int);\r
 void doshield(int);\r
-void dock(void);\r
+void dock(int);\r
 void dreprt(void);\r
 void chart(int);\r
 void impuls(void);\r
@@ -364,7 +377,7 @@ void finish(FINTYPE);
 void dstrct(void);\r
 void kaboom(void);\r
 void freeze(int);\r
-void thaw(void);\r
+int thaw(void);\r
 void plaque(void);\r
 int scan(void);\r
 #define IHEOL (0)\r
@@ -380,40 +393,48 @@ void newqad(int);
 int ja(void);\r
 void cramen(int);\r
 void crmshp(void);\r
-void cramlc(int, int, int);\r
+char *cramlc(enum loctype, int, int);\r
 double expran(double);\r
 double Rand(void);\r
 void iran8(int *, int *);\r
 void iran10(int *, int *);\r
-double square(double);\r
+#define square(i) ((i)*(i))\r
 void dropin(int, int*, int*);\r
 void newcnd(void);\r
 void sortkl(void);\r
-void move(void);\r
+void imove(void);\r
 void ram(int, int, int, int);\r
 void crmena(int, int, int, int, int);\r
 void deadkl(int, int, int, int, int);\r
 void timwrp(void);\r
 void movcom(void);\r
-void torpedo(double, double, int, int, double *);\r
-void cramf(double, int, int);\r
+void torpedo(double, double, int, int, double *, int);\r
 void huh(void);\r
-void pause(int);\r
+void pause_game(int);\r
 void nova(int, int);\r
 void snova(int, int);\r
 void scom(int *);\r
 void hittem(double *);\r
 void prouts(char *, ...);\r
+void proutc(char *);\r
 int isit(char *);\r
 void preport(void);\r
 void orbit(void);\r
 void sensor(void);\r
+#ifdef SERGEEV\r
+void drawmaps(short);\r
+#endif /* SERGEEV */\r
 void beam(void);\r
 void mine(void);\r
 void usecrystals(void);\r
 void shuttle(void);\r
 void deathray(void);\r
 void debugme(void);\r
-void attakreport(void);\r
+void attakreport(int);\r
 void movetho(void);\r
 void probe(void);\r
+void clearscreen(void);\r
+void iostart(int);\r
+void ioend(void);\r
+void getline(char *, int);\r
+void commandhook(char *, int);\r