diff options
| author | Paul Gilbert | 2017-09-03 23:36:47 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-03 23:36:47 -0400 |
| commit | f36f3942ea1e8109ded3d36bb50af2ec79f64016 (patch) | |
| tree | 51e66807be6b8cc2da9c17636c8ec071498e039d /engines/titanic/npcs | |
| parent | 9fa97cd1197746688b5d55b7788f323b65bd5825 (diff) | |
| download | scummvm-rg350-f36f3942ea1e8109ded3d36bb50af2ec79f64016.tar.gz scummvm-rg350-f36f3942ea1e8109ded3d36bb50af2ec79f64016.tar.bz2 scummvm-rg350-f36f3942ea1e8109ded3d36bb50af2ec79f64016.zip | |
TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame
Diffstat (limited to 'engines/titanic/npcs')
| -rw-r--r-- | engines/titanic/npcs/doorbot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 94c5e2c725..8ee1e3220c 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -554,7 +554,7 @@ bool CDoorbot::TextInputMsg(CTextInputMsg *msg) { bool CDoorbot::EnterViewMsg(CEnterViewMsg *msg) { if ((_npcFlags & NPCFLAG_DOORBOT_INTRO) && _introMovieNum == 7) playClip("SE Move And Turn", MOVIE_NOTIFY_OBJECT); - else if (msg->_newView == getParent() && getPetControl()->canSummonBot("DoorBot")) { + else if (!compareRoomNameTo("ServiceElevator") && 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 |