[Scummvm-cvs-logs] CVS: scummvm string.cpp,1.43,1.44

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv32097

Modified Files:
	string.cpp 
Log Message:
fix for #529538

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- string.cpp	25 May 2002 08:53:08 -0000	1.43
+++ string.cpp	1 Jun 2002 23:05:51 -0000	1.44
@@ -328,6 +328,14 @@
 
 	charset._disableOffsX = charset._unk12 = !_keepText;
 
+	bool has_speech = false;
+	for (byte *tmp = buffer; *tmp; ++tmp) {
+		if (*tmp == 10) {
+			has_speech = true;
+			break;
+		}
+	}
+
 	do {
 		c = *buffer++;
 		if (c == 0) {
@@ -365,11 +373,11 @@
 				charset.printCharOld(c);
 			else if (!(_features & GF_AFTER_V6)) {
 //                                if (!_vars[VAR_V5_CHARFLAG]) { /* FIXME */
-				if (!(a && _noSubtitles))
+				if (!(has_speech && _noSubtitles))
 					charset.printChar(c);
 //                                }
 			} else {
-				if (!(a && _noSubtitles))
+				if (!(has_speech && _noSubtitles))
 					charset.printChar(c);
 			}