aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2019-07-07 11:26:10 -0700
committerPaul Gilbert2019-07-09 19:19:55 -0700
commit79627fbf6131db956b6d63f1ea4523dfea763d3d (patch)
tree042595393c84a6ae96e5f70bc3b0c117e990ab2f /engines
parent09d1ef00f746377ccb751f7c57049b838adc944d (diff)
downloadscummvm-rg350-79627fbf6131db956b6d63f1ea4523dfea763d3d.tar.gz
scummvm-rg350-79627fbf6131db956b6d63f1ea4523dfea763d3d.tar.bz2
scummvm-rg350-79627fbf6131db956b6d63f1ea4523dfea763d3d.zip
GLK: TADS2: Move detection entry structure into Glk base namespace
Diffstat (limited to 'engines')
-rw-r--r--engines/glk/detection.h11
-rw-r--r--engines/glk/tads/detection.cpp2
-rw-r--r--engines/glk/tads/detection_tables.h13
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 677519d8e5..7fa74e4a35 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -114,6 +114,17 @@ public:
const Common::String &md5, size_t filesize);
};
+/**
+ * Game detection entry
+ */
+struct GlkDetectionEntry {
+ const char *const _gameId;
+ const char *const _extra;
+ const char *const _md5;
+ size_t _filesize;
+ Common::Language _language;
+};
+
} // End of namespace Glk
#endif
diff --git a/engines/glk/tads/detection.cpp b/engines/glk/tads/detection.cpp
index 4cb7e560e3..7bca1bb83b 100644
--- a/engines/glk/tads/detection.cpp
+++ b/engines/glk/tads/detection.cpp
@@ -100,7 +100,7 @@ bool TADSMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &ga
continue;
// Check for known games
- const TADSGameDescription *p = TADS_GAMES;
+ const GlkDetectionEntry *p = TADS_GAMES;
while (p->_gameId && p->_md5 && (md5 != p->_md5 || filesize != p->_filesize))
++p;
diff --git a/engines/glk/tads/detection_tables.h b/engines/glk/tads/detection_tables.h
index e9b4dc1aca..55a1e42d35 100644
--- a/engines/glk/tads/detection_tables.h
+++ b/engines/glk/tads/detection_tables.h
@@ -27,17 +27,6 @@
namespace Glk {
namespace TADS {
-/**
- * Game description
- */
-struct TADSGameDescription {
- const char *const _gameId;
- const char *const _extra;
- const char *const _md5;
- size_t _filesize;
- Common::Language _language;
-};
-
const PlainGameDescriptor TADS2_GAME_LIST[] = {
{ "tads2", "TADS 2 Game" },
{ "oncefuture", "Once and Future" },
@@ -52,7 +41,7 @@ const PlainGameDescriptor TADS3_GAME_LIST[] = {
#define ENTRY0(ID, MD5, FILESIZE) { ID, "", MD5, FILESIZE, Common::EN_ANY }
#define TABLE_END_MARKER { nullptr, nullptr, nullptr, 0, Common::EN_ANY }
-const TADSGameDescription TADS_GAMES[] = {
+const GlkDetectionEntry TADS_GAMES[] = {
ENTRY0("oncefuture", "4ed995d0784520ca6f0ec5391d92f4d8", 909993),
TABLE_END_MARKER
};