[Scummvm-git-logs] scummvm master -> 03c15ad01cd5ebf5a55e4ae2c8ec5e803ab8c752

[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:
03c15ad01c TITANIC: Re-enable mouse after dragging parrot into inventory


Commit: 03c15ad01cd5ebf5a55e4ae2c8ec5e803ab8c752
    https://github.com/scummvm/scummvm/commit/03c15ad01cd5ebf5a55e4ae2c8ec5e803ab8c752
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-20T21:09:10-05:00

Commit Message:
TITANIC: Re-enable mouse after dragging parrot into inventory

Changed paths:
    engines/titanic/carry/carry_parrot.cpp


diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index ed86384..cbc8028 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -105,10 +105,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) {
 
 	if (msg->_mousePos.y >= 360) {
 		petAddToInventory();
-		return true;
-	}
-
-	if (compareViewNameTo("ParrotLobby.Node 1.N")) {
+	} else if (compareViewNameTo("ParrotLobby.Node 1.N")) {
 		if (msg->_mousePos.x >= 75 && msg->_mousePos.x <= 565 &&
 				!CParrot::_v2 && !CCage::_open) {
 			setVisible(false);