Corrected fix, and test, for #67.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index 88899410f38c457be553346a24d9f1dc796ff28d..d2d0b8f0aa2b920a2d16c97564f7f782813846d3 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -432,6 +432,7 @@ 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);
+    // Second conjunct is because the magic-word placeholder is a bit special
     if (ref_num != WORD_NOT_FOUND) {
         *id = ref_num;
         *type = MOTION;
@@ -446,7 +447,7 @@ static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
     }
 
     ref_num = get_action_vocab_id(word);
-    if (ref_num != WORD_NOT_FOUND) {
+    if (ref_num != WORD_NOT_FOUND && ref_num != PART) {
         *id = ref_num;
         *type = ACTION;
         return;
@@ -600,7 +601,12 @@ void put(obj_t object, loc_t where, int pval)
  *  negated game.prop values for the repository objects. */
 {
     move(object, where);
-    game.objects[object].prop = (-1) - pval;;  // Needs to stay synchronized with STASHED
+    /* (ESR) Read this in combination with the macro defintions in advebt.h.
+     */
+    game.objects[object].prop = PROP_STASHIFY(pval);
+#ifdef PROP_SET_SEEN
+    PROP_SET_SEEN(object);
+#endif
 }
 
 void carry(obj_t object, loc_t where)