diff options
| author | Paul Gilbert | 2017-09-05 22:37:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-05 22:37:50 -0400 |
| commit | d5cfa3f2be047975623162d880cd3267c10764d3 (patch) | |
| tree | 1663cc61b8f7c8d3a2f0ca964d37e1749f0a485f /engines | |
| parent | 0c2fc12756311baf3457718fae7e9394aea390b8 (diff) | |
| download | scummvm-rg350-d5cfa3f2be047975623162d880cd3267c10764d3.tar.gz scummvm-rg350-d5cfa3f2be047975623162d880cd3267c10764d3.tar.bz2 scummvm-rg350-d5cfa3f2be047975623162d880cd3267c10764d3.zip | |
TITANIC: Fix Bellbot disappearing during checkin cutscene
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index c6c6a9e3a6..93f9aeb43e 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -103,7 +103,8 @@ bool CBellBot::EnterViewMsg(CEnterViewMsg *msg) { // WORKAROUND: Calling bot in front of doors and then going through them // can leave it in the view. Detect this and properly remove him when // the player returns to that view - if (msg->_newView == getParent() && getPetControl()->canSummonBot("BellBot")) + if (!hasActiveMovie() && msg->_newView == getParent() + && getPetControl()->canSummonBot("BellBot")) petMoveToHiddenRoom(); return true; |