[Scummvm-cvs-logs] scummvm master -> 1599ae55fa20265b617ef54114ad3b2e32fa3a58

[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:
1599ae55fa SHERLOCK: RT: Fix splitting up lines for talk dialog


Commit: 1599ae55fa20265b617ef54114ad3b2e32fa3a58
    https://github.com/scummvm/scummvm/commit/1599ae55fa20265b617ef54114ad3b2e32fa3a58
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-12T17:05:32-04:00

Commit Message:
SHERLOCK: RT: Fix splitting up lines for talk dialog

Changed paths:
    engines/sherlock/tattoo/widget_talk.cpp



diff --git a/engines/sherlock/tattoo/widget_talk.cpp b/engines/sherlock/tattoo/widget_talk.cpp
index 2b79aa1..55f7df3 100644
--- a/engines/sherlock/tattoo/widget_talk.cpp
+++ b/engines/sherlock/tattoo/widget_talk.cpp
@@ -64,9 +64,13 @@ void WidgetTalk::getTalkWindowSize() {
 	// Now that we have a width, split up the text into individual lines
 	int numLines = 0;
 	for (uint idx = 0; idx < talk._statements.size(); ++idx) {
+		Common::StringArray statementLines;
 		if (talk._statements[idx]._talkMap != -1) {
-			splitLines(talk._statements[idx]._statement, lines, width, 999);
-			numLines += lines.size();
+			splitLines(talk._statements[idx]._statement, statementLines, width, 999);
+			numLines += statementLines.size();
+
+			for (uint sIdx = 0; sIdx < statementLines.size(); ++sIdx)
+				lines.push_back(statementLines[sIdx]);
 		}
 	}