diff options
author | Paul Gilbert | 2017-09-09 21:18:16 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-09-09 21:18:16 -0400 |
commit | 29465fd116ac120d1710a3e3967d07a9823fc526 (patch) | |
tree | 464721b44cfb11aac25043c9f6b4eb3150977e9e | |
parent | 030b1d369d21bbd82fc5b101c8dd3ad58d612263 (diff) | |
download | scummvm-rg350-29465fd116ac120d1710a3e3967d07a9823fc526.tar.gz scummvm-rg350-29465fd116ac120d1710a3e3967d07a9823fc526.tar.bz2 scummvm-rg350-29465fd116ac120d1710a3e3967d07a9823fc526.zip |
TITANIC: Disable input during Bellbot intro to prevent moving away
-rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/npcs/deskbot.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 93f9aeb43e..d38004c959 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 27bea6f9a0..367d704f6b 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; |