[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.311,1.312

[kirben]

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

Modified Files:
	string.cpp 
Log Message:

Fix Kanji regression in FOA, due to lost code.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- string.cpp	5 Nov 2005 00:14:34 -0000	1.311
+++ string.cpp	15 Nov 2005 23:49:06 -0000	1.312
@@ -455,6 +455,15 @@
 
 		_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) {