thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: Stop using 'single id'

Browse source
This commit is contained in:
Bastien Bouclet 2016-09-15 18:34:15 +02:00
parent 4b42112721
commit 9c8bd056d6
54 changed files with 0 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/access/detection.cpp
View file

@ -75,7 +75,6 @@ Common::Platform AccessEngine::getPlatform() const {
} // End of namespace Access } // End of namespace Access
static const PlainGameDescriptor AccessGames[] = { static const PlainGameDescriptor AccessGames[] = {
{"Access", "Access"},
{"amazon", "Amazon: Guardians of Eden"}, {"amazon", "Amazon: Guardians of Eden"},
{"martian", "Martian Memorandum"}, {"martian", "Martian Memorandum"},
{0, 0} {0, 0}

1
engines/agi/detection.cpp
View file

@ -202,7 +202,6 @@ class AgiMetaEngine : public AdvancedMetaEngine {
public: public:
AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) { AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) {
_singleId = "agi";
_guiOptions = GUIO1(GUIO_NOSPEECH); _guiOptions = GUIO1(GUIO_NOSPEECH);
} }

1
engines/bbvs/detection.cpp
View file

@ -69,7 +69,6 @@ static const char * const directoryGlobs[] = {
class BbvsMetaEngine : public AdvancedMetaEngine { class BbvsMetaEngine : public AdvancedMetaEngine {
public: public:
BbvsMetaEngine() : AdvancedMetaEngine(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) { BbvsMetaEngine() : AdvancedMetaEngine(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) {
_singleId = "bbvs";
_maxScanDepth = 3; _maxScanDepth = 3;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

1
engines/cge/detection.cpp
View file

@ -115,7 +115,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class CGEMetaEngine : public AdvancedMetaEngine { class CGEMetaEngine : public AdvancedMetaEngine {
public: public:
CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) {
_singleId = "soltys";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/cge2/detection.cpp
View file

@ -121,7 +121,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class CGE2MetaEngine : public AdvancedMetaEngine { class CGE2MetaEngine : public AdvancedMetaEngine {
public: public:
CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) { CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) {
_singleId = "sfinx";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/chewy/detection.cpp
View file

@ -115,7 +115,6 @@ public:
ChewyMetaEngine() : AdvancedMetaEngine(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) { ChewyMetaEngine() : AdvancedMetaEngine(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) {
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
_singleId = "chewy";
} }
const char *getEngineId() const { const char *getEngineId() const {

14
engines/cine/detection.cpp
View file

@ -23,7 +23,6 @@
#include "base/plugins.h" #include "base/plugins.h"
#include "engines/advancedDetector.h" #include "engines/advancedDetector.h"
#include "engines/obsolete.h"
#include "common/system.h" #include "common/system.h"
#include "common/textconsole.h" #include "common/textconsole.h"
@ -49,18 +48,11 @@ Common::Platform CineEngine::getPlatform() const { return _gameDescription->desc
} // End of namespace Cine } // End of namespace Cine
static const PlainGameDescriptor cineGames[] = { static const PlainGameDescriptor cineGames[] = {
{"cine", "Cinematique evo.1 engine game"},
{"fw", "Future Wars"}, {"fw", "Future Wars"},
{"os", "Operation Stealth"}, {"os", "Operation Stealth"},
{0, 0} {0, 0}
}; };
static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = {
{"fw", "cine", Common::kPlatformUnknown},
{"os", "cine", Common::kPlatformUnknown},
{0, 0, Common::kPlatformUnknown}
};
#include "cine/detection_tables.h" #include "cine/detection_tables.h"
static const ADExtraGuiOptionsMap optionsList[] = { static const ADExtraGuiOptionsMap optionsList[] = {
@ -80,14 +72,9 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class CineMetaEngine : public AdvancedMetaEngine { class CineMetaEngine : public AdvancedMetaEngine {
public: public:
CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) { CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) {
_singleId = "cine";
_guiOptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD); _guiOptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD);
} }
PlainGameDescriptor findGame(const char *gameId) const override {
return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable);
}
const char *getEngineId() const { const char *getEngineId() const {
return "cine"; return "cine";
} }
@ -101,7 +88,6 @@ public:
} }
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine); return AdvancedMetaEngine::createInstance(syst, engine);
} }
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;

2
engines/composer/detection.cpp
View file

@ -55,7 +55,6 @@ Common::Language ComposerEngine::getLanguage() const {
} }
static const PlainGameDescriptor composerGames[] = { static const PlainGameDescriptor composerGames[] = {
{"composer", "Composer Game"},
{"babayaga", "Magic Tales: Baba Yaga and the Magic Geese"}, {"babayaga", "Magic Tales: Baba Yaga and the Magic Geese"},
{"darby", "Darby the Dragon"}, {"darby", "Darby the Dragon"},
{"gregory", "Gregory and the Hot Air Balloon"}, {"gregory", "Gregory and the Hot Air Balloon"},
@ -480,7 +479,6 @@ static const char *directoryGlobs[] = {
class ComposerMetaEngine : public AdvancedMetaEngine { class ComposerMetaEngine : public AdvancedMetaEngine {
public: public:
ComposerMetaEngine() : AdvancedMetaEngine(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) { ComposerMetaEngine() : AdvancedMetaEngine(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) {
_singleId = "composer";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

2
engines/cruise/detection.cpp
View file

@ -48,7 +48,6 @@ Common::Platform CruiseEngine::getPlatform() const {
} }
static const PlainGameDescriptor cruiseGames[] = { static const PlainGameDescriptor cruiseGames[] = {
{"cruise", "Cinematique evo.2 engine game"},
{"cruise", "Cruise for a Corpse"}, {"cruise", "Cruise for a Corpse"},
{0, 0} {0, 0}
}; };
@ -196,7 +195,6 @@ static const CRUISEGameDescription gameDescriptions[] = {
class CruiseMetaEngine : public AdvancedMetaEngine { class CruiseMetaEngine : public AdvancedMetaEngine {
public: public:
CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) {
_singleId = "cruise";
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
} }

1
engines/cryo/detection.cpp
View file

@ -133,7 +133,6 @@ static const ADGameDescription gameDescriptions[] = {
class CryoMetaEngine : public AdvancedMetaEngine { class CryoMetaEngine : public AdvancedMetaEngine {
public: public:
CryoMetaEngine() : AdvancedMetaEngine(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) { CryoMetaEngine() : AdvancedMetaEngine(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) {
_singleId = "losteden";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/cryomni3d/detection.cpp
View file

@ -104,7 +104,6 @@ class CryOmni3DMetaEngine : public AdvancedMetaEngine {
public: public:
CryOmni3DMetaEngine() : AdvancedMetaEngine(CryOmni3D::gameDescriptions, CryOmni3DMetaEngine() : AdvancedMetaEngine(CryOmni3D::gameDescriptions,
sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) { sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) {
//_singleId = "cryomni3d";
_maxScanDepth = 1; _maxScanDepth = 1;
} }

1
engines/director/detection.cpp
View file

@ -99,7 +99,6 @@ static const char *directoryGlobs[] = {
class DirectorMetaEngine : public AdvancedMetaEngine { class DirectorMetaEngine : public AdvancedMetaEngine {
public: public:
DirectorMetaEngine() : AdvancedMetaEngine(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) { DirectorMetaEngine() : AdvancedMetaEngine(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) {
_singleId = "director";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

1
engines/dm/detection.cpp
View file

@ -98,7 +98,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class DMMetaEngine : public AdvancedMetaEngine { class DMMetaEngine : public AdvancedMetaEngine {
public: public:
DMMetaEngine() : AdvancedMetaEngine(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) { DMMetaEngine() : AdvancedMetaEngine(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) {
_singleId = "dm";
} }
virtual const char *getEngineId() const { virtual const char *getEngineId() const {

1
engines/draci/detection.cpp
View file

@ -84,7 +84,6 @@ const ADGameDescription gameDescriptions[] = {
class DraciMetaEngine : public AdvancedMetaEngine { class DraciMetaEngine : public AdvancedMetaEngine {
public: public:
DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) {
_singleId = "draci";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/drascula/detection.cpp
View file

@ -339,7 +339,6 @@ SaveStateDescriptor loadMetaData(Common::ReadStream *s, int slot, bool setPlayTi
class DrasculaMetaEngine : public AdvancedMetaEngine { class DrasculaMetaEngine : public AdvancedMetaEngine {
public: public:
DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) {
_singleId = "drascula";
_guiOptions = GUIO1(GUIO_NOMIDI); _guiOptions = GUIO1(GUIO_NOMIDI);
} }

1
engines/dreamweb/detection.cpp
View file

@ -71,7 +71,6 @@ public:
AdvancedMetaEngine(DreamWeb::gameDescriptions, AdvancedMetaEngine(DreamWeb::gameDescriptions,
sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames, sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames,
gameGuiOptions) { gameGuiOptions) {
_singleId = "dreamweb";
_guiOptions = GUIO1(GUIO_NOMIDI); _guiOptions = GUIO1(GUIO_NOMIDI);
} }

1
engines/fullpipe/detection.cpp
View file

@ -130,7 +130,6 @@ static const ADGameDescription gameDescriptions[] = {
class FullpipeMetaEngine : public AdvancedMetaEngine { class FullpipeMetaEngine : public AdvancedMetaEngine {
public: public:
FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) { FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
_singleId = "fullpipe";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/gnap/detection.cpp
View file

@ -78,7 +78,6 @@ static const ADGameDescription gameDescriptions[] = {
class GnapMetaEngine : public AdvancedMetaEngine { class GnapMetaEngine : public AdvancedMetaEngine {
public: public:
GnapMetaEngine() : AdvancedMetaEngine(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) { GnapMetaEngine() : AdvancedMetaEngine(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) {
_singleId = "gnap";
_maxScanDepth = 3; _maxScanDepth = 3;
} }

9
engines/gob/detection/detection.cpp
View file

@ -22,7 +22,6 @@
#include "base/plugins.h" #include "base/plugins.h"
#include "engines/advancedDetector.h" #include "engines/advancedDetector.h"
#include "engines/obsolete.h"
#include "gob/gob.h" #include "gob/gob.h"
#include "gob/dataio.h" #include "gob/dataio.h"
@ -33,8 +32,6 @@ class GobMetaEngine : public AdvancedMetaEngine {
public: public:
GobMetaEngine(); GobMetaEngine();
PlainGameDescriptor findGame(const char *gameId) const override;
const char *getEngineId() const { const char *getEngineId() const {
return "gob"; return "gob";
} }
@ -59,14 +56,9 @@ private:
GobMetaEngine::GobMetaEngine() : GobMetaEngine::GobMetaEngine() :
AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
_singleId = "gob";
_guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); _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 GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
ADDetectedGame detectedGame = detectGameFilebased(allFiles, fslist, Gob::fileBased); ADDetectedGame detectedGame = detectGameFilebased(allFiles, fslist, Gob::fileBased);
if (!detectedGame.desc) { if (!detectedGame.desc) {
@ -180,7 +172,6 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const {
} }
Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const { Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine); return AdvancedMetaEngine::createInstance(syst, engine);
} }

8
engines/gob/detection/tables.h
View file

@ -41,7 +41,6 @@ using namespace Common;
// Game IDs and proper names // Game IDs and proper names
static const PlainGameDescriptor gobGames[] = { static const PlainGameDescriptor gobGames[] = {
{"gob", "Gob engine game"},
{"gob1", "Gobliiins"}, {"gob1", "Gobliiins"},
{"gob1cd", "Gobliiins CD"}, {"gob1cd", "Gobliiins CD"},
{"gob2", "Gobliins 2"}, {"gob2", "Gobliins 2"},
@ -81,13 +80,6 @@ static const PlainGameDescriptor gobGames[] = {
{0, 0} {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 { namespace Gob {
// Detection tables // Detection tables

4
engines/groovie/detection.cpp
View file

@ -42,8 +42,6 @@ static const PlainGameDescriptor groovieGames[] = {
{"tlc", "Tender Loving Care"}, {"tlc", "Tender Loving Care"},
#endif #endif
// Unknown
{"groovie", "Groovie engine game"},
{0, 0} {0, 0}
}; };
@ -333,8 +331,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class GroovieMetaEngine : public AdvancedMetaEngine { class GroovieMetaEngine : public AdvancedMetaEngine {
public: public:
GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) { GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) {
_singleId = "groovie";
// Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from // Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from
// its "Making of" as well as the Clandestiny Trailer; they all share // its "Making of" as well as the Clandestiny Trailer; they all share
// the same MD5. // the same MD5.

1
engines/hdb/detection.cpp
View file

@ -167,7 +167,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class HDBMetaEngine : public AdvancedMetaEngine { class HDBMetaEngine : public AdvancedMetaEngine {
public: public:
HDBMetaEngine() : AdvancedMetaEngine(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) { HDBMetaEngine() : AdvancedMetaEngine(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) {
_singleId = "hdb";
} }
const char *getEngineId() const { const char *getEngineId() const {

2
engines/illusions/detection.cpp
View file

@ -32,7 +32,6 @@
#include "graphics/thumbnail.h" #include "graphics/thumbnail.h"
static const PlainGameDescriptor illusionsGames[] = { static const PlainGameDescriptor illusionsGames[] = {
{ "illusions", "Illusions engine game" },
{ "bbdou", "Beavis and Butt-head Do U" }, { "bbdou", "Beavis and Butt-head Do U" },
{ "duckman", "Duckman" }, { "duckman", "Duckman" },
{ 0, 0 } { 0, 0 }
@ -115,7 +114,6 @@ static const char * const directoryGlobs[] = {
class IllusionsMetaEngine : public AdvancedMetaEngine { class IllusionsMetaEngine : public AdvancedMetaEngine {
public: public:
IllusionsMetaEngine() : AdvancedMetaEngine(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) { IllusionsMetaEngine() : AdvancedMetaEngine(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) {
_singleId = "illusions";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

2
engines/lab/detection.cpp
View file

@ -115,8 +115,6 @@ uint32 LabEngine::getFeatures() const {
class LabMetaEngine : public AdvancedMetaEngine { class LabMetaEngine : public AdvancedMetaEngine {
public: public:
LabMetaEngine() : AdvancedMetaEngine(labDescriptions, sizeof(ADGameDescription), lab_setting) { LabMetaEngine() : AdvancedMetaEngine(labDescriptions, sizeof(ADGameDescription), lab_setting) {
_singleId = "lab";
_maxScanDepth = 4; _maxScanDepth = 4;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
_flags = kADFlagUseExtraAsHint; _flags = kADFlagUseExtraAsHint;

1
engines/lastexpress/detection.cpp
View file

@ -227,7 +227,6 @@ static const ADGameDescription gameDescriptions[] = {
class LastExpressMetaEngine : public AdvancedMetaEngine { class LastExpressMetaEngine : public AdvancedMetaEngine {
public: public:
LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) {
_singleId = "lastexpress";
_guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX);
} }

1
engines/lure/detection.cpp
View file

@ -207,7 +207,6 @@ class LureMetaEngine : public AdvancedMetaEngine {
public: public:
LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) {
_md5Bytes = 1024; _md5Bytes = 1024;
_singleId = "lure";
// Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions // Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions
// of italian Lure when their datafiles sit in the same directory. // of italian Lure when their datafiles sit in the same directory.

2
engines/made/detection.cpp
View file

@ -46,7 +46,6 @@ uint16 MadeEngine::getVersion() const {
} }
static const PlainGameDescriptor madeGames[] = { static const PlainGameDescriptor madeGames[] = {
{"made", "MADE engine game"},
{"manhole", "The Manhole"}, {"manhole", "The Manhole"},
{"rtz", "Return to Zork"}, {"rtz", "Return to Zork"},
{"lgop2", "Leather Goddesses of Phobos 2"}, {"lgop2", "Leather Goddesses of Phobos 2"},
@ -57,7 +56,6 @@ static const PlainGameDescriptor madeGames[] = {
class MadeMetaEngine : public AdvancedMetaEngine { class MadeMetaEngine : public AdvancedMetaEngine {
public: public:
MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) {
_singleId = "made";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/mads/detection.cpp
View file

@ -69,7 +69,6 @@ Common::Platform MADSEngine::getPlatform() const {
} // End of namespace MADS } // End of namespace MADS
static const PlainGameDescriptor MADSGames[] = { static const PlainGameDescriptor MADSGames[] = {
{"MADS", "MADS"},
{"dragonsphere", "Dragonsphere"}, {"dragonsphere", "Dragonsphere"},
{"nebular", "Rex Nebular and the Cosmic Gender Bender"}, {"nebular", "Rex Nebular and the Cosmic Gender Bender"},
{"phantom", "Return of the Phantom"}, {"phantom", "Return of the Phantom"},

2
engines/mohawk/detection.cpp
View file

@ -136,7 +136,6 @@ bool MohawkEngine_Riven::hasFeature(EngineFeature f) const {
} // End of Namespace Mohawk } // End of Namespace Mohawk
static const PlainGameDescriptor mohawkGames[] = { static const PlainGameDescriptor mohawkGames[] = {
{"mohawk", "Mohawk Game"},
{"myst", "Myst"}, {"myst", "Myst"},
{"makingofmyst", "The Making of Myst"}, {"makingofmyst", "The Making of Myst"},
{"riven", "Riven: The Sequel to Myst"}, {"riven", "Riven: The Sequel to Myst"},
@ -196,7 +195,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class MohawkMetaEngine : public AdvancedMetaEngine { class MohawkMetaEngine : public AdvancedMetaEngine {
public: public:
MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames, optionsList) { MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames, optionsList) {
_singleId = "mohawk";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

1
engines/mortevielle/detection.cpp
View file

@ -55,7 +55,6 @@ public:
MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription), MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription),
MortevielleGame) { MortevielleGame) {
_md5Bytes = 512; _md5Bytes = 512;
_singleId = "mortevielle";
// Use kADFlagUseExtraAsHint to distinguish between original and improved versions // Use kADFlagUseExtraAsHint to distinguish between original and improved versions
// (i.e. use or not of the game data file). // (i.e. use or not of the game data file).
_flags = kADFlagUseExtraAsHint; _flags = kADFlagUseExtraAsHint;

1
engines/neverhood/detection.cpp
View file

@ -198,7 +198,6 @@ static const ExtraGuiOption neverhoodExtraGuiOption3 = {
class NeverhoodMetaEngine : public AdvancedMetaEngine { class NeverhoodMetaEngine : public AdvancedMetaEngine {
public: public:
NeverhoodMetaEngine() : AdvancedMetaEngine(Neverhood::gameDescriptions, sizeof(Neverhood::NeverhoodGameDescription), neverhoodGames) { NeverhoodMetaEngine() : AdvancedMetaEngine(Neverhood::gameDescriptions, sizeof(Neverhood::NeverhoodGameDescription), neverhoodGames) {
_singleId = "neverhood";
_guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI); _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI);
} }

1
engines/parallaction/detection.cpp
View file

@ -45,7 +45,6 @@ Common::Platform Parallaction::getPlatform() const { return _gameDescription->de
} }
static const PlainGameDescriptor parallactionGames[] = { static const PlainGameDescriptor parallactionGames[] = {
{"parallaction", "Parallaction engine game"},
{"nippon", "Nippon Safes Inc."}, {"nippon", "Nippon Safes Inc."},
{"bra", "The Big Red Adventure"}, {"bra", "The Big Red Adventure"},
{0, 0} {0, 0}

1
engines/pegasus/detection.cpp
View file

@ -135,7 +135,6 @@ static const PegasusGameDescription gameDescriptions[] = {
class PegasusMetaEngine : public AdvancedMetaEngine { class PegasusMetaEngine : public AdvancedMetaEngine {
public: public:
PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) { PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) {
_singleId = "pegasus";
} }
virtual const char *getEngineId() const { virtual const char *getEngineId() const {

1
engines/plumbers/detection.cpp
View file

@ -73,7 +73,6 @@ static const ADGameDescription gameDescriptions[] = {
class PlumbersMetaEngine : public AdvancedMetaEngine { class PlumbersMetaEngine : public AdvancedMetaEngine {
public: public:
PlumbersMetaEngine() : AdvancedMetaEngine(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) { PlumbersMetaEngine() : AdvancedMetaEngine(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) {
_singleId = "plumbers";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/prince/detection.cpp
View file

@ -148,7 +148,6 @@ const static char *directoryGlobs[] = {
class PrinceMetaEngine : public AdvancedMetaEngine { class PrinceMetaEngine : public AdvancedMetaEngine {
public: public:
PrinceMetaEngine() : AdvancedMetaEngine(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) { PrinceMetaEngine() : AdvancedMetaEngine(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) {
_singleId = "prince";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

1
engines/queen/detection.cpp
View file

@ -482,7 +482,6 @@ static const QueenGameDescription gameDescriptions[] = {
class QueenMetaEngine : public AdvancedMetaEngine { class QueenMetaEngine : public AdvancedMetaEngine {
public: public:
QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) {
_singleId = "queen";
} }
const char *getEngineId() const { const char *getEngineId() const {

16
engines/saga/detection.cpp
View file

@ -28,7 +28,6 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "engines/advancedDetector.h" #include "engines/advancedDetector.h"
#include "engines/obsolete.h"
#include "common/system.h" #include "common/system.h"
#include "graphics/thumbnail.h" #include "graphics/thumbnail.h"
@ -81,7 +80,6 @@ const ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _
} }
static const PlainGameDescriptor sagaGames[] = { static const PlainGameDescriptor sagaGames[] = {
{"saga", "SAGA Engine game"},
{"ite", "Inherit the Earth: Quest for the Orb"}, {"ite", "Inherit the Earth: Quest for the Orb"},
{"ihnm", "I Have No Mouth and I Must Scream"}, {"ihnm", "I Have No Mouth and I Must Scream"},
{"dino", "Dinotopia"}, {"dino", "Dinotopia"},
@ -89,24 +87,11 @@ static const PlainGameDescriptor sagaGames[] = {
{0, 0} {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" #include "saga/detection_tables.h"
class SagaMetaEngine : public AdvancedMetaEngine { class SagaMetaEngine : public AdvancedMetaEngine {
public: public:
SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { 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 { const char *getEngineId() const {
@ -142,7 +127,6 @@ public:
virtual bool hasFeature(MetaEngineFeature f) const; virtual bool hasFeature(MetaEngineFeature f) const;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const { virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine); return AdvancedMetaEngine::createInstance(syst, engine);
} }
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;

1
engines/sci/detection.cpp
View file

@ -558,7 +558,6 @@ static const char *directoryGlobs[] = {
class SciMetaEngine : public AdvancedMetaEngine { class SciMetaEngine : public AdvancedMetaEngine {
public: public:
SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) { SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) {
_singleId = "sci";
_maxScanDepth = 3; _maxScanDepth = 3;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
_matchFullPaths = true; _matchFullPaths = true;

1
engines/sludge/detection.cpp
View file

@ -79,7 +79,6 @@ static char s_fallbackFileNameBuffer[51];
class SludgeMetaEngine : public AdvancedMetaEngine { class SludgeMetaEngine : public AdvancedMetaEngine {
public: public:
SludgeMetaEngine() : AdvancedMetaEngine(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) { SludgeMetaEngine() : AdvancedMetaEngine(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) {
_singleId = "sludge";
_maxScanDepth = 1; _maxScanDepth = 1;
} }

2
engines/startrek/detection.cpp
View file

@ -60,7 +60,6 @@ Common::Language StarTrekEngine::getLanguage() const {
} // End of Namespace StarTrek } // End of Namespace StarTrek
static const PlainGameDescriptor starTrekGames[] = { static const PlainGameDescriptor starTrekGames[] = {
{"startrek", "Star Trek game"},
{"st25", "Star Trek: 25th Anniversary"}, {"st25", "Star Trek: 25th Anniversary"},
{"stjr", "Star Trek: Judgment Rites"}, {"stjr", "Star Trek: Judgment Rites"},
{0, 0} {0, 0}
@ -321,7 +320,6 @@ static const StarTrekGameDescription gameDescriptions[] = {
class StarTrekMetaEngine : public AdvancedMetaEngine { class StarTrekMetaEngine : public AdvancedMetaEngine {
public: public:
StarTrekMetaEngine() : AdvancedMetaEngine(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) { StarTrekMetaEngine() : AdvancedMetaEngine(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) {
_singleId = "startrek";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/supernova/detection.cpp
View file

@ -100,7 +100,6 @@ static const ADGameDescription gameDescriptions[] = {
class SupernovaMetaEngine: public AdvancedMetaEngine { class SupernovaMetaEngine: public AdvancedMetaEngine {
public: public:
SupernovaMetaEngine() : AdvancedMetaEngine(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) { SupernovaMetaEngine() : AdvancedMetaEngine(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) {
// _singleId = "supernova";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/teenagent/detection.cpp
View file

@ -88,7 +88,6 @@ enum {
class TeenAgentMetaEngine : public AdvancedMetaEngine { class TeenAgentMetaEngine : public AdvancedMetaEngine {
public: public:
TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) {
_singleId = "teenagent";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/testbed/detection.cpp
View file

@ -49,7 +49,6 @@ class TestbedMetaEngine : public AdvancedMetaEngine {
public: public:
TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) {
_md5Bytes = 512; _md5Bytes = 512;
_singleId = "testbed";
} }
const char *getEngineId() const { const char *getEngineId() const {

2
engines/tinsel/detection.cpp
View file

@ -74,7 +74,6 @@ bool TinselEngine::isV1CD() const {
} // End of namespace Tinsel } // End of namespace Tinsel
static const PlainGameDescriptor tinselGames[] = { static const PlainGameDescriptor tinselGames[] = {
{"tinsel", "Tinsel engine game"},
{"dw", "Discworld"}, {"dw", "Discworld"},
{"dw2", "Discworld 2: Missing Presumed ...!?"}, {"dw2", "Discworld 2: Missing Presumed ...!?"},
{0, 0} {0, 0}
@ -85,7 +84,6 @@ static const PlainGameDescriptor tinselGames[] = {
class TinselMetaEngine : public AdvancedMetaEngine { class TinselMetaEngine : public AdvancedMetaEngine {
public: public:
TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) {
_singleId = "tinsel";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/toltecs/detection.cpp
View file

@ -220,7 +220,6 @@ static const ExtraGuiOption toltecsExtraGuiOption = {
class ToltecsMetaEngine : public AdvancedMetaEngine { class ToltecsMetaEngine : public AdvancedMetaEngine {
public: public:
ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) { ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) {
_singleId = "toltecs";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/toon/detection.cpp
View file

@ -137,7 +137,6 @@ static const char * const directoryGlobs[] = {
class ToonMetaEngine : public AdvancedMetaEngine { class ToonMetaEngine : public AdvancedMetaEngine {
public: public:
ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) {
_singleId = "toon";
_maxScanDepth = 3; _maxScanDepth = 3;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

1
engines/touche/detection.cpp
View file

@ -128,7 +128,6 @@ class ToucheMetaEngine : public AdvancedMetaEngine {
public: public:
ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) {
_md5Bytes = 4096; _md5Bytes = 4096;
_singleId = "touche";
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;
} }

2
engines/tsage/detection.cpp
View file

@ -58,7 +58,6 @@ Common::String TSageEngine::getPrimaryFilename() const {
} // End of namespace TsAGE } // End of namespace TsAGE
static const PlainGameDescriptor tSageGameTitles[] = { static const PlainGameDescriptor tSageGameTitles[] = {
{ "tsage", "Tsunami TsAGE-based Game" },
{ "ringworld", "Ringworld: Revenge of the Patriarch" }, { "ringworld", "Ringworld: Revenge of the Patriarch" },
{ "blueforce", "Blue Force" }, { "blueforce", "Blue Force" },
{ "ringworld2", "Return to Ringworld" }, { "ringworld2", "Return to Ringworld" },
@ -75,7 +74,6 @@ enum {
class TSageMetaEngine : public AdvancedMetaEngine { class TSageMetaEngine : public AdvancedMetaEngine {
public: public:
TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) {
_singleId = "tsage";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/tucker/detection.cpp
View file

@ -125,7 +125,6 @@ class TuckerMetaEngine : public AdvancedMetaEngine {
public: public:
TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) {
_md5Bytes = 512; _md5Bytes = 512;
_singleId = "tucker";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/wage/detection.cpp
View file

@ -55,7 +55,6 @@ class WageMetaEngine : public AdvancedMetaEngine {
public: public:
WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) {
_md5Bytes = 2 * 1024 * 1024; _md5Bytes = 2 * 1024 * 1024;
_singleId = "wage";
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
} }

1
engines/wintermute/detection.cpp
View file

@ -88,7 +88,6 @@ static const char *directoryGlobs[] = {
class WintermuteMetaEngine : public AdvancedMetaEngine { class WintermuteMetaEngine : public AdvancedMetaEngine {
public: public:
WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) {
_singleId = "wintermute";
_guiOptions = GUIO3(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS, GAMEOPTION_BILINEAR); _guiOptions = GUIO3(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS, GAMEOPTION_BILINEAR);
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = directoryGlobs; _directoryGlobs = directoryGlobs;

1
engines/xeen/detection.cpp
View file

@ -76,7 +76,6 @@ bool XeenEngine::getIsCD() const {
} // End of namespace Xeen } // End of namespace Xeen
static const PlainGameDescriptor XeenGames[] = { static const PlainGameDescriptor XeenGames[] = {
{ "xeen", "Xeen" },
{ "cloudsofxeen", "Might and Magic IV: Clouds of Xeen" }, { "cloudsofxeen", "Might and Magic IV: Clouds of Xeen" },
{ "darksideofxeen", "Might and Magic V: Dark Side of Xeen" }, { "darksideofxeen", "Might and Magic V: Dark Side of Xeen" },
{ "worldofxeen", "Might and Magic: World of Xeen" }, { "worldofxeen", "Might and Magic: World of Xeen" },

1
engines/zvision/detection.cpp
View file

@ -61,7 +61,6 @@ public:
ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) { ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) {
_maxScanDepth = 2; _maxScanDepth = 2;
_directoryGlobs = ZVision::directoryGlobs; _directoryGlobs = ZVision::directoryGlobs;
_singleId = "zvision";
} }
const char *getEngineId() const { const char *getEngineId() const {

1
engines/zvision/detection_tables.h
View file

@ -26,7 +26,6 @@
namespace ZVision { namespace ZVision {
static const PlainGameDescriptor zVisionGames[] = { static const PlainGameDescriptor zVisionGames[] = {
{ "zvision", "Z-Vision Game" },
{ "znemesis", "Zork Nemesis: The Forbidden Lands" }, { "znemesis", "Zork Nemesis: The Forbidden Lands" },
{ "zgi", "Zork: Grand Inquisitor" }, { "zgi", "Zork: Grand Inquisitor" },
{ 0, 0 } { 0, 0 }