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

[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:
e790b9a5f0 TITANIC: Fix log heading for talking to Deskbot


Commit: e790b9a5f010d7cb84b148bd02d88bdf24539e23
    https://github.com/scummvm/scummvm/commit/e790b9a5f010d7cb84b148bd02d88bdf24539e23
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-01T23:00:07-04:00

Commit Message:
TITANIC: Fix log heading for talking to Deskbot

Changed paths:
    engines/titanic/npcs/deskbot.cpp
    engines/titanic/pet_control/pet_conversations.cpp



diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index d932473..d3f8d03 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -78,7 +78,7 @@ void CDeskbot::load(SimpleFile *file) {
 bool CDeskbot::TurnOn(CTurnOn *msg) {
 	if (!_deskbotActive) {
 		setVisible(true);
-		playClip("BellRinging", 4);
+		playClip("BellRinging", MOVIE_NOTIFY_OBJECT);
 		playSound("b#69.wav");
 		petSetArea(PET_CONVERSATION);
 
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 10b3637..b534136 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -285,7 +285,7 @@ void CPetConversations::displayNPCName(CGameObject *npc) {
 
 		if (name.contains("Doorbot")) {
 			msg += "the DoorBot";
-		} else if (name.contains("DeskBot")) {
+		} else if (name.contains("Deskbot")) {
 			id = 2;
 			msg += "the DeskBot";
 		} else if (name.contains("LiftBot")) {