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

Upgrade get_vocab_metadata() to use command_type_t.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-08-02 23:08:55 -07:00
parent 5c91ea3739
commit 23ae7edb10
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
misc.c
View file

@ -413,54 +413,54 @@ static bool is_valid_int(const char *str)
return true; return true;
} }
static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type) static void get_vocab_metadata(command_word_t* word)
{ {
/* Check for an empty string */ /* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0) { if (strncmp(word->raw, "", sizeof("")) == 0) {
*id = WORD_EMPTY; word->id = WORD_EMPTY;
*type = NO_WORD_TYPE; word->type = NO_WORD_TYPE;
return; return;
} }
vocab_t ref_num; vocab_t ref_num;
ref_num = get_motion_vocab_id(word); ref_num = get_motion_vocab_id(word->raw);
if (ref_num != WORD_NOT_FOUND) { if (ref_num != WORD_NOT_FOUND) {
*id = ref_num; word->id = ref_num;
*type = MOTION; word->type = MOTION;
return; return;
} }
ref_num = get_object_vocab_id(word); ref_num = get_object_vocab_id(word->raw);
if (ref_num != WORD_NOT_FOUND) { if (ref_num != WORD_NOT_FOUND) {
*id = ref_num; word->id = ref_num;
*type = OBJECT; word->type = OBJECT;
return; return;
} }
ref_num = get_action_vocab_id(word); ref_num = get_action_vocab_id(word->raw);
if (ref_num != WORD_NOT_FOUND) { if (ref_num != WORD_NOT_FOUND) {
*id = ref_num; word->id = ref_num;
*type = ACTION; word->type = ACTION;
return; return;
} }
// Check for the reservoir magic word. // Check for the reservoir magic word.
if (strcasecmp(word, game.zzword) == 0) { if (strcasecmp(word->raw, game.zzword) == 0) {
*id = PART; word->id = PART;
*type = ACTION; word->type = ACTION;
return; return;
} }
// Check words that are actually numbers. // Check words that are actually numbers.
if (is_valid_int(word)) { if (is_valid_int(word->raw)) {
*id = WORD_EMPTY; word->id = WORD_EMPTY;
*type = NUMERIC; word->type = NUMERIC;
return; return;
} }
*id = WORD_NOT_FOUND; word->id = WORD_NOT_FOUND;
*type = NO_WORD_TYPE; word->type = NO_WORD_TYPE;
return; return;
} }
@ -496,8 +496,8 @@ static void tokenize(char* raw, struct command_t *cmd)
} }
/* populate command with parsed vocabulary metadata */ /* populate command with parsed vocabulary metadata */
get_vocab_metadata(cmd->word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type)); get_vocab_metadata(&(cmd->word[0]));
get_vocab_metadata(cmd->word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type)); get_vocab_metadata(&(cmd->word[1]));
} }
bool get_command_input(struct command_t *command) bool get_command_input(struct command_t *command)