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

6
base/plugins.cpp
View file

@ -718,7 +718,7 @@ QualifiedGameList EngineManager::findGameInLoadedPlugins(const Common::String &g
return results;
}
DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const {
DetectionResults EngineManager::detectGames(const Common::FSList &fslist) {
DetectedGames candidates;
PluginList plugins;
PluginList::const_iterator iter;
@ -733,7 +733,7 @@ DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const
// Iterate over all known games and for each check if it might be
// the game in the presented directory.
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
// set the debug flags
DebugMan.addAllDebugChannels(metaEngine.getDebugChannels());
DetectedGames engineCandidates = metaEngine.detectGames(fslist);
@ -941,7 +941,7 @@ void EngineManager::upgradeTargetForEngineId(const Common::String &target) const
}
// Take the first detection entry
const MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
// set debug flags before call detectGames
DebugMan.addAllDebugChannels(metaEngine.getDebugChannels());
DetectedGames candidates = metaEngine.detectGames(files);

4
engines/adl/detection.cpp
View file

@ -479,7 +479,7 @@ public:
return debugFlagList;
}
ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const override;
ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) override;
bool addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const;
};
@ -503,7 +503,7 @@ bool AdlMetaEngineDetection::addFileProps(const FileMap &allFiles, Common::Strin
}
// Based on AdvancedMetaEngine::detectGame
ADDetectedGames AdlMetaEngineDetection::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const {
ADDetectedGames AdlMetaEngineDetection::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) {
// We run the file-based detector first, if it finds a match we do not search for disk images
ADDetectedGames matched = AdvancedMetaEngineDetection::detectGame(parent, allFiles, language, platform, extra);

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]);

11
engines/advancedDetector.h
View file

@ -357,7 +357,7 @@ public:
* (possibly empty) list of games supported by the engine that were
* found among the given files.
*/
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
/**
* A generic createInstance.
@ -365,7 +365,7 @@ public:
* For instantiating engine objects, this method is called first,
* and then the subclass implemented createInstance is called from within.
*/
Common::Error createInstance(OSystem *syst, Engine **engine) const;
Common::Error createInstance(OSystem *syst, Engine **engine);
/**
* Return a list of extra GUI options for the specified target.
@ -399,11 +399,12 @@ protected:
private:
void initSubSystems(const ADGameDescription *gameDesc) const;
void preprocessDescriptions() const;
void preprocessDescriptions();
bool isEntryGrayListed(const ADGameDescription *g) const;
private:
Common::HashMap<Common::String, bool, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _grayListMap;
bool _hashMapsInited;
protected:
/**
@ -420,7 +421,7 @@ protected:
*
* @return A list of @ref ADGameDescription pointers corresponding to the matched games.
*/
virtual ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const;
virtual ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra);
/**
* @return True if variant of a game with unknown files can be played with the engine and false otherwise.
@ -473,7 +474,7 @@ public:
* By the time this is called, it is assumed that there is only one
* plugin engine loaded in memory.
*/
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
/**
* A createInstance implementation for subclasses. To be called after the base

2
engines/agos/metaengine.cpp
View file

@ -42,7 +42,7 @@ public:
bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Common::Error createInstance(OSystem *syst, Engine **engine) override {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine);
}

2
engines/ags/detection.cpp
View file

@ -76,7 +76,7 @@ AGSMetaEngineDetection::AGSMetaEngineDetection() : AdvancedMetaEngineDetection(A
sizeof(AGS::AGSGameDescription), AGS::GAME_NAMES) {
}
DetectedGames AGSMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames AGSMetaEngineDetection::detectGames(const Common::FSList &fslist) {
FileMap allFiles;
if (fslist.empty())

2
engines/ags/detection.h
View file

@ -87,7 +87,7 @@ public:
return debugFlagList;
}
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra = nullptr) const override;

2
engines/glk/detection.cpp
View file

@ -181,7 +181,7 @@ PlainGameDescriptor GlkMetaEngineDetection::findGame(const char *gameId) const {
#undef FIND_GAME
DetectedGames GlkMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames GlkMetaEngineDetection::detectGames(const Common::FSList &fslist) {
#ifndef RELEASE_BUILD
// This is as good a place as any to detect multiple sub-engines using the same Ids
detectClashes();

2
engines/glk/detection.h
View file

@ -57,7 +57,7 @@ public:
* (possibly empty) list of games supported by the engine which it was able
* to detect amongst the given files.
*/
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
/**
* Query the engine for a PlainGameDescriptor for the specified gameid, if any.

6
engines/glk/metaengine.cpp
View file

@ -81,7 +81,7 @@ public:
}
bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
@ -144,7 +144,7 @@ Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) con
folder.getChildren(fslist, Common::FSNode::kListFilesOnly);
// Get the matching MetaEngine for this Engine.
const MetaEngineDetection &metaEngine = g_engine->getMetaEngineDetection();
MetaEngineDetection &metaEngine = g_engine->getMetaEngineDetection();
// Iterate over the files
for (Common::FSList::iterator i = fslist.begin(); i != fslist.end(); ++i) {
@ -162,7 +162,7 @@ Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) con
return Common::String();
}
Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) {
#ifndef RELEASE_BUILD
Glk::GameDescriptor td = Glk::GameDescriptor::empty();
#endif

2
engines/grim/metaengine.cpp
View file

@ -38,7 +38,7 @@ public:
return "grim";
}
Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Common::Error createInstance(OSystem *syst, Engine **engine) override {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine);
}

6
engines/metaengine.h
View file

@ -156,7 +156,7 @@ public:
* (possibly empty) list of games supported by the engine that were
* found among the given files.
*/
virtual DetectedGames detectGames(const Common::FSList &fslist) const = 0;
virtual DetectedGames detectGames(const Common::FSList &fslist) = 0;
/**
* Return a list of extra GUI options for the specified target.
@ -269,7 +269,7 @@ public:
*
* @return A Common::Error describing the error that occurred, or kNoError.
*/
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const = 0;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) = 0;
/**
* Return a list of all save states associated with the given target.
@ -576,7 +576,7 @@ public:
*
* Returns an empty list if none are found.
*/
DetectionResults detectGames(const Common::FSList &fslist) const;
DetectionResults detectGames(const Common::FSList &fslist);
/** Find a plugin by its engine ID. */
const Plugin *findPlugin(const Common::String &engineId) const;

