[Scummvm-git-logs] scummvm master -> a5f01bbfb8ad72a983a08fb18ae940931702ccab

[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:
a5f01bbfb8 TITANIC: Fix parrot eating nuts in 2nd class suite


Commit: a5f01bbfb8ad72a983a08fb18ae940931702ccab
    https://github.com/scummvm/scummvm/commit/a5f01bbfb8ad72a983a08fb18ae940931702ccab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-26T23:04:29-05:00

Commit Message:
TITANIC: Fix parrot eating nuts in 2nd class suite

Changed paths:
    engines/titanic/carry/carry_parrot.cpp
    engines/titanic/game/parrot/parrot_nut_eater.cpp


diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index 70b191b..0f57721 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -171,8 +171,9 @@ bool CCarryParrot::PassOnDragStartMsg(CPassOnDragStartMsg *msg) {
 	_fieldE0 = 0;
 	playSound("z#475.wav");
 	moveUnder(findRoom());
-	msg->_value4 = 1;
+	CParrot::_v4 = 2;
 
+	msg->_value4 = 1;
 	return true;
 }
 
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index 49b8de5..b9697d7 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -66,6 +66,7 @@ bool CParrotNutEater::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) {
 
 bool CParrotNutEater::NutPuzzleMsg(CNutPuzzleMsg *msg) {
 	if (msg->_value == "Jiggle") {
+		setVisible(true);
 		playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
 		movieEvent(68);
 		movieEvent(132);