From 6547ef6e129fb42c75c20f24e1f24dff1458f727 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 14 Mar 2008 17:31:04 +0000
Subject: Started to get rid of Common::EncapsulatedADGameDesc (using plain
 Common::ADGameDescription instead)

svn-id: r31121
---
 common/advancedDetector.cpp | 8 +++-----
 common/advancedDetector.h   | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'common')

diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index e76de22d45..cc3b269fc1 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -271,14 +271,12 @@ PluginError AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) c
 		}
 	}
 
-	if (result.realDesc != 0) {
-		debug(2, "Running %s", toGameDescriptor(result, params.list).description().c_str());
-	}
-
 	if (result.realDesc == 0) {
 		return kNoGameDataFoundError;
 	}
-	if (!createInstance(syst, engine, result)) {
+
+	debug(2, "Running %s", toGameDescriptor(result, params.list).description().c_str());
+	if (!createInstance(syst, engine, result.realDesc)) {
 		return kNoGameDataFoundError;
 	}
 	return kNoError;
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index 5702243484..cb93510231 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -232,8 +232,7 @@ public:
 	virtual PluginError createInstance(OSystem *syst, Engine **engine) const;
 
 	// To be provided by subclasses
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const = 0;
-
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const = 0;
 
 	/**
 	 * An (optional) generic fallback detect function which is invoked
-- 
cgit v1.2.3