Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2

2 files changed, 9 insertions, 32 deletions

diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 1151339d49..004f1462a6 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -511,7 +511,7 @@ int16 GameDatabaseV2::loadgame(const char *filename, int16 version) {
 		_objects[i]->load(*in);
 	}
 	delete in;
-	
+
 	_objectPropertyCache.clear();	// make sure to clear cache
 	return result;
 }
@@ -642,7 +642,7 @@ void GameDatabaseV3::load(Common::SeekableReadStream &sourceS) {
 void GameDatabaseV3::reloadFromStream(Common::SeekableReadStream &sourceS) {
 	sourceS.seek(_gameStateOffs);
 	sourceS.read(_gameState, _gameStateSize);
-	
+
 	_objectPropertyCache.clear();	// make sure to clear cache
 }
 
@@ -734,9 +734,9 @@ int16 GameDatabaseV3::loadgame(const char *filename, int16 version) {
 	in->skip(64); // skip savegame description
 	in->read(_gameState, _gameStateSize);
 	delete in;
-	
+
 	_objectPropertyCache.clear();	// make sure to clear cache
-	
+
 	return 0;
 }
 
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index 4576e2b5ce..e8c948af4e 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -525,34 +525,11 @@ static MadeGameDescription g_fallbackDesc = {
 
 } // End of namespace Made
 
-static const ADParams detectionParams = {
-	// Pointer to ADGameDescription or its superset structure
-	(const byte *)Made::gameDescriptions,
-	// Size of that superset structure
-	sizeof(Made::MadeGameDescription),
-	// Number of bytes to compute MD5 sum for
-	5000,
-	// List of all engine targets
-	madeGames,
-	// Structure for autoupgrading obsolete targets
-	0,
-	// Name of single gameid (optional)
-	"made",
-	// List of files for file-based fallback detection (optional)
-	0,
-	// Flags
-	0,
-	// Additional GUI options (for every game}
-	Common::GUIO_NONE,
-	// Maximum directory depth
-	1,
-	// List of directory globs
-	0
-};
-
 class MadeMetaEngine : public AdvancedMetaEngine {
 public:
-	MadeMetaEngine() : AdvancedMetaEngine(detectionParams) {}
+	MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) {
+		_singleid = "made";
+	}
 
 	virtual const char *getName() const {
 		return "MADE";
@@ -565,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;
+	const ADGameDescription *fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) const;
 
 };
 
@@ -587,7 +564,7 @@ bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 	return gd != 0;
 }
 
-const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist) const {
+const ADGameDescription *MadeMetaEngine::fallbackDetect(const Common::FSList &fslist, const FileMap &allFiles) 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;