X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=2c95e979606548973b84417c51f93103cb8ef580;hp=754ea1646d419a34172849732052ddfafb9fbf7b;hb=3b780dd57e295b57ba78649e008fede10e07cdd9;hpb=d6cb6f0d8d258f4125fd3a0cc3899541ea2efd5b diff --git a/advent.h b/advent.h index 754ea16..2c95e97 100644 --- a/advent.h +++ b/advent.h @@ -127,7 +127,7 @@ extern unsigned long get_next_lcg_value(void); extern long randrange(long); extern long score(enum termination); extern void terminate(enum termination) __attribute__((noreturn)); -extern int savefile(FILE *); +extern int savefile(FILE *, long); extern int suspend(void); extern int resume(void); extern int restore(FILE *); @@ -160,27 +160,11 @@ extern int restore(FILE *); #define PCT(N) (randrange(100) < (N)) #define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH) #define FOREST(LOC) CNDBIT(LOC, COND_FOREST) -#define VOCWRD(LETTRS,SECT) (vocab(MAKEWD(LETTRS),SECT)) #define SPECIAL(LOC) ((LOC) > SPECIALBASE) #define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC)) #define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC)) -/* vocabulary items */ -extern long NUL; -extern long BACK; -extern long LOOK; -extern long CAVE; -extern long FIND; -extern long INVENT; -extern long SAY; -extern long ENTER; -extern long STREAM; -extern long DPRSSN; -extern long ENTRNC; -extern long LOCK; -extern long THROW; - enum speechpart {unknown, intransitive, transitive}; struct command_t {