X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=62d3696e3d924877513b85b4613af9e85e1fc227;hp=c545f048f2f67a943957a10a26b994083ef3c851;hb=52723acb7207fe8487d931151a5df1d36f6db75d;hpb=50efa22849c73c3b43e5005e6ddafc5f0027464a diff --git a/advent.h b/advent.h index c545f04..62d3696 100644 --- a/advent.h +++ b/advent.h @@ -89,6 +89,8 @@ enum speechpart {unknown, intransitive, transitive}; enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL}; +typedef enum scorebonus {none, splatter, defeat, victory} score_t; + /* 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. @@ -99,7 +101,6 @@ enum phase_codes { GO_TOP, GO_CLEAROBJ, GO_CHECKHINT, - GO_CHECKFOO, GO_DIRECTION, GO_LOOKUP, GO_WORD2, @@ -118,7 +119,7 @@ typedef long loc_t; // index into the locations array */ struct game_t { unsigned long lcg_a, lcg_c, lcg_m, lcg_x; long abbnum; // How often to print non-abbreviated descriptions - long bonus; + score_t bonus; // What kind of bonus we are getting for finishing the game long chloc; long chloc2; long clock1; // # turns from finding last treasure till closing @@ -205,9 +206,6 @@ extern struct settings_t settings; extern void packed_to_token(long, char token[]); extern long token_to_packed(const char token[]); extern void tokenize(char*, struct command_t *); -extern void vspeak(const char*, bool, 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 sspeak(long msg, ...);