Merge remote branch 'upstream/master' into pegasus

1 files changed, 6 insertions, 27 deletions

diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 6a73b28246..a7442729d2 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -158,35 +158,14 @@ static const char *directoryGlobs[] = {
 	0
 };
 
-static const ADParams detectionParams = {
-	// Pointer to ADGameDescription or its superset structure
-	(const byte *)Mohawk::gameDescriptions,
-	// Size of that superset structure
-	sizeof(Mohawk::MohawkGameDescription),
-	// Number of bytes to compute MD5 sum for
-	5000,
-	// List of all engine targets
-	mohawkGames,
-	// Structure for autoupgrading obsolete targets
-	0,
-	// Name of single gameid (optional)
-	"mohawk",
-	// List of files for file-based fallback detection (optional)
-	Mohawk::fileBased,
-	// Flags
-	0,
-	// Additional GUI options (for every game)
-	Common::GUIO_NONE,
-	// Maximum directory depth
-	2,
-	// List of directory globs
-	directoryGlobs
-};
-
 class MohawkMetaEngine : public AdvancedMetaEngine {
 public:
-	MohawkMetaEngine() : AdvancedMetaEngine(detectionParams) {}
-
+	MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) {
+		params.singleid = "mohawk";
+		params.fileBasedFallback = Mohawk::fileBased;
+		params.depth = 2;
+		params.directoryGlobs = directoryGlobs;
+	}
 	virtual const char *getName() const {
 		return "Mohawk";
 	}