[Scummvm-git-logs] scummvm master -> 93746e702fb8df3a8caf1d3e1391c1c27174e4b0

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0e48263e50 AD: Allow both MacResFork and non-resfork entries coexist
93746e702f LURE: Made game flags enum sequential


Commit: 0e48263e50ba8639b8d2c588a328a57f233e6569
    https://github.com/scummvm/scummvm/commit/0e48263e50ba8639b8d2c588a328a57f233e6569
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-14T13:55:44+03:00

Commit Message:
AD: Allow both MacResFork and non-resfork entries coexist

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index c668ed0ace..dfec5a7585 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -486,10 +486,15 @@ namespace Common {
 	DECLARE_SINGLETON(MD5CacheManager);
 }
 
+static char flagsToMD5Prefix(uint32 flags) {
+	if (flags & ADGF_MACRESFORK)
+		return 'm';
+
+	return 'f';
+}
+
 bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
-	// FIXME/TODO: We don't handle the case that a file is listed as a regular
-	// file and as one with resource fork.
-	Common::String hashname = Common::String::format("%s:%d", fname.c_str(), _md5Bytes);
+	Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes);
 
 	if (MD5Man.contains(hashname)) {
 		fileProps.md5 = MD5Man.getMD5(hashname);


Commit: 93746e702fb8df3a8caf1d3e1391c1c27174e4b0
    https://github.com/scummvm/scummvm/commit/93746e702fb8df3a8caf1d3e1391c1c27174e4b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-14T13:58:58+03:00

Commit Message:
LURE: Made game flags enum sequential

Changed paths:
    engines/lure/detection.h


diff --git a/engines/lure/detection.h b/engines/lure/detection.h
index 23d35230ce..b42612fe08 100644
--- a/engines/lure/detection.h
+++ b/engines/lure/detection.h
@@ -28,10 +28,10 @@
 namespace Lure {
 
 enum {
-	GF_FLOPPY	= 1 <<  0,
-	GF_EGA		= 1 <<  1,
-	GF_KONAMI	= 1 <<  2,
-	GF_LNGUNK	= 1 << 15
+	GF_FLOPPY	= 1 << 0,
+	GF_EGA		= 1 << 1,
+	GF_KONAMI	= 1 << 2,
+	GF_LNGUNK	= 1 << 3
 };
 
 struct LureGameDescription {