[Scummvm-cvs-logs] scummvm master -> 11ba4474830ad0557de5a8c2b47dcd3000bc0032
m-kiewitz
m_kiewitz at users.sourceforge.net
Sun Nov 2 19:30:56 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
11ba447483 SCI: bugfix in GetLongest() for Japanese SQ4
Commit: 11ba4474830ad0557de5a8c2b47dcd3000bc0032
https://github.com/scummvm/scummvm/commit/11ba4474830ad0557de5a8c2b47dcd3000bc0032
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-11-02T19:31:37+01:00
Commit Message:
SCI: bugfix in GetLongest() for Japanese SQ4
Changed paths:
engines/sci/graphics/text16.cpp
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 3769cd3..c5c2054 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -201,14 +201,17 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
}
// it's meant to pass through here
case 0xA:
- case 0x9781: // this one is used by SQ4/japanese as line break as well
- curCharCount++; textPtr++;
- // and it's also meant to pass through here
case 0:
SetFont(previousFontId);
_ports->penColor(previousPenColor);
return curCharCount;
+ case 0x9781: // this one is used by SQ4/japanese as line break as well
+ curCharCount += 2; textPtr += 2;
+ SetFont(previousFontId);
+ _ports->penColor(previousPenColor);
+ return curCharCount;
+
case ' ':
lastSpaceCharCount = curCharCount; // return count up to (but not including) breaking space
lastSpacePtr = textPtr + 1; // remember position right after the current space
More information about the Scummvm-git-logs
mailing list