projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jettison the -s option.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index ac648fecc454317b87847c96b7e4a1ddddfde28b..e638e8424eb8d743f08dc6e45c6d971cad59436a 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-54,6
+54,12
@@
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
#define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC))
#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC))
#define BUG(x) bug(x, #x)
+#define MOTION_WORD(n) ((n) + 0)
+#define OBJECT_WORD(n) ((n) + 1000)
+#define ACTION_WORD(n) ((n) + 2000)
+#define SPECIAL_WORD(n) ((n) + 3000)
+#define PROMOTE_WORD(n) ((n) + 1000)
+#define DEMOTE_WORD(n) ((n) - 1000)
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
enum bugtype {
SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST,
@@
-167,7
+173,7
@@
struct command_t {
extern struct game_t game;
extern FILE *logfp;
extern struct game_t game;
extern FILE *logfp;
-extern bool oldstyle,
editline,
prompt;
+extern bool oldstyle, prompt;
extern char* xstrdup(const char* s);
extern void* xmalloc(size_t size);
extern char* xstrdup(const char* s);
extern void* xmalloc(size_t size);
@@
-210,7
+216,7
@@
extern int savefile(FILE *, long);
extern int suspend(void);
extern int resume(void);
extern int restore(FILE *);
extern int suspend(void);
extern int resume(void);
extern int restore(FILE *);
-extern
void
initialise(void);
+extern
long
initialise(void);
extern int action(struct command_t *command);
/* Alas, declaring this static confuses the coverage analyzer */
extern int action(struct command_t *command);
/* Alas, declaring this static confuses the coverage analyzer */