projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up ugly FORTRANISH names.
[super-star-trek.git]
/
src
/
sst.h
diff --git
a/src/sst.h
b/src/sst.h
index e4eb9d3fa97274efa0111059e7ded26b90f5d497..5ea29e9a07f96f96062326f7f3ed0b69370b0631 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 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.
/*
* These macros hide the difference between 0-origin and 1-origin addressing.
@@
-118,9
+120,6
@@
typedef struct {
} chart[GALSIZE+1][GALSIZE+1]; // the starchart (subscript 0 not used)
} snapshot; // Data that is snapshot
} 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)
#define NKILLK (game.inkling - game.state.remkl)
#define NKILLC (game.incom - game.state.remcom)
#define NKILLSC (game.inscom - game.state.nscrem)
@@
-355,17
+354,17
@@
extern void photon(void);
extern void warp(bool);
extern void doshield(bool);
extern void dock(bool);
extern void warp(bool);
extern void doshield(bool);
extern void dock(bool);
-extern void d
rep
rt(void);
+extern void d
amagerepo
rt(void);
extern void chart(void);
extern void rechart(void);
extern void chart(void);
extern void rechart(void);
-extern void impuls(void);
+extern void impuls
e
(void);
extern void wait(void);
extern void wait(void);
-extern void setwrp(void);
+extern void setw
a
rp(void);
extern void events(void);
extern void report(void);
extern void eta(void);
extern void mayday(void);
extern void events(void);
extern void report(void);
extern void eta(void);
extern void mayday(void);
-extern void abandn(void);
+extern void aband
o
n(void);
extern void finish(FINTYPE);
extern void selfdestruct(void);
extern void kaboom(void);
extern void finish(FINTYPE);
extern void selfdestruct(void);
extern void kaboom(void);
@@
-397,7
+396,7
@@
extern double Rand(void);
extern coord randplace(int);
extern coord dropin(feature);
extern void newcnd(void);
extern coord randplace(int);
extern coord dropin(feature);
extern void newcnd(void);
-extern void sortkl(void);
+extern void sortkl
ings
(void);
extern void imove(bool);
extern void ram(bool, feature, coord);
extern void crmena(bool, feature, enum loctype, coord w);
extern void imove(bool);
extern void ram(bool, feature, coord);
extern void crmena(bool, feature, enum loctype, coord w);
@@
-409,11
+408,11
@@
extern void huh(void);
extern void pause_reset(void);
extern void pause_game(bool);
extern void nova(coord);
extern void pause_reset(void);
extern void pause_game(bool);
extern void nova(coord);
-extern void snova(bool, coord *);
-extern void s
com
(void);
+extern void s
uper
nova(bool, coord *);
+extern void s
upercommander
(void);
extern void hittem(double *);
extern bool isit(char *);
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);
extern void orbit(void);
extern void sensor(void);
extern void drawmaps(int);
@@
-423,8
+422,8
@@
extern void usecrystals(void);
extern void shuttle(void);
extern void deathray(void);
extern void debugme(void);
extern void shuttle(void);
extern void deathray(void);
extern void debugme(void);
-extern void attakreport(bool);
-extern void movetho(void);
+extern void atta
c
kreport(bool);
+extern void movetho
lian
(void);
extern void probe(void);
extern void iostart(void);
extern void setwnd(WINDOW *);
extern void probe(void);
extern void iostart(void);
extern void setwnd(WINDOW *);