diff options
author | Paul Gilbert | 2017-09-03 23:18:04 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-09-03 23:18:04 -0400 |
commit | 9fa97cd1197746688b5d55b7788f323b65bd5825 (patch) | |
tree | dec2040cbe389af4638f23a4c2432f385a80c695 /engines/titanic/npcs/doorbot.cpp | |
parent | 0092d5eaec18cb2bacc40b04071d88564e32e906 (diff) | |
download | scummvm-rg350-9fa97cd1197746688b5d55b7788f323b65bd5825.tar.gz scummvm-rg350-9fa97cd1197746688b5d55b7788f323b65bd5825.tar.bz2 scummvm-rg350-9fa97cd1197746688b5d55b7788f323b65bd5825.zip |
TITANIC: Fix Doorbot disappearing in prologue elevator
Diffstat (limited to 'engines/titanic/npcs/doorbot.cpp')
-rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 066191ed56..94c5e2c725 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -552,14 +552,14 @@ bool CDoorbot::TextInputMsg(CTextInputMsg *msg) { } bool CDoorbot::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("DoorBot")) - petMoveToHiddenRoom(); - if ((_npcFlags & NPCFLAG_DOORBOT_INTRO) && _introMovieNum == 7) playClip("SE Move And Turn", MOVIE_NOTIFY_OBJECT); + else if (msg->_newView == getParent() && getPetControl()->canSummonBot("DoorBot")) { + // 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 + petMoveToHiddenRoom(); + } return true; } |