From f36f3942ea1e8109ded3d36bb50af2ec79f64016 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 3 Sep 2017 23:36:47 -0400 Subject: [PATCH] TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame --- engines/titanic/npcs/doorbot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index 94c5e2c7251b..8ee1e3220cf6 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