diff options
| author | Paul Gilbert | 2019-07-14 10:28:11 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-07-14 10:47:52 -0700 |
| commit | babe4d9ef259fa90099328b7d9ec291d5815b05d (patch) | |
| tree | 45c9f911076ecca4f6a0f4ac1bdfd7a7fa8ac41b /engines/glk/alan2 | |
| parent | bb9b52f9c6d0d32e4dd9e9d7a0bf78c3492e7e59 (diff) | |
| download | scummvm-rg350-babe4d9ef259fa90099328b7d9ec291d5815b05d.tar.gz scummvm-rg350-babe4d9ef259fa90099328b7d9ec291d5815b05d.tar.bz2 scummvm-rg350-babe4d9ef259fa90099328b7d9ec291d5815b05d.zip | |
GLK: ALAN2: Change detections list to use common GlkDetectionEntry
Diffstat (limited to 'engines/glk/alan2')
| -rw-r--r-- | engines/glk/alan2/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/glk/alan2/detection_tables.h | 44 |
2 files changed, 16 insertions, 30 deletions
diff --git a/engines/glk/alan2/detection.cpp b/engines/glk/alan2/detection.cpp index 345e230936..f37120d1f9 100644 --- a/engines/glk/alan2/detection.cpp +++ b/engines/glk/alan2/detection.cpp @@ -67,7 +67,7 @@ bool Alan2MetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g gameFile.close(); // Check for known games - const Alan2GameDescription *p = ALAN2_GAMES; + const GlkDetectionEntry *p = ALAN2_GAMES; while (p->_gameId && (md5 != p->_md5 || filesize != p->_filesize)) ++p; diff --git a/engines/glk/alan2/detection_tables.h b/engines/glk/alan2/detection_tables.h index 277a473eec..bd3aef7c5a 100644 --- a/engines/glk/alan2/detection_tables.h +++ b/engines/glk/alan2/detection_tables.h @@ -27,17 +27,6 @@ namespace Glk { namespace Alan2 { -/** - * Game description - */ -struct Alan2GameDescription { - const char *const _gameId; - const char *const _extra; - const char *const _md5; - size_t _filesize; - Common::Language _language; -}; - const PlainGameDescriptor ALAN2_GAME_LIST[] = { { "alan2", "Alan2 Game" }, @@ -58,25 +47,22 @@ const PlainGameDescriptor ALAN2_GAME_LIST[] = { { nullptr, nullptr } }; -#define ENTRY0(ID, MD5, FILESIZE) { ID, nullptr, MD5, FILESIZE, Common::EN_ANY } -#define TABLE_END_MARKER { nullptr, nullptr, nullptr, 0, Common::EN_ANY } - -const Alan2GameDescription ALAN2_GAMES[] = { - ENTRY0("bugged", "f4eed3db3771a456143744a0e36653db", 112640), - ENTRY0("chasing", "718ffcc9dfe85cfd8c6f50f541a3926e", 147456), - ENTRY0("closet", "5d724469e6240cde0c16c959f50ebc93", 37888), - ENTRY0("dinnertime", "1c0bad19156e8bdefe9e19d99f96f7d8", 9216), - ENTRY0("hebgb", "87f9516bc4217afb5c329cb1ae01d861", 173056), - ENTRY0("lostinnewyork", "483a8c7c84f3bb5af61150fd770806e5", 30720), - ENTRY0("mazemapper", "8e7409758c3535201aeb901923b20064", 30720), - ENTRY0("meanstory", "e4ae6873d6f2ab74fb2ec35b27752397", 13312), - ENTRY0("outofthestudy", "cc4ab3f1b406a8ce04adcfb641c3b250", 110592), - ENTRY0("plsghints", "fb9df41138691a77ea3489986fe8856c", 10240), - ENTRY0("sardoria", "b48ba08ae33b5cb224bcb4ce0eea36bc", 150528), - ENTRY0("tgttos", "0fed94b37b8add48938d8288ca5e7e4f", 29696), - ENTRY0("afteryou", "998ca167b0e9ffb671203b2057d06bef", 17408), +const GlkDetectionEntry ALAN2_GAMES[] = { + DT_ENTRY0("bugged", "f4eed3db3771a456143744a0e36653db", 112640), + DT_ENTRY0("chasing", "718ffcc9dfe85cfd8c6f50f541a3926e", 147456), + DT_ENTRY0("closet", "5d724469e6240cde0c16c959f50ebc93", 37888), + DT_ENTRY0("dinnertime", "1c0bad19156e8bdefe9e19d99f96f7d8", 9216), + DT_ENTRY0("hebgb", "87f9516bc4217afb5c329cb1ae01d861", 173056), + DT_ENTRY0("lostinnewyork", "483a8c7c84f3bb5af61150fd770806e5", 30720), + DT_ENTRY0("mazemapper", "8e7409758c3535201aeb901923b20064", 30720), + DT_ENTRY0("meanstory", "e4ae6873d6f2ab74fb2ec35b27752397", 13312), + DT_ENTRY0("outofthestudy", "cc4ab3f1b406a8ce04adcfb641c3b250", 110592), + DT_ENTRY0("plsghints", "fb9df41138691a77ea3489986fe8856c", 10240), + DT_ENTRY0("sardoria", "b48ba08ae33b5cb224bcb4ce0eea36bc", 150528), + DT_ENTRY0("tgttos", "0fed94b37b8add48938d8288ca5e7e4f", 29696), + DT_ENTRY0("afteryou", "998ca167b0e9ffb671203b2057d06bef", 17408), - TABLE_END_MARKER + DT_END_MARKER }; } // End of namespace Alan2 |