Started to get rid of Common::EncapsulatedADGameDesc (using plain Common::ADGameDescription instead)

svn-id: r31121

14 files changed, 40 insertions, 43 deletions

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
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index d2912898ea..2adb2aacd4 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -2270,15 +2270,15 @@ public:
 		return "Sierra AGI Engine (C) Sierra On-Line Software";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 
 	Common::EncapsulatedADGameDesc fallbackDetect(const FSList *fslist) const {
 		return Agi::fallbackDetector(fslist);
 	}
 };
 
-bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Agi::AGIGameDescription *gd = (const Agi::AGIGameDescription *)(encapsulatedDesc.realDesc);
+bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Agi::AGIGameDescription *gd = (const Agi::AGIGameDescription *)desc;
 	bool res = true;
 
 	switch (gd->gameType) {
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index ce3e4f34de..fd56651a70 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -109,11 +109,11 @@ public:
 		return "AGOS (C) Adventure Soft";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const AGOS::AGOSGameDescription *gd = (const AGOS::AGOSGameDescription *)(encapsulatedDesc.realDesc);
+bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const AGOS::AGOSGameDescription *gd = (const AGOS::AGOSGameDescription *)desc;
 	bool res = true;
 
 	switch (gd->gameType) {
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index d9765a6b5c..750c07aa14 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -498,11 +498,11 @@ public:
 		return "Future Wars & Operation Stealth (C) Delphine Software";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Cine::CINEGameDescription *gd = (const Cine::CINEGameDescription *)(encapsulatedDesc.realDesc);
+bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Cine::CINEGameDescription *gd = (const Cine::CINEGameDescription *)desc;
 	if (gd) {
 		*engine = new Cine::CineEngine(syst, gd);
 	}
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 07d2ab7c8e..b9330ada77 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -133,11 +133,11 @@ public:
 		return "Cruise for a Corpse (C) Delphine Software";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Cruise::CRUISEGameDescription *gd = (const Cruise::CRUISEGameDescription *)(encapsulatedDesc.realDesc);
+bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Cruise::CRUISEGameDescription *gd = (const Cruise::CRUISEGameDescription *)desc;
 	if (gd) {
 		*engine = new Cruise::CruiseEngine(syst, gd);
 	}
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 3c9ac41ba4..a51c563383 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -173,15 +173,15 @@ public:
 		return "Drascula Engine (C) 2000 Alcachofa Soft, 1996 (C) Digital Dreams Multimedia, 1994 (C) Emilio de Paz";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 
 	Common::EncapsulatedADGameDesc fallbackDetect(const FSList *fslist) const {
 		return Drascula::fallbackDetector(fslist);
 	}
 };
 
-bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Drascula::DrasculaGameDescription *gd = (const Drascula::DrasculaGameDescription *)(encapsulatedDesc.realDesc);
+bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Drascula::DrasculaGameDescription *gd = (const Drascula::DrasculaGameDescription *)desc;
 	if (gd) {
 		*engine = new Drascula::DrasculaEngine(syst, gd);
 	}
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index f3ff11ba75..a022318670 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -1869,11 +1869,11 @@ public:
 		return "Goblins Games (C) Coktel Vision";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)(encapsulatedDesc.realDesc);
+bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)desc;
 	if (gd) {
 		*engine = new Gob::GobEngine(syst);
 		((Gob::GobEngine *)*engine)->initGame(gd);
diff --git a/engines/igor/detection.cpp b/engines/igor/detection.cpp
index c938a77c1e..d63c280347 100644
--- a/engines/igor/detection.cpp
+++ b/engines/igor/detection.cpp
@@ -116,11 +116,11 @@ public:
 		return "Igor: Objective Uikokahonia (C) Pendulo Studios";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool IgorMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const IgorGameDescription *gd = (const IgorGameDescription *)(encapsulatedDesc.realDesc);
+bool IgorMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const IgorGameDescription *gd = (const IgorGameDescription *)desc;
 	if (gd) {
 		Igor::DetectedGameVersion dgv;
 		dgv.version = gd->gameVersion;
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index f02c23a127..18b78d0395 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -440,11 +440,11 @@ public:
 		return "The Legend of Kyrandia (C) Westwood Studios";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const KYRAGameDescription *gd = (const KYRAGameDescription *)(encapsulatedDesc.realDesc);
+bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const KYRAGameDescription *gd = (const KYRAGameDescription *)desc;
 	bool res = true;
 
 	Kyra::GameFlags flags = gd->flags;
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index e7b4d1bcd8..ea1835ff86 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -184,11 +184,11 @@ public:
 		return "Lure of the Temptress (C) Revolution";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Lure::LureGameDescription *gd = (const Lure::LureGameDescription *)(encapsulatedDesc.realDesc);
+bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Lure::LureGameDescription *gd = (const Lure::LureGameDescription *)desc;
 	if (gd) {
 		*engine = new Lure::LureEngine(syst, gd);
 	}
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index c608f58100..b350dfcb87 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -194,11 +194,11 @@ public:
 		return "Nippon Safes Inc. (C) Dynabyte";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Parallaction::PARALLACTIONGameDescription *gd = (const Parallaction::PARALLACTIONGameDescription *)(encapsulatedDesc.realDesc);
+bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Parallaction::PARALLACTIONGameDescription *gd = (const Parallaction::PARALLACTIONGameDescription *)desc;
 	bool res = true;
 
 	switch (gd->gameType) {
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 2ac314cf73..565d781e98 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -151,11 +151,11 @@ public:
 		return "Inherit the Earth (C) Wyrmkeep Entertainment";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Saga::SAGAGameDescription *gd = (const Saga::SAGAGameDescription *)(encapsulatedDesc.realDesc);
+bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Saga::SAGAGameDescription *gd = (const Saga::SAGAGameDescription *)desc;
 	if (gd) {
 		*engine = new Saga::SagaEngine(syst, gd);
 	}
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 2fde7e9da1..2277adf6f6 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -135,11 +135,11 @@ public:
 		return "Touche: The Adventures of the 5th Musketeer (C) Clipper Software";
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const;
+	virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
 };
 
-bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::EncapsulatedADGameDesc &encapsulatedDesc) const {
-	const Common::ADGameDescription *gd = encapsulatedDesc.realDesc;
+bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
+	const Common::ADGameDescription *gd = desc;
 	if (gd) {
 		*engine = new Touche::ToucheEngine(syst, gd->language);
 	}