[Scummvm-cvs-logs] scummvm master -> fa7a6d473e07d3bf2068bd58d3474e77634b0b30

[m-kiewitz]

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:
fa7a6d473e SCI: GetClosest() bugfix the bugfix thx wjp


Commit: fa7a6d473e07d3bf2068bd58d3474e77634b0b30
    https://github.com/scummvm/scummvm/commit/fa7a6d473e07d3bf2068bd58d3474e77634b0b30
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2014-11-02T19:37:23+01:00

Commit Message:
SCI: GetClosest() bugfix the bugfix thx wjp

Changed paths:
    engines/sci/graphics/text16.cpp



diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index c5c2054..7552cb8 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -201,13 +201,13 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId
 			}
 			// it's meant to pass through here
 		case 0xA:
-		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;
+			curCharCount++; textPtr++;
+			if (curChar > 0xFF) {
+				curCharCount++; textPtr++;
+			}
+			// and it's also meant to pass through here
+		case 0:
 			SetFont(previousFontId);
 			_ports->penColor(previousPenColor);
 			return curCharCount;