[Scummvm-git-logs] scummvm master -> 2b18e4f787e330cec9df5c43986ba80f7bdc8acd

[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:
2b18e4f787 TITANIC: Have Bellbot properly excited when told to smash TV Set


Commit: 2b18e4f787e330cec9df5c43986ba80f7bdc8acd
    https://github.com/scummvm/scummvm/commit/2b18e4f787e330cec9df5c43986ba80f7bdc8acd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-21T19:04:13-05:00

Commit Message:
TITANIC: Have Bellbot properly excited when told to smash TV Set

Changed paths:
    engines/titanic/true_talk/bellbot_script.cpp


diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 5e000dd..c958727 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -169,17 +169,21 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 			|| sentence->localWord("smash") || sentence->localWord("destroy")
 			|| sentence->localWord("toss") || sentence->localWord("put")
 			|| sentence->localWord("pitch") || sentence->localWord("heft")) {
+			// You've instructed the Bellbot to go all Pete Townshend on a TV
 			if (getValue(40) == 1) {
+				// Won't smash
 				addResponse(getDialogueId(201687));
 				applyResponse();
 				return 2;
 			} else if (roomScript->_scriptId == 111) {
-				addResponse(getDialogueId(201687));
+				// Within the Parrot Lobby
+				addResponse(getDialogueId(200914));
 				applyResponse();
 				CTrueTalkManager::triggerAction(17, 0);
 				CTrueTalkManager::setFlags(40, 1);
 				return 2;
 			} else {
+				// In any other room other than the Parrot Lobby
 				addResponse(getDialogueId(200710));
 				addResponse(getDialogueId(201334));
 				applyResponse();