Remove testing for intransitive seperate from NO_OBJECT in attact()

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index b9b2e0c996608e9eb309197ae727ee1eaf72e94f..2ef6a59bdf59ea88f26d5138a72a6a26f3011768 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -19,11 +19,14 @@
 #define PANICTIME      15         // time left after closing
 #define BATTERYLIFE    2500       // turn limit increment from batteries
 #define WORD_NOT_FOUND -1         // "Word not found" flag value for the vocab hash functions.
-#define NOT_YET_FOUND  -1        // 'Not found" state of treasures */
 #define CARRIED        -1         // Player is toting it
 #define READ_MODE      "rb"       // b is not needed for POSIX but harmless
 #define WRITE_MODE     "wb"       // b is not needed for POSIX but harmless
 
+/* 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
+
 /*
  *  MOD(N,M)    = Arithmetic modulus
  *  AT(OBJ)     = true if on either side of two-placed object
@@ -106,7 +109,6 @@ typedef long vocab_t;  // index into a vocabulary array */
 struct game_t {
     unsigned long lcg_a, lcg_c, lcg_m, lcg_x;
     long abbnum;                 // How often to print non-abbreviated descriptions
-    long blklin;
     long bonus;
     long chloc;
     long chloc2;
@@ -190,12 +192,12 @@ extern void* xmalloc(size_t size);
 extern void packed_to_token(long, char token[]);
 extern long token_to_packed(const char token[6]);
 extern void tokenize(char*, long tokens[4]);
-extern void vspeak(const char*, va_list);
+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 pspeak(vocab_t, enum speaktype, int, ...);
+extern void pspeak(vocab_t, enum speaktype, int, bool, ...);
 extern void rspeak(vocab_t, ...);
 extern void echo_input(FILE*, const char*, const char*);
 extern int word_count(char*);