TITANIC: Properly handle uppercase and 's when normalizing conv text

scummvm · Jan 28, 2017 · 927f533 · 927f533
1 parent ca55163
commit 927f533
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
@@ -131,7 +131,7 @@ int TTparser::normalize(TTsentence *sentence) {
 			if (!destLine->empty() && destLine->lastChar() != ' ')
 				(*destLine) += ' ';
 		} else if (Common::isUpper(c)) {
-			(*destLine) += toupper(c);
+			(*destLine) += tolower(c);
 		} else if (Common::isDigit(c)) {
 			if (c == '0' && isEmoticon(srcLine, index)) {
 				sentence->set38(10);
@@ -256,7 +256,7 @@ int TTparser::isEmoticon(const TTstring &str, int &index) {
 	}
 }
 
-bool TTparser::normalizeContraction(const TTstring &srcLine, int srcIndex, TTstring &destLine) {
+bool TTparser::normalizeContraction(const TTstring &srcLine, int &srcIndex, TTstring &destLine) {
 	int startIndex = srcIndex + 1;
 	switch (srcLine[startIndex]) {
 	case 'd':

diff --git a/engines/titanic/true_talk/tt_parser.h b/engines/titanic/true_talk/tt_parser.h
@@ -95,7 +95,7 @@ class TTparser {
 	 * Submethod called by normalize to handle expanding contacted word pairs
 	 * like can't, should've, and so on.
 	 */
-	bool normalizeContraction(const TTstring &srcLine, int srcIndex, TTstring &destLine);
+	bool normalizeContraction(const TTstring &srcLine, int &srcIndex, TTstring &destLine);
 
 	/**
 	 * Checks for what is likely special developer cheat codes