X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=misc.c;h=5b1068e379084b872f90ebcd6da91876b855ee2a;hb=fd57b3b5bdf15fe7f8b861c2559c905269f9ac15;hp=d1c68ab2d42641c0e5a36928dc1f46d6aaf21fd3;hpb=df87c596fb94eed31616a827289b1a30fe83cf87;p=open-adventure.git diff --git a/misc.c b/misc.c index d1c68ab..5b1068e 100644 --- a/misc.c +++ b/misc.c @@ -516,23 +516,23 @@ 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) - return (PART + 2000); // FIXME: replace with a proper hash + return ACTION_WORD(PART); return (WORD_NOT_FOUND); }