thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync with ScummVM rev. 654b8208b8

Browse source
This commit is contained in:
Pawel Kolodziejski 2020-06-22 08:14:16 +02:00
parent 2fa313def1
commit 8f4e1c6cf3
185 changed files with 6769 additions and 2586 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/advancedDetector.cpp
View file

@ -289,15 +289,11 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
if (!agdDesc.desc)
return Common::kNoGameDataFoundError;
DetectedGame gameDescriptor = toDetectedGame(agdDesc);
// If the GUI options were updated, we catch this here and update them in the users config
// file transparently.
Common::String lang = getGameGUIOptionsDescriptionLanguage(agdDesc.desc->language);
if (agdDesc.desc->flags & ADGF_ADDENGLISH)
lang += " " + getGameGUIOptionsDescriptionLanguage(Common::EN_ANY);
Common::updateGameGUIOptions(agdDesc.desc->guiOptions + _guiOptions, lang);
DetectedGame gameDescriptor = toDetectedGame(agdDesc);
ConfMan.setAndFlush("guioptions", gameDescriptor.getGUIOptions());
bool showTestingWarning = false;