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

[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:
e58dad8bb6 TITANIC: Parser fixes for using unrecognised words


Commit: e58dad8bb6f50c160de4465551abbe877b673360
    https://github.com/scummvm/scummvm/commit/e58dad8bb6f50c160de4465551abbe877b673360
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-03T23:04:58-04:00

Commit Message:
TITANIC: Parser fixes for using unrecognised words

Changed paths:
    engines/titanic/support/font.cpp
    engines/titanic/true_talk/tt_parser.cpp
    engines/titanic/true_talk/tt_vocab.cpp



diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp
index 7bcac9b..b91a7ec 100644
--- a/engines/titanic/support/font.cpp
+++ b/engines/titanic/support/font.cpp
@@ -90,7 +90,7 @@ int STFont::getTextBounds(const CString &str, int maxWidth, Point *sizeOut) cons
 				strP += 4;
 			} else {
 				if (*strP == ' ') {
-					// Check fo rline wrapping
+					// Check for line wrapping
 					checkLineWrap(textSize, maxWidth, strP);
 				}
 
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index f69c0c7..1045416 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -499,8 +499,10 @@ int TTparser::findFrames(TTsentence *sentence) {
 		for (TTword *currP = word; currP && status <= 1; currP = currP->_nextP)
 			status = processRequests(currP);
 
-		word->deleteSiblings();
-		delete word;
+		if (word) {
+			word->deleteSiblings();
+			delete word;
+		}
 	}
 
 	if (!status) {
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 785f33a..6748d65 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -552,7 +552,6 @@ TTword *TTvocab::getPrefixedWord(TTstring &str) const {
 			word->_text = str;
 	}
 
-	delete tempStr;
 	return word;
 }