Ticket #8240: 2byte_charset.diff

README

@@ -393 +393 @@
         es  - Spanish
         jp  - Japanese
         zh  - Chinese
-        ko  - Korean
+        kr  - Korean
         hb  - Hebrew
 
 Graphics filters:

scumm.dsp

@@ -207 +207 @@
 # End Group
 
 # Begin Source File
 
 
 
+SOURCE=.\scumm\2byte_charset.cpp
 
+# End Source File
 

common/gameDetector.cpp

@@ -56 +56 @@
         "\t-g<mode>      - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x,advmame3x,tv2x,dotmatrix)\n"
         "\t-e<mode>      - set music engine (see README for details)\n"
         "\t-a            - specify game is amiga version\n"
-        "\t-q<lang>      - specify language (en,de,fr,it,pt,es,jp,zh,ko,hb)\n"
+        "\t-q<lang>      - specify language (en,de,fr,it,pt,es,jp,zh,kr,hb)\n"
         "\n"
         "\t-c<num>       - use cdrom <num> for cd audio\n"
         "\t-m<num>       - set music volume to <num> (0-255)\n"
@@ -117 +117 @@
         {"es", "Spanish", ES_ESP},
         {"jp", "Japanese", JA_JPN},
         {"zh", "Chinese (Taiwan)", ZH_TWN},
-        {"ko", "Korean", KO_KOR},
+        {"kr", "Korean", KO_KOR},
         {"hb", "Hebrew", HB_HEB},
         {0, 0, 0}
 };

scumm/charset.cpp

@@ -23 +23 @@
 #include "scumm.h"
 #include "nut_renderer.h"
 
+bool _2byte_pos_hack;
+
 CharsetRenderer::CharsetRenderer(Scumm *vm) {
 
         _nextLeft = 0;
@@ -79 +81 @@
 
 // do spacing for variable width old-style font
 int CharsetRendererClassic::getCharWidth(byte chr) {
+        if(chr >= 0x80 && _CJKMode)
+                return 6;
         int spacing = 0;
 
         int offs = READ_LE_UINT32(_fontPtr + chr * 4 + 4);
@@ -628 +632 @@
         int offsX, offsY;
         int d;
         VirtScreen *vs;
+        int is2byte = 0;
 
         _vm->checkRange(_vm->_maxCharsets - 1, 1, _curId, "Printing with bad charset %d");
         
@@ -640 +645 @@
         _bpp = *_fontPtr;
         _vm->_charsetColorMap[1] = _color;
 
-        uint32 charOffs = READ_LE_UINT32(_fontPtr + chr * 4 + 4);
+        is2byte = (chr >= 0x80 && _CJKMode) ? 1 : 0;
+
+        uint32 charOffs = READ_LE_UINT32(_fontPtr + (is2byte ? 0x0f : chr) * 4 + 4); //HACK!
 
         if (!charOffs)
                 return;
@@ -649 +656 @@
 
         _charPtr = _fontPtr + charOffs;
 
-        width = _charPtr[0];
+        if(is2byte) width = _charPtr[0] - 1; else width = _charPtr[0]; //HACK!!!
         height = _charPtr[1];
         if (_firstChar) {
                 _str.left = 0;
@@ -721 +728 @@
                 dst = _vm->getResourceAddress(rtBuffer, vs->number + 5)
                         + vs->xstart + drawTop * _vm->_screenWidth + _left;
 
-                drawBits(vs, dst, mask, drawTop, width, height);
+                if(is2byte)
+                        draw2byte(vs, dst, mask, drawTop, chr);
+                else
+                        drawBits(vs, dst, mask, drawTop, width, height);
 
                 int h = height;
                 do {
@@ -730 +740 @@
                         dst += _vm->_screenWidth;
                 } while (--h);
         } else {
-                drawBits(vs, dst, mask, drawTop, width, height);
+                if(is2byte)
+                        draw2byte(vs, dst, mask, drawTop, chr);
+                else
+                        drawBits(vs, dst, mask, drawTop, width, height);
         }
         
         _left += width;
@@ -844 +857 @@
         int width = _current->getCharWidth(chr);
         int height = _current->getCharHeight(chr);
 
+        if(chr >= 256 && _CJKMode)
+                width = 16;
+
         _hasMask = true;
-        _current->drawChar((char)chr, _left, _top, _color, !_ignoreCharsetMask);
+        if(chr >= 256 && _CJKMode)
+                _current->draw2byte(chr, _left, _top + (_2byte_pos_hack ? 6 : 0), _color, !_ignoreCharsetMask);
+        else
+                _current->drawChar((char)chr, _left, _top, _color, !_ignoreCharsetMask);
         _vm->updateDirtyRect(0, _left, _left + width, _top, _top + height, 0);
 
         _left += width;
@@ -854 +873 @@
 
         if (_top + height > _str.bottom)
                 _str.bottom = _top + height;
+
+        _2byte_pos_hack = false;
 }
 

scumm/charset.h

@@ -90 +90 @@
         byte *_charPtr;
 
         int getCharWidth(byte chr);
+        void draw2byte(VirtScreen *vs, byte *dst, byte *mask, int drawTop, int idx);
         void drawBits(VirtScreen *vs, byte *dst, byte *mask, int drawTop, int width, int height);
 
 public:

scumm/module.mk

@@ -1 +1 @@
 MODULE := scumm
 
 SCUMM_OBJS = \
+        scumm/2byte_charset.o \
         scumm/actor.o \
         scumm/akos.o \
         scumm/base-costume.o \

scumm/nut_renderer.cpp

@@ -133 +133 @@
                 return 0;
         }
 
