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

Specials excised from adventure.yaml

Browse source
This commit is contained in:
Aaron Traas 2017-07-21 17:15:23 -04:00
parent 5f28f95244
commit e8a627f964
6 changed files with 13 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

20
misc.c
View file

@ -386,19 +386,6 @@ static int get_action_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
static int get_special_vocab_id(const char* word)
// Return the first special number that has 'word' as one of its words.
{
for (int i = 0; i < NSPECIALS; ++i) {
for (int j = 0; j < specials[i].words.n; ++j) {
if (strncasecmp(word, specials[i].words.strs[j], TOKLEN) == 0)
return (i);
}
}
// If execution reaches here, we didn't find the word.
return (WORD_NOT_FOUND);
}
static bool is_valid_int(const char *str)
/* Returns true if the string passed in is represents a valid integer,
* that could then be parsed by atoi() */
@ -455,13 +442,6 @@ static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* typ
return;
}
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) {
*id = PART;