From 55ada2315a269ee5dd2777652dc622c5b1c70b2e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 2 Aug 2010 08:36:33 +0000
Subject: AdvancedDetector: Fix ADGF_ADDENGISH implementation

svn-id: r51606
---
 engines/advancedDetector.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'engines/advancedDetector.cpp')

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 61e6a9de73..f4af4a8500 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -309,7 +309,12 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
 
 	// If the GUI options were updated, we catch this here and update them in the users config
 	// file transparently.
-	Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions, getGameGUIOptionsDescriptionLanguage(agdDesc->language));
+	Common::String lang = getGameGUIOptionsDescriptionLanguage(agdDesc->language);
+	if (agdDesc->flags & ADGF_ADDENGLISH)
+		lang += " " + getGameGUIOptionsDescriptionLanguage(Common::EN_ANY);
+
+	Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions, lang);
+
 
 	debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str());
 	if (!createInstance(syst, engine, agdDesc))
@@ -458,7 +463,8 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p
 
 		// Do not even bother to look at entries which do not have matching
 		// language and platform (if specified).
-		if ((language != Common::UNK_LANG && g->language != Common::UNK_LANG && g->language != language) ||
+		if ((language != Common::UNK_LANG && g->language != Common::UNK_LANG && g->language != language
+			 && !(language == Common::EN_ANY && (g->flags & ADGF_ADDENGLISH))) ||
 			(platform != Common::kPlatformUnknown && g->platform != Common::kPlatformUnknown && g->platform != platform)) {
 			continue;
 		}
-- 
cgit v1.2.3