aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorGregory Montoir2006-01-08 18:37:35 +0000
committerGregory Montoir2006-01-08 18:37:35 +0000
commit24bb551c1b7d865dd5cb4f563d8bef46a5de47d0 (patch)
tree1de27d5c53d0de930ecdc75933b895f580e8942d /scumm
parentf082fe390c19bca213f9de51c878cf3d39702ed8 (diff)
downloadscummvm-rg350-24bb551c1b7d865dd5cb4f563d8bef46a5de47d0.tar.gz
scummvm-rg350-24bb551c1b7d865dd5cb4f563d8bef46a5de47d0.tar.bz2
scummvm-rg350-24bb551c1b7d865dd5cb4f563d8bef46a5de47d0.zip
Moved the workaround for bug #864030 in drawBlastText to fix bug #1399843.
svn-id: r19948
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp16
1 files 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)) {