From 04f07813114e9cb709a0ab6e04a8851bd29814a8 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 15 Nov 2005 23:49:06 +0000
Subject: Fix Kanji regression in FOA, due to lost code.

svn-id: r19606
---
 scumm/string.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

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) {
-- 
cgit v1.2.3