[Scummvm-git-logs] scummvm master -> 721041bc3083d45174f4bcd119ba192a9385a452

[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:
721041bc30 TITANIC: Fix Coverity warnings


Commit: 721041bc3083d45174f4bcd119ba192a9385a452
    https://github.com/scummvm/scummvm/commit/721041bc3083d45174f4bcd119ba192a9385a452
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-09T07:57:55-04:00

Commit Message:
TITANIC: Fix Coverity warnings

Changed paths:
    engines/titanic/true_talk/tt_npc_script.cpp
    engines/titanic/true_talk/tt_vocab.cpp


diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 5e31659..83ce50b 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -306,15 +306,13 @@ int TTnpcScript::handleQuote(const TTroomScript *roomScript, const TTsentence *s
 					error("Invalid dialogue index in bot script");
 				TThandleQuoteEntry &quote = _quotes[dialogueId];
 
-				int rangeLimit;
+				int rangeLimit = quote._index;
 				if (isQuoteDialled()) {
 					// Barbot and Doorbot response is affected by dial region
 					int dialRegion = getDialRegion(0);
 					if (dialRegion != 1) {
 						rangeLimit = MAX((int)quote._tag1 - 20, 20);
 					}
-				} else {
-					rangeLimit = quote._index;
 				}
 
 				dialogueId = ((remainder + _quotes._incr) % 100) >= (uint)rangeLimit
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 5ed163f..e9fc098 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -315,7 +315,9 @@ TTword *TTvocab::getSuffixedWord(TTstring &str, TTword **srcWord) const {
 
 		if (word) {
 			if (word->_wordClass == WC_ACTION) {
-				dynamic_cast<TTaction *>(word)->setVal(1);
+				TTaction *action = dynamic_cast<TTaction *>(word);
+				assert(action);
+				action->setVal(1);
 			}
 		} else {
 			tempStr = str;