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

Some vocabulary lookup code can be hidden from main.c.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-20 10:38:59 -04:00
parent 8bd947b54d
commit aa5870a92e
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
advent.h
View file

@ -212,10 +212,6 @@ extern int word_count(char*);
extern char* get_input(void);
extern bool silent_yes(void);
extern bool yes(const char*, const char*, const char*);
extern int get_motion_vocab_id(const char*);
extern int get_object_vocab_id(const char*);
extern int get_action_vocab_id(const char*);
extern int get_special_vocab_id(const char*);
extern void get_vocab_metadata(const char*, long*, enum wordtype*);
extern void juggle(obj_t);
extern void move(obj_t, loc_t);

8
misc.c
View file

@ -378,7 +378,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response
/* Data structure routines */
int get_motion_vocab_id(const char* word)
static int get_motion_vocab_id(const char* word)
// Return the first motion number that has 'word' as one of its words.
{
for (int i = 0; i < NMOTIONS; ++i) {
@ -393,7 +393,7 @@ int get_motion_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
int get_object_vocab_id(const char* word)
static int get_object_vocab_id(const char* word)
// Return the first object number that has 'word' as one of its words.
{
for (int i = 0; i < NOBJECTS + 1; ++i) { // FIXME: the + 1 should go when 1-indexing for objects is removed
@ -406,7 +406,7 @@ int get_object_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
int get_action_vocab_id(const char* word)
static int get_action_vocab_id(const char* word)
// Return the first motion number that has 'word' as one of its words.
{
for (int i = 0; i < NACTIONS; ++i) {
@ -421,7 +421,7 @@ int get_action_vocab_id(const char* word)
return (WORD_NOT_FOUND);
}
int get_special_vocab_id(const char* word)
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) {