[Scummvm-git-logs] scummvm master -> 0a5e36d689d19d11129a5ecd243342be0a8a8b81

dreammaster dreammaster at scummvm.org
Sat Jan 28 17:00:33 CET 2017


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:
0a5e36d689 TITANIC: Properly handle sentences with multiple objects


Commit: 0a5e36d689d19d11129a5ecd243342be0a8a8b81
    https://github.com/scummvm/scummvm/commit/0a5e36d689d19d11129a5ecd243342be0a8a8b81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-28T10:59:15-05:00

Commit Message:
TITANIC: Properly handle sentences with multiple objects

Changed paths:
    engines/titanic/true_talk/tt_parser.cpp


diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index c557359..88a5ec3 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);





More information about the Scummvm-git-logs mailing list