X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=9de79f049f80c49eb5915e94ebe370a48452e8dc;hp=ac648fecc454317b87847c96b7e4a1ddddfde28b;hb=3d3cd4ba397018aa9d245b5ce8cb7b4802a82304;hpb=0a87fc9f78c40354068749f93cbbed80e217cd88

diff --git a/advent.h b/advent.h
index ac648fe..9de79f0 100644
--- 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 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,
@@ -167,7 +173,7 @@ struct command_t {
 
 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);
@@ -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 echo_input(FILE*, char*, char*);
+extern void echo_input(FILE*, const char*, const char*);
 extern int word_count(char*);
 extern char* get_input(void);
 extern bool silent_yes(void);
@@ -210,7 +216,7 @@ extern int savefile(FILE *, long);
 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 */