archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Express word type with an enum instead of magic numbers.

Browse source 
* Make a cleaner function for getting vocab metadata.
* Get rid of magic numbers.
* Purge get_vocab_id().
* Abolish the *_WORD() macros.
* Add FIXME comment on some ugliness.
This commit is contained in:
Jason S. Ninneman 2017-07-11 17:44:06 -07:00
parent b5badcacc8
commit 50efa22849
4 changed files with 89 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

70
misc.c
View file

@ -523,37 +523,61 @@ int get_special_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
long get_vocab_id(const char* word)
// Search the vocab categories in order for the supplied word.
void get_vocab_metadata(const char* word, long* id, enum wordtype* type)
{
/* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0)
return (WORD_EMPTY);
/* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0)
{
*id = WORD_EMPTY;
*type = NO_WORD_TYPE;
return;
}
long ref_num;
long ref_num;
/* FIXME: Magic numbers related to vocabulary */
ref_num = get_motion_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
return MOTION_WORD(ref_num);
ref_num = get_motion_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
{
*id = ref_num;
*type = MOTION;
return;
}
ref_num = get_object_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
return OBJECT_WORD(ref_num);
ref_num = get_object_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
{
*id = ref_num;
*type = OBJECT;
return;
}
ref_num = get_action_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
return ACTION_WORD(ref_num);
ref_num = get_action_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
{
*id = ref_num;
*type = ACTION;
return;
}
ref_num = get_special_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
return SPECIAL_WORD(ref_num);
ref_num = get_special_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
{
*id = ref_num;
*type = SPECIAL;
return;
}
// Check for the reservoir magic word.
if (strcasecmp(word, game.zzword) == 0)
return ACTION_WORD(PART);
// Check for the reservoir magic word.
if (strcasecmp(word, game.zzword) == 0)
{
*id = PART;
*type = ACTION;
return;
}
return (WORD_NOT_FOUND);
*id = WORD_NOT_FOUND;
*type = NO_WORD_TYPE;
return;
}
void juggle(obj_t object)