X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=f7551d0ebb56fc65e54f62983fd5861c42f4d79e;hp=e461b575ff441b7b639cb6e066e337b57d625e16;hb=67ed99b29cfe5c32b3db72091de3fb174195e032;hpb=fa9b6d317f5138c8a4937a14a92acf4b5928545e diff --git a/advent.h b/advent.h index e461b57..f7551d0 100644 --- a/advent.h +++ b/advent.h @@ -5,17 +5,20 @@ #include "common.h" #define LINESIZE 100 -#define NDWARVES 6 +#define NDWARVES 6 /* number of dwarves */ #define PIRATE NDWARVES /* must be NDWARVES-1 when zero-origin */ #define DALTLC LOC_NUGGET /* alternate dwarf location */ -#define MINTRS 50 -#define MAXTRS 79 -#define MAXPARMS 25 -#define INVLIMIT 7 +#define MINTRS 50 /* index of lowest reasure */ +#define MAXTRS 79 /* index of highest reasure */ +#define MAXPARMS 25 /* Max parameters for speak() */ +#define INVLIMIT 7 /* inverntory limit (# of objects) */ #define INTRANSITIVE -1 /* illegal object number */ #define SPECIALBASE 300 /* base number of special rooms */ +#define GAMELIMIT 330 /* base limit of turns */ +#define NOVICELIMIT 1000 /* limit of turns for novice */ #define WARNTIME 30 /* late game starts at game.limit-this */ #define PANICTIME 15 /* time left after closing */ +#define BATTERYLIFE 2500 /* turn limit increment from batteries */ typedef long token_t; /* word token - someday this will be char[TOKLEN+1] */ typedef long vocab_t; /* index into a vocabulary array */ @@ -29,9 +32,9 @@ struct game_t { long chloc2; long clock1; long clock2; - long clshnt; - long closed; - long closng; + bool clshnt; /* has player read the clue in the endgame? */ + bool closed; /* whether we're all the way closed */ + bool closng; /* whether it's closing time yet */ long conds; long detail; long dflag; @@ -42,40 +45,40 @@ struct game_t { long iwest; long knfloc; long limit; - long lmwarn; + bool lmwarn; /* has player been warned about lamp going dim? */ long loc; long newloc; - long novice; + bool novice; /* asked for instructions at start-up? */ long numdie; long oldloc; long oldlc2; long oldobj; - long panic; + bool panic; /* has player found out he's trapped in the cave? */ long saved; long tally; long thresh; long trndex; long trnluz; long turns; - long wzdark; + bool wzdark; /* whether the loc he's leaving was dark */ long zzword; - long abbrev[LOCSIZ+1]; - long atloc[LOCSIZ+1]; - long dseen[NDWARVES+1]; - long dloc[NDWARVES+1]; - long odloc[NDWARVES+1]; - long fixed[NOBJECTS+1]; - long link[NOBJECTS*2 + 1]; - long place[NOBJECTS+1]; - long hinted[HNTSIZ+1]; - long hintlc[HNTSIZ+1]; - long prop[NOBJECTS+1]; + long abbrev[LOCSIZ + 1]; + long atloc[LOCSIZ + 1]; + long dseen[NDWARVES + 1]; + long dloc[NDWARVES + 1]; + long odloc[NDWARVES + 1]; + long fixed[NOBJECTS + 1]; + long link[NOBJECTS * 2 + 1]; + long place[NOBJECTS + 1]; + long hinted[HNTSIZ + 1]; + long hintlc[HNTSIZ + 1]; + long prop[NOBJECTS + 1]; }; extern struct game_t game; extern long LNLENG, LNPOSN, PARMS[]; -extern char rawbuf[LINESIZE], INLINE[LINESIZE+1]; +extern char rawbuf[LINESIZE], INLINE[LINESIZE + 1]; extern const char ascii_to_advent[]; extern const char advent_to_ascii[]; extern FILE *logfp; @@ -87,26 +90,30 @@ extern bool oldstyle, editline, prompt; extern void* xmalloc(size_t size); extern char* xstrdup(const char*); extern void packed_to_token(long, char token[]); +extern void token_to_packed(char token[], long*); extern void speak(const char*); -extern void PSPEAK(vocab_t,int); +extern bool wordeq(token_t, token_t); +extern bool wordempty(token_t); +extern void wordclear(token_t *); +extern void PSPEAK(vocab_t, int); extern void RSPEAK(vocab_t); -extern void SETPRM(long,long,long); -extern bool GETIN(FILE *,token_t*,token_t*,token_t*,token_t*); +extern void SETPRM(long, long, long); +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(vocab_t, vocab_t, vocab_t); -extern long GETTXT(bool,bool,bool); +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 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 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 TSTBIT(long, int); +extern long RNDVOC(long, long); extern bool MAPLIN(FILE *); extern void DATIME(long*, long*); @@ -135,7 +142,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, 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) @@ -161,23 +168,31 @@ extern int restore(FILE *); #define OUTSID(LOC) ((LOC) <= LOC_GRATE || FOREST(LOC) || (LOC) == PLAC[SAPPH] || (LOC) == LOC_FOOF2 || (LOC) == LOC_FOOF4) #define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC) && (LOC) != LOC_FOOF1) -/* vocabulary items */ +/* 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; + 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 { + enum speechpart part; + vocab_t verb; + vocab_t obj; + token_t wd1, wd1x; + token_t wd2, wd2x; +}; + void initialise(void); -int action(FILE *input, enum speechpart part, long verb, token_t obj); +int action(FILE *input, struct command_t *command); -/* Phase codes for action returns. +/* Phase codes for action returns. * These were at one time FORTRAN line numbers. * The values don't matter, but perturb their order at your peril. */ @@ -187,7 +202,6 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj); #define GO_CLEAROBJ 2012 #define GO_CHECKHINT 2600 #define GO_CHECKFOO 2607 -#define GO_CLOSEJUMP 2610 #define GO_DIRECTION 2620 #define GO_LOOKUP 2630 #define GO_WORD2 2800 @@ -203,7 +217,7 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj); #define NOARRR 3 /* Pirate doesn't go here unless following player */ #define NOBACK 4 /* Cannot use "back" to move away */ /* Bits past 10 indicate areas of interest to "hint" routines */ -#define HBASE 10 /* Base for location hint bitss */ +#define HBASE 10 /* Base for location hint bits */ #define HCAVE 11 /* Trying to get into cave */ #define HBIRD 12 /* Trying to catch bird */ #define HSNAKE 13 /* Trying to deal with snake */ @@ -217,10 +231,87 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj); /* Special object statuses in game.place - can also be a location number (> 0) */ #define CARRIED -1 /* Player is toting it */ -#define NOWHERE 0 /* It's destroyed */ /* hack to ignore GCC Unused Result */ #define IGNORE(r) do{if (r){}}while(0) +/* + * FIXME: These constants should be replaced by strings, at their usage sites. + * They are sixbit-packed representations of vocabulary words. This, and code + * 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 +#define WORD_ENTER 514200518 +#define WORD_ENTRNC 514201801 +#define WORD_LOOK 12151511 +#define WORD_NUL 14211212 +#define WORD_STREAM 1920180501 +#define WORD_FIND 6091404 +#define WORD_INVENT 914220514 +#define WORD_LOCK 12150311 +#define WORD_SAY 190125 +#define WORD_THROW 2008181523 +#define WORD_WEST 23051920 +#define WORD_YES 250519 +#define WORD_YINIT 25 + /* end */