[Scummvm-git-logs] scummvm master -> 649f51a65e9bbd774864c5e78f94dff975188712

[dreammaster]

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:
649f51a65e TITANIC: Fix saying goodbye to Bellbot


Commit: 649f51a65e9bbd774864c5e78f94dff975188712
    https://github.com/scummvm/scummvm/commit/649f51a65e9bbd774864c5e78f94dff975188712
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-12T20:12:32-04:00

Commit Message:
TITANIC: Fix saying goodbye to Bellbot

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 c36eef8..5ace6ec 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -1583,7 +1583,10 @@ bool TTparser::checkConcept2(TTconcept *concept, int conceptMode) {
 		return concept->checkWordId1();
 
 	case 9:
-		if (!concept->checkWordId3() && _sentenceConcept->_concept2P) {
+		if (concept->checkWordId3())
+			return true;
+
+		if (_sentenceConcept->_concept2P) {
 			if (!_sentenceConcept->_concept2P->checkWordId2() || !concept->checkWordId2()) {
 				return _sentenceConcept->_concept2P->checkWordClass() &&
 					concept->checkWordClass();