diff options
| author | Bastien Bouclet | 2016-09-15 18:34:15 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2019-11-03 11:43:00 +0100 |
| commit | 9c8bd056d6d597a10f7f653b559dc34cd2bd2be9 (patch) | |
| tree | b38576232baefa4c4310498ca7df184fff8d12c1 /engines/gob | |
| parent | 4b42112721a3a12ee10652f2c1dfcd227ab140b3 (diff) | |
| download | scummvm-rg350-9c8bd056d6d597a10f7f653b559dc34cd2bd2be9.tar.gz scummvm-rg350-9c8bd056d6d597a10f7f653b559dc34cd2bd2be9.tar.bz2 scummvm-rg350-9c8bd056d6d597a10f7f653b559dc34cd2bd2be9.zip | |
ENGINES: Stop using 'single id'
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/detection/detection.cpp | 9 | ||||
| -rw-r--r-- | engines/gob/detection/tables.h | 8 |
2 files changed, 0 insertions, 17 deletions
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 |