From 0b6befdcc5f5f8d6d5deb2831104fb7abc0f7466 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 8 Mar 2016 18:30:58 +0100 Subject: ENGINES: Make variable names of AdvancedMetaEngine conform to our guidelines. _singleid -> _singleId _gameids -> _gameIds _guioptions -> _guiOptions --- engines/advancedDetector.cpp | 40 ++++++++++++++++++------------------- engines/advancedDetector.h | 10 +++++----- engines/agi/detection.cpp | 4 ++-- engines/agos/detection.cpp | 6 +++--- engines/bbvs/detection.cpp | 2 +- engines/cge/detection.cpp | 2 +- engines/cge2/detection.cpp | 2 +- engines/cine/detection.cpp | 8 ++++---- engines/composer/detection.cpp | 2 +- engines/cruise/detection.cpp | 4 ++-- engines/draci/detection.cpp | 2 +- engines/drascula/detection.cpp | 4 ++-- engines/dreamweb/detection.cpp | 4 ++-- engines/fullpipe/detection.cpp | 2 +- engines/gob/detection/detection.cpp | 10 +++++----- engines/groovie/detection.cpp | 4 ++-- engines/lab/detection.cpp | 2 +- engines/lastexpress/detection.cpp | 4 ++-- engines/lure/detection.cpp | 4 ++-- engines/made/detection.cpp | 2 +- engines/mohawk/detection.cpp | 2 +- engines/mortevielle/detection.cpp | 2 +- engines/neverhood/detection.cpp | 4 ++-- engines/parallaction/detection.cpp | 2 +- engines/pegasus/detection.cpp | 2 +- engines/prince/detection.h | 2 +- engines/queen/detection.cpp | 2 +- engines/saga/detection.cpp | 6 +++--- engines/sci/detection.cpp | 2 +- engines/sword25/detection.cpp | 2 +- engines/teenagent/detection.cpp | 2 +- engines/testbed/detection.cpp | 2 +- engines/tinsel/detection.cpp | 2 +- engines/toltecs/detection.cpp | 2 +- engines/toon/detection.cpp | 2 +- engines/touche/detection.cpp | 2 +- engines/tsage/detection.cpp | 2 +- engines/tucker/detection.cpp | 2 +- engines/wage/detection.cpp | 4 ++-- engines/wintermute/detection.cpp | 4 ++-- engines/zvision/detection.cpp | 2 +- 41 files changed, 85 insertions(+), 85 deletions(-) diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index ec48a9b6c2..0d051e470b 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -102,9 +102,9 @@ static Common::String sanitizeName(const char *name) { } void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *realDesc) const { - if (_singleid != NULL) { + if (_singleId != NULL) { desc["preferredtarget"] = desc["gameid"]; - desc["gameid"] = _singleid; + desc["gameid"] = _singleId; } if (!desc.contains("preferredtarget")) @@ -120,7 +120,7 @@ void AdvancedMetaEngine::updateGameDescriptor(GameDescriptor &desc, const ADGame if (_flags & kADFlagUseExtraAsHint) desc["extra"] = realDesc->extra; - desc.setGUIOptions(realDesc->guioptions + _guioptions); + desc.setGUIOptions(realDesc->guioptions + _guiOptions); desc.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(realDesc->language)); if (realDesc->flags & ADGF_ADDENGLISH) @@ -166,7 +166,7 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { // Use fallback detector if there were no matches by other means const ADGameDescription *fallbackDesc = fallbackDetect(allFiles, fslist); if (fallbackDesc != 0) { - GameDescriptor desc(toGameDescriptor(*fallbackDesc, _gameids)); + GameDescriptor desc(toGameDescriptor(*fallbackDesc, _gameIds)); updateGameDescriptor(desc, fallbackDesc); detectedGames.push_back(desc); } @@ -174,7 +174,7 @@ GameList AdvancedMetaEngine::detectGames(const Common::FSList &fslist) const { // Otherwise use the found matches cleanupPirated(matches); for (uint i = 0; i < matches.size(); i++) { - GameDescriptor desc(toGameDescriptor(*matches[i], _gameids)); + GameDescriptor desc(toGameDescriptor(*matches[i], _gameIds)); updateGameDescriptor(desc, matches[i]); detectedGames.push_back(desc); } @@ -269,7 +269,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (cleanupPirated(matches)) return Common::kNoGameDataFoundError; - if (_singleid == NULL) { + if (_singleId == NULL) { // Find the first match with correct gameid. for (uint i = 0; i < matches.size(); i++) { if (matches[i]->gameid == gameid) { @@ -287,7 +287,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (agdDesc != 0) { // Seems we found a fallback match. But first perform a basic // sanity check: the gameid must match. - if (_singleid == NULL && agdDesc->gameid != gameid) + if (_singleId == NULL && agdDesc->gameid != gameid) agdDesc = 0; } } @@ -301,9 +301,9 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine) if (agdDesc->flags & ADGF_ADDENGLISH) lang += " " + getGameGUIOptionsDescriptionLanguage(Common::EN_ANY); - Common::updateGameGUIOptions(agdDesc->guioptions + _guioptions, lang); + Common::updateGameGUIOptions(agdDesc->guioptions + _guiOptions, lang); - GameDescriptor gameDescriptor = toGameDescriptor(*agdDesc, _gameids); + GameDescriptor gameDescriptor = toGameDescriptor(*agdDesc, _gameIds); bool showTestingWarning = false; @@ -585,27 +585,27 @@ const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap & } GameList AdvancedMetaEngine::getSupportedGames() const { - if (_singleid != NULL) { + if (_singleId != NULL) { GameList gl; - const PlainGameDescriptor *g = _gameids; + const PlainGameDescriptor *g = _gameIds; while (g->gameid) { - if (0 == scumm_stricmp(_singleid, g->gameid)) { + if (0 == scumm_stricmp(_singleId, g->gameid)) { gl.push_back(GameDescriptor(g->gameid, g->description)); return gl; } g++; } - error("Engine %s doesn't have its singleid specified in ids list", _singleid); + error("Engine %s doesn't have its singleid specified in ids list", _singleId); } - return GameList(_gameids); + return GameList(_gameIds); } -GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const { +GameDescriptor AdvancedMetaEngine::findGame(const char *gameId) const { // First search the list of supported gameids for a match. - const PlainGameDescriptor *g = findPlainGameDescriptor(gameid, _gameids); + const PlainGameDescriptor *g = findPlainGameDescriptor(gameId, _gameIds); if (g) return GameDescriptor(*g); @@ -613,14 +613,14 @@ GameDescriptor AdvancedMetaEngine::findGame(const char *gameid) const { return GameDescriptor(); } -AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameids, const ADExtraGuiOptionsMap *extraGuiOptions) - : _gameDescriptors((const byte *)descs), _descItemSize(descItemSize), _gameids(gameids), +AdvancedMetaEngine::AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions) + : _gameDescriptors((const byte *)descs), _descItemSize(descItemSize), _gameIds(gameIds), _extraGuiOptions(extraGuiOptions) { _md5Bytes = 5000; - _singleid = NULL; + _singleId = NULL; _flags = 0; - _guioptions = GUIO_NONE; + _guiOptions = GUIO_NONE; _maxScanDepth = 1; _directoryGlobs = NULL; } diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index ba1aa02cff..9c766b1414 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -192,7 +192,7 @@ protected: * A list of all gameids (and their corresponding descriptions) supported * by this engine. */ - const PlainGameDescriptor *_gameids; + const PlainGameDescriptor *_gameIds; /** * A map containing all the extra game GUI options the engine supports. @@ -220,7 +220,7 @@ protected: * address a more generic problem. We should find a better way to * disambiguate gameids. */ - const char *_singleid; + const char *_singleId; /** * A bitmask of flags which can be used to configure the behavior @@ -234,7 +234,7 @@ protected: * entry in addition to per-game options. Refer to GameGUIOption * enum for the list. */ - Common::String _guioptions; + Common::String _guiOptions; /** * Maximum depth of directories to look up. @@ -252,7 +252,7 @@ protected: const char * const *_directoryGlobs; public: - AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameids, const ADExtraGuiOptionsMap *extraGuiOptions = 0); + AdvancedMetaEngine(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions = 0); /** * Returns list of targets supported by the engine. @@ -260,7 +260,7 @@ public: */ virtual GameList getSupportedGames() const; - virtual GameDescriptor findGame(const char *gameid) const; + virtual GameDescriptor findGame(const char *gameId) const; virtual GameList detectGames(const Common::FSList &fslist) const; diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 7d5fd3d668..8e971aec67 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -202,8 +202,8 @@ class AgiMetaEngine : public AdvancedMetaEngine { public: AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) { - _singleid = "agi"; - _guioptions = GUIO1(GUIO_NOSPEECH); + _singleId = "agi"; + _guiOptions = GUIO1(GUIO_NOSPEECH); } virtual const char *getName() const { diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 82f8ad4bf2..2c89522089 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -94,13 +94,13 @@ using namespace AGOS; class AgosMetaEngine : public AdvancedMetaEngine { public: AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { - _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); + _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } - virtual GameDescriptor findGame(const char *gameid) const { - return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + virtual GameDescriptor findGame(const char *gameId) const { + return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); } virtual const char *getName() const { diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp index 37b5e398df..7c0045ee73 100644 --- a/engines/bbvs/detection.cpp +++ b/engines/bbvs/detection.cpp @@ -69,7 +69,7 @@ static const char * const directoryGlobs[] = { class BbvsMetaEngine : public AdvancedMetaEngine { public: BbvsMetaEngine() : AdvancedMetaEngine(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) { - _singleid = "bbvs"; + _singleId = "bbvs"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 95705cbebc..52168dc934 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -115,7 +115,7 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CGEMetaEngine : public AdvancedMetaEngine { public: CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { - _singleid = "soltys"; + _singleId = "soltys"; } virtual const char *getName() const { diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index 3ccfffe43f..01119bb1fd 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -111,7 +111,7 @@ static const ADExtraGuiOptionsMap optionsList[] = { class CGE2MetaEngine : public AdvancedMetaEngine { public: CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) { - _singleid = "sfinx"; + _singleId = "sfinx"; } virtual const char *getName() const { diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 5e1ffadb1b..ec01e8734d 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -80,12 +80,12 @@ 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); + _singleId = "cine"; + _guiOptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD); } - virtual GameDescriptor findGame(const char *gameid) const { - return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + virtual GameDescriptor findGame(const char *gameId) const { + return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); } virtual const char *getName() const { diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index e250996371..c6e4c1509c 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -386,7 +386,7 @@ static const char *directoryGlobs[] = { class ComposerMetaEngine : public AdvancedMetaEngine { public: ComposerMetaEngine() : AdvancedMetaEngine(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) { - _singleid = "composer"; + _singleId = "composer"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 69e1bc4ad0..6807df1fbe 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -196,8 +196,8 @@ 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); + _singleId = "cruise"; + _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index 82b6935d72..65427bd8cd 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -84,7 +84,7 @@ const ADGameDescription gameDescriptions[] = { class DraciMetaEngine : public AdvancedMetaEngine { public: DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { - _singleid = "draci"; + _singleId = "draci"; } virtual const char *getName() const { diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 9a2da1d732..ffec393a0a 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -310,8 +310,8 @@ 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); + _singleId = "drascula"; + _guiOptions = GUIO1(GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index 853047ccc7..764171bcb0 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -70,8 +70,8 @@ public: AdvancedMetaEngine(DreamWeb::gameDescriptions, sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames, gameGuiOptions) { - _singleid = "dreamweb"; - _guioptions = GUIO1(GUIO_NOMIDI); + _singleId = "dreamweb"; + _guiOptions = GUIO1(GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index 99fbdc4b82..a865e9ad06 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -76,7 +76,7 @@ static const ADGameDescription gameDescriptions[] = { class FullpipeMetaEngine : public AdvancedMetaEngine { public: FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) { - _singleid = "fullpipe"; + _singleId = "fullpipe"; } virtual const char *getName() const { diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp index 3b26f63c39..b0aa78f416 100644 --- a/engines/gob/detection/detection.cpp +++ b/engines/gob/detection/detection.cpp @@ -33,7 +33,7 @@ class GobMetaEngine : public AdvancedMetaEngine { public: GobMetaEngine(); - virtual GameDescriptor findGame(const char *gameid) const; + virtual GameDescriptor findGame(const char *gameId) const; virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; @@ -55,12 +55,12 @@ private: GobMetaEngine::GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { - _singleid = "gob"; - _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); + _singleId = "gob"; + _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); } -GameDescriptor GobMetaEngine::findGame(const char *gameid) const { - return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); +GameDescriptor GobMetaEngine::findGame(const char *gameId) const { + return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); } const ADGameDescription *GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index a249b66858..b12e264a57 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -322,7 +322,7 @@ static const ADExtraGuiOptionsMap optionsList[] = { class GroovieMetaEngine : public AdvancedMetaEngine { public: GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) { - _singleid = "groovie"; + _singleId = "groovie"; // Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from // its "Making of" as well as the Clandestiny Trailer; they all share @@ -333,7 +333,7 @@ public: // to the detection entries. In the latter case, this TODO should be // replaced with an according explanation. _flags = kADFlagUseExtraAsHint; - _guioptions = GUIO3(GUIO_NOSUBTITLES, GUIO_NOSFX, GUIO_NOASPECT); + _guiOptions = GUIO3(GUIO_NOSUBTITLES, GUIO_NOSFX, GUIO_NOASPECT); // Need MIDI directory to detect 11H Mac Installed _maxScanDepth = 2; diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp index 8d81e5f0ae..9fe4a16d35 100644 --- a/engines/lab/detection.cpp +++ b/engines/lab/detection.cpp @@ -115,7 +115,7 @@ uint32 LabEngine::getFeatures() const { class LabMetaEngine : public AdvancedMetaEngine { public: LabMetaEngine() : AdvancedMetaEngine(labDescriptions, sizeof(ADGameDescription), lab_setting) { - _singleid = "lab"; + _singleId = "lab"; _maxScanDepth = 4; _directoryGlobs = directoryGlobs; diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index d790582104..52224e4ea5 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -199,8 +199,8 @@ static const ADGameDescription gameDescriptions[] = { class LastExpressMetaEngine : public AdvancedMetaEngine { public: LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { - _singleid = "lastexpress"; - _guioptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); + _singleId = "lastexpress"; + _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); } const char *getName() const { diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index d0a8ee0b4a..690a358bc3 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -193,12 +193,12 @@ class LureMetaEngine : public AdvancedMetaEngine { public: LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames) { _md5Bytes = 1024; - _singleid = "lure"; + _singleId = "lure"; // Use kADFlagUseExtraAsHint to distinguish between EGA and VGA versions // of italian Lure when their datafiles sit in the same directory. _flags = kADFlagUseExtraAsHint; - _guioptions = GUIO1(GUIO_NOSPEECH); + _guiOptions = GUIO1(GUIO_NOSPEECH); } virtual const char *getName() const { diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index 7adc3e1f98..636c2d147c 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -521,7 +521,7 @@ static MadeGameDescription g_fallbackDesc = { class MadeMetaEngine : public AdvancedMetaEngine { public: MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { - _singleid = "made"; + _singleId = "made"; } virtual const char *getName() const { diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 2579712105..7b91a179d2 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -178,7 +178,7 @@ static const ADExtraGuiOptionsMap optionsList[] = { class MohawkMetaEngine : public AdvancedMetaEngine { public: MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames, optionsList) { - _singleid = "mohawk"; + _singleId = "mohawk"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp index b6c27e6b12..6791707dd5 100644 --- a/engines/mortevielle/detection.cpp +++ b/engines/mortevielle/detection.cpp @@ -55,7 +55,7 @@ public: MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription), MortevielleGame) { _md5Bytes = 512; - _singleid = "mortevielle"; + _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 c663d5d3a4..60a7927c2d 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -181,8 +181,8 @@ 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); + _singleId = "neverhood"; + _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 0c7ebb2b05..4c52990874 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -220,7 +220,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { class ParallactionMetaEngine : public AdvancedMetaEngine { public: ParallactionMetaEngine() : AdvancedMetaEngine(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { - _guioptions = GUIO1(GUIO_NOLAUNCHLOAD); + _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); } virtual const char *getName() const { diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp index 721c382d4f..161a133c8b 100644 --- a/engines/pegasus/detection.cpp +++ b/engines/pegasus/detection.cpp @@ -134,7 +134,7 @@ static const PegasusGameDescription gameDescriptions[] = { class PegasusMetaEngine : public AdvancedMetaEngine { public: PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) { - _singleid = "pegasus"; + _singleId = "pegasus"; } virtual const char *getName() const { diff --git a/engines/prince/detection.h b/engines/prince/detection.h index 7e5bdd6b7b..3076253cf5 100644 --- a/engines/prince/detection.h +++ b/engines/prince/detection.h @@ -104,7 +104,7 @@ const static char *directoryGlobs[] = { class PrinceMetaEngine : public AdvancedMetaEngine { public: PrinceMetaEngine() : AdvancedMetaEngine(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) { - _singleid = "prince"; + _singleId = "prince"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index 4e87b7e5c2..34cfcedd40 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -401,7 +401,7 @@ static const QueenGameDescription gameDescriptions[] = { class QueenMetaEngine : public AdvancedMetaEngine { public: QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { - _singleid = "queen"; + _singleId = "queen"; } virtual const char *getName() const { diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index e201612beb..0677e84d67 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -102,11 +102,11 @@ static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = { class SagaMetaEngine : public AdvancedMetaEngine { public: SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { - _singleid = "saga"; + _singleId = "saga"; } - virtual GameDescriptor findGame(const char *gameid) const { - return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable); + virtual GameDescriptor findGame(const char *gameId) const { + return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable); } virtual const char *getName() const { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 985e12a7f6..3001f47260 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -473,7 +473,7 @@ static char s_fallbackGameIdBuf[256]; class SciMetaEngine : public AdvancedMetaEngine { public: SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) { - _singleid = "sci"; + _singleId = "sci"; } virtual const char *getName() const { diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index df68d11609..ca6bb406de 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -44,7 +44,7 @@ static const char *directoryGlobs[] = { class Sword25MetaEngine : public AdvancedMetaEngine { public: Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { - _guioptions = GUIO1(GUIO_NOMIDI); + _guiOptions = GUIO1(GUIO_NOMIDI); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index cefc1a89d3..caa7bdbec9 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -88,7 +88,7 @@ enum { class TeenAgentMetaEngine : public AdvancedMetaEngine { public: TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { - _singleid = "teenagent"; + _singleId = "teenagent"; } virtual const char *getName() const { diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 348ade62b0..7aff7a1805 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -49,7 +49,7 @@ class TestbedMetaEngine : public AdvancedMetaEngine { public: TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { _md5Bytes = 512; - _singleid = "testbed"; + _singleId = "testbed"; } virtual const char *getName() const { diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 0c7d0b0665..cf40b0324c 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -85,7 +85,7 @@ static const PlainGameDescriptor tinselGames[] = { class TinselMetaEngine : public AdvancedMetaEngine { public: TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { - _singleid = "tinsel"; + _singleId = "tinsel"; } virtual const char *getName() const { diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 145d9544f2..7c707895e6 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -206,7 +206,7 @@ static const ExtraGuiOption toltecsExtraGuiOption = { class ToltecsMetaEngine : public AdvancedMetaEngine { public: ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) { - _singleid = "toltecs"; + _singleId = "toltecs"; } virtual const char *getName() const { diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 2ca2bce2ee..5d2e0a9bca 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -127,7 +127,7 @@ static const char * const directoryGlobs[] = { class ToonMetaEngine : public AdvancedMetaEngine { public: ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { - _singleid = "toon"; + _singleId = "toon"; _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 1d0e136d69..dcb58ffae6 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -128,7 +128,7 @@ class ToucheMetaEngine : public AdvancedMetaEngine { public: ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { _md5Bytes = 4096; - _singleid = "touche"; + _singleId = "touche"; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index 7784a3de1a..7bf6e71fe5 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -75,7 +75,7 @@ enum { class TSageMetaEngine : public AdvancedMetaEngine { public: TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { - _singleid = "tsage"; + _singleId = "tsage"; } virtual const char *getName() const { diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index a2878f4cc8..2447e15d6b 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -116,7 +116,7 @@ class TuckerMetaEngine : public AdvancedMetaEngine { public: TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { _md5Bytes = 512; - _singleid = "tucker"; + _singleId = "tucker"; } virtual const char *getName() const { diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp index 8c2b18f3d3..fcecb8d2b0 100644 --- a/engines/wage/detection.cpp +++ b/engines/wage/detection.cpp @@ -53,8 +53,8 @@ static const PlainGameDescriptor wageGames[] = { class WageMetaEngine : public AdvancedMetaEngine { public: WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { - _singleid = "wage"; - _guioptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); + _singleId = "wage"; + _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } virtual const char *getName() const { diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index aca682ae99..495a937f16 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -75,8 +75,8 @@ static const char *directoryGlobs[] = { class WintermuteMetaEngine : public AdvancedMetaEngine { public: WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { - _singleid = "wintermute"; - _guioptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS); + _singleId = "wintermute"; + _guiOptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp index 8b47590861..cc967070d9 100644 --- a/engines/zvision/detection.cpp +++ b/engines/zvision/detection.cpp @@ -61,7 +61,7 @@ public: ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) { _maxScanDepth = 2; _directoryGlobs = ZVision::directoryGlobs; - _singleid = "zvision"; + _singleId = "zvision"; } virtual const char *getName() const { -- cgit v1.2.3