[Scummvm-git-logs] scummvm master -> 57ebb1161938627be22f3dc114f4573a6bc22e03

[eriktorbjorn]

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:
57ebb11619 SCUMM: Test that the Mac Indy 3 / Loom executable has a resource fork


Commit: 57ebb1161938627be22f3dc114f4573a6bc22e03
    https://github.com/scummvm/scummvm/commit/57ebb1161938627be22f3dc114f4573a6bc22e03
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-12-20T18:52:29+01:00

Commit Message:
SCUMM: Test that the Mac Indy 3 / Loom executable has a resource fork

This was prompted by bug #14753, but is not a fix for it.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index a9de92a7c71..767e7b201cf 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1230,6 +1230,16 @@ Common::Error ScummEngine::init() {
 			}
 		}
 
+		if (!macResourceFile.empty()) {
+			if (!resource.open(macResourceFile))
+				return Common::Error(Common::kReadingFailed, Common::U32String::format(_("Could not open Macintosh resource file %s"), macResourceFile.c_str()));
+
+			if (!resource.hasResFork())
+				return Common::Error(Common::kReadingFailed, Common::U32String::format(_("Could not find resource fork in Macintosh resource file %s"), macResourceFile.c_str()));
+
+			resource.close();
+		}
+
 		if (!_macScreen && _renderMode == Common::kRenderMacintoshBW)
 			_renderMode = Common::kRenderDefault;