diff options
| author | Paul Gilbert | 2017-10-09 07:57:55 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-10-09 07:57:55 -0400 |
| commit | 721041bc3083d45174f4bcd119ba192a9385a452 (patch) | |
| tree | c5097fa8c6fc136ec48c8917eca5fd87d2b8be3d | |
| parent | e30bf609d79183c925a5315c3922d0eb28aa87e1 (diff) | |
| download | scummvm-rg350-721041bc3083d45174f4bcd119ba192a9385a452.tar.gz scummvm-rg350-721041bc3083d45174f4bcd119ba192a9385a452.tar.bz2 scummvm-rg350-721041bc3083d45174f4bcd119ba192a9385a452.zip | |
TITANIC: Fix Coverity warnings
| -rw-r--r-- | engines/titanic/true_talk/tt_npc_script.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index 5e31659f81..83ce50b83c 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 "e = _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 5ed163f364..e9fc098749 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;
|