[Scummvm-cvs-logs] SF.net SVN: scummvm:[51606] scummvm/trunk/engines/advancedDetector.cpp

[sev at users.sourceforge.net]

Revision: 51606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51606&view=rev
Author:   sev
Date:     2010-08-02 08:36:33 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
AdvancedDetector: Fix ADGF_ADDENGISH implementation

Modified Paths:
--------------
    scummvm/trunk/engines/advancedDetector.cpp

Modified: scummvm/trunk/engines/advancedDetector.cpp
===================================================================
--- scummvm/trunk/engines/advancedDetector.cpp	2010-08-02 03:38:35 UTC (rev 51605)
+++ scummvm/trunk/engines/advancedDetector.cpp	2010-08-02 08:36:33 UTC (rev 51606)
@@ -309,8 +309,13 @@
 
 	// 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))
 		return Common::kNoGameDataFoundError;
@@ -458,7 +463,8 @@
 
 		// 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;
 		}


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