[Scummvm-git-logs] scummvm master -> 1c203ea249e73f940a524b08d7aade1e8b40adb2

[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:
cadb29d83d ENGINES: AD: When file has no Mac Resource fork, compute its md5 normally
1c203ea249 DIRECTOR: Added detection for The Apartment D4


Commit: cadb29d83d3601ecf6b6eca726fc220670cc7136
    https://github.com/scummvm/scummvm/commit/cadb29d83d3601ecf6b6eca726fc220670cc7136
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-13T22:20:51+01:00

Commit Message:
ENGINES: AD: When file has no Mac Resource fork, compute its md5 normally

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 3b130de..8b6dc0c 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -397,7 +397,9 @@ bool AdvancedMetaEngine::getFileProperties(const Common::FSNode &parent, const F
 
 		fileProps.md5 = macResMan.computeResForkMD5AsString(_md5Bytes);
 		fileProps.size = macResMan.getResForkDataSize();
-		return true;
+
+		if (fileProps.size != 0)
+			return true;
 	}
 
 	if (!allFiles.contains(fname))


Commit: 1c203ea249e73f940a524b08d7aade1e8b40adb2
    https://github.com/scummvm/scummvm/commit/1c203ea249e73f940a524b08d7aade1e8b40adb2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-13T22:20:51+01:00

Commit Message:
DIRECTOR: Added detection for The Apartment D4

Changed paths:
    engines/director/detection.cpp
    engines/director/detection_tables.h


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index ca0b5c1..c26084a 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -73,7 +73,7 @@ bool DirectorEngine::hasFeature(EngineFeature f) const {
 static const PlainGameDescriptor directorGames[] = {
 	{ "director",	"Macromedia Director Game" },
 	{ "directortest",	"Macromedia Director Test Target" },
-	{ "theapartment",	"The Apartment, D3 interactive demo" },
+	{ "theapartment",	"The Apartment, Interactive demo" },
 	{ "gundam0079",	"Gundam 0079: The War for Earth" },
 	{ "jewels",		"Jewels of the Oracle" },
 	{ "jman",		"The Journeyman Project" },
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index ae52784..15bdf37 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -69,7 +69,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	{
 		{
 			"theapartment",
-			"",
+			"D3",
 			AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911),
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
@@ -79,6 +79,19 @@ static const DirectorGameDescription gameDescriptions[] = {
 		GID_GENERIC,
 		3
 	},
+	{
+		{
+			"theapartment",
+			"D4",
+			AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
 
 	{
 		{