Change some ugly and misleading names.

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

diff --git a/src/sst.h b/src/sst.h
index a9c6ad294395fbd8e669d5911bd03b7e94323c22..ce4c6792e345dd260de57a7dea7e67290af92901 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -46,7 +46,7 @@ typedef struct {int x; int y;} coord;
 #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)
+#define is_valid(w)            (w.x != 0 && w.y != 0)
 
 typedef struct {
     coord w;
@@ -81,8 +81,8 @@ typedef enum {
 } feature;
 
 typedef struct {
-    bool snap;         // snapshot taken
-    int crew,          // crew complement
+    bool snap;                 // snapshot taken
+    int crew,                  // crew complement
 #define FULLCREW       428     /* BSD Trek was 387, that's wrong */
        remkl,                  // remaining klingons
        remcom,                 // remaining commanders
@@ -93,9 +93,9 @@ typedef struct {
        nromrem,                // Romulans remaining
        nplankl,                // destroyed uninhabited planets
        nworldkl;               // destroyed inhabited planets
-    planet plnets[PLNETMAX];  // Planet information
+    planet planets[PLNETMAX];  // Planet information
     double date,               // stardate
-       remres,         // remaining resources
+       remres,                 // remaining resources
        remtime;                // remaining time
     coord baseq[BASEMAX+1];    // Base quadrant coordinates
     coord kcmdr[QUADSIZE+1];   // Commander quadrant coordinates
@@ -403,7 +403,7 @@ void ram(bool, feature, coord);
 void crmena(bool, feature, enum loctype, coord w);
 void deadkl(coord, feature, coord);
 void timwrp(void);
-void movcom(void);
+void moveklings(void);
 void torpedo(double, double, coord, double *, int, int);
 void huh(void);
 void pause_game(bool);