First round of changes from Stas Sergeev.

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

diff --git a/sst.h b/sst.h
index 375e7aaddcfc0d07407d91d80e5486f9bce18397..63ea4cfa1ef9e957e87d66b440fb24c00093b589 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -131,6 +131,8 @@ EXTERN struct {
        batx,\r
        baty,\r
        ithere,\r
+        iqhere,\r
+        iqengry,\r
        ithx,\r
        ithy,\r
        iseenit,\r
@@ -205,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
@@ -339,6 +343,10 @@ 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
@@ -354,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
@@ -369,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
@@ -390,7 +398,7 @@ double expran(double);
 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
@@ -402,7 +410,7 @@ void timwrp(void);
 void movcom(void);\r
 void torpedo(double, double, int, int, double *);\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
@@ -419,7 +427,7 @@ void usecrystals(void);
 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