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/titania.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/titania.cpp')
| -rw-r--r-- | engines/titanic/npcs/titania.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp index db0c85d5f5..b961e0d77c 100644 --- a/engines/titanic/npcs/titania.cpp +++ b/engines/titanic/npcs/titania.cpp @@ -99,7 +99,7 @@ bool CTitania::AddHeadPieceMsg(CAddHeadPieceMsg *msg) { _eye2 = true; } else if (msg->_value == "Ear1") { _ear1 = true; - } else if (msg->_value == "Ear2") { + } else if (msg->_value == "Ear 2") { _ear2 = true; } else if (msg->_value == "Mouth") { _mouth = true; @@ -216,8 +216,11 @@ bool CTitania::EnterViewMsg(CEnterViewMsg *msg) { } bool CTitania::TimerMsg(CTimerMsg *msg) { - changeView("Titania.Node 18.N", ""); + // WORKAROUND: The original uses the disc change dialog as a pause + // to allow the parrot speech to finish. I've rewritten it to instead + // use the standard TrueTalkNotifySpeechEndedMsg message instead startTalking("PerchedParrot", 80022); + lockMouse(); return true; } |