aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/parser
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-05-14 17:59:30 +0200
committerWillem Jan Palenstijn2011-05-14 18:08:20 +0200
commit0788493015cb899b50986f2173899c106d9d789b (patch)
treebdea04345af13be0649ef7c98646ee6ec3e01fc6 /engines/sci/parser
parent47a7b65dc149149ff00baacf9fa76ce0fcaedfd2 (diff)
downloadscummvm-rg350-0788493015cb899b50986f2173899c106d9d789b.tar.gz
scummvm-rg350-0788493015cb899b50986f2173899c106d9d789b.tar.bz2
scummvm-rg350-0788493015cb899b50986f2173899c106d9d789b.zip
SCI: Don't do suffix expansions after exact dict match
This fixes the parsing of "buy healing pills" in QfG2 (bug #3288328). The behaviour is half-confirmed with experimentation in SSCI.
Diffstat (limited to 'engines/sci/parser')
-rw-r--r--engines/sci/parser/vocabulary.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 116a0bdea4..a5c4686b3b 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -392,9 +392,11 @@ void Vocabulary::lookupWord(ResultWordList& retval, const char *word, int word_l
// SCI01 was the first version to support
// multiple matches, so no need to look further
// in earlier versions.
- if (getSciVersion() < SCI_VERSION_01)
- return;
+ // In versions that do support multiple matches, it seems
+ // that SSCI also aborts early when it finds an exact match in the
+ // dictionary.
+ return;
}
// Now try all suffixes