libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fixed regression of rev b1055a3c86. Japanese games should work again

Browse Source
This commit is contained in:
md5 2011-03-13 17:50:40 +02:00
parent 0360b4ac95
commit 5a7c2e0df5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/sci/graphics/text16.cpp
View File

@ -204,21 +204,24 @@ int16 GfxText16::GetLongest(const char *text, int16 maxWidth, GuiResourceId orgF
maxChars = curCharCount; // return count up to (but not including) breaking space
break;
}
if (width + _font->getCharWidth(curChar) > maxWidth)
// Sometimes this can go off the screen, like for example bug #3040161.
// However, we only perform this for non-Japanese games, as these require
// special handling, done after this loop.
if (width + _font->getCharWidth(curChar) > maxWidth && g_sci->getLanguage() != Common::JA_JPN)
break;
width += _font->getCharWidth(curChar);
curCharCount++;
}
// Text without spaces, probably Kanji/Japanese
if (maxChars == 0) {
// Text w/o space, supposingly kanji
maxChars = curCharCount;
uint16 nextChar;
// We remove the last char only, if maxWidth was actually equal width
// before adding the last char. Otherwise we won't get the same cutting
// as in sierra pc98 sci. Note: changing the while() instead will NOT
// WORK. it would break all sorts of regular sci games.
// as in sierra pc98 sci.
if (maxWidth == (width - _font->getCharWidth(curChar))) {
maxChars--;
if (curChar > 0xFF)