X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=c853237f742195bd1a837f8779737cac5de7df64;hb=258b7703f22045be1b6e9fb74bd3391ed94ed86b;hp=d24ed2f9791edb79331f385dd36091761930affe;hpb=1f9f39d789aed4daec0f901a84f54abbeb5b6c57;p=open-adventure.git diff --git a/misc.c b/misc.c index d24ed2f..c853237 100644 --- a/misc.c +++ b/misc.c @@ -1,8 +1,7 @@ /* * I/O and support routines. * - * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods - * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods * SPDX-License-Identifier: BSD-2-Clause */ @@ -433,7 +432,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 - if (ref_num != WORD_NOT_FOUND || ref_num == PART) { + if (ref_num != WORD_NOT_FOUND) { *id = ref_num; *type = MOTION; return; @@ -447,7 +446,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;