-        return READ_LE_UINT16(_dataSrc + _offsets[c] + 6);
+        if(c & 0x80 && _CJKMode)
+                return 8;
+        else
+                return READ_LE_UINT16(_dataSrc + _offsets[c] + 6) + 2;
 }
 
 int32 NutRenderer::getCharHeight(byte c) {
@@ -143 +146 @@
                 return 0;
         }
 
-        return READ_LE_UINT16(_dataSrc + _offsets[c] + 8);
+        if(c & 0x80 && _CJKMode)
+                return 16;
+        else
+                return READ_LE_UINT16(_dataSrc + _offsets[c] + 8);
 }
 
 int32 NutRenderer::getStringWidth(const byte *string) {

scumm/nut_renderer.h

@@ -41 +41 @@
         ~NutRenderer();
 
         bool loadFont(const char *filename, const char *dir);
+        void draw2byte(int c, int32 x, int32 y, byte color, bool useMask);
         void drawChar(byte c, int32 x, int32 y, byte color, bool useMask);
 //      void drawString(const char *string, int32 x, int32 y, byte color, int32 mode);
         int32 getCharWidth(byte c);

scumm/script_v8.cpp

@@ -599 +599 @@
                         if (c != 0 && c != 0xFF) {
                                 _charset->_left = _charset->_nextLeft;
                                 _charset->_top = _charset->_nextTop;
-                                _charset->printChar(c);
+                                if(c >= 0x80 && _CJKMode)
+                                        _charset->printChar(c + (*buf++ * 256));
+                                else
+                                        _charset->printChar(c);
                                 _charset->_nextLeft = _charset->_left;
                                 _charset->_nextTop = _charset->_top;
                         }

scumm/scumm.h

@@ -1069 +1069 @@
 
         void loadLanguageBundle();
 public:
+        bool checkCJKLanguage();
         void translateText(const byte *text, byte *trans_buff); // Used by class ScummDialog
 protected:
 
@@ -1202 +1203 @@
 
 // This is a constant lookup table of reverse bit masks
 extern const byte revBitMask[8];
+
+//nasty hacks
+extern bool _CJKMode;
+extern int _gid;
+extern char *_2byte;
+extern int _2byte_height;
+extern int _2byte_width;
+extern bool _2byte_pos_hack;
 
 /* Direction conversion functions (between old dir and new dir format) */
 int newDirToOldDir(int dir);

scumm/scummvm.cpp

@@ -56 +56 @@
 Scumm *g_scumm = 0;
 ScummDebugger *g_debugger;
 
+int _gid;
+char *_2byte;
+int _2byte_width;
+int _2byte_height;
+bool _CJKMode;
+
 extern NewGui *g_gui;
 extern uint16 _debugLevel;
 
@@ -634 +640 @@
                 _saveLoadCompatible = false;
         }
         loadLanguageBundle();
+
+        // Load CJK font
+        if((_gameId == GID_DIG || _gameId == GID_CMI) && checkCJKLanguage()) {
+                _gid = _gameId;
+                File _fp;
+                char _fontFile[16];
+                _CJKMode = true;
+                switch(_language) {
+                case KO_KOR:
+                        strcpy(_fontFile, "korean.fnt");
+                        break;
+                case JA_JPN:
+                        strcpy(_fontFile, (_gameId == GID_DIG) ? "kanji16.fnt" : "japanese.fnt");
+                        break;
+                case ZH_TWN:
+                        if(_gameId == GID_CMI)
+                                strcpy(_fontFile, "chinese.fnt");
+                        else
+                                _CJKMode = false;
+                        break;
+                }
+                if(_CJKMode && _fp.open(_fontFile, getGameDataPath(), 1)) {
+                        debug(2, "Loading CJK Font");
+                        _fp.seek(2,SEEK_CUR);
+                        _2byte_width = _fp.readByte(); //FIXME: is this correct?
+                        _2byte_height = _fp.readByte();
+
+                        int numChar = 0;
+                        switch(_language) {
+                        case KO_KOR:
+                                numChar = 2350;
+                                break;
+                        case JA_JPN:
+                                numChar = (_gameId == GID_DIG) ? 1 : 1; //FIXME
+                                break;
+                        case ZH_TWN:
+                                numChar = 1; //FIXME
+                                break;
+                        }
+                        _2byte = new char[2 * _2byte_height * numChar];
+                        _fp.read(_2byte, 2 * _2byte_height * numChar);
+                        _fp.close();
+                }
+        }
+
         _audioNames = NULL;
 }
 
