[Scummvm-git-logs] scummvm master -> 6a955be8ac1394b5257c98a9500fda9f4343c39e

[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:
6a955be8ac TITANIC: Fix some Liftbot dialogue responses


Commit: 6a955be8ac1394b5257c98a9500fda9f4343c39e
    https://github.com/scummvm/scummvm/commit/6a955be8ac1394b5257c98a9500fda9f4343c39e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T19:07:15-05:00

Commit Message:
TITANIC: Fix some Liftbot dialogue responses

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


diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp
index e52e47d..c77885e 100644
--- a/engines/titanic/true_talk/liftbot_script.cpp
+++ b/engines/titanic/true_talk/liftbot_script.cpp
@@ -506,7 +506,7 @@ int LiftbotScript::addResponse1(int index, bool flag, int id) {
 		return 1;
 	} else if (index == getCurrentFloor()) {
 		if (index == 1) {
-			addResponse(30558 - getRandomBit() ? 290 : 0);
+			addResponse(30558 - (getRandomBit() ? 290 : 0));
 			addResponse(getDialogueId(210589));
 		} else {
 			if (index == 39)
@@ -535,7 +535,7 @@ int LiftbotScript::addResponse1(int index, bool flag, int id) {
 
 	if (flag) {
 		if (index == 1) {
-			selectResponse(30558 - getRandomBit() ? 290 : 0);
+			selectResponse(30558 - (getRandomBit() ? 290 : 0));
 		} else if (index == 39) {
 			addResponse(30346);
 		} else {
@@ -619,7 +619,7 @@ int LiftbotScript::sentence1(const TTsentence *sentence) {
 	} else if (sentence->localWord("titaniaroom")) {
 		newId = 210723;
 	} else if (sentence->localWord("restaurant")) {
-		if (classNum == 1) {
+		if (classNum == FIRST_CLASS) {
 			newId = 210719;
 			diff = 1;
 		} else {