aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-11-15 23:49:06 +0000
committerTravis Howell2005-11-15 23:49:06 +0000
commit04f07813114e9cb709a0ab6e04a8851bd29814a8 (patch)
treeee608f238ae26f67f11a5c0c8432d34abb1779ed /scumm
parent87c419317e40b5295c0add9b10587ee3c842115f (diff)
downloadscummvm-rg350-04f07813114e9cb709a0ab6e04a8851bd29814a8.tar.gz
scummvm-rg350-04f07813114e9cb709a0ab6e04a8851bd29814a8.tar.bz2
scummvm-rg350-04f07813114e9cb709a0ab6e04a8851bd29814a8.zip
Fix Kanji regression in FOA, due to lost code.
svn-id: r19606
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index a68caad909..6e107fd8f8 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -455,6 +455,15 @@ void ScummEngine::CHARSET_1() {
_charset->_left = _charset->_nextLeft;
_charset->_top = _charset->_nextTop;
+ if (c & 0x80 && _useCJKMode) {
+ if (_language == Common::JA_JPN && !checkSJISCode(c)) {
+ c = 0x20; //not in S-JIS
+ } else {
+ byte *buffer = _charsetBuffer + _charsetBufPos;
+ c += *buffer++ * 256; //LE
+ _charsetBufPos = buffer - _charsetBuffer;
+ }
+ }
if (_version >= 7) {
#ifndef DISABLE_SCUMM_7_8
if (subtitleLine == subtitleBuffer) {