diff options
| author | Paul Gilbert | 2018-12-31 19:47:14 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-31 19:47:14 -0800 |
| commit | 013f39cb5d7029e9569861034661770d1578847e (patch) | |
| tree | a8796b50ce79001dc04dcc9db7e661f5d928fead /engines/glk/tads/detection.cpp | |
| parent | 84b6534c3fcf3315ed1c7fe3cabbdd167fc748a9 (diff) | |
| download | scummvm-rg350-013f39cb5d7029e9569861034661770d1578847e.tar.gz scummvm-rg350-013f39cb5d7029e9569861034661770d1578847e.tar.bz2 scummvm-rg350-013f39cb5d7029e9569861034661770d1578847e.zip | |
GLK: Standardizing on a common GameDescriptor class for detectors
Diffstat (limited to 'engines/glk/tads/detection.cpp')
| -rw-r--r-- | engines/glk/tads/detection.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/glk/tads/detection.cpp b/engines/glk/tads/detection.cpp index 95f7330d65..9206193f63 100644 --- a/engines/glk/tads/detection.cpp +++ b/engines/glk/tads/detection.cpp @@ -31,18 +31,18 @@ namespace Glk { namespace TADS { void TADSMetaEngine::getSupportedGames(PlainGameList &games) { - for (const TADSDescriptor *pd = TADS_GAME_LIST; pd->gameId; ++pd) { + for (const GameDescriptor *pd = TADS_GAME_LIST; pd->_gameId; ++pd) { games.push_back(*pd); } } -TADSDescriptor TADSMetaEngine::findGame(const char *gameId) { - for (const TADSDescriptor *pd = TADS_GAME_LIST; pd->gameId; ++pd) { - if (!strcmp(gameId, pd->gameId)) +GameDescriptor TADSMetaEngine::findGame(const char *gameId) { + for (const GameDescriptor *pd = TADS_GAME_LIST; pd->_gameId; ++pd) { + if (!strcmp(gameId, pd->_gameId)) return *pd; } - return TADSDescriptor();; + return GameDescriptor::empty(); } bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) { @@ -81,8 +81,8 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga debug("ENTRY0(\"%s\", \"%s\", %u),", fname.c_str(), md5.c_str(), (uint)filesize); } - const TADSDescriptor &desc = TADS_GAME_LIST[0]; - gd = DetectedGame(desc.gameId, desc.description, Common::UNK_LANG, Common::kPlatformUnknown); + const GameDescriptor &desc = TADS_GAME_LIST[0]; + gd = DetectedGame(desc._gameId, desc._description, Common::UNK_LANG, Common::kPlatformUnknown); } else { PlainGameDescriptor gameDesc = findGame(p->_gameId); @@ -97,10 +97,10 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga } void TADSMetaEngine::detectClashes(Common::StringMap &map) { - for (const TADSDescriptor *pd = TADS_GAME_LIST; pd->gameId; ++pd) { - if (map.contains(pd->gameId)) - error("Duplicate game Id found - %s", pd->gameId); - map[pd->gameId] = ""; + for (const GameDescriptor *pd = TADS_GAME_LIST; pd->_gameId; ++pd) { + if (map.contains(pd->_gameId)) + error("Duplicate game Id found - %s", pd->_gameId); + map[pd->_gameId] = ""; } } |