[Scummvm-git-logs] scummvm master -> b1ae4319e53b5cbf28ce66bd7457349a2daddb12
dreammaster
paulfgilbert at gmail.com
Sun Jul 14 19:54:58 CEST 2019
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bb9b52f9c6 GLK: ADVSYS: Change detections list to use common GlkDetectionEntry
babe4d9ef2 GLK: ALAN2: Change detections list to use common GlkDetectionEntry
649dadaedc GLK: ALAN3: Change detections list to use common GlkDetectionEntry
b1ae4319e5 GLK: TADS2: Fix duplicate detection
Commit: bb9b52f9c6d0d32e4dd9e9d7a0bf78c3492e7e59
https://github.com/scummvm/scummvm/commit/bb9b52f9c6d0d32e4dd9e9d7a0bf78c3492e7e59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-14T10:47:52-07:00
Commit Message:
GLK: ADVSYS: Change detections list to use common GlkDetectionEntry
Changed paths:
engines/glk/advsys/detection.cpp
engines/glk/advsys/detection_tables.h
diff --git a/engines/glk/advsys/detection.cpp b/engines/glk/advsys/detection.cpp
index f14fda2..bb7c4e8 100644
--- a/engines/glk/advsys/detection.cpp
+++ b/engines/glk/advsys/detection.cpp
@@ -71,10 +71,10 @@ bool AdvSysMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
gameFile.seek(0);
Common::String md5 = Common::computeStreamMD5AsString(gameFile, 5000);
- int32 filesize = gameFile.size();
+ uint32 filesize = gameFile.size();
// Scan through the AdvSys game list for a match
- const AdvSysGame *p = ADVSYS_GAMES;
+ const GlkDetectionEntry *p = ADVSYS_GAMES;
while (p->_md5 && p->_filesize != filesize && md5 != p->_md5)
++p;
diff --git a/engines/glk/advsys/detection_tables.h b/engines/glk/advsys/detection_tables.h
index e109f53..561f8bd 100644
--- a/engines/glk/advsys/detection_tables.h
+++ b/engines/glk/advsys/detection_tables.h
@@ -27,15 +27,6 @@
namespace Glk {
namespace AdvSys {
-/**
- * Game descriptor for Scott Adams games
- */
-struct AdvSysGame {
- const char *_md5;
- const char *_gameId;
- int32 _filesize;
-};
-
const PlainGameDescriptor ADVSYS_GAME_LIST[] = {
{ "advsys", "AdvSys Game" },
@@ -49,15 +40,15 @@ const PlainGameDescriptor ADVSYS_GAME_LIST[] = {
{ nullptr, nullptr }
};
-const AdvSysGame ADVSYS_GAMES[] = {
- { "2246a2686a07c714868680eaf980ece9", "bustedadvsys", 79091 },
- { "120d7041dfa000c9a313a8b0ae9cef33", "starshipcolumbus", 76032 },
- { "746963e82552f95b5e743fe24ecd1ec3", "elves87", 77947 },
- { "892217ab8d902a732e82c55efd22931d", "keytotime", 24941 },
- { "3a2a3cc24709ff3272f3a15d09b5e63e", "onehand", 95762 },
- { "e55fff2ac51a8a16b979541e8d3210d8", "pirating", 29529 },
+const GlkDetectionEntry ADVSYS_GAMES[] = {
+ DT_ENTRY0("bustedadvsys", "2246a2686a07c714868680eaf980ece9", 79091),
+ DT_ENTRY0("starshipcolumbus", "120d7041dfa000c9a313a8b0ae9cef33", 76032),
+ DT_ENTRY0("elves87", "746963e82552f95b5e743fe24ecd1ec3", 77947),
+ DT_ENTRY0("keytotime", "892217ab8d902a732e82c55efd22931d", 24941),
+ DT_ENTRY0("onehand", "3a2a3cc24709ff3272f3a15d09b5e63e", 95762),
+ DT_ENTRY0("pirating", "e55fff2ac51a8a16b979541e8d3210d8", 29529),
- { nullptr, nullptr, 0 }
+ DT_END_MARKER
};
} // End of namespace AdvSys
Commit: babe4d9ef259fa90099328b7d9ec291d5815b05d
https://github.com/scummvm/scummvm/commit/babe4d9ef259fa90099328b7d9ec291d5815b05d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-14T10:47:52-07:00
Commit Message:
GLK: ALAN2: Change detections list to use common GlkDetectionEntry
Changed paths:
engines/glk/alan2/detection.cpp
engines/glk/alan2/detection_tables.h
diff --git a/engines/glk/alan2/detection.cpp b/engines/glk/alan2/detection.cpp
index 345e230..f37120d 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 277a473..bd3aef7 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
Commit: 649dadaedc55911ada3b0f62ae7fa56fccba893e
https://github.com/scummvm/scummvm/commit/649dadaedc55911ada3b0f62ae7fa56fccba893e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-14T10:47:52-07:00
Commit Message:
GLK: ALAN3: Change detections list to use common GlkDetectionEntry
Changed paths:
engines/glk/alan3/detection.cpp
engines/glk/alan3/detection_tables.h
diff --git a/engines/glk/alan3/detection.cpp b/engines/glk/alan3/detection.cpp
index 08a489b..e8a6e62 100644
--- a/engines/glk/alan3/detection.cpp
+++ b/engines/glk/alan3/detection.cpp
@@ -67,7 +67,7 @@ bool Alan3MetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
gameFile.close();
// Check for known games
- const Alan3GameDescription *p = ALAN3_GAMES;
+ const GlkDetectionEntry *p = ALAN3_GAMES;
while (p->_gameId && (md5 != p->_md5 || filesize != p->_filesize))
++p;
diff --git a/engines/glk/alan3/detection_tables.h b/engines/glk/alan3/detection_tables.h
index 8762983..7924215 100644
--- a/engines/glk/alan3/detection_tables.h
+++ b/engines/glk/alan3/detection_tables.h
@@ -27,17 +27,6 @@
namespace Glk {
namespace Alan3 {
-/**
- * Game description
- */
-struct Alan3GameDescription {
- const char *const _gameId;
- const char *const _extra;
- const char *const _md5;
- size_t _filesize;
- Common::Language _language;
-};
-
const PlainGameDescriptor ALAN3_GAME_LIST[] = {
{ "alan3", "Alan3 Game" },
@@ -51,18 +40,15 @@ const PlainGameDescriptor ALAN3_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 Alan3GameDescription ALAN3_GAMES[] = {
- ENTRY0("christmasparty", "86b87969d124c213632398980ec87c23", 94892),
- ENTRY0("deadleaves", "7c228698507508043d1d3938695e28cd", 90139),
- ENTRY0("fishmess", "e9952cfbe2adef5dcef82abd57661f60", 312561),
- ENTRY0("hwmurders", "abadbb15faf7f0b7324222fdea6bd495", 213539),
- ENTRY0("misguided", "cc2c6e724d599e731efa9b7a34ae4f51", 672613),
- ENTRY0("room206", "eb5711ecfad102ee4d9fda7fcb3ddf78", 364156),
+const GlkDetectionEntry ALAN3_GAMES[] = {
+ DT_ENTRY0("christmasparty", "86b87969d124c213632398980ec87c23", 94892),
+ DT_ENTRY0("deadleaves", "7c228698507508043d1d3938695e28cd", 90139),
+ DT_ENTRY0("fishmess", "e9952cfbe2adef5dcef82abd57661f60", 312561),
+ DT_ENTRY0("hwmurders", "abadbb15faf7f0b7324222fdea6bd495", 213539),
+ DT_ENTRY0("misguided", "cc2c6e724d599e731efa9b7a34ae4f51", 672613),
+ DT_ENTRY0("room206", "eb5711ecfad102ee4d9fda7fcb3ddf78", 364156),
- TABLE_END_MARKER
+ DT_END_MARKER
};
} // End of namespace Alan3
Commit: b1ae4319e53b5cbf28ce66bd7457349a2daddb12
https://github.com/scummvm/scummvm/commit/b1ae4319e53b5cbf28ce66bd7457349a2daddb12
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-14T10:47:52-07:00
Commit Message:
GLK: TADS2: Fix duplicate detection
Changed paths:
engines/glk/tads/detection_tables.h
diff --git a/engines/glk/tads/detection_tables.h b/engines/glk/tads/detection_tables.h
index 626a111..807be79 100644
--- a/engines/glk/tads/detection_tables.h
+++ b/engines/glk/tads/detection_tables.h
@@ -121,7 +121,6 @@ const PlainGameDescriptor TADS2_GAME_LIST[] = {
{ "nbdemo", "The Singular, and Historically Inaccurate, Misadventures of Nobeard" },
{ "ninjaburger", "Ninja Burger" },
{ "ntts", "No Time To Squeal" },
- { "oncefuture", "Once and Future" },
{ "onefootdown", "One Foot Down" },
{ "onegotaway", "The One That Got Away" },
{ "pasttense", "Past Tense" },
@@ -435,7 +434,7 @@ const GlkDetectionEntry TADS_GAMES[] = {
DT_ENTRY0("zerosum", "286ede6ac6deaa588d98252ad9207013", 296769),
// TADS 2 - Commercial games
- DT_ENTRY0("oncefuture", "4ed995d0784520ca6f0ec5391d92f4d8", 909993),
+ DT_ENTRY0("onceandfuture", "4ed995d0784520ca6f0ec5391d92f4d8", 909993),
// TADS 2 - Adventions games
DT_ENTRY0("ccr", "2da7dba524075aed0167ae02e6484a32", 291305),
More information about the Scummvm-git-logs
mailing list