[Scummvm-cvs-logs] scummvm master -> 0788493015cb899b50986f2173899c106d9d789b

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0788493015 SCI: Don't do suffix expansions after exact dict match


Commit: 0788493015cb899b50986f2173899c106d9d789b
    https://github.com/scummvm/scummvm/commit/0788493015cb899b50986f2173899c106d9d789b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-05-14T09:08:20-07:00

Commit Message:
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.

Changed paths:
    engines/sci/parser/vocabulary.cpp



diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 116a0bd..a5c4686 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