diff options
| author | Max Horn | 2009-03-24 17:41:26 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-24 17:41:26 +0000 |
| commit | d38590e6d4053939390ae5a853397f9574d9982e (patch) | |
| tree | 30a1d0545929fa888891f6fb2d4a3f6d3db96e38 /engines/sci/scicore/vocabulary.h | |
| parent | 3e2c1a39e2fd9ac613c3f7d14e152df0332b3908 (diff) | |
| download | scummvm-rg350-d38590e6d4053939390ae5a853397f9574d9982e.tar.gz scummvm-rg350-d38590e6d4053939390ae5a853397f9574d9982e.tar.bz2 scummvm-rg350-d38590e6d4053939390ae5a853397f9574d9982e.zip | |
SCI: Turned synonyms list into a Common::List
svn-id: r39669
Diffstat (limited to 'engines/sci/scicore/vocabulary.h')
| -rw-r--r-- | engines/sci/scicore/vocabulary.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/engines/sci/scicore/vocabulary.h b/engines/sci/scicore/vocabulary.h index 6ad583a6c4..41562e092d 100644 --- a/engines/sci/scicore/vocabulary.h +++ b/engines/sci/scicore/vocabulary.h @@ -165,13 +165,11 @@ struct synonym_t { int replacement; /* The replacement word group for this one */ }; +typedef Common::List<synonym_t> SynonymList; struct parse_tree_branch_t { - int id; - int data[10]; - }; #define PARSE_TREE_NODE_LEAF 0 @@ -179,16 +177,11 @@ struct parse_tree_branch_t { struct parse_tree_node_t { - short type; /* leaf or branch */ - union { - int value; /* For leaves */ short branches[2]; /* For branches */ - } content; - }; @@ -374,11 +367,10 @@ void vocab_decypher_said_block(EngineState *s, byte *pos); */ -void vocab_synonymize_tokens(ResultWordList &words, synonym_t *synonyms, int synonyms_nr); +void vocab_synonymize_tokens(ResultWordList &words, const SynonymList &synonyms); /* Synonymizes a token list ** Parameters: (ResultWordList &) words: The word list to synonymize -** (synonym_t *) synonyms: Synonym list -** (int) synonyms_nr: Number of synonyms in the list +** (const SynonymList &) synonyms: Synonym list */ int vocab_gnf_parse(parse_tree_node_t *nodes, const ResultWordList &words, |