projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected fix, and test, for #67.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index d24ed2f9791edb79331f385dd36091761930affe..d2d0b8f0aa2b920a2d16c97564f7f782813846d3 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-433,7
+433,7
@@
static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
ref_num = get_motion_vocab_id(word);
// Second conjunct is because the magic-word placeholder is a bit special
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
|| ref_num == PART
) {
+ if (ref_num != WORD_NOT_FOUND) {
*id = ref_num;
*type = MOTION;
return;
*id = ref_num;
*type = MOTION;
return;
@@
-447,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);
}
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;
*id = ref_num;
*type = ACTION;
return;