diff options
| author | Eugene Sandulenko | 2010-08-02 08:36:33 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-08-02 08:36:33 +0000 |
| commit | 55ada2315a269ee5dd2777652dc622c5b1c70b2e (patch) | |
| tree | c3c8d42ea05a9e9ba5be4a3642a76957ec5807e9 | |
| parent | ddd2bd6a1cc3e8b599e4398b61bc8e6e45ebb805 (diff) | |
| download | scummvm-rg350-55ada2315a269ee5dd2777652dc622c5b1c70b2e.tar.gz scummvm-rg350-55ada2315a269ee5dd2777652dc622c5b1c70b2e.tar.bz2 scummvm-rg350-55ada2315a269ee5dd2777652dc622c5b1c70b2e.zip | |
AdvancedDetector: Fix ADGF_ADDENGISH implementation
svn-id: r51606
| -rw-r--r-- | engines/advancedDetector.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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; } |