[Scummvm-cvs-logs] SF.net SVN: scummvm:[44204] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 44204
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44204&view=rev
Author:   lordhoto
Date:     2009-09-20 12:44:35 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Add checks for half-width katakana, which are currently unsupported.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-09-20 12:33:03 UTC (rev 44203)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-09-20 12:44:35 UTC (rev 44204)
@@ -1203,15 +1203,23 @@
 					break;
 			}
 
-			if (c <= 0x7F || !_useSJIS) {
+			if (!_useSJIS) {
 				drawCharANSI(c, x, y);
 				charHeight = charHeightFnt;
 			} else {
-				c = READ_LE_UINT16(str - 1);
-				++str;
-				charWidth = getCharWidth(c);
-				charHeight = _sjisFont->getFontHeight() >> 1;
-				drawCharSJIS(c, x, y);
+				if (c <= 0x7F) {
+					// draw ANSI chars through the setup font
+					drawCharANSI(c, x, y);
+					charHeight = charHeightFnt;
+				} else if (c >= 0xA1 && c <= 0xDF) {
+					warning("Use of unsupported half-width katakana %.2X", c);
+				} else {
+					c = READ_LE_UINT16(str - 1);
+					++str;
+					charWidth = getCharWidth(c);
+					charHeight = _sjisFont->getFontHeight() >> 1;
+					drawCharSJIS(c, x, y);
+				}
 			}
 
 			x += charWidth;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.