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.cpp | |
| 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.cpp')
| -rw-r--r-- | engines/sci/scicore/vocabulary.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/sci/scicore/vocabulary.cpp b/engines/sci/scicore/vocabulary.cpp index fac3af1c20..283029b226 100644 --- a/engines/sci/scicore/vocabulary.cpp +++ b/engines/sci/scicore/vocabulary.cpp @@ -599,16 +599,14 @@ void vocab_dump_parse_tree(const char *tree_name, parse_tree_node_t *nodes) { sciprintf("))\n"); } -void vocab_synonymize_tokens(ResultWordList &words, synonym_t *synonyms, int synonyms_nr) { - int sync; - - if (!synonyms || !synonyms_nr) +void vocab_synonymize_tokens(ResultWordList &words, const SynonymList &synonyms) { + if (synonyms.empty()) return; // No synonyms: Nothing to check for (ResultWordList::iterator i = words.begin(); i != words.end(); ++i) - for (sync = 0; sync < synonyms_nr; sync++) - if (i->group == synonyms[sync].replaceant) - i->group = synonyms[sync].replacement; + for (SynonymList::const_iterator sync = synonyms.begin(); sync != synonyms.end(); ++sync) + if (i->group == sync->replaceant) + i->group = sync->replacement; } } // End of namespace Sci |