Ticket #8490: cjkfix.diff

charset.cpp

@@ -156 +156 @@
                 else if (kanjiType == EKANJI) chunk = 144;
                 break;
         default:
-                error("Invalid Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
+                debug(4, "Invalid Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
                 return 0;
         }
 

string.cpp

@@ -455 +455 @@
 
                 _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) {
@@ -474 +466 @@
                         *subtitleLine = '\0';
 #endif
                 } else {
+                        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; // 16bit LE
+                                        _charsetBufPos = buffer - _charsetBuffer;
+                                }
+                        }
                         if (_version <= 3) {
                                 _charset->printChar(c);
                         } else {
@@ -988 +989 @@
                 for (i = 0; i < lineCount; i++) {
                         if (*ptr == '!') {
                                 // Don't know what a line with '!' means, just ignore it
+                        } else if (*ptr == 'h') {
+                                // File is containing Korean text (Hangul). Igonre it
                         } else if (*ptr == 'e') {
                                 // File is encoded!
                                 enc = 0x13;