From 24bb551c1b7d865dd5cb4f563d8bef46a5de47d0 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sun, 8 Jan 2006 18:37:35 +0000
Subject: Moved the workaround for bug #864030 in drawBlastText to fix bug
 #1399843.

svn-id: r19948
---
 scumm/string.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scumm/string.cpp b/scumm/string.cpp
index 1aceec7676..6129b6ec26 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -419,13 +419,6 @@ void ScummEngine::CHARSET_1() {
 			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 @@ void ScummEngine_v6::drawBlastTexts() {
 
 			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)) {
-- 
cgit v1.2.3