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

[m_kiewitz at users.sourceforge.net]

Revision: 51608
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51608&view=rev
Author:   m_kiewitz
Date:     2010-08-02 08:47:06 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
SCI: fixing getting selected language

for multilingual games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-08-02 08:43:47 UTC (rev 51607)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-08-02 08:47:06 UTC (rev 51608)
@@ -62,7 +62,7 @@
 	}
 
 	// Japanese versions of games use hi-res font on upscaled version of the game.
-	if ((g_sci->getPlatform() == Common::kPlatformPC98) && (getSciVersion() <= SCI_VERSION_1_1))
+	if ((g_sci->getLanguage() == Common::JA_JPN) && (getSciVersion() <= SCI_VERSION_1_1))
 		_upscaledHires = GFX_SCREEN_UPSCALED_640x400;
 
 	_pixels = _width * _height;

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-08-02 08:43:47 UTC (rev 51607)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-08-02 08:47:06 UTC (rev 51608)
@@ -239,7 +239,8 @@
 
 	if (_gameDescription->flags & ADGF_ADDENGLISH) {
 		// if game is multilingual
-		if (getLanguage() == Common::EN_ANY) {
+		Common::Language selectedLanguage = Common::parseLanguage(ConfMan.get("language"));
+		if (selectedLanguage == Common::EN_ANY) {
 			// and english was selected as language
 			if (SELECTOR(printLang) != -1) // set text language to english
 				writeSelectorValue(segMan, _gameObj, SELECTOR(printLang), 1);


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