X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=2c95e979606548973b84417c51f93103cb8ef580;hp=d2b082cbbd785cbdfa880cc5126627c0421cc122;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=81be19238c2176f7a2b343422daa555b21df2c6e diff --git a/advent.h b/advent.h index d2b082c..2c95e97 100644 --- a/advent.h +++ b/advent.h @@ -104,21 +104,21 @@ extern void rspeak(vocab_t, ...); extern bool GETIN(FILE *, token_t*, token_t*, token_t*, token_t*); extern void echo_input(FILE*, char*, char*); extern char* get_input(void); -extern bool YES(const char*, const char*, const char*); +extern bool yes(const char*, const char*, const char*); extern long GETTXT(bool, bool, bool); extern token_t MAKEWD(long); -extern long VOCAB(long, long); -extern void JUGGLE(long); -extern void MOVE(long, long); -extern long PUT(long, long, long); -extern void CARRY(long, long); -extern void DROP(long, long); -extern long ATDWRF(long); -extern long SETBIT(long); -extern bool TSTBIT(long, int); -extern long RNDVOC(long, long); +extern long vocab(long, long); +extern void juggle(long); +extern void move(long, long); +extern long put(long, long, long); +extern void carry(long, long); +extern void drop(long, long); +extern long atdwrf(long); +extern long setbit(long); +extern bool tstbit(long, int); +extern long rndvoc(long, long); extern bool MAPLIN(FILE *); -extern void DATIME(long*, long*); +extern void datime(long*, long*); enum termination {endgame, quitgame, scoregame}; @@ -127,6 +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 *, long); extern int suspend(void); extern int resume(void); extern int restore(FILE *); @@ -145,7 +146,7 @@ extern int restore(FILE *); * PCT(N) = true N% of the time (N integer from 0 to 100) * TOTING(OBJ) = true if the OBJ is being carried */ -#define DESTROY(N) MOVE(N, LOC_NOWHERE) +#define DESTROY(N) move(N, LOC_NOWHERE) #define MOD(N,M) ((N) % (M)) #define TOTING(OBJ) (game.place[OBJ] == CARRIED) #define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc) @@ -153,29 +154,17 @@ extern int restore(FILE *); #define LIQ2(PBOTL) ((1-(PBOTL))*WATER+((PBOTL)/2)*(WATER+OIL)) #define LIQUID() (LIQ2(game.prop[BOTTLE]<0 ? -1-game.prop[BOTTLE] : game.prop[BOTTLE])) #define LIQLOC(LOC) (LIQ2((MOD(conditions[LOC]/2*2,8)-5)*MOD(conditions[LOC]/4,2)+1)) -#define CNDBIT(L,N) (TSTBIT(conditions[L],N)) +#define CNDBIT(L,N) (tstbit(conditions[L],N)) #define FORCED(LOC) CNDBIT(LOC, COND_FORCED) -#define DARK(DUMMY) ((!TSTBIT(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP))) +#define DARK(DUMMY) ((!tstbit(conditions[game.loc],COND_LIT)) && (game.prop[LAMP] == LAMP_DARK || !HERE(LAMP))) #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 AMBER, ATTACK, AXE, BACK, BATTERY, BEAR, - BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, - CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS, - EMERALD, ENTER, ENTRNC, FIND, FISSURE, FOOD, GRATE, HINT, INVENT, - JADE, KEYS, KNIFE, LAMP, LOCK, LOOK, MAGAZINE, MESSAG, MIRROR, NUGGET, NUL, - OGRE, OIL, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAMID, - RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SIGN, SNAKE, - STEPS, STICK, STREAM, THROW, TRIDENT, TROLL, TROLL2, - URN, VASE, VEND, VOLCANO, WATER; - enum speechpart {unknown, intransitive, transitive}; struct command_t { @@ -219,61 +208,9 @@ int action(FILE *input, struct command_t *command); * left in misc.c, is the only place left in the runtime that knows about * word packing. */ -#define WORD_AXE 12405 -#define WORD_BATTERY 201202005 -#define WORD_BEAR 2050118 -#define WORD_BIRD 2091804 -#define WORD_BLOOD 212151504 -#define WORD_BOTTLE 215202012 -#define WORD_CAGE 3010705 #define WORD_CATCH 301200308 -#define WORD_CAVITY 301220920 -#define WORD_CHASM 308011913 -#define WORD_CLAM 3120113 -#define WORD_DOOR 4151518 -#define WORD_DRAGON 418010715 -#define WORD_DWARF 423011806 -#define WORD_FISSURE 609191921 -#define WORD_FOOD 6151504 #define WORD_GO 715 -#define WORD_GRATE 718012005 -#define WORD_KEYS 11052519 -#define WORD_KNIFE 1114090605 -#define WORD_LAMP 12011316 -#define WORD_MAGAZINE 1301070126 -#define WORD_MESSAG 1305191901 -#define WORD_MIRROR 1309181815 -#define WORD_OGRE 15071805 -#define WORD_OIL 150912 -#define WORD_OYSTER 1525192005 -#define WORD_PILLOW 1609121215 -#define WORD_PLANT 1612011420 #define WORD_POUR 16152118 -#define WORD_RESER 1805190518 -#define WORD_ROD 181504 -#define WORD_SIGN 19090714 -#define WORD_SNAKE 1914011105 -#define WORD_STEPS 1920051619 -#define WORD_TROLL 2018151212 -#define WORD_URN 211814 -#define WORD_VEND 1755140409 -#define WORD_VOLCANO 1765120301 -#define WORD_WATER 1851200518 -#define WORD_AMBER 113020518 -#define WORD_CHAIN 308010914 -#define WORD_CHEST 308051920 -#define WORD_COINS 315091419 -#define WORD_EGGS 5070719 -#define WORD_EMERALD 513051801 -#define WORD_JADE 10010405 -#define WORD_NUGGET 7151204 -#define WORD_PEARL 1605011812 -#define WORD_PYRAMID 1625180113 -#define WORD_RUBY 18210225 -#define WORD_RUG 182107 -#define WORD_SAPPH 1901161608 -#define WORD_TRIDENT 2018090405 -#define WORD_VASE 22011905 #define WORD_BACK 2010311 #define WORD_CAVE 3012205 #define WORD_DPRSSN 405161805