[Scummvm-git-logs] scummvm master -> d5cfa3f2be047975623162d880cd3267c10764d3

[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:
d5cfa3f2be TITANIC: Fix Bellbot disappearing during checkin cutscene


Commit: d5cfa3f2be047975623162d880cd3267c10764d3
    https://github.com/scummvm/scummvm/commit/d5cfa3f2be047975623162d880cd3267c10764d3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-05T22:37:50-04:00

Commit Message:
TITANIC: Fix Bellbot disappearing during checkin cutscene

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


diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index c6c6a9e..93f9aeb 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -103,7 +103,8 @@ bool CBellBot::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("BellBot"))
+	if (!hasActiveMovie() && msg->_newView == getParent()
+			&& getPetControl()->canSummonBot("BellBot"))
 		petMoveToHiddenRoom();
 
 	return true;