aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/sci/engine/state.cpp8
-rw-r--r--engines/sci/graphics/text16.cpp4
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;