diff options
| author | Max Horn | 2008-03-14 17:31:04 +0000 |
|---|---|---|
| committer | Max Horn | 2008-03-14 17:31:04 +0000 |
| commit | 6547ef6e129fb42c75c20f24e1f24dff1458f727 (patch) | |
| tree | 95cdbfad275c76a32608d1a8b414e6824fe47091 /common | |
| parent | aa8105011748674313e7bf19e23ea8f2ee90c7aa (diff) | |
| download | scummvm-rg350-6547ef6e129fb42c75c20f24e1f24dff1458f727.tar.gz scummvm-rg350-6547ef6e129fb42c75c20f24e1f24dff1458f727.tar.bz2 scummvm-rg350-6547ef6e129fb42c75c20f24e1f24dff1458f727.zip | |
Started to get rid of Common::EncapsulatedADGameDesc (using plain Common::ADGameDescription instead)
svn-id: r31121
Diffstat (limited to 'common')
| -rw-r--r-- | common/advancedDetector.cpp | 8 | ||||
| -rw-r--r-- | common/advancedDetector.h | 3 |
2 files changed, 4 insertions, 7 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 |