@@ -641 +692 @@
 {
         delete [] _actors;
         
+        delete _2byte;
         delete _charset;
         delete _pauseDialog;
         delete _optionsDialog;

scumm/string.cpp

@@ -241 +241 @@
                 if (c != 0xFF) {
                         _charset->_left = _charset->_nextLeft;
                         _charset->_top = _charset->_nextTop;
+                        if(c & 0x80 && _CJKMode) {
+                                c += *buffer++ * 256;
+                                if(_gameId == GID_CMI)
+                                        _2byte_pos_hack = true; //HACK: ¿µ¹®°úÀÇ yÁÂÇ¥°¡ ¸ÂÁö ¾Ê´Ù.
+                        }
                         if (_features & GF_AFTER_V2 || _features & GF_AFTER_V3) {
                                 _charset->printChar(c);
                         } else if (_features & GF_AFTER_V6) {
@@ -371 +376 @@
                 if (c != 0 && c != 0xFF) {
                         _charset->_left = _charset->_nextLeft;
                         _charset->_top = _charset->_nextTop;
-                        _charset->printChar(c);
+                        if(c & 0x80 && _CJKMode)
+                                _charset->printChar(c + ((*buf++) * 256));
+                        else
+                                _charset->printChar(c);
                         _charset->_nextLeft = _charset->_left;
                         _charset->_nextTop = _charset->_top;
                 }
@@ -477 +485 @@
                                 if (_string[a].no_talk_anim == 0)
                                         _charset->_blitAlso = true;
                         }
-                        _charset->printChar(chr);
+                        if(chr >= 0x80 && _CJKMode) {
+                                if(_gameId == GID_CMI)
+                                        _2byte_pos_hack = true;
+                                _charset->printChar(chr + (buf[i++] * 256));
+                        }
+                        else
+                                _charset->printChar(chr);
                         _charset->_blitAlso = false;
                 }
         }

scumm/smush/smush_font.cpp

@@ -105 +105 @@
 }
 
 int SmushFont::getCharWidth(byte v) {
+        if(v >= 0x80 && _CJKMode)
+                return get2byteCharWidth();
+
         if(v >= _nbChars)
                 error("invalid character in SmushFont::charWidth : %d (%d)", v, _nbChars);
 
@@ -112 +115 @@
 }
 
 int SmushFont::getCharHeight(byte v) {
+        if(v >= 0x80 && _CJKMode)
+                return get2byteCharHeight();
+
         if(v >= _nbChars)
                 error("invalid character in SmushFont::charHeight : %d (%d)", v, _nbChars);
 
@@ -243 +249 @@
 }
 
 void SmushFont::drawSubstring(char *str, byte *buffer, int dst_width, int x, int y) {
-        for(int i = 0; str[i] != 0; i++)
-                x += drawChar(buffer, dst_width, x, y, str[i]);
+        for(int i = 0; str[i] != 0; i++) {
+                if((byte)str[i] >= 0x80 && _CJKMode) {
+                        x += draw2byte(buffer, dst_width, x, y, str[i], str[i+1]);
+                        i++;
+                } else
+                        x += drawChar(buffer, dst_width, x, y, str[i]);
+        }
 }
 
 void SmushFont::drawStringAbsolute(char *str, byte *buffer, int dst_width, int x, int y) {

scumm/smush/smush_font.h

@@ -46 +46 @@
 
 protected:
 
+        int get2byteCharWidth();
+        int get2byteCharHeight();
         int getCharWidth(byte c);
         int getStringWidth(char *str);
         int getCharHeight(byte c);
         int getStringHeight(char *str);
+        int draw2byte(byte *buffer, int dst_width, int x, int y, byte fst, byte snd);
         int drawChar(byte *buffer, int dst_width, int x, int y, byte chr);
         void drawSubstring(char *str, byte *buffer, int dst_width, int x, int y);
         void decodeCodec(byte *dst, byte *src, int length);