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

ENGINES: resolve compile errors

Browse source
This commit is contained in:
ysj1173886760 2021-06-11 10:08:16 +08:00 • committed by Eugene Sandulenko
parent 073db5b715
commit 5c08d58f70
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/metaengine.cpp
View file

@ -281,7 +281,7 @@ public:
// A fallback detection method. This is not ideal as all detection lives in MetaEngine, but // A fallback detection method. This is not ideal as all detection lives in MetaEngine, but
// here fb detection has many engine dependencies. // here fb detection has many engine dependencies.
virtual ADDetectedGame fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const override; virtual ADDetectedGame fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra) const override;
}; };
Common::Error SciMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { Common::Error SciMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
@ -640,7 +640,7 @@ void constructFallbackDetectionEntry(Common::String &gameId, Common::Platform pl
} }
} }
ADDetectedGame SciMetaEngine::fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const { ADDetectedGame SciMetaEngine::fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra) const {
// If necessary SCI files aren't found, it can't be SCI // If necessary SCI files aren't found, it can't be SCI
if (!necessarySciResourceFilesFound(allFiles)) if (!necessarySciResourceFilesFound(allFiles))
return ADDetectedGame(); return ADDetectedGame();

2
engines/wintermute/metaengine.cpp
View file

@ -162,7 +162,7 @@ public:
return getWintermuteKeymaps(target, gameId, gameDescr); return getWintermuteKeymaps(target, gameId, gameDescr);
} }
ADDetectedGame fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const override { ADDetectedGame fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extraInfo) const override {
// Set some defaults // Set some defaults
s_fallbackDesc.extra = ""; s_fallbackDesc.extra = "";
s_fallbackDesc.language = Common::UNK_LANG; s_fallbackDesc.language = Common::UNK_LANG;