[Scummvm-cvs-logs] SF.net SVN: scummvm:[48673] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 48673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48673&view=rev
Author:   m_kiewitz
Date:     2010-04-16 13:27:30 +0000 (Fri, 16 Apr 2010)

Log Message:
-----------
SCI: dont switch to english on kanji text, also cut off text w/o spaces inside GetLongest() so that kanji raw chars will appear in windows

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/graphics/text16.cpp

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-04-16 13:03:26 UTC (rev 48672)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-04-16 13:27:30 UTC (rev 48673)
@@ -139,10 +139,10 @@
 		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);

Modified: scummvm/trunk/engines/sci/graphics/text16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-16 13:03:26 UTC (rev 48672)
+++ scummvm/trunk/engines/sci/graphics/text16.cpp	2010-04-16 13:27:30 UTC (rev 48673)
@@ -192,6 +192,10 @@
 		width += _font->getCharWidth(curChar);
 		curCharCount++;
 	}
+	if (maxChars == 0) {
+		// Is Kanji
+		maxChars = curCharCount - 1;
+	}
 	SetFont(oldFontId);
 	_ports->penColor(oldPenColor);
 	return maxChars;


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