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

[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:
da6b280922 TITANIC: DE: Fix upgrading to 1st class


Commit: da6b280922136ecc3e49670d1a276036a9a519d2
    https://github.com/scummvm/scummvm/commit/da6b280922136ecc3e49670d1a276036a9a519d2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-02T20:20:32-04:00

Commit Message:
TITANIC: DE: Fix upgrading to 1st class

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


diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index f45b1b1..cf832a1 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -396,9 +396,11 @@ int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 		case 1:
 			id = 240336;
 			break;
+
 		case 2:
-			addAssignedRoom();
+			id = addAssignedRoomDialogue();
 			break;
+
 		case 3:
 			if (id == 240431 || id == 240432) {
 				if (getValue(3) == 1) {
@@ -410,9 +412,13 @@ int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 				}
 			}
 			break;
+
 		default:
 			break;
 		}
+
+		addResponse(getDialogueId(id));
+		return 2;
 	} else {
 		switch (val1) {
 		case 1:
@@ -444,15 +450,20 @@ int DeskbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
 
 		case 2:
 			if (getValue(1) == 1)
-				return true;
+				return 1;
+			break;
+
+		case 3:
+			if (getValue(1) != 1)
+				return 1;
 			break;
 
 		default:
 			break;
 		}
-	}
 
-	return 0;
+		return 0;
+	}
 }
 
 bool DeskbotScript::randomResponse(uint index) {