[Scummvm-git-logs] scummvm master -> 43d96157e527cae9a715588735f56685f91f11d7

[mistydemeo]

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:
43d96157e5 DIRECTOR: unify getResource behaviour


Commit: 43d96157e527cae9a715588735f56685f91f11d7
    https://github.com/scummvm/scummvm/commit/43d96157e527cae9a715588735f56685f91f11d7
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-08-16T17:43:33-07:00

Commit Message:
DIRECTOR: unify getResource behaviour

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 500345161eb..7adcfadc3cc 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -343,8 +343,7 @@ Common::SeekableReadStreamEndian *MacArchive::getResource(uint32 tag, uint16 id)
 	Common::SeekableReadStream *stream = _resFork->getResource(tag, id);
 
 	if (stream == nullptr) {
-		warning("MacArchive::getResource('%s', %d): Resource doesn't exit", tag2str(tag), id);
-		return nullptr;
+		error("MacArchive::getResource(): Archive does not contain '%s' %d", tag2str(tag), id);
 	}
 
 	return new Common::SeekableSubReadStreamEndian(stream, 0, stream->size(), true, DisposeAfterUse::YES);
@@ -922,8 +921,7 @@ Common::SeekableReadStreamEndian *RIFXArchive::getResource(uint32 tag, uint16 id
 			unsigned long actualUncompLength = res.uncompSize;
 			Common::SeekableReadStreamEndian *stream = readZlibData(*_stream, res.size, &actualUncompLength, _isBigEndian);
 			if (!stream) {
-				warning("RIFXArchive::getResource(): Could not uncompress '%s' %d", tag2str(tag), id);
-				return nullptr;
+				error("RIFXArchive::getResource(): Could not uncompress '%s' %d", tag2str(tag), id);
 			}
 			if (res.uncompSize != actualUncompLength) {
 				warning("RIFXArchive::getResource(): For '%s' %d expected uncompressed length %d but got length %lu",