[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.314,1.315

Gregory Montoir cyx at users.sourceforge.net
Sun Jan 8 10:38:06 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9192/scumm

Modified Files:
	string.cpp 
Log Message:
Moved the workaround for bug #864030 in drawBlastText to fix bug #1399843.

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- string.cpp	27 Nov 2005 10:32:21 -0000	1.314
+++ string.cpp	8 Jan 2006 18:37:35 -0000	1.315
@@ -419,13 +419,6 @@
 			break;
 		}
 
-		// FIXME: This is a workaround for bug #864030: In COMI, some text
-		// contains ASCII character 11 = 0xB. It's not quite clear what it is
-		// good for; so for now we just ignore it, which seems to match the
-		// original engine (BTW, traditionally, this is a 'vertical tab').
-		if (c == 0x0B)
-			continue;
-
 		if (c == 13) {
 		newLine:;
 			_charset->_nextLeft = _string[0].xpos;
@@ -895,6 +888,15 @@
 
 			do {
 				c = *buf++;
+				
+				// FIXME: This is a workaround for bugs #864030 and #1399843:
+				// In COMI, some text contains ASCII character 11 = 0xB. It's
+				// not quite clear what it is good for; so for now we just ignore
+				// it, which seems to match the original engine (BTW, traditionally,
+				// this is a 'vertical tab').
+				if (c == 0x0B)
+					continue;
+				
 				if (c != 0 && c != 0xFF && c != '\n') {
 					if (c & 0x80 && _useCJKMode) {
 						if (_language == Common::JA_JPN && !checkSJISCode(c)) {





More information about the Scummvm-git-logs mailing list