4
engines/scumm/detection.cpp
View file

@ -83,7 +83,7 @@ public:
PlainGameList getSupportedGames() const override;
PlainGameDescriptor findGame(const char *gameid) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
};
@ -122,7 +122,7 @@ static Common::String generatePreferredTarget(const DetectorResult &x) {
return res;
}
DetectedGames ScummMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames ScummMetaEngineDetection::detectGames(const Common::FSList &fslist) {
DetectedGames detectedGames;
Common::List<DetectorResult> results;
::detectGames(fslist, results, nullptr);

2
engines/scumm/metaengine.cpp
View file

@ -245,7 +245,7 @@ bool ScummEngine::hasFeature(EngineFeature f) const {
*
* This is heavily based on our MD5 detection scheme.
*/
Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) {
assert(syst);
assert(engine);
const char *gameid = ConfMan.get("gameid").c_str();

2
engines/scumm/metaengine.h
View file

@ -30,7 +30,7 @@ class ScummMetaEngine : public MetaEngine {
bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;

4
engines/sky/detection.cpp
View file

@ -75,7 +75,7 @@ public:
PlainGameList getSupportedGames() const override;
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
PlainGameDescriptor findGame(const char *gameid) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
};
const char *SkyMetaEngineDetection::getName() const {
@ -117,7 +117,7 @@ PlainGameDescriptor SkyMetaEngineDetection::findGame(const char *gameid) const {
return PlainGameDescriptor::empty();
}
DetectedGames SkyMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames SkyMetaEngineDetection::detectGames(const Common::FSList &fslist) {
DetectedGames detectedGames;
bool hasSkyDsk = false;
bool hasSkyDnr = false;

4
engines/sky/metaengine.cpp
View file

@ -44,7 +44,7 @@ class SkyMetaEngine : public MetaEngine {
bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
@ -142,7 +142,7 @@ Common::KeymapArray SkyMetaEngine::initKeymaps(const char *target) const {
return keymaps;
}
Common::Error SkyMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error SkyMetaEngine::createInstance(OSystem *syst, Engine **engine) {
assert(engine);
*engine = new Sky::SkyEngine(syst);
return Common::kNoError;

4
engines/sword1/detection.cpp
View file

@ -86,7 +86,7 @@ public:
PlainGameList getSupportedGames() const override;
PlainGameDescriptor findGame(const char *gameId) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
};
PlainGameList SwordMetaEngineDetection::getSupportedGames() const {
@ -133,7 +133,7 @@ void Sword1CheckDirectory(const Common::FSList &fslist, bool *filesFound) {
}
}
DetectedGames SwordMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames SwordMetaEngineDetection::detectGames(const Common::FSList &fslist) {
int i, j;
DetectedGames detectedGames;
bool filesFound[NUM_FILES_TO_CHECK];

4
engines/sword1/metaengine.cpp
View file

@ -44,7 +44,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("sword1.###");
@ -71,7 +71,7 @@ bool Sword1::SwordEngine::hasFeature(EngineFeature f) const {
(f == kSupportsLoadingDuringRuntime);
}
Common::Error SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) {
assert(engine);
*engine = new Sword1::SwordEngine(syst);
return Common::kNoError;

4
engines/sword2/detection.cpp
View file

@ -52,7 +52,7 @@ public:
PlainGameList getSupportedGames() const override;
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
PlainGameDescriptor findGame(const char *gameid) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) override;
};
PlainGameList Sword2MetaEngineDetection::getSupportedGames() const {
@ -81,7 +81,7 @@ PlainGameDescriptor Sword2MetaEngineDetection::findGame(const char *gameid) cons
return PlainGameDescriptor::of(g->gameid, g->description);
}
DetectedGames Sword2MetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames Sword2MetaEngineDetection::detectGames(const Common::FSList &fslist) {
// The required game data files can be located in the game directory, or in
// a subdirectory called "clusters". In the latter case, we don't want to
// detect the game in that subdirectory, as this will detect the game twice

4
engines/sword2/metaengine.cpp
View file

@ -48,7 +48,7 @@ public:
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) override;
};
bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const {
@ -106,7 +106,7 @@ void Sword2MetaEngine::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(filename);
}
Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) {
assert(syst);
assert(engine);