[Scummvm-git-logs] scummvm master -> 9fa97cd1197746688b5d55b7788f323b65bd5825

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9fa97cd119 TITANIC: Fix Doorbot disappearing in prologue elevator


Commit: 9fa97cd1197746688b5d55b7788f323b65bd5825
    https://github.com/scummvm/scummvm/commit/9fa97cd1197746688b5d55b7788f323b65bd5825
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-03T23:18:04-04:00

Commit Message:
TITANIC: Fix Doorbot disappearing in prologue elevator

Changed paths:
    engines/titanic/npcs/doorbot.cpp


diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 066191e..94c5e2c 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;
 }