[Scummvm-git-logs] scummvm master -> cbab97dacd5ec3391756a9727233206411c994d8
trembyle
noreply at scummvm.org
Fri Feb 18 16:46:19 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
45a4fa0286 COMMON: Create detector flag for DVDs
ed1a65b1d3 GROOVIE: TLC: Use CD/DVD detector flags
cbab97dacd GROOVIE: TLC: Detect German CD/DVD versions
Commit: 45a4fa0286b7fb801d909d3e3de5a9c0d067b1b7
https://github.com/scummvm/scummvm/commit/45a4fa0286b7fb801d909d3e3de5a9c0d067b1b7
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2022-02-18T11:45:53-05:00
Commit Message:
COMMON: Create detector flag for DVDs
This will be used to differentiate from CD releases.
Changed paths:
engines/advancedDetector.cpp
engines/advancedDetector.h
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 5758a2d4323..204dcca37c7 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -144,6 +144,10 @@ static Common::String generatePreferredTarget(const ADGameDescription *desc, int
res = res + "-cd";
}
+ if (desc->flags & ADGF_DVD) {
+ res = res + "-dvd";
+ }
+
if (desc->flags & ADGF_REMASTERED) {
res = res + "-remastered";
}
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index a4d0b8c94c5..2f3b76af10a 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -89,22 +89,23 @@ struct ADGameFileDescription {
*/
enum ADGameFlags {
ADGF_NO_FLAGS = 0, ///< No flags.
- ADGF_TAILMD5 = (1 << 16), ///< Calculate the MD5 for this entry from the end of the file.
- ADGF_REMASTERED = (1 << 17), ///< Add "-remastered' to gameid.
- ADGF_AUTOGENTARGET = (1 << 18), ///< Automatically generate gameid from @ref ADGameDescription::extra.
- ADGF_UNSTABLE = (1 << 19), ///< Flag to designate not yet officially supported games that are not fit for public testing.
- ADGF_TESTING = (1 << 20), ///< Flag to designate not yet officially supported games that are fit for public testing.
- ADGF_PIRATED = (1 << 21), ///< Flag to designate well-known pirated versions with cracks.
- ADGF_UNSUPPORTED = (1 << 22), /*!< Flag to mark certain versions (like badly protected full games as demos) not to be run for various reasons.
+ ADGF_TAILMD5 = (1 << 15), ///< Calculate the MD5 for this entry from the end of the file.
+ ADGF_REMASTERED = (1 << 16), ///< Add "-remastered' to gameid.
+ ADGF_AUTOGENTARGET = (1 << 17), ///< Automatically generate gameid from @ref ADGameDescription::extra.
+ ADGF_UNSTABLE = (1 << 18), ///< Flag to designate not yet officially supported games that are not fit for public testing.
+ ADGF_TESTING = (1 << 19), ///< Flag to designate not yet officially supported games that are fit for public testing.
+ ADGF_PIRATED = (1 << 20), ///< Flag to designate well-known pirated versions with cracks.
+ ADGF_UNSUPPORTED = (1 << 21), /*!< Flag to mark certain versions (like badly protected full games as demos) not to be run for various reasons.
A custom message can be provided in the @ref ADGameDescription::extra field. */
- ADGF_WARNING = (1 << 23), /*!< Flag to mark certain versions to show confirmation warning before proceeding.
+ ADGF_WARNING = (1 << 22), /*!< Flag to mark certain versions to show confirmation warning before proceeding.
A custom message should be provided in the @ref ADGameDescription::extra field. */
- ADGF_ADDENGLISH = (1 << 24), ///< Always add English as a language option.
- ADGF_MACRESFORK = (1 << 25), ///< Calculate the MD5 for this entry from the resource fork.
- ADGF_USEEXTRAASTITLE = (1 << 26), ///< Use @ref ADGameDescription::extra as the main game title, not gameid.
- ADGF_DROPLANGUAGE = (1 << 27), ///< Do not add language to gameid.
- ADGF_DROPPLATFORM = (1 << 28), ///< Do not add platform to gameid.
- ADGF_CD = (1 << 29), ///< Add "-cd" to gameid.
+ ADGF_ADDENGLISH = (1 << 23), ///< Always add English as a language option.
+ ADGF_MACRESFORK = (1 << 24), ///< Calculate the MD5 for this entry from the resource fork.
+ ADGF_USEEXTRAASTITLE = (1 << 25), ///< Use @ref ADGameDescription::extra as the main game title, not gameid.
+ ADGF_DROPLANGUAGE = (1 << 26), ///< Do not add language to gameid.
+ ADGF_DROPPLATFORM = (1 << 27), ///< Do not add platform to gameid.
+ ADGF_CD = (1 << 28), ///< Add "-cd" to gameid.
+ ADGF_DVD = (1 << 29), ///< Add "-dvd" to gameid.
ADGF_DEMO = (1 << 30) ///< Add "-demo" to gameid.
};
Commit: ed1a65b1d35237b6ee16837a12a65313e9527373
https://github.com/scummvm/scummvm/commit/ed1a65b1d35237b6ee16837a12a65313e9527373
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2022-02-18T11:45:53-05:00
Commit Message:
GROOVIE: TLC: Use CD/DVD detector flags
Both German and English have CD and DVD releases.
Changed paths:
engines/groovie/detection.cpp
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 264591e3349..98086c50641 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -367,7 +367,7 @@ static const GroovieGameDescription gameDescriptions[] = {
"tlc", "CD",
AD_ENTRY2s("tlcmain.grv", "47c235155de5103e72675fe7294720b8", 17479,
"tlcnav.gjd", nullptr, -1),
- Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING,
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_CD | ADGF_TESTING,
GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
},
kGroovieTLC
@@ -379,7 +379,7 @@ static const GroovieGameDescription gameDescriptions[] = {
"tlc", _s("Missing game code"),
AD_ENTRY2s("tlcmain.grv", "151af191015beb6f662919153e6c28d8", 17379,
"tlcnav.gjd", nullptr, -1),
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSUPPORTED,
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_DVD | ADGF_UNSUPPORTED,
GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
},
kGroovieTLC
@@ -391,7 +391,7 @@ static const GroovieGameDescription gameDescriptions[] = {
"tlc", _s("Missing game code"),
AD_ENTRY2s("tlcmain.grv", "8a591c47d24dde38615e6ea2e79b51a5", 17375,
"tlcnav.gjd", nullptr, -1),
- Common::EN_ANY, Common::kPlatformWindows, ADGF_UNSUPPORTED,
+ Common::EN_ANY, Common::kPlatformWindows, ADGF_DVD | ADGF_UNSUPPORTED,
GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
},
kGroovieTLC
Commit: cbab97dacd5ec3391756a9727233206411c994d8
https://github.com/scummvm/scummvm/commit/cbab97dacd5ec3391756a9727233206411c994d8
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2022-02-18T11:45:54-05:00
Commit Message:
GROOVIE: TLC: Detect German CD/DVD versions
These appear to be earlier than the English ones. The DVD version
still does not work, and so is marked unsupported.
Error is ERROR: Groovie::Resource: Unknown GJD 1000!" as in the
English language DVD versions.
Changed paths:
engines/groovie/detection.cpp
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 98086c50641..3f99066dd11 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -397,6 +397,32 @@ static const GroovieGameDescription gameDescriptions[] = {
kGroovieTLC
},
+ // Tender Loving Care PC German (CD-ROM 1998-04-09)
+ // "Die Versuchung", Funsoft
+ {
+ {
+ "tlc", "CD",
+ AD_ENTRY2s("tlcmain.grv", "3459a25a5f31b430d320cba2e47d3c98", 17353,
+ "tlcnav.gjd", nullptr, -1),
+ Common::DE_DEU, Common::kPlatformWindows, ADGF_CD | ADGF_TESTING,
+ GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
+ },
+ kGroovieTLC
+ },
+
+ // Tender Loving Care PC German (DVD-ROM 1998-03-06)
+ // "Die Versuchung", Conspiracy Entertainment Europe
+ {
+ {
+ "tlc", "DVD",
+ AD_ENTRY2s("tlcmain.grv", "50e62d41ad2cddd0f31ea0a542338387", 17344,
+ "tlcnav.gjd", nullptr, -1),
+ Common::DE_DEU, Common::kPlatformWindows, ADGF_DVD | ADGF_TESTING,
+ GUIO2(GUIO_NOMIDI, GUIO_NOASPECT)
+ },
+ kGroovieTLC
+ },
+
// Tender Loving Care PC Demo German https://archive.org/details/Tender_Loving_Care_demo
{
{
More information about the Scummvm-git-logs
mailing list