From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 5 Jul 2017 06:53:39 +0000 (-0400)
Subject: Magic-number elimination.
X-Git-Tag: takebird~16
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d522d22c71ce0972efcb8872c851335ca08abaa4;p=open-adventure.git

Magic-number elimination.
---

diff --git a/misc.c b/misc.c
index d1c68ab..a793026 100644
--- a/misc.c
+++ b/misc.c
@@ -516,19 +516,19 @@ long get_vocab_id(const char* word)
     /* FIXME: Magic numbers related to vocabulary */
     ref_num = get_motion_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
-        return (ref_num + 0); // FIXME: replace with a proper hash
+        return MOTION_WORD(ref_num);
 
     ref_num = get_object_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
-        return (ref_num + 1000); // FIXME: replace with a proper hash
+        return OBJECT_WORD(ref_num);
 
     ref_num = get_action_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
-        return (ref_num + 2000); // FIXME: replace with a proper hash
+        return ACTION_WORD(ref_num);
 
     ref_num = get_special_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
-        return (ref_num + 3000); // FIXME: replace with a proper hash
+        return SPECIAL_WORD(ref_num);
 
     // Check for the reservoir magic word.
     if (strcasecmp(word, game.zzword) == 0)