Simplify SPDX copyright lines to the shortest canonical form...

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index d24ed2f9791edb79331f385dd36091761930affe..c853237f742195bd1a837f8779737cac5de7df64 100644 (file)
--- 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;