projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
752ac08
)
Magic-number elimination.
author
Eric S. Raymond
<esr@thyrsus.com>
Wed, 5 Jul 2017 06:53:39 +0000
(
02:53
-0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Wed, 5 Jul 2017 06:53:39 +0000
(
02:53
-0400)
misc.c
patch
|
blob
|
history
diff --git
a/misc.c
b/misc.c
index d1c68ab2d42641c0e5a36928dc1f46d6aaf21fd3..a793026c34b1af41a068ad0143254e55e6265d2e 100644
(file)
--- 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)
/* 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)
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)
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)
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)
// Check for the reservoir magic word.
if (strcasecmp(word, game.zzword) == 0)