diff options
| author | Paul Gilbert | 2016-12-28 16:54:46 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-28 16:54:46 -0500 |
| commit | af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f (patch) | |
| tree | bec4ebfdd885067e51210b92a77f2118690cd053 /engines/titanic/npcs | |
| parent | cfaf749c60c4c641f11142bde53ce6b183847895 (diff) | |
| download | scummvm-rg350-af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f.tar.gz scummvm-rg350-af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f.tar.bz2 scummvm-rg350-af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f.zip | |
TITANIC: Fix Bilge SuccUBus activation speech
Diffstat (limited to 'engines/titanic/npcs')
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index f2b163406a..7ce361da5f 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -187,7 +187,7 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (_startFrame11 >= 0) playSound("z#30.wav"); } else { - if (_onEndFrame == _offEndFrame && pet) { + if (msg->_endFrame == _onEndFrame && pet) { if (_v2) { startTalking(this, getRandomNumber(1) ? 230062 : 230063); } else if (!findMail(pet->getRoomFlags())) { @@ -205,9 +205,8 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { break; } } - } - if (msg->_endFrame == _sendEndFrame) { + } else if (msg->_endFrame == _sendEndFrame) { switch (_field158) { case 1: stopSound(_soundHandle); |