aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs/bellbot.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-06 22:31:27 -0500
committerPaul Gilbert2016-11-06 22:31:27 -0500
commit73030bd42f3bc3fb21bf44a9b0cb26e0f4b10e6e (patch)
treee15c56b2034240423854b3d583cc453dfbc8d4f6 /engines/titanic/npcs/bellbot.cpp
parent0c7c72b75073910ba2e2ef32f5259f39d8ed2503 (diff)
downloadscummvm-rg350-73030bd42f3bc3fb21bf44a9b0cb26e0f4b10e6e.tar.gz
scummvm-rg350-73030bd42f3bc3fb21bf44a9b0cb26e0f4b10e6e.tar.bz2
scummvm-rg350-73030bd42f3bc3fb21bf44a9b0cb26e0f4b10e6e.zip
TITANIC: Fix BellBot's intro speech
Diffstat (limited to 'engines/titanic/npcs/bellbot.cpp')
-rw-r--r--engines/titanic/npcs/bellbot.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 2514d20df6..1326655299 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -238,8 +238,6 @@ bool CBellBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
bool CBellBot::TimerMsg(CTimerMsg *msg) {
if (msg->_action == "SummonDoorbot") {
- CTrueTalkNPC::TimerMsg(msg);
- } else {
CRoomItem *room = getRoom();
if (room) {
CSummonBotMsg botMsg;
@@ -249,6 +247,8 @@ bool CBellBot::TimerMsg(CTimerMsg *msg) {
}
_npcFlags &= ~NPCFLAG_20000;
+ } else {
+ CTrueTalkNPC::TimerMsg(msg);
}
return true;