aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-28 10:59:15 -0500
committerPaul Gilbert2017-01-28 10:59:15 -0500
commit0a5e36d689d19d11129a5ecd243342be0a8a8b81 (patch)
tree4a70e97f6170dee6cfe4bcb0f8593a706d74e5d2
parent927f53368b52f6340d7e1ba467655a5d659b9522 (diff)
downloadscummvm-rg350-0a5e36d689d19d11129a5ecd243342be0a8a8b81.tar.gz
scummvm-rg350-0a5e36d689d19d11129a5ecd243342be0a8a8b81.tar.bz2
scummvm-rg350-0a5e36d689d19d11129a5ecd243342be0a8a8b81.zip
TITANIC: Properly handle sentences with multiple objects
-rw-r--r--engines/titanic/true_talk/tt_parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index c557359295..88a5ec3614 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -792,8 +792,8 @@ int TTparser::considerRequests(TTword *word) {
if (flag)
delete oldConcept;
} else if (!_sentenceConcept->_concept3P &&
- (!_sentenceConcept->_concept1P || (_sentenceConcept->_concept1P->getWordId() &&
- _sentenceConcept->_concept1P->getWordId() == 112)) &&
+ (!_sentenceConcept->_concept1P || (_sentenceConcept->_concept1P->getWordId() != 113 &&
+ _sentenceConcept->_concept1P->getWordId() != 112)) &&
_sentenceConcept->_concept2P->checkWordId1() &&
(word->_wordClass == WC_THING || word->_wordClass == WC_PRONOUN)) {
_sentenceConcept->changeConcept(0, &_sentenceConcept->_concept2P, 3);