Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DIRECTOR: fix loading cursor from main archive #5320

Merged
merged 1 commit into from Sep 10, 2023

Conversation

mistydemeo
Copy link
Contributor

Fixes a bug introduced in 9aa0958. 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.

I scoped this to Mac right now because that's the platform I encountered this on, and the other branches are specific to Windows. However, I'm not sure if this behaviour is actually Mac-specific. @sev- also suggested that possibly the main cast should always be present in _allOpenResFiles.

Broken:

scummvm-nemurenu-mac-ja-00008

Fixed:

scummvm-nemurenu-mac-ja-00007

Fixes a bug introduced in 9aa0958.
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.
@sev-
Copy link
Member

sev- commented Sep 10, 2023

Thank you!

@sev- sev- merged commit 2c05c5b into scummvm:master Sep 10, 2023
8 checks passed
@mistydemeo mistydemeo deleted the director_fix_cursor_main_archive branch September 10, 2023 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants