diff options
author | Paul Gilbert | 2016-12-26 23:04:29 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-12-26 23:04:29 -0500 |
commit | a5f01bbfb8ad72a983a08fb18ae940931702ccab (patch) | |
tree | f4610876e628f06171aad6e1d486526f1eaf77e0 /engines | |
parent | 96c36d53984dc2047af5542a5378adeb8e42be7c (diff) | |
download | scummvm-rg350-a5f01bbfb8ad72a983a08fb18ae940931702ccab.tar.gz scummvm-rg350-a5f01bbfb8ad72a983a08fb18ae940931702ccab.tar.bz2 scummvm-rg350-a5f01bbfb8ad72a983a08fb18ae940931702ccab.zip |
TITANIC: Fix parrot eating nuts in 2nd class suite
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/carry/carry_parrot.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/game/parrot/parrot_nut_eater.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp index 70b191ba7c..0f577211de 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 49b8de509f..b9697d7b61 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); |