X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=advent.h;h=44839a899c81a0c30f7b6600043c06e6631de309;hp=553d1c71a4ae98ec986373533ba0278608ffa75d;hb=4a4c113624239b55b176ee23ed8e23c2337d42e2;hpb=53b68161ff5dcc6015fe5ff133830549d7359ed1 diff --git a/advent.h b/advent.h index 553d1c7..44839a8 100644 --- a/advent.h +++ b/advent.h @@ -65,8 +65,10 @@ #define GSTONE(OBJ) ((OBJ) == EMERALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH) #define FOREST(LOC) CNDBIT(LOC, COND_FOREST) #define OUTSID(LOC) (CNDBIT(LOC, COND_ABOVE) || FOREST(LOC)) +#define INSIDE(LOC) (!OUTSID(LOC) || LOC == LOC_BUILDING) #define INDEEP(LOC) ((LOC) >= LOC_MISTHALL && !OUTSID(LOC)) #define BUG(x) bug(x, #x) + #define MOTION_WORD(n) ((n) + 0) #define OBJECT_WORD(n) ((n) + 1000) #define ACTION_WORD(n) ((n) + 2000) @@ -144,6 +146,7 @@ struct game_t { long dtotal; long foobar; // current progress in saying "FEE FIE FOE FOO". long holdng; // number of objects being carried + long igo; // How many times he's said "go" instead of the direction long iwest; // How many times he's said "west" instead of "w" long knfloc; // 0 if no knife here, loc if knife , -1 after caveat long limit; // lifetime of lamp (not set here)