diff options
54 files changed, 0 insertions, 109 deletions
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp index bf944b7e04..b452d25f8b 100644 --- a/engines/access/detection.cpp +++ b/engines/access/detection.cpp @@ -75,7 +75,6 @@ Common::Platform AccessEngine::getPlatform() const { } // End of namespace Access static const PlainGameDescriptor AccessGames[] = { - {"Access", "Access"}, {"amazon", "Amazon: Guardians of Eden"}, {"martian", "Martian Memorandum"}, {0, 0} diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index eda6c18434..faf1215f94 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -202,7 +202,6 @@ class AgiMetaEngine : public AdvancedMetaEngine { public: AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) { - _singleId = "agi"; _guiOptions = GUIO1(GUIO_NOSPEECH); } diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp index 6966719b7e..19d1b62d00 100644 --- a/engines/bbvs/detection.cpp +++ b/engines/bbvs/detection.cpp @@ -69,7 +69,6 @@ static const char * const directoryGlobs[] = { class BbvsMetaEngine : public AdvancedMetaEngine { public: BbvsMetaEngine() : AdvancedMetaEngine(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) { - _singleId = "bbvs"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 8277b091bb..8a468dcf75 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -115,7 +115,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CGEMetaEngine : public AdvancedMetaEngine { public: CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { - _singleId = "soltys"; } const char *getEngineId() const { diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index cc4fd711b1..5432a3b452 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -121,7 +121,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CGE2MetaEngine : public AdvancedMetaEngine { public: CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) { - _singleId = "sfinx"; } const char *getEngineId() const { diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp index 1374799ed5..2206202b12 100644 --- a/engines/chewy/detection.cpp +++ b/engines/chewy/detection.cpp @@ -115,7 +115,6 @@ public: ChewyMetaEngine() : AdvancedMetaEngine(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; - _singleId = "chewy"; } const char *getEngineId() const { diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 441ec0d197..55e76c6863 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -23,7 +23,6 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" -#include "engines/obsolete.h" #include "common/system.h" #include "common/textconsole.h" @@ -49,18 +48,11 @@ Common::Platform CineEngine::getPlatform() const { return _gameDescription->desc } // End of namespace Cine static const PlainGameDescriptor cineGames[] = { - {"cine", "Cinematique evo.1 engine game"}, {"fw", "Future Wars"}, {"os", "Operation Stealth"}, {0, 0} }; -static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { - {"fw", "cine", Common::kPlatformUnknown}, - {"os", "cine", Common::kPlatformUnknown}, - {0, 0, Common::kPlatformUnknown} -}; - #include "cine/detection_tables.h" static const ADExtraGuiOptionsMap optionsList[] = { @@ -80,14 +72,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CineMetaEngine : public AdvancedMetaEngine { public: CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) { - _singleId = "cine"; _guiOptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD); } - PlainGameDescriptor findGame(const char *gameId) const override { - return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); - } - const char *getEngineId() const { return "cine"; } @@ -101,7 +88,6 @@ public: } virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { - Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); return AdvancedMetaEngine::createInstance(syst, engine); } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 8f4bab182d..93a3a40146 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -55,7 +55,6 @@ Common::Language ComposerEngine::getLanguage() const { } static const PlainGameDescriptor composerGames[] = { - {"composer", "Composer Game"}, {"babayaga", "Magic Tales: Baba Yaga and the Magic Geese"}, {"darby", "Darby the Dragon"}, {"gregory", "Gregory and the Hot Air Balloon"}, @@ -480,7 +479,6 @@ static const char *directoryGlobs[] = { class ComposerMetaEngine : public AdvancedMetaEngine { public: ComposerMetaEngine() : AdvancedMetaEngine(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) { - _singleId = "composer"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index f75df975a1..e657318440 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -48,7 +48,6 @@ Common::Platform CruiseEngine::getPlatform() const { } static const PlainGameDescriptor cruiseGames[] = { - {"cruise", "Cinematique evo.2 engine game"}, {"cruise", "Cruise for a Corpse"}, {0, 0} }; @@ -196,7 +195,6 @@ static const CRUISEGameDescription gameDescriptions[] = { class CruiseMetaEngine : public AdvancedMetaEngine { public: CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { - _singleId = "cruise"; _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp index b269d06be6..bb5be81898 100644 --- a/engines/cryo/detection.cpp +++ b/engines/cryo/detection.cpp @@ -133,7 +133,6 @@ static const ADGameDescription gameDescriptions[] = { class CryoMetaEngine : public AdvancedMetaEngine { public: CryoMetaEngine() : AdvancedMetaEngine(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) { - _singleId = "losteden"; } const char *getEngineId() const { diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp index 9cb5a67357..11c78ba303 100644 --- a/engines/cryomni3d/detection.cpp +++ b/engines/cryomni3d/detection.cpp @@ -104,7 +104,6 @@ class CryOmni3DMetaEngine : public AdvancedMetaEngine { public: CryOmni3DMetaEngine() : AdvancedMetaEngine(CryOmni3D::gameDescriptions, sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) { - //_singleId = "cryomni3d"; _maxScanDepth = 1; } diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp index 6634fc406c..bf3f95bc72 100644 --- a/engines/director/detection.cpp +++ b/engines/director/detection.cpp @@ -99,7 +99,6 @@ static const char *directoryGlobs[] = { class DirectorMetaEngine : public AdvancedMetaEngine { public: DirectorMetaEngine() : AdvancedMetaEngine(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) { - _singleId = "director"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp index 8b745bb910..e6e25ea5db 100644 --- a/engines/dm/detection.cpp +++ b/engines/dm/detection.cpp @@ -98,7 +98,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class DMMetaEngine : public AdvancedMetaEngine { public: DMMetaEngine() : AdvancedMetaEngine(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) { - _singleId = "dm"; } virtual const char *getEngineId() const { diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index 8fd62cc665..97dbbee3e7 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -84,7 +84,6 @@ const ADGameDescription gameDescriptions[] = { class DraciMetaEngine : public AdvancedMetaEngine { public: DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { - _singleId = "draci"; } const char *getEngineId() const { diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 3c671472f3..7ed2abc202 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -339,7 +339,6 @@ SaveStateDescriptor loadMetaData(Common::ReadStream *s, int slot, bool setPlayTi class DrasculaMetaEngine : public AdvancedMetaEngine { public: DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { - _singleId = "drascula"; _guiOptions = GUIO1(GUIO_NOMIDI); } diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index bbb7077351..cb81414c1a 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -71,7 +71,6 @@ public: AdvancedMetaEngine(DreamWeb::gameDescriptions, sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames, gameGuiOptions) { - _singleId = "dreamweb"; _guiOptions = GUIO1(GUIO_NOMIDI); } diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index a76b47322b..05c4732841 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -130,7 +130,6 @@ static const ADGameDescription gameDescriptions[] = { class FullpipeMetaEngine : public AdvancedMetaEngine { public: FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) { - _singleId = "fullpipe"; } const char *getEngineId() const { diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp index f792fe5169..343180d887 100644 --- a/engines/gnap/detection.cpp +++ b/engines/gnap/detection.cpp @@ -78,7 +78,6 @@ static const ADGameDescription gameDescriptions[] = { class GnapMetaEngine : public AdvancedMetaEngine { public: GnapMetaEngine() : AdvancedMetaEngine(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) { - _singleId = "gnap"; _maxScanDepth = 3; } diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp index 2a5196173c..c56ed45552 100644 --- a/engines/gob/detection/detection.cpp +++ b/engines/gob/detection/detection.cpp @@ -22,7 +22,6 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" -#include "engines/obsolete.h" #include "gob/gob.h" #include "gob/dataio.h" @@ -33,8 +32,6 @@ class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine(); - PlainGameDescriptor findGame(const char *gameId) const override; - const char *getEngineId() const { return "gob"; } @@ -59,14 +56,9 @@ private: GobMetaEngine::GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { - _singleId = "gob"; _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); } -PlainGameDescriptor GobMetaEngine::findGame(const char *gameId) const { - return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); -} - ADDetectedGame GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { ADDetectedGame detectedGame = detectGameFilebased(allFiles, fslist, Gob::fileBased); if (!detectedGame.desc) { @@ -180,7 +172,6 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const { } Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const { - Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); return AdvancedMetaEngine::createInstance(syst, engine); } diff --git a/engines/gob/detection/tables.h b/engines/gob/detection/tables.h index 9b24203aa8..031ea627e0 100644 --- a/engines/gob/detection/tables.h +++ b/engines/gob/detection/tables.h @@ -41,7 +41,6 @@ using namespace Common; // Game IDs and proper names static const PlainGameDescriptor gobGames[] = { - {"gob", "Gob engine game"}, {"gob1", "Gobliiins"}, {"gob1cd", "Gobliiins CD"}, {"gob2", "Gobliins 2"}, @@ -81,13 +80,6 @@ static const PlainGameDescriptor gobGames[] = { {0, 0} }; -// Obsolete IDs we don't want anymore -static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { - {"gob1", "gob", kPlatformUnknown}, - {"gob2", "gob", kPlatformUnknown}, - {0, 0, kPlatformUnknown} -}; - namespace Gob { // Detection tables diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 0aa06ded47..f386d8bfe9 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -42,8 +42,6 @@ static const PlainGameDescriptor groovieGames[] = { {"tlc", "Tender Loving Care"}, #endif - // Unknown - {"groovie", "Groovie engine game"}, {0, 0} }; @@ -333,8 +331,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class GroovieMetaEngine : public AdvancedMetaEngine { public: GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) { - _singleId = "groovie"; - // Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from // its "Making of" as well as the Clandestiny Trailer; they all share // the same MD5. diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp index 4cb7b03bc6..5a64a8320b 100644 --- a/engines/hdb/detection.cpp +++ b/engines/hdb/detection.cpp @@ -167,7 +167,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class HDBMetaEngine : public AdvancedMetaEngine { public: HDBMetaEngine() : AdvancedMetaEngine(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) { - _singleId = "hdb"; } const char *getEngineId() const { diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp index 18c50182a8..72c5620108 100644 --- a/engines/illusions/detection.cpp +++ b/engines/illusions/detection.cpp @@ -32,7 +32,6 @@ #include "graphics/thumbnail.h" static const PlainGameDescriptor illusionsGames[] = { - { "illusions", "Illusions engine game" }, { "bbdou", "Beavis and Butt-head Do U" }, { "duckman", "Duckman" }, { 0, 0 } @@ -115,7 +114,6 @@ static const char * const directoryGlobs[] = { class IllusionsMetaEngine : public AdvancedMetaEngine { public: IllusionsMetaEngine() : AdvancedMetaEngine(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) { - _singleId = "illusions"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp index 009bd5cdf7..a2570f65b7 100644 --- a/engines/lab/detection.cpp +++ b/engines/lab/detection.cpp @@ -115,8 +115,6 @@ uint32 LabEngine::getFeatures() const { class LabMetaEngine : public AdvancedMetaEngine { public: LabMetaEngine() : AdvancedMetaEngine(labDescriptions, sizeof(ADGameDescription), lab_setting) { - _singleId = "lab"; - _maxScanDepth = 4; _directoryGlobs = directoryGlobs; _flags = kADFlagUseExtraAsHint; diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 3e6aa3a17b..94fbbae6dd 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -227,7 +227,6 @@ static const ADGameDescription gameDescriptions[] = { class LastExpressMetaEngine : public AdvancedMetaEngine { public: LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { - _singleId = "lastexpress"; _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); } diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index b9473b2f3c..0a87303974 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -207,7 +207,6 @@ class LureMetaEngine : public AdvancedMetaEngine { public: LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { _md5Bytes = 1024; - _singleId = "lure"; // Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions // of italian Lure when their datafiles sit in the same directory. diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index 71e2de62b5..f4f46f36ec 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -46,7 +46,6 @@ uint16 MadeEngine::getVersion() const { } static const PlainGameDescriptor madeGames[] = { - {"made", "MADE engine game"}, {"manhole", "The Manhole"}, {"rtz", "Return to Zork"}, {"lgop2", "Leather Goddesses of Phobos 2"}, @@ -57,7 +56,6 @@ static const PlainGameDescriptor madeGames[] = { class MadeMetaEngine : public AdvancedMetaEngine { public: MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { - _singleId = "made"; } const char *getEngineId() const { diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp index 77df3a0e9d..65725a8726 100644 --- a/engines/mads/detection.cpp +++ b/engines/mads/detection.cpp @@ -69,7 +69,6 @@ Common::Platform MADSEngine::getPlatform() const { } // End of namespace MADS static const PlainGameDescriptor MADSGames[] = { - {"MADS", "MADS"}, {"dragonsphere", "Dragonsphere"}, {"nebular", "Rex Nebular and the Cosmic Gender Bender"}, {"phantom", "Return of the Phantom"}, diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 278cce2878..bc7f6cda38 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -136,7 +136,6 @@ bool MohawkEngine_Riven::hasFeature(EngineFeature f) const { } // End of Namespace Mohawk static const PlainGameDescriptor mohawkGames[] = { - {"mohawk", "Mohawk Game"}, {"myst", "Myst"}, {"makingofmyst", "The Making of Myst"}, {"riven", "Riven: The Sequel to Myst"}, @@ -196,7 +195,6 @@ static const ADExtraGuiOptionsMap optionsList[] = { class MohawkMetaEngine : public AdvancedMetaEngine { public: MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames, optionsList) { - _singleId = "mohawk"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp index fc1acff29d..f94182922c 100644 --- a/engines/mortevielle/detection.cpp +++ b/engines/mortevielle/detection.cpp @@ -55,7 +55,6 @@ public: MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription), MortevielleGame) { _md5Bytes = 512; - _singleId = "mortevielle"; // Use kADFlagUseExtraAsHint to distinguish between original and improved versions // (i.e. use or not of the game data file). _flags = kADFlagUseExtraAsHint; diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index dcaf6536c7..0d4a7278bb 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -198,7 +198,6 @@ static const ExtraGuiOption neverhoodExtraGuiOption3 = { class NeverhoodMetaEngine : public AdvancedMetaEngine { public: NeverhoodMetaEngine() : AdvancedMetaEngine(Neverhood::gameDescriptions, sizeof(Neverhood::NeverhoodGameDescription), neverhoodGames) { - _singleId = "neverhood"; _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI); } diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index f4dcc16dd7..dfcf406bf7 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -45,7 +45,6 @@ Common::Platform Parallaction::getPlatform() const { return _gameDescription->de } static const PlainGameDescriptor parallactionGames[] = { - {"parallaction", "Parallaction engine game"}, {"nippon", "Nippon Safes Inc."}, {"bra", "The Big Red Adventure"}, {0, 0} diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp index fbacf09e33..4bc56e7203 100644 --- a/engines/pegasus/detection.cpp +++ b/engines/pegasus/detection.cpp @@ -135,7 +135,6 @@ static const PegasusGameDescription gameDescriptions[] = { class PegasusMetaEngine : public AdvancedMetaEngine { public: PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) { - _singleId = "pegasus"; } virtual const char *getEngineId() const { diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp index 6a5e81f270..37c6368170 100644 --- a/engines/plumbers/detection.cpp +++ b/engines/plumbers/detection.cpp @@ -73,7 +73,6 @@ static const ADGameDescription gameDescriptions[] = { class PlumbersMetaEngine : public AdvancedMetaEngine { public: PlumbersMetaEngine() : AdvancedMetaEngine(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) { - _singleId = "plumbers"; } const char *getEngineId() const { diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp index 400c2dae88..5390e3640f 100644 --- a/engines/prince/detection.cpp +++ b/engines/prince/detection.cpp @@ -148,7 +148,6 @@ const static char *directoryGlobs[] = { class PrinceMetaEngine : public AdvancedMetaEngine { public: PrinceMetaEngine() : AdvancedMetaEngine(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) { - _singleId = "prince"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index ed8f3dd803..ed7dd7bdde 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -482,7 +482,6 @@ static const QueenGameDescription gameDescriptions[] = { class QueenMetaEngine : public AdvancedMetaEngine { public: QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { - _singleId = "queen"; } const char *getEngineId() const { diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 713756539b..ed8d7cd66d 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -28,7 +28,6 @@ #include "common/config-manager.h" #include "engines/advancedDetector.h" -#include "engines/obsolete.h" #include "common/system.h" #include "graphics/thumbnail.h" @@ -81,7 +80,6 @@ const ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _ } static const PlainGameDescriptor sagaGames[] = { - {"saga", "SAGA Engine game"}, {"ite", "Inherit the Earth: Quest for the Orb"}, {"ihnm", "I Have No Mouth and I Must Scream"}, {"dino", "Dinotopia"}, @@ -89,24 +87,11 @@ static const PlainGameDescriptor sagaGames[] = { {0, 0} }; -static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { - {"ite", "saga", Common::kPlatformUnknown}, - {"ihnm", "saga", Common::kPlatformUnknown}, - {"dino", "saga", Common::kPlatformUnknown}, - {"fta2", "saga", Common::kPlatformUnknown}, - {0, 0, Common::kPlatformUnknown} -}; - #include "saga/detection_tables.h" class SagaMetaEngine : public AdvancedMetaEngine { public: SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { - _singleId = "saga"; - } - - PlainGameDescriptor findGame(const char *gameId) const override { - return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); } const char *getEngineId() const { @@ -142,7 +127,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { - Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); return AdvancedMetaEngine::createInstance(syst, engine); } virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 8e766c89a5..422c32ab6f 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -558,7 +558,6 @@ static const char *directoryGlobs[] = { class SciMetaEngine : public AdvancedMetaEngine { public: SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) { - _singleId = "sci"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; _matchFullPaths = true; diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp index 1f005ea9e2..bd469c8a7a 100644 --- a/engines/sludge/detection.cpp +++ b/engines/sludge/detection.cpp @@ -79,7 +79,6 @@ static char s_fallbackFileNameBuffer[51]; class SludgeMetaEngine : public AdvancedMetaEngine { public: SludgeMetaEngine() : AdvancedMetaEngine(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) { - _singleId = "sludge"; _maxScanDepth = 1; } diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp index 7d47d5ed1a..4135481d02 100644 --- a/engines/startrek/detection.cpp +++ b/engines/startrek/detection.cpp @@ -60,7 +60,6 @@ Common::Language StarTrekEngine::getLanguage() const { } // End of Namespace StarTrek static const PlainGameDescriptor starTrekGames[] = { - {"startrek", "Star Trek game"}, {"st25", "Star Trek: 25th Anniversary"}, {"stjr", "Star Trek: Judgment Rites"}, {0, 0} @@ -321,7 +320,6 @@ static const StarTrekGameDescription gameDescriptions[] = { class StarTrekMetaEngine : public AdvancedMetaEngine { public: StarTrekMetaEngine() : AdvancedMetaEngine(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) { - _singleId = "startrek"; } const char *getEngineId() const { diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp index f225601c5c..c511c2a2b5 100644 --- a/engines/supernova/detection.cpp +++ b/engines/supernova/detection.cpp @@ -100,7 +100,6 @@ static const ADGameDescription gameDescriptions[] = { class SupernovaMetaEngine: public AdvancedMetaEngine { public: SupernovaMetaEngine() : AdvancedMetaEngine(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) { -// _singleId = "supernova"; } const char *getEngineId() const { diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index 5601f48915..44df7716ab 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -88,7 +88,6 @@ enum { class TeenAgentMetaEngine : public AdvancedMetaEngine { public: TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { - _singleId = "teenagent"; } const char *getEngineId() const { diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 86199ae2e7..7aa97accec 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -49,7 +49,6 @@ class TestbedMetaEngine : public AdvancedMetaEngine { public: TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { _md5Bytes = 512; - _singleId = "testbed"; } const char *getEngineId() const { diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 408247b03e..0516a47cc8 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -74,7 +74,6 @@ bool TinselEngine::isV1CD() const { } // End of namespace Tinsel static const PlainGameDescriptor tinselGames[] = { - {"tinsel", "Tinsel engine game"}, {"dw", "Discworld"}, {"dw2", "Discworld 2: Missing Presumed ...!?"}, {0, 0} @@ -85,7 +84,6 @@ static const PlainGameDescriptor tinselGames[] = { class TinselMetaEngine : public AdvancedMetaEngine { public: TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { - _singleId = "tinsel"; } const char *getEngineId() const { diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index d372c30f3f..153d96a23b 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -220,7 +220,6 @@ static const ExtraGuiOption toltecsExtraGuiOption = { class ToltecsMetaEngine : public AdvancedMetaEngine { public: ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) { - _singleId = "toltecs"; } const char *getEngineId() const { diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index ece06dfe69..4fc6b068b2 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -137,7 +137,6 @@ static const char * const directoryGlobs[] = { class ToonMetaEngine : public AdvancedMetaEngine { public: ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { - _singleId = "toon"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 1d9625980d..08644cc344 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -128,7 +128,6 @@ class ToucheMetaEngine : public AdvancedMetaEngine { public: ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { _md5Bytes = 4096; - _singleId = "touche"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index f10b9329e8..d6473eafff 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -58,7 +58,6 @@ Common::String TSageEngine::getPrimaryFilename() const { } // End of namespace TsAGE static const PlainGameDescriptor tSageGameTitles[] = { - { "tsage", "Tsunami TsAGE-based Game" }, { "ringworld", "Ringworld: Revenge of the Patriarch" }, { "blueforce", "Blue Force" }, { "ringworld2", "Return to Ringworld" }, @@ -75,7 +74,6 @@ enum { class TSageMetaEngine : public AdvancedMetaEngine { public: TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { - _singleId = "tsage"; } const char *getEngineId() const { diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 39ecf156f8..990c1adf01 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -125,7 +125,6 @@ class TuckerMetaEngine : public AdvancedMetaEngine { public: TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { _md5Bytes = 512; - _singleId = "tucker"; } const char *getEngineId() const { diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp index 75bfa963d1..49a01f8f45 100644 --- a/engines/wage/detection.cpp +++ b/engines/wage/detection.cpp @@ -55,7 +55,6 @@ class WageMetaEngine : public AdvancedMetaEngine { public: WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { _md5Bytes = 2 * 1024 * 1024; - _singleId = "wage"; _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index 6f3be398cc..3411512064 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -88,7 +88,6 @@ static const char *directoryGlobs[] = { class WintermuteMetaEngine : public AdvancedMetaEngine { public: WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { - _singleId = "wintermute"; _guiOptions = GUIO3(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS, GAMEOPTION_BILINEAR); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp index 3a19172fbc..45490f39fa 100644 --- a/engines/xeen/detection.cpp +++ b/engines/xeen/detection.cpp @@ -76,7 +76,6 @@ bool XeenEngine::getIsCD() const { } // End of namespace Xeen static const PlainGameDescriptor XeenGames[] = { - { "xeen", "Xeen" }, { "cloudsofxeen", "Might and Magic IV: Clouds of Xeen" }, { "darksideofxeen", "Might and Magic V: Dark Side of Xeen" }, { "worldofxeen", "Might and Magic: World of Xeen" }, diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp index 50e5f9a404..1ce98714de 100644 --- a/engines/zvision/detection.cpp +++ b/engines/zvision/detection.cpp @@ -61,7 +61,6 @@ public: ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) { _maxScanDepth = 2; _directoryGlobs = ZVision::directoryGlobs; - _singleId = "zvision"; } const char *getEngineId() const { diff --git a/engines/zvision/detection_tables.h b/engines/zvision/detection_tables.h index 05e3807aa2..171df1f6ca 100644 --- a/engines/zvision/detection_tables.h +++ b/engines/zvision/detection_tables.h @@ -26,7 +26,6 @@ namespace ZVision { static const PlainGameDescriptor zVisionGames[] = { - { "zvision", "Z-Vision Game" }, { "znemesis", "Zork Nemesis: The Forbidden Lands" }, { "zgi", "Zork: Grand Inquisitor" }, { 0, 0 } |