[Scummvm-git-logs] scummvm master -> 836dbae94bb33f2ca472ca19571612a3e1bc15c0

[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:
836dbae94b TITANIC: Fix Parrot message when trying to take it's perch


Commit: 836dbae94bb33f2ca472ca19571612a3e1bc15c0
    https://github.com/scummvm/scummvm/commit/836dbae94bb33f2ca472ca19571612a3e1bc15c0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-18T23:26:51-05:00

Commit Message:
TITANIC: Fix Parrot message when trying to take it's perch

Changed paths:
    engines/titanic/game/parrot/parrot_perch_holder.cpp
    engines/titanic/npcs/parrot.cpp


diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp
index b1a7dab..205995c 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.cpp
+++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp
@@ -45,7 +45,7 @@ void CParrotPerchHolder::load(SimpleFile *file) {
 }
 
 bool CParrotPerchHolder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
-	if (CParrot::_v1) {
+	if (!CParrot::_v1) {
 		if (CCage::_open) {
 			petDisplayMessage(CANNOT_TAKE_CAGE_LOCKED);
 		} else if (!CParrot::_v4) {
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 37710e5..e9aeba1 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -369,7 +369,7 @@ bool CParrot::EnterViewMsg(CEnterViewMsg *msg) {
 }
 
 bool CParrot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
-	if (_v4) {
+	if (_v4 != 3) {
 		CViewItem *view = msg->_param2 ? findView() : nullptr;
 		startTalking(this, msg->_action, view);
 	}
@@ -396,10 +396,11 @@ bool CParrot::MouseDragStartMsg(CMouseDragStartMsg *msg) {
 
 			CActMsg actMsg("LoseParrot");
 			actMsg.execute("ParrotLobbyController");
+			return true;
 		}
 	}
 
-	return true;
+	return false;
 }
 
 bool CParrot::LeaveViewMsg(CLeaveViewMsg *msg) {