[Scummvm-git-logs] scummvm master -> 16faf2dd340e03529cb98c31a7620b809fea7b06

[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:
16faf2dd34 TITANIC: Have Parrot return after Perch is placed in cage


Commit: 16faf2dd340e03529cb98c31a7620b809fea7b06
    https://github.com/scummvm/scummvm/commit/16faf2dd340e03529cb98c31a7620b809fea7b06
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-17T21:40:39-04:00

Commit Message:
TITANIC: Have Parrot return after Perch is placed in cage

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


diff --git a/engines/titanic/carry/central_core.cpp b/engines/titanic/carry/central_core.cpp
index 457428c..8b1e24d 100644
--- a/engines/titanic/carry/central_core.cpp
+++ b/engines/titanic/carry/central_core.cpp
@@ -74,6 +74,8 @@ bool CCentralCore::DropZoneLostObjectMsg(CDropZoneLostObjectMsg *msg) {
 bool CCentralCore::DropZoneGotObjectMsg(CDropZoneGotObjectMsg *msg) {
 	CString name = msg->_object->getName();
 	if (name == "PerchCoreHolder") {
+		CParrot::_takeOff = false;
+
 		if (isEquals("CentralCore")) {
 			CParrot::_coreReplaced = true;
 			CActMsg actMsg("CoreReplaced");