Address GitLab issue #67: saying Z'ZZZ at the reservoir causes the water to part...

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index f6a37f71a05d66fb5a59ab2c296fe4836b35500c..d24ed2f9791edb79331f385dd36091761930affe 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -432,7 +432,8 @@ static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
     vocab_t ref_num;
 
     ref_num = get_motion_vocab_id(word);
-    if (ref_num != WORD_NOT_FOUND) {
+    // Second conjunct is because the magic-word placeholder is a bit special
+    if (ref_num != WORD_NOT_FOUND || ref_num == PART) {
         *id = ref_num;
         *type = MOTION;
         return;
@@ -602,11 +603,9 @@ void put(obj_t object, loc_t where, int pval)
     move(object, where);
     /* (ESR) Read this in combination with the macro defintions in advebt.h.
      */
-#ifndef FOUNDBOOL
-    game.objects[object].prop = (-1) - pval;   // Needs to stay synchronized with PROP_STASHED
-#else
-    game.objects[object].prop = - pval;;       // Needs to stay synchronized with PROP_STASHED
-    game.objects[object].found = true;
+    game.objects[object].prop = PROP_STASHIFY(pval);
+#ifdef PROP_SET_SEEN
+    PROP_SET_SEEN(object);
 #endif
 }