/*
* I/O and support routines.
*
- * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, 2017 by Eric S. Raymond
* SPDX-License-Identifier: BSD-2-Clause
*/
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;
}
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;
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
}