X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.h;h=a9c6ad294395fbd8e669d5911bd03b7e94323c22;hp=a397ed25633ad63db6a05fad108280b8c47ae0b6;hb=c2847bb7511b0cf8472ba3a0a170a4fedd3b2861;hpb=f5a89916bc70a66b6fa6a3abc4c36023503cd380

diff --git a/src/sst.h b/src/sst.h
index a397ed2..a9c6ad2 100644
--- a/src/sst.h
+++ b/src/sst.h
@@ -45,6 +45,8 @@ typedef struct {int x; int y;} coord;
 #define square(i)		((i)*(i))
 #define same(c1, c2)		((c1.x == c2.x) && (c1.y == c2.y))
 #define distance(c1, c2)	sqrt(square(c1.x - c2.x) + square(c1.y - c2.y))
+#define invalidate(w)		w.x = w.y = 0
+#define is_valid(w)		(w.x == 0 || w.y == 0)
 
 typedef struct {
     coord w;
@@ -339,13 +341,6 @@ typedef enum {
 
 enum loctype {neither, quadrant, sector};
 
-typedef enum {
-    SCAN_FULL,
-    SCAN_REQUEST,
-    SCAN_STATUS,
-    SCAN_NO_LEFTSIDE,
-} scantype;
-
 /* Function prototypes */
 void prelim(void);
 void attack(bool);
@@ -353,7 +348,7 @@ bool choose(bool);
 void setup(bool);
 void score(void);
 void atover(bool);
-void srscan(scantype);
+void srscan(void);
 void lrscan(void);
 void phasers(void);
 void photon(void);
@@ -361,7 +356,7 @@ void warp(bool);
 void doshield(bool);
 void dock(bool);
 void dreprt(void);
-void chart(bool);
+void chart(void);
 void rechart(void);
 void impuls(void);
 void wait(void);
@@ -378,14 +373,19 @@ void freeze(bool);
 bool thaw(void);
 void plaque(void);
 int scan(void);
+void status(int req);
+void request(void);
 #define IHEOL (0)
 #define IHALPHA (1)
 #define IHREAL (2)
 void chew(void);
 void chew2(void);
 void skip(int);
-void prout(char *, ...);
-void proutn(char *, ...);
+void prout(const char *, ...) __attribute__((format(printf, 1, 2)));
+void proutn(const char *, ...) __attribute__((format(printf, 1, 2)));
+void prouts(const char *, ...) __attribute__((format(printf, 1, 2)));
+void prstat(const char *txt, const char *fmt, ...)
+	__attribute__((format(printf, 2, 3)));
 void stars(void);
 void newqad(bool);
 bool ja(void);
@@ -411,7 +411,6 @@ void nova(coord);
 void snova(bool, coord *);
 void scom(bool *);
 void hittem(double *);
-void prouts(char *, ...);
 bool isit(char *);
 void preport(void);
 void orbit(void);
@@ -436,7 +435,6 @@ void waitfor(void);
 void setpassword(void);
 void commandhook(char *, bool);
 void makechart(void);
-void enqueue(char *);
 coord newkling(int);
 #if BSD_BUG_FOR_BUG
 void visual(void);