X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=63b16ffa0155707543dd67dcd2a49c880df442d9;hb=64035d00262d3b10c126748be659d22394b7ed3b;hp=0bf87bb7f7991bc0214a4fe1a0c42cf12a794f86;hpb=0eb85f233a21402106adee89104f558662d6030b;p=open-adventure.git diff --git a/advent.h b/advent.h index 0bf87bb..63b16ff 100644 --- a/advent.h +++ b/advent.h @@ -3,6 +3,7 @@ #include #include "common.h" +#include "newdb.h" #define LINESIZE 100 #define NDWARVES 6 /* number of dwarves */ @@ -62,6 +63,7 @@ struct game_t { long turns; bool wzdark; /* whether the loc he's leaving was dark */ long zzword; + bool blooded; /* has player drunk of dragon's blood? */ long abbrev[LOCSIZ + 1]; long atloc[LOCSIZ + 1]; long dseen[NDWARVES + 1]; @@ -70,30 +72,35 @@ struct game_t { long fixed[NOBJECTS + 1]; long link[NOBJECTS * 2 + 1]; long place[NOBJECTS + 1]; - long hinted[HNTSIZ + 1]; - long hintlc[HNTSIZ + 1]; + long hinted[NHINTS]; + long hintlc[NHINTS]; long prop[NOBJECTS + 1]; }; extern struct game_t game; -extern long LNLENG, LNPOSN, PARMS[]; +extern long LNLENG, LNPOSN; extern char rawbuf[LINESIZE], INLINE[LINESIZE + 1]; extern const char ascii_to_advent[]; extern const char advent_to_ascii[]; extern FILE *logfp; extern bool oldstyle, editline, prompt; +enum speaktype {touch, look, hear, study}; + /* b is not needed for POSIX but harmless */ #define READ_MODE "rb" #define WRITE_MODE "wb" extern void* xmalloc(size_t size); -extern char* xstrdup(const char*); extern void packed_to_token(long, char token[]); -extern void speak(const char*); -extern void PSPEAK(vocab_t, int); -extern void RSPEAK(vocab_t); -extern void SETPRM(long, long, long); +extern void token_to_packed(char token[], long*); +extern void vspeak(const char*, va_list); +extern bool wordeq(token_t, token_t); +extern bool wordempty(token_t); +extern void wordclear(token_t *); +extern void speak(const char*, ...); +extern void pspeak(vocab_t, enum speaktype, int, ...); +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); @@ -145,24 +152,18 @@ extern int restore(FILE *); #define HERE(OBJ) (AT(OBJ) || TOTING(OBJ)) #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(COND[LOC]/2*2,8)-5)*MOD(COND[LOC]/4,2)+1)) -#define CNDBIT(L,N) (TSTBIT(COND[L],N)) -#define FORCED(LOC) (COND[LOC] == 2) -#define DARK(DUMMY) ((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP))) +#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 FORCED(LOC) CNDBIT(LOC, COND_FORCED) +#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) ((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22) +#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)) -/* The following two functions were added to fix a bug (game.clock1 decremented - * while in forest). They should probably be replaced by using another - * "cond" bit. For now, however, a quick fix... OUTSID(LOC) is true if - * LOC is outside, INDEEP(LOC) is true if LOC is "deep" in the cave (hall - * of mists or deeper). Note special kludges for "Foof!" locs. */ - -#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) +#define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC)) /* vocabulary items */ extern long AMBER, ATTACK, AXE, BACK, BATTERY, BEAR, @@ -177,8 +178,16 @@ extern long AMBER, ATTACK, AXE, BACK, BATTERY, BEAR, 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. * These were at one time FORTRAN line numbers. @@ -198,30 +207,89 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj); #define GO_ACTION 40000 #define GO_DWARFWAKE 19000 -/* Symbols for cond bits */ -#define LIGHT 0 /* Light */ -#define OILY 1 /* If bit 2 is on: on for oil, off for water */ -#define FLUID 2 /* Liquid asset, see bit 1 */ -#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 bits */ -#define HCAVE 11 /* Trying to get into cave */ -#define HBIRD 12 /* Trying to catch bird */ -#define HSNAKE 13 /* Trying to deal with snake */ -#define HMAZE 14 /* Lost in maze */ -#define HDARK 15 /* Pondering dark room */ -#define HWITT 16 /* At Witt's End */ -#define HCLIFF 17 /* Cliff with urn */ -#define HWOODS 18 /* Lost in forest */ -#define HOGRE 19 /* Trying to deal with ogre */ -#define HJADE 20 /* Found all treasures except jade */ - /* Special object statuses in game.place - can also be a location number (> 0) */ #define CARRIED -1 /* Player is toting it */ /* 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 */