1 files changed, 11 insertions, 11 deletions

diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 7aa32eeef3..1326655299 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -79,7 +79,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
 		for (idx = 0; idx < 8; ++idx) {
 			if (compareRoomNameTo(ROOM_WAVES[idx][0])) {
 				playSound(ROOM_WAVES[idx][1]);
-
+				break;
 			}
 		}
 		if (idx == 8)
@@ -99,7 +99,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
 bool CBellBot::LeaveViewMsg(CLeaveViewMsg *msg) {
 	if (_npcFlags & NPCFLAG_10000) {
 		performAction(1);
-		_npcFlags &= ~NPCFLAG_4;
+		_npcFlags &= ~NPCFLAG_START_IDLING;
 		CDismissBotMsg dismissMsg;
 		dismissMsg.execute(this);
 	}
@@ -113,13 +113,13 @@ bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) {
 	} else if (clipExistsByEnd("Walk On", msg->_endFrame)) {
 		setPosition(Point(80, 10));
 		loadFrame(543);
-		_npcFlags |= NPCFLAG_4;
+		_npcFlags |= NPCFLAG_START_IDLING;
 		if (_npcFlags & NPCFLAG_40000) {
 			startTalking(this, 157);
 			_npcFlags &= ~NPCFLAG_40000;
 		}
 
-		endTalking(this, true);
+		setTalking(this, true);
 		petSetArea(PET_CONVERSATION);
 	} else if (clipExistsByEnd("Walk Off", msg->_endFrame)) {
 		CPutBotBackInHisBoxMsg boxMsg;
@@ -142,8 +142,8 @@ bool CBellBot::Use(CUse *msg) {
 bool CBellBot::DismissBotMsg(CDismissBotMsg *msg) {
 	if (_npcFlags & NPCFLAG_10000) {
 		playClip("Walk Off", MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
-		if (_npcFlags & NPCFLAG_4) {
-			_npcFlags &= ~NPCFLAG_4;
+		if (_npcFlags & NPCFLAG_START_IDLING) {
+			_npcFlags &= ~NPCFLAG_START_IDLING;
 			performAction(true);
 		} else {
 			performAction(false);
@@ -160,7 +160,7 @@ bool CBellBot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
 	switch (msg->_action) {
 	case 1:
 	case 28: {
-		_npcFlags &= ~NPCFLAG_2;
+		_npcFlags &= ~NPCFLAG_IDLING;
 		CDismissBotMsg dismissMsg;
 		dismissMsg.execute(this);
 		break;
@@ -203,7 +203,7 @@ bool CBellBot::MovieFrameMsg(CMovieFrameMsg *msg) {
 
 bool CBellBot::PutBotBackInHisBoxMsg(CPutBotBackInHisBoxMsg *msg) {
 	petMoveToHiddenRoom();
-	_npcFlags &= ~NPCFLAG_4;
+	_npcFlags &= ~NPCFLAG_START_IDLING;
 	return true;
 }
 
@@ -229,7 +229,7 @@ bool CBellBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 	};
 
 	if (msg->_value2 == 2)
-		playClip("Mother Frame", 0);
+		playClip("Mother Frame");
 	else
 		msg->_names = NAMES;
 
@@ -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;