projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor specials[] to have strings instead of enum references.
[open-adventure.git]
/
advent.h
diff --git
a/advent.h
b/advent.h
index 6f66d1ec4414c3be019c606690fe26911f73bf88..9de79f049f80c49eb5915e94ebe370a48452e8dc 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);
@@
-181,7
+187,7
@@
extern void wordclear(token_t *);
extern void speak(const char*, ...);
extern void pspeak(vocab_t, enum speaktype, int, ...);
extern void rspeak(vocab_t, ...);
extern void speak(const char*, ...);
extern void pspeak(vocab_t, enum speaktype, int, ...);
extern void rspeak(vocab_t, ...);
-extern void echo_input(FILE*, c
har*,
char*);
+extern void echo_input(FILE*, c
onst char*, const
char*);
extern int word_count(char*);
extern char* get_input(void);
extern bool silent_yes(void);
extern int word_count(char*);
extern char* get_input(void);
extern bool silent_yes(void);