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

[Max Horn]

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

Modified Files:
	string.cpp 
Log Message:
undoing my previous changes, it's completly bogus(sorry)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- string.cpp	1 Jun 2002 23:05:51 -0000	1.44
+++ string.cpp	1 Jun 2002 23:32:01 -0000	1.45
@@ -328,14 +328,6 @@
 
 	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) {
@@ -373,11 +365,11 @@
 				charset.printCharOld(c);
 			else if (!(_features & GF_AFTER_V6)) {
 //                                if (!_vars[VAR_V5_CHARFLAG]) { /* FIXME */
-				if (!(has_speech && _noSubtitles))
+				if (!(a && _noSubtitles))
 					charset.printChar(c);
 //                                }
 			} else {
-				if (!(has_speech && _noSubtitles))
+				if (!(a && _noSubtitles))
 					charset.printChar(c);
 			}