[Scummvm-git-logs] scummvm master -> 61140e634051af7c70a2b36b59512c752649a35a

dreammaster dreammaster at scummvm.org
Thu Jan 12 02:13:52 CET 2017


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:
61140e6340 TITANIC: Fix return value of BarbotScript doSentenceEntry


Commit: 61140e634051af7c70a2b36b59512c752649a35a
    https://github.com/scummvm/scummvm/commit/61140e634051af7c70a2b36b59512c752649a35a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-11T20:13:45-05:00

Commit Message:
TITANIC: Fix return value of BarbotScript doSentenceEntry

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


diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp
index 14e92e7..5b77864 100644
--- a/engines/titanic/true_talk/barbot_script.cpp
+++ b/engines/titanic/true_talk/barbot_script.cpp
@@ -1147,9 +1147,10 @@ int BarbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScrip
 	if (id) {
 		addResponse(getDialogueId(id));
 		applyResponse();
+		return 2;
 	}
 
-	return 2;
+	return 0;
 }
 
 void BarbotScript::setDialRegion(int dialNum, int region) {





More information about the Scummvm-git-logs mailing list