[Scummvm-git-logs] scummvm master -> 17a2ce8c5a68e496203016710afd7534310d1065

[sev-]

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

Summary:
17a2ce8c5a DIRECTOR: Accept MacBinary for Macintosh and Pippin versions


Commit: 17a2ce8c5a68e496203016710afd7534310d1065
    https://github.com/scummvm/scummvm/commit/17a2ce8c5a68e496203016710afd7534310d1065
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-28T23:00:33+01:00

Commit Message:
DIRECTOR: Accept MacBinary for Macintosh and Pippin versions

Pippin videos for Lzone have resource fork and end up in MacBinary format.
This apparently fixes Pippin version of L-zone but I didn't check whether
it's completable.

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 894d5004cce..3de3a807c6e 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -22,6 +22,7 @@
 #include "common/file.h"
 #include "common/fs.h"
 #include "common/keyboard.h"
+#include "common/macresman.h"
 #include "common/memstream.h"
 #include "common/punycode.h"
 #include "common/tokenizer.h"
@@ -396,8 +397,13 @@ bool testPath(Common::String &path, bool directory) {
 	Common::FSNode d = Common::FSNode(*g_director->getGameDataDir());
 	Common::FSNode node;
 
-	// Test if we have it right in the SearchMan
-	if (SearchMan.hasFile(Common::Path(path, g_director->_dirSeparator)))
+	// Test if we have it right in the SearchMan. Also accept MacBinary
+	// for Mac and Pippin
+	if (SearchMan.hasFile(Common::Path(path, g_director->_dirSeparator)) ||
+	    ((g_director->getPlatform() == Common::kPlatformMacintoshII
+	      || g_director->getPlatform() == Common::kPlatformMacintosh
+	      || g_director->getPlatform() == Common::kPlatformPippin) &&
+	     Common::MacResManager::exists(Common::Path(path, g_director->_dirSeparator))))
 		return true;
 
 	debug(9, "testPath: %s  dir: %d", path.c_str(), directory);