diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /engines/sci/parser | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'engines/sci/parser')
| -rw-r--r-- | engines/sci/parser/grammar.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/parser/said.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/parser/vocabulary.cpp | 9 | ||||
| -rw-r--r-- | engines/sci/parser/vocabulary.h | 3 |
4 files changed, 4 insertions, 14 deletions
diff --git a/engines/sci/parser/grammar.cpp b/engines/sci/parser/grammar.cpp index b330a432e3..6e02eb75e3 100644 --- a/engines/sci/parser/grammar.cpp +++ b/engines/sci/parser/grammar.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* Functionality to transform the context-free SCI grammar rules into diff --git a/engines/sci/parser/said.cpp b/engines/sci/parser/said.cpp index 666a235cf9..827e28073a 100644 --- a/engines/sci/parser/said.cpp +++ b/engines/sci/parser/said.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "sci/engine/state.h" diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp index 25043401cc..a5c4686b3b 100644 --- a/engines/sci/parser/vocabulary.cpp +++ b/engines/sci/parser/vocabulary.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Main vocabulary support functions and word lookup @@ -395,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 diff --git a/engines/sci/parser/vocabulary.h b/engines/sci/parser/vocabulary.h index 6d3e0b301e..e4a7e41b3c 100644 --- a/engines/sci/parser/vocabulary.h +++ b/engines/sci/parser/vocabulary.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SCI_SCICORE_VOCABULARY_H |