projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Magic-number cleanup.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 85d9026881e6cfc9d7d80f65dfd7b8885582f77a..192248d370ae23688ba779e003739dbc03627182 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-1,6
+1,8
@@
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdbool.h>
+#include "sizes.h"
+
#define LINESIZE 100
#define NDWARVES 6
#define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */
#define LINESIZE 100
#define NDWARVES 6
#define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */
@@
-43,6
+45,7
@@
struct game_t {
long oldobj;
long panic;
long saved;
long oldobj;
long panic;
long saved;
+ long setup;
long tally;
long thresh;
long trndex;
long tally;
long thresh;
long trndex;
@@
-50,7
+53,7
@@
struct game_t {
long turns;
long wzdark;
long zzword;
long turns;
long wzdark;
long zzword;
- long abbrev[
185+1]; /* FIXME: LOCSIZE in the compiler */
+ long abbrev[
LOCSIZ+1];
long dseen[NDWARVES+1];
long dloc[NDWARVES+1];
long odloc[NDWARVES+1];
long dseen[NDWARVES+1];
long dloc[NDWARVES+1];
long odloc[NDWARVES+1];
@@
-58,9
+61,7
@@
struct game_t {
extern struct game_t game;
extern struct game_t game;
-extern long ATLOC[], FIXED[],
- LINK[], LNLENG, LNPOSN,
- PARMS[], PLACE[];
+extern long ATLOC[], FIXED[], LINK[], LNLENG, LNPOSN, PARMS[], PLACE[];
extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
extern FILE *logfp;
extern bool oldstyle;
extern char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
extern FILE *logfp;
extern bool oldstyle;
@@
-133,7
+134,7
@@
extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
OGRE, OIL, OLDOBJ, OYSTER,
PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
OGRE, OIL, OLDOBJ, OYSTER,
PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
- SCORE, SECT, S
ETUP, S
IGN, SNAKE, SPK, STEPS, STICK,
+ SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
STREAM, THROW, TK[], TRIDNT, TROLL, TROLL2,
URN, V1, V2, VASE, VEND, VERB,
VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;
STREAM, THROW, TK[], TRIDNT, TROLL, TROLL2,
URN, V1, V2, VASE, VEND, VERB,
VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X;