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

Datatype definition for command word types.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-08-02 19:22:52 -07:00
parent 1966264715
commit 0d3393ebee
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
advent.h
View file

@ -87,7 +87,7 @@ enum termination {endgame, quitgame, scoregame};
enum speechpart {unknown, intransitive, transitive}; enum speechpart {unknown, intransitive, transitive};
enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC}; typedef enum {NO_WORD_TYPE, MOTION, OBJECT, ACTION, NUMERIC} word_type_t;
typedef enum scorebonus {none, splatter, defeat, victory} score_t; typedef enum scorebonus {none, splatter, defeat, victory} score_t;
@ -188,8 +188,8 @@ struct command_t {
enum speechpart part; enum speechpart part;
vocab_t id1; vocab_t id1;
vocab_t id2; vocab_t id2;
enum wordtype type1; word_type_t type1;
enum wordtype type2; word_type_t type2;
verb_t verb; verb_t verb;
obj_t obj; obj_t obj;
}; };

2
misc.c
View file

@ -413,7 +413,7 @@ static bool is_valid_int(const char *str)
return true; return true;
} }
static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type) static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
{ {
/* Check for an empty string */ /* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0) { if (strncmp(word, "", sizeof("")) == 0) {