[Scummvm-git-logs] scummvm master -> 3d4bc3c59b652acd53fa6307e53db7ad5a500f30

dreammaster dreammaster at scummvm.org
Tue Sep 19 04:22:22 CEST 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:
3d4bc3c59b TITANIC: Add missing return check in BellbotScript::process


Commit: 3d4bc3c59b652acd53fa6307e53db7ad5a500f30
    https://github.com/scummvm/scummvm/commit/3d4bc3c59b652acd53fa6307e53db7ad5a500f30
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-18T22:22:16-04:00

Commit Message:
TITANIC: Add missing return check in BellbotScript::process

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 7496bd5..ec15c5d 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -267,6 +267,8 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 			return 2;
 		}
 	}
+	if (result == 2)
+		return 2;
 
 	if (sentence->localWord("television") || sentence->localWord("tv")
 			|| sentence->localWord("crush") || sentence->localWord("crushed")) {





More information about the Scummvm-git-logs mailing list