TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame

This commit is contained in:
Paul Gilbert 2017-09-03 23:36:47 -04:00
parent 9fa97cd119
commit f36f3942ea

View File

@ -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