aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/include/vocabulary.h
diff options
context:
space:
mode:
authorMax Horn2009-02-21 22:06:42 +0000
committerMax Horn2009-02-21 22:06:42 +0000
commit8430b662a99d96100fbeb3428a61595444fc3526 (patch)
tree2c0421af6635c6496905d6fb95c8e9de2a0487c4 /engines/sci/include/vocabulary.h
parentda190b30fcf79edb14b58e560b243f797fb17820 (diff)
downloadscummvm-rg350-8430b662a99d96100fbeb3428a61595444fc3526.tar.gz
scummvm-rg350-8430b662a99d96100fbeb3428a61595444fc3526.tar.bz2
scummvm-rg350-8430b662a99d96100fbeb3428a61595444fc3526.zip
SCI: Changed typedef struct -> struct
svn-id: r38752
Diffstat (limited to 'engines/sci/include/vocabulary.h')
-rw-r--r--engines/sci/include/vocabulary.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/engines/sci/include/vocabulary.h b/engines/sci/include/vocabulary.h
index 25f68bce78..3e2239b952 100644
--- a/engines/sci/include/vocabulary.h
+++ b/engines/sci/include/vocabulary.h
@@ -110,32 +110,32 @@ extern const char *class_names[]; /* Vocabulary class names */
#define SAID_LONG(x) ((x) << 8)
-typedef struct {
+struct word_t {
int w_class; /* Word class */
int group; /* Word group */
char word[1]; /* The actual word */
-} word_t;
+};
-typedef struct {
+struct parse_rule_t {
int id; /* non-terminal ID */
int first_special; /* first terminal or non-terminal */
int specials_nr; /* number of terminals and non-terminals */
int length;
int data[1]; /* actual data (size 1 to avoid compiler warnings) */
-} parse_rule_t;
+};
-typedef struct _parse_rule_list {
+struct parse_rule_list_t {
int terminal; /* Terminal character this rule matches against or 0 for a non-terminal rule */
parse_rule_t *rule;
- struct _parse_rule_list *next;
-} parse_rule_list_t;
+ parse_rule_list_t *next;
+};
-typedef struct {
+struct suffix_t {
int class_mask; /* the word class this suffix applies to */
int result_class; /* the word class a word is morphed to if it doesn't fail this check */
@@ -146,36 +146,36 @@ typedef struct {
char *alt_suffix; /* The alternative suffix */
char *word_suffix; /* The suffix as used in the word vocabulary */
-} suffix_t;
+};
-typedef struct {
+struct result_word_t {
int w_class; /* Word class */
int group; /* Word group */
-} result_word_t;
+};
-typedef struct {
+struct synonym_t {
int replaceant; /* The word group to replace */
int replacement; /* The replacement word group for this one */
-} synonym_t;
+};
-typedef struct {
+struct parse_tree_branch_t {
int id;
int data[10];
-} parse_tree_branch_t;
+};
#define PARSE_TREE_NODE_LEAF 0
#define PARSE_TREE_NODE_BRANCH 1
-typedef struct {
+struct parse_tree_node_t {
short type; /* leaf or branch */
@@ -186,7 +186,7 @@ typedef struct {
} content;
-} parse_tree_node_t;
+};