diff options
| author | Paul Gilbert | 2017-02-20 16:44:45 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-20 16:44:45 -0500 |
| commit | bb5db9de27260c21c42442d55b4f8cae9b340bae (patch) | |
| tree | fac6a4adaad64c6d03a971b682808224ff7e25a4 /engines/titanic/npcs/parrot.cpp | |
| parent | deba34cc05c8bf00de72a5db68e288d4a3584b27 (diff) | |
| download | scummvm-rg350-bb5db9de27260c21c42442d55b4f8cae9b340bae.tar.gz scummvm-rg350-bb5db9de27260c21c42442d55b4f8cae9b340bae.tar.bz2 scummvm-rg350-bb5db9de27260c21c42442d55b4f8cae9b340bae.zip | |
TITANIC: Wait for parrot speech to end before waking Titania
Diffstat (limited to 'engines/titanic/npcs/parrot.cpp')
| -rw-r--r-- | engines/titanic/npcs/parrot.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index 223f6b4cf2..6a48837d08 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -43,6 +43,7 @@ BEGIN_MESSAGE_MAP(CParrot, CTrueTalkNPC) ON_MESSAGE(PreEnterViewMsg) ON_MESSAGE(PanningAwayFromParrotMsg) ON_MESSAGE(LeaveRoomMsg) + ON_MESSAGE(TrueTalkNotifySpeechEndedMsg) END_MESSAGE_MAP() bool CParrot::_eatingChicken; @@ -729,4 +730,15 @@ bool CParrot::LeaveRoomMsg(CLeaveRoomMsg *msg) { return true; } +bool CParrot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) { + if (msg->_dialogueId == 80022) { + // WORKAROUND: End of parrot speech after having fixed Titania + unlockMouse(); + changeView("Titania.Node 18.N", ""); + } + + return CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg); +} + + } // End of namespace Titanic |