[Scummvm-git-logs] scummvm master -> 3e9e39a8fa8d608367a0a685cb7e440ba04fdb87

[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:
3e9e39a8fa DIRECTOR: resource might be missing cursor


Commit: 3e9e39a8fa8d608367a0a685cb7e440ba04fdb87
    https://github.com/scummvm/scummvm/commit/3e9e39a8fa8d608367a0a685cb7e440ba04fdb87
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-07-13T18:12:22+02:00

Commit Message:
DIRECTOR: resource might be missing cursor

Co-authored-by: Eugene Sandulenko <sev at scummvm.org>

Changed paths:
    engines/director/cursor.cpp


diff --git a/engines/director/cursor.cpp b/engines/director/cursor.cpp
index d54fddf931c..91208ff8e66 100644
--- a/engines/director/cursor.cpp
+++ b/engines/director/cursor.cpp
@@ -176,11 +176,14 @@ void Cursor::readFromResource(Datum resourceId) {
 		bool readSuccessful = false;
 
 		for (Common::HashMap<Common::String, Archive *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo>::iterator it = g_director->_openResFiles.begin(); it != g_director->_openResFiles.end(); ++it) {
-			Common::SeekableReadStreamEndian *cursorStream;
+			Common::SeekableReadStreamEndian *cursorStream = nullptr;
+			MacArchive *arch = (MacArchive *)it->_value;
 
-			cursorStream = ((MacArchive *)it->_value)->getResource(MKTAG('C', 'U', 'R', 'S'), resourceId.asInt());
-			if (!cursorStream)
-				cursorStream = ((MacArchive *)it->_value)->getResource(MKTAG('C', 'R', 'S', 'R'), resourceId.asInt());
+			if (arch->hasResource(MKTAG('C', 'U', 'R', 'S'), resourceId.asInt()))
+				cursorStream = arch->getResource(MKTAG('C', 'U', 'R', 'S'), resourceId.asInt());
+
+			if (!cursorStream && arch->hasResource(MKTAG('C', 'R', 'S', 'R'), resourceId.asInt()))
+				cursorStream = arch->getResource(MKTAG('C', 'R', 'S', 'R'), resourceId.asInt());
 
 			if (cursorStream && readFromStream(*((Common::SeekableReadStream *)cursorStream), false, 0)) {
 				_usePalette = true;