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

AD: Make sure that we initialize hashmaps. Unfortunately, this leads to less const'ness

Browse source
This commit is contained in:
Eugene Sandulenko 2021-11-29 01:21:20 +01:00
parent 55dc78960b
commit ccfaf478ab
No known key found for this signature in database
GPG key ID: 014D387312D34F08
21 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
engines/advancedDetector.cpp
View file

@ -248,12 +248,16 @@ bool AdvancedMetaEngineDetection::cleanupPirated(ADDetectedGames &matched) const
return false;
}
DetectedGames AdvancedMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames AdvancedMetaEngineDetection::detectGames(const Common::FSList &fslist) {
FileMap allFiles;
if (fslist.empty())
return DetectedGames();
// Sometimes this method is called directly, so we have to build the maps, especially
// the _directoryGlobsMap
preprocessDescriptions();
// Compose a hashmap of all files in fslist.
composeFileHashMap(allFiles, fslist, (_maxScanDepth == 0 ? 1 : _maxScanDepth));
@ -329,7 +333,7 @@ const ExtraGuiOptions AdvancedMetaEngineDetection::getExtraGuiOptions(const Comm
return options;
}
Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine **engine) const {
Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine **engine) {
assert(engine);
Common::Language language = Common::UNK_LANG;
@ -364,6 +368,10 @@ Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine
if (files.empty())
return Common::kNoGameDataFoundError;
// Sometimes this method is called directly, so we have to build the maps, especially
// the _directoryGlobsMap
preprocessDescriptions();
// Compose a hashmap of all files in fslist.
FileMap allFiles;
composeFileHashMap(allFiles, files, (_maxScanDepth == 0 ? 1 : _maxScanDepth));
@ -567,7 +575,7 @@ static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::Fil
return true;
}
ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const {
ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) {
FilePropertiesMap filesProps;
ADDetectedGames matched;
@ -794,6 +802,8 @@ AdvancedMetaEngineDetection::AdvancedMetaEngineDetection(const void *descs, uint
_matchFullPaths = false;
_maxAutogenLength = 15;
_hashMapsInited = false;
for (auto f = grayList; *f; f++)
_grayListMap.setVal(*f, true);
}
@ -806,7 +816,12 @@ void AdvancedMetaEngineDetection::initSubSystems(const ADGameDescription *gameDe
#endif
}
void AdvancedMetaEngineDetection::preprocessDescriptions() const {
void AdvancedMetaEngineDetection::preprocessDescriptions() {
if (_hashMapsInited)
return;
_hashMapsInited = true;
// Check if the detection entries have only files from the blacklist
for (const byte *descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameId != nullptr; descPtr += _descItemSize) {
const ADGameDescription *g = (const ADGameDescription *)descPtr;
@ -832,7 +847,7 @@ bool AdvancedMetaEngineDetection::isEntryGrayListed(const ADGameDescription *g)
return (grayIsPresent && !nonGrayIsPresent);
}
Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) {
PluginList pl = PluginMan.getPlugins(PLUGIN_TYPE_ENGINE);
if (pl.size() == 1) {
const Plugin *metaEnginePlugin = PluginMan.getMetaEngineFromEngine(pl[0]);