[Scummvm-git-logs] scummvm master -> 29465fd116ac120d1710a3e3967d07a9823fc526

[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:
29465fd116 TITANIC: Disable input during Bellbot intro to prevent moving away


Commit: 29465fd116ac120d1710a3e3967d07a9823fc526
    https://github.com/scummvm/scummvm/commit/29465fd116ac120d1710a3e3967d07a9823fc526
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-09T21:18:16-04:00

Commit Message:
TITANIC: Disable input during Bellbot intro to prevent moving away

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


diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 93f9aeb..d38004c 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -285,8 +285,10 @@ bool CBellBot::TrueTalkGetStateValueMsg(CTrueTalkGetStateValueMsg *msg) {
 bool CBellBot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) {
 	CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg);
 
-	if (msg->_dialogueId == 20991)
+	if (msg->_dialogueId == 20991) {
 		petDismissBot("DoorBot");
+		getGameManager()->unlockInputHandler();
+	}
 
 	return true;
 }
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index 27bea6f..367d704 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/npcs/deskbot.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/game_manager.h"
 
 namespace Titanic {
 
@@ -133,6 +134,7 @@ bool CDeskbot::MovieEndMsg(CMovieEndMsg *msg) {
 			CTurnOn turnOn;
 			turnOn.execute("EmbBellbotTrigger");
 			unlockMouse();
+			getGameManager()->lockInputHandler();
 			changeView("EmbLobby.Node 4.N", "");
 		} else if (_npcFlags & NPCFLAG_MOVE_LEFT) {
 			CTurnOn turnOn;