[Scummvm-git-logs] scummvm master -> 8d9ddcfc2ba6801c0738f56dcdd9cabc33da31ef

[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:
8d9ddcfc2b TITANIC: Fix CPetConversations timerExpired


Commit: 8d9ddcfc2ba6801c0738f56dcdd9cabc33da31ef
    https://github.com/scummvm/scummvm/commit/8d9ddcfc2ba6801c0738f56dcdd9cabc33da31ef
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-10T20:33:35-05:00

Commit Message:
TITANIC: Fix CPetConversations timerExpired

Changed paths:
    engines/titanic/pet_control/pet_conversations.cpp


diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 8f317ed..490ed75 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -265,7 +265,7 @@ void CPetConversations::leave() {
 }
 
 void CPetConversations::timerExpired(int val) {
-	if (val == 1) {
+	if (val != 1) {
 		CPetSection::timerExpired(val);
 	} else {
 		CString name = _field418 ? _npcName : getActiveNPCName();