[Scummvm-git-logs] scummvm master -> 2c05c5bdfad51dda64787266d01fc61ef2f42e47

[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:
2c05c5bdfa DIRECTOR: fix loading cursor from main archive


Commit: 2c05c5bdfad51dda64787266d01fc61ef2f42e47
    https://github.com/scummvm/scummvm/commit/2c05c5bdfad51dda64787266d01fc61ef2f42e47
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-09-10T09:20:37+02:00

Commit Message:
DIRECTOR: fix loading cursor from main archive

Fixes a bug introduced in 9aa095873683b990ac85b4c06b5fa843dcbd682a.
That commit limited reading cursors to open res files, not all
*seen* res files. However, that broke the custom cursor in Small
Stories for Sleepless Nights for Mac (nemurenu-mac-ja), which stores
its cursor in the game's main archive which is already closed at the
time the cursor gets loaded.

Changed paths:
    engines/director/cursor.cpp


diff --git a/engines/director/cursor.cpp b/engines/director/cursor.cpp
index 99c4113e5b0..853acceb37c 100644
--- a/engines/director/cursor.cpp
+++ b/engines/director/cursor.cpp
@@ -190,6 +190,12 @@ void Cursor::readFromResource(Datum resourceId) {
 				break;
 		}
 
+		// Cursors can be located in the main archive, which may not
+		// be in _allOpenResFiles
+		if (!readSuccessful && g_director->getPlatform() == Common::kPlatformMacintosh) {
+			readSuccessful = readFromArchive(g_director->getMainArchive(), resourceId.asInt());
+		}
+
 		// TODO: figure out where to read custom cursor in windows platform
 		// currently, let's just set arrow for default one.
 		if (g_director->getPlatform() == Common::kPlatformWindows) {