From 52c9c7b445f430879cadf06277a0da8fb499e4d8 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 2 Aug 2010 08:47:06 +0000
Subject: SCI: fixing getting selected language

for multilingual games

svn-id: r51608
---
 engines/sci/graphics/screen.cpp | 2 +-
 engines/sci/sci.cpp             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 07ba7441ca..839b9975c5 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -62,7 +62,7 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 	}
 
 	// 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;
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index ba2779e84d..6abe52fea4 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -239,7 +239,8 @@ Common::Error SciEngine::run() {
 
 	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);
-- 
cgit v1.2.3