[Scummvm-cvs-logs] scummvm master -> eec84253f0e5d24bd37f5a8fa88b29df6da45f83
salty-horse
ori at avtalion.name
Wed Jun 29 23:57:12 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eec84253f0 MADE: Fix hidden overloaded virtual function warning
Commit: eec84253f0e5d24bd37f5a8fa88b29df6da45f83
https://github.com/scummvm/scummvm/commit/eec84253f0e5d24bd37f5a8fa88b29df6da45f83
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-06-29T14:53:33-07:00
Commit Message:
MADE: Fix hidden overloaded virtual function warning
Changed paths:
engines/made/detection.cpp
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index e8c948a..1320daa 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -542,7 +542,7 @@ public:
virtual bool hasFeature(MetaEngineFeature f) const;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- const ADGameDescription *fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) const;
+ const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const;
};
@@ -564,7 +564,7 @@ bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
return gd != 0;
}
-const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) const {
+const ADGameDescription *MadeMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
// Set the default values for the fallback descriptor's ADGameDescription part.
Made::g_fallbackDesc.desc.language = Common::UNK_LANG;
Made::g_fallbackDesc.desc.platform = Common::kPlatformPC;
More information about the Scummvm-git-logs
mailing list