projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change some ugly and misleading names.
[super-star-trek.git]
/
src
/
sst.h
diff --git
a/src/sst.h
b/src/sst.h
index fbaa466f42a05eda0d0dc401d884e1fecf3479a8..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 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;
typedef struct {
coord w;
@@
-81,8
+81,8
@@
typedef enum {
} feature;
typedef struct {
} 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
#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
nromrem, // Romulans remaining
nplankl, // destroyed uninhabited planets
nworldkl; // destroyed inhabited planets
- planet plnets[PLNETMAX]; // Planet information
+ planet pl
a
nets[PLNETMAX]; // Planet information
double date, // stardate
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
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 crmena(bool, feature, enum loctype, coord w);
void deadkl(coord, feature, coord);
void timwrp(void);
-void mov
com
(void);
+void mov
eklings
(void);
void torpedo(double, double, coord, double *, int, int);
void huh(void);
void pause_game(bool);
void torpedo(double, double, coord, double *, int, int);
void huh(void);
void pause_game(bool);