curses interface is now partly working.

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

diff --git a/sst.h b/sst.h
index 8705b8480ce06277cbb4e6c410e2e658f35a99c7..f9eb043c2a73f1718377e0977e0eca5ae81dce75 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
@@ -251,7 +254,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
@@ -314,8 +316,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
@@ -340,8 +344,8 @@ char *device[NDEVICES+1] = {
 /* 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
@@ -390,7 +394,7 @@ double square(double);
 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
@@ -404,6 +408,7 @@ void snova(int, int);
 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
@@ -417,3 +422,7 @@ void debugme(void);
 void attakreport(void);\r
 void movetho(void);\r
 void probe(void);\r
+void clearscreen(void);\r
+void iostart(void);\r
+void ioend(void);\r
+void getline(char *, int);\r