From 4827cc914a128b956d88ea3eae66d8866d9cd40e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 10 Jun 2011 00:30:48 +0200
Subject: ENGINES: Change incorrect use of 'target' to 'gameid'

---
 engines/cruise/detection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/cruise/detection.cpp')

diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 3bd0c1f76f..cc058b14ed 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -224,9 +224,9 @@ static const ADParams detectionParams = {
 	sizeof(Cruise::CRUISEGameDescription),
 	// Number of bytes to compute MD5 sum for
 	5000,
-	// List of all engine targets
+	// List of all engine gameid
 	cruiseGames,
-	// Structure for autoupgrading obsolete targets
+	// Structure for autoupgrading obsolete gameids
 	0,
 	// Name of single gameid (optional)
 	"cruise",
-- 
cgit v1.2.3


From 446e6028409259f55691146c80070fb6a57a8640 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 10 Jun 2011 15:53:51 +0200
Subject: CRUISE: Switch to alternate AdvancedMetaEngine, avoid ADParams

---
 engines/cruise/detection.cpp | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

(limited to 'engines/cruise/detection.cpp')

diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index cc058b14ed..f6f8db4f3a 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -217,34 +217,12 @@ static const CRUISEGameDescription gameDescriptions[] = {
 
 }
 
-static const ADParams detectionParams = {
-	// Pointer to ADGameDescription or its superset structure
-	(const byte *)Cruise::gameDescriptions,
-	// Size of that superset structure
-	sizeof(Cruise::CRUISEGameDescription),
-	// Number of bytes to compute MD5 sum for
-	5000,
-	// List of all engine gameid
-	cruiseGames,
-	// Structure for autoupgrading obsolete gameids
-	0,
-	// Name of single gameid (optional)
-	"cruise",
-	// List of files for file-based fallback detection (optional)
-	0,
-	// Flags
-	0,
-	// Additional GUI options (for every game}
-	Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI,
-	// Maximum directory depth
-	1,
-	// List of directory globs
-	0
-};
-
 class CruiseMetaEngine : public AdvancedMetaEngine {
 public:
-	CruiseMetaEngine() : AdvancedMetaEngine(detectionParams) {}
+	CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) {
+		params.singleid = "cruise";
+		params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI;
+	}
 
 	virtual const char *getName() const {
 		return "CruisE";
-- 
cgit v1.2.3


From 7c992d6598743fce09e6666f2c9a0f550ac5e870 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 11 Jun 2011 17:52:32 +0200
Subject: DETECTOR: Merge ADParams into AdvancedMetaEngine

---
 engines/cruise/detection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/cruise/detection.cpp')

diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index f6f8db4f3a..5be2fdeeea 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -220,8 +220,8 @@ static const CRUISEGameDescription gameDescriptions[] = {
 class CruiseMetaEngine : public AdvancedMetaEngine {
 public:
 	CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) {
-		params.singleid = "cruise";
-		params.guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI;
+		_singleid = "cruise";
+		_guioptions = Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI;
 	}
 
 	virtual const char *getName() const {
-- 
cgit v1.2.3