projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1966264
)
Datatype definition for command word types.
author
Jason S. Ninneman
<jsn@mbar.us>
Thu, 3 Aug 2017 02:22:52 +0000
(19:22 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Thu, 3 Aug 2017 15:16:19 +0000
(08:16 -0700)
advent.h
patch
|
blob
|
history
misc.c
patch
|
blob
|
history
diff --git
a/advent.h
b/advent.h
index ce763faa707882ec74f59eed461d9e2080a9bb48..2e07c7ef26d30c176905f6740c890c261546b7e6 100644
(file)
--- a/
advent.h
+++ b/
advent.h
@@
-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;
vocab_t id1;
vocab_t id2;
enum speechpart part;
vocab_t id1;
vocab_t id2;
-
enum wordtype
type1;
-
enum wordtype
type2;
+
word_type_t
type1;
+
word_type_t
type2;
verb_t verb;
obj_t obj;
};
verb_t verb;
obj_t obj;
};
diff --git
a/misc.c
b/misc.c
index ba2e2afffc0c637f8ec37aa2fef701035ec82cad..23c053f2e41a7b91f41e1ebda1b154361e6629c9 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-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 */
if (strncmp(word, "", sizeof("")) == 0) {
{
/* Check for an empty string */
if (strncmp(word, "", sizeof("")) == 0) {