X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=45b1c0c034256834de840433552860e28d1940e9;hp=cca1dbab1d328e310643fc1f389639d03444f0c4;hb=d522d22c71ce0972efcb8872c851335ca08abaa4;hpb=294f2b8a6d0afeb1d209f5cd7baa6509710f0bc0 diff --git a/advent.h b/advent.h index cca1dba..45b1c0c 100644 --- a/advent.h +++ b/advent.h @@ -27,7 +27,17 @@ /* Special object-state values - integers > 0 are object-specific */ #define STATE_NOTFOUND -1 // 'Not found" state of treasures */ -#define STATE_GROUND 0 // After discovered, before messed with +#define STATE_FOUND 0 // After discovered, before messed with +#define STATE_IN_CAVITY 1 // State value common to all gemstones + +/* Special fixed object-state values - integers > 0 are location */ +#define IS_FIXED -1 +#define IS_FREE 0 + +/* Map a state property value to a negative range, where the object cannot be + * picked up but the value can be recovered later. Avoid colliding with -1, + * which has its own meaning. */ +#define STASHED(obj) (-1 - game.prop[obj]) /* * MOD(N,M) = Arithmetic modulus @@ -185,7 +195,7 @@ struct command_t { token_t wd2; long id1; long id2; - char raw1[BUFSIZ], raw2[BUFSIZ]; + char raw1[LINESIZE], raw2[LINESIZE]; }; extern struct game_t game;