Merge remote branch 'upstream/master' into pegasus

1 files changed, 6 insertions, 26 deletions

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index be44c05bfb..2ecd6b741e 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -86,34 +86,14 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = {
 
 #include "gob/detection_tables.h"
 
-static const ADParams detectionParams = {
-	// Pointer to ADGameDescription or its superset structure
-	(const byte *)Gob::gameDescriptions,
-	// Size of that superset structure
-	sizeof(Gob::GOBGameDescription),
-	// Number of bytes to compute MD5 sum for
-	5000,
-	// List of all engine targets
-	gobGames,
-	// Structure for autoupgrading obsolete targets
-	obsoleteGameIDsTable,
-	// Name of single gameid (optional)
-	"gob",
-	// List of files for file-based fallback detection (optional)
-	Gob::fileBased,
-	// Flags
-	0,
-	// Additional GUI options (for every game}
-	Common::GUIO_NOLAUNCHLOAD,
-	// Maximum directory depth
-	1,
-	// List of directory globs
-	0
-};
-
 class GobMetaEngine : public AdvancedMetaEngine {
 public:
-	GobMetaEngine() : AdvancedMetaEngine(detectionParams) {}
+	GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
+		params.obsoleteList = obsoleteGameIDsTable;
+		params.singleid = "gob";
+		params.fileBasedFallback = Gob::fileBased;
+		params.guioptions = Common::GUIO_NOLAUNCHLOAD;
+	}
 
 	virtual const char *getName() const {
 		return "Gob";