Get rid of DESTROY macro.

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

diff --git a/src/sst.h b/src/sst.h
index e4eb9d3fa97274efa0111059e7ded26b90f5d497..7389c5de3aecd4a0c3636b88c172849e9a4d9ea1 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -20,13 +20,15 @@
 #define min(x, y)      ((x)<(y)?(x):(y))
 #define max(x, y)      ((x)>(y)?(x):(y))
 
-#define PHASEFAC (2.0)
-#define GALSIZE        (8)
-#define NINHAB (GALSIZE * GALSIZE / 2)
-#define MAXUNINHAB (10)
-#define PLNETMAX (NINHAB + MAXUNINHAB)
-#define QUADSIZE (10)
-#define BASEMAX        (5)
+#define PHASEFAC       2.0
+#define GALSIZE                8
+#define NINHAB         (GALSIZE * GALSIZE / 2)
+#define MAXUNINHAB     10
+#define PLNETMAX       (NINHAB + MAXUNINHAB)
+#define QUADSIZE       10
+#define BASEMAX                (GALSIZE * GALSIZE / 12)
+#define MAXKLGAME      127
+#define MAXKLQUAD      9
 
 /*
  * These macros hide the difference between 0-origin and 1-origin addressing.
@@ -34,11 +36,6 @@
  */
 #define VALID_QUADRANT(x, y)   ((x)>=1 && (x)<=GALSIZE && (y)>=1 && (y)<=GALSIZE)
 #define VALID_SECTOR(x, y)     ((x)>=1 && (x)<=QUADSIZE && (y)>=1 && (y)<=QUADSIZE)
-#define for_quadrants(i)       for (i = 1; i <= GALSIZE; i++)
-#define for_sectors(i)         for (i = 1; i <= QUADSIZE; i++)
-#define for_commanders(i)      for (i = 1; i <= game.state.remcom; i++)
-#define for_local_enemies(i)   for (i = 1; i <= game.nenhere; i++)
-#define for_starbases(i)       for (i = 1; i <= game.state.rembase; i++)
 
 typedef struct {int x; int y;} coord;
 
@@ -50,15 +47,13 @@ typedef struct {int x; int y;} coord;
 
 typedef struct {
     coord w;
-    enum {M=0, N=1, O=2} pclass;
+    enum {destroyed= -1, M=0, N=1, O=2} pclass;
     int inhabited;     /* if NZ, an index into a name array */
 #define UNINHABITED    -1
     enum {mined=-1, present=0, absent=1} crystals; /* has crystals */
     enum {unknown, known, shuttle_down} known;
 } planet;
 
-#define DESTROY(pl)    memset(pl, '\0', sizeof(planet))
-
 typedef enum {
     IHR = 'R',
     IHK = 'K',
@@ -118,9 +113,6 @@ typedef struct {
     } chart[GALSIZE+1][GALSIZE+1];     // the starchart (subscript 0 not used)
 } snapshot;                            // Data that is snapshot
 
-#define MAXKLGAME      127
-#define MAXKLQUAD      9
-
 #define NKILLK (game.inkling - game.state.remkl)
 #define NKILLC (game.incom - game.state.remcom)
 #define NKILLSC (game.inscom - game.state.nscrem)
@@ -355,17 +347,17 @@ extern void photon(void);
 extern void warp(bool);
 extern void doshield(bool);
 extern void dock(bool);
-extern void dreprt(void);
+extern void damagereport(void);
 extern void chart(void);
 extern void rechart(void);
-extern void impuls(void);
+extern void impulse(void);
 extern void wait(void);
-extern void setwrp(void);
+extern void setwarp(void);
 extern void events(void);
 extern void report(void);
 extern void eta(void);
 extern void mayday(void);
-extern void abandn(void);
+extern void abandon(void);
 extern void finish(FINTYPE);
 extern void selfdestruct(void);
 extern void kaboom(void);
@@ -397,7 +389,7 @@ extern double Rand(void);
 extern coord randplace(int);
 extern coord dropin(feature);
 extern void newcnd(void);
-extern void sortkl(void);
+extern void sortklings(void);
 extern void imove(bool);
 extern void ram(bool, feature, coord);
 extern void crmena(bool, feature, enum loctype, coord w);
@@ -409,11 +401,11 @@ extern void huh(void);
 extern void pause_reset(void);
 extern void pause_game(bool);
 extern void nova(coord);
-extern void snova(bool, coord *);
-extern void scom(void);
+extern void supernova(bool, coord *);
+extern void supercommander(void);
 extern void hittem(double *);
 extern bool isit(char *);
-extern void preport(void);
+extern void survey(void);
 extern void orbit(void);
 extern void sensor(void);
 extern void drawmaps(int);
@@ -423,8 +415,8 @@ extern void usecrystals(void);
 extern void shuttle(void);
 extern void deathray(void);
 extern void debugme(void);
-extern void attakreport(bool);
-extern void movetho(void);
+extern void attackreport(bool);
+extern void movetholian(void);
 extern void probe(void);
 extern void iostart(void);
 extern void setwnd(WINDOW *);