[Scummvm-git-logs] scummvm master -> 557b067bb51c1f0e033c9bace97f67e9d0f29a6c

[moralrecordings]

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:
557b067bb5 DIRECTOR: XOBJ: Downgrade crash in AiffXObj to warning


Commit: 557b067bb51c1f0e033c9bace97f67e9d0f29a6c
    https://github.com/scummvm/scummvm/commit/557b067bb51c1f0e033c9bace97f67e9d0f29a6c
Author: Scott Percival (code at moral.net.au)
Date: 2024-03-31T23:30:06+08:00

Commit Message:
DIRECTOR: XOBJ: Downgrade crash in AiffXObj to warning

Fixes crash when leaving the crusher room in Gahan Wilson's The Ultimate
Haunted House. The AIFF file for the door sound effect doesn't appear
to be included with some copies of the game.

Changed paths:
    engines/director/lingo/xlibs/aiff.cpp


diff --git a/engines/director/lingo/xlibs/aiff.cpp b/engines/director/lingo/xlibs/aiff.cpp
index 203bb2337f7..8937559e07b 100644
--- a/engines/director/lingo/xlibs/aiff.cpp
+++ b/engines/director/lingo/xlibs/aiff.cpp
@@ -96,12 +96,11 @@ void AiffXObj::m_duration(int nargs) {
 	g_lingo->printSTUBWithArglist("AiffXObj::m_duration", nargs);
 	auto filePath = g_lingo->pop().asString();
 
-	// Mac-ify any mac-paths to make them at least consistent:
-	Common::replace(filePath, "\\", ":");
-
 	auto aiffStream = Common::MacResManager::openFileOrDataFork(findPath(filePath));
 	if (!aiffStream) {
-		error("Failed to open %s", filePath.c_str());
+		warning("Failed to open %s", filePath.c_str());
+		g_lingo->push(0);
+		return;
 	}
 
 	auto aiffHeader = Audio::AIFFHeader::readAIFFHeader(aiffStream, DisposeAfterUse::YES);