[Scummvm-git-logs] scummvm master -> 4ad6faecd9ea95a54ca5a700eb382de0ab65797b

[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:
4ad6faecd9 TITANIC: Fix NPCs responding to common phrases


Commit: 4ad6faecd9ea95a54ca5a700eb382de0ab65797b
    https://github.com/scummvm/scummvm/commit/4ad6faecd9ea95a54ca5a700eb382de0ab65797b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T15:44:34-05:00

Commit Message:
TITANIC: Fix NPCs responding to common phrases

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



diff --git a/engines/titanic/true_talk/tt_sentence.cpp b/engines/titanic/true_talk/tt_sentence.cpp
index 6bd7e09..4515823 100644
--- a/engines/titanic/true_talk/tt_sentence.cpp
+++ b/engines/titanic/true_talk/tt_sentence.cpp
@@ -109,10 +109,10 @@ int TTsentence::storeVocabHit(TTword *word) {
 
 bool TTsentence::fn1(const CString &str, int wordId1, const CString &str1, const CString &str2,
 		const CString &str3, int wordId2, int val1, int val2, const TTconceptNode *node) const {
-	if (node)
+	if (!node)
 		node = &_sentenceConcept;
 
-	if (!node && !node)
+	if (!node)
 		return false;
 	if (val1 && !is18(val1, node))
 		return false;