aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/parser
diff options
context:
space:
mode:
authoragent-q2011-05-21 16:01:26 +0100
committeragent-q2011-05-21 16:01:26 +0100
commit92d0216db18c96c97bb4b57ada76cf532838cf5b (patch)
tree6d405ce821d055403a10aa347e8ae2826917bba1 /engines/sci/parser
parent4076a0466d67d42f093e3e73a30ea48e1e1d59e9 (diff)
parentdd6b5698b181532b37cba41b1475b01813aadddc (diff)
downloadscummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.gz
scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.bz2
scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.zip
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
Diffstat (limited to 'engines/sci/parser')
-rw-r--r--engines/sci/parser/vocabulary.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 25043401cc..11d214b28d 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -398,6 +398,12 @@ void Vocabulary::lookupWord(ResultWordList& retval, const char *word, int word_l
if (getSciVersion() < SCI_VERSION_01)
return;
+ // WORKAROUND:
+ // This is a hack to temporarily fix bug #3288328.
+ // On the master branch this return is unconditional.
+ if (g_sci->getGameId() == GID_QFG2 && strcmp(word, "healing") == 0)
+ return;
+
}
// Now try all suffixes