diff options
| author | Martin Kiewitz | 2010-04-16 13:27:30 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-04-16 13:27:30 +0000 |
| commit | 01852cbf93de30fc8b61e8193379de1c2a5d689a (patch) | |
| tree | a5a1c859a1c27f46c4fdf763107b8a5159af051d | |
| parent | 85f0fceef3120831d4fad0cbac380b72f9b3312b (diff) | |
| download | scummvm-rg350-01852cbf93de30fc8b61e8193379de1c2a5d689a.tar.gz scummvm-rg350-01852cbf93de30fc8b61e8193379de1c2a5d689a.tar.bz2 scummvm-rg350-01852cbf93de30fc8b61e8193379de1c2a5d689a.zip | |
SCI: dont switch to english on kanji text, also cut off text w/o spaces inside GetLongest() so that kanji raw chars will appear in windows
svn-id: r48673
| -rw-r--r-- | engines/sci/engine/state.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/graphics/text16.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 2babdf4383..fb7359e343 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -139,10 +139,10 @@ Common::String SciEngine::getSciLanguageString(const char *str, kLanguage lang) seeker++; } - if ((secondLang == K_LANG_JAPANESE) && (*(seeker + 1) == 'J')) { - // FIXME: Add Kanji support - lang = K_LANG_ENGLISH; - } + //if ((secondLang == K_LANG_JAPANESE) && (*(seeker + 1) == 'J')) { + // // FIXME: Add Kanji support + // lang = K_LANG_ENGLISH; + //} if (secondLang == lang) return Common::String(seeker + 2); diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index 68e46c5472..9f39725692 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -192,6 +192,10 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF width += _font->getCharWidth(curChar); curCharCount++; } + if (maxChars == 0) { + // Is Kanji + maxChars = curCharCount - 1; + } SetFont(oldFontId); _ports->penColor(oldPenColor); return maxChars; |