[Scummvm-git-logs] scummvm master -> 8acff5258a6fab9df56c76d1afe67bed79f8351f

[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:
524193ac26 SLUDGE: Rename loadsave.* -> saveload.* for consistency
8acff5258a AD: Fix detection for Mac games after the cache was introduced


Commit: 524193ac26372f02c8799f3f5d4796ef9f985b1e
    https://github.com/scummvm/scummvm/commit/524193ac26372f02c8799f3f5d4796ef9f985b1e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-15T17:17:23+02:00

Commit Message:
SLUDGE: Rename loadsave.* -> saveload.* for consistency

Changed paths:
  A engines/sludge/saveload.cpp
  A engines/sludge/saveload.h
  R engines/sludge/loadsave.cpp
  R engines/sludge/loadsave.h
    engines/sludge/main_loop.cpp
    engines/sludge/module.mk


diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index f3810c3271..547321029c 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -25,8 +25,8 @@
 #include "sludge/event.h"
 #include "sludge/function.h"
 #include "sludge/graphics.h"
-#include "sludge/loadsave.h"
 #include "sludge/people.h"
+#include "sludge/saveload.h"
 #include "sludge/sound.h"
 #include "sludge/sludge.h"
 #include "sludge/sludger.h"
diff --git a/engines/sludge/module.mk b/engines/sludge/module.mk
index ccea36adbe..4c0f2d47dd 100644
--- a/engines/sludge/module.mk
+++ b/engines/sludge/module.mk
@@ -15,7 +15,6 @@ MODULE_OBJS := \
 	hsi.o \
 	imgloader.o \
 	language.o \
-	loadsave.o \
 	main_loop.o \
 	metaengine.o \
 	moreio.o \
@@ -25,6 +24,7 @@ MODULE_OBJS := \
 	people.o \
 	region.o \
 	savedata.o \
+	saveload.o \
 	sludge.o \
 	sludger.o \
 	sound.o \
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/saveload.cpp
similarity index 99%
rename from engines/sludge/loadsave.cpp
rename to engines/sludge/saveload.cpp
index eab6cea8c5..12f71cba0e 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/saveload.cpp
@@ -33,11 +33,11 @@
 #include "sludge/function.h"
 #include "sludge/graphics.h"
 #include "sludge/language.h"
-#include "sludge/loadsave.h"
 #include "sludge/newfatal.h"
 #include "sludge/people.h"
 #include "sludge/region.h"
 #include "sludge/savedata.h"
+#include "sludge/saveload.h"
 #include "sludge/sludge.h"
 #include "sludge/sludger.h"
 #include "sludge/sound.h"
diff --git a/engines/sludge/loadsave.h b/engines/sludge/saveload.h
similarity index 100%
rename from engines/sludge/loadsave.h
rename to engines/sludge/saveload.h


Commit: 8acff5258a6fab9df56c76d1afe67bed79f8351f
    https://github.com/scummvm/scummvm/commit/8acff5258a6fab9df56c76d1afe67bed79f8351f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-15T17:17:23+02:00

Commit Message:
AD: Fix detection for Mac games after the cache was introduced

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index aef274cf39..c6e42f7702 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -459,10 +459,7 @@ namespace Common {
 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.
-	if (!allFiles.contains(fname))
-		return false;
-
-	Common::String hashname = Common::String::format("%s:%d", allFiles[fname].getPath().c_str(), _md5Bytes);
+	Common::String hashname = Common::String::format("%s:%d", fname.c_str(), _md5Bytes);
 
 	if (MD5Man.contains(hashname)) {
 		fileProps.md5 = MD5Man.getMD5(hashname);
@@ -488,6 +485,9 @@ bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, con
 		}
 	}
 
+	if (!allFiles.contains(fname))
+		return false;
+
 	Common::File testFile;
 
 	if (!testFile.open(allFiles[fname]))