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

BURIED: Fix door opening transition to Da Vinci study (bug 12885) #3363

Merged
merged 1 commit into from Sep 16, 2021

Conversation

@eriktorbjorn
Copy link
Member

@eriktorbjorn eriktorbjorn commented Sep 13, 2021

This should hopefully fix https://bugs.scummvm.org/ticket/12885 but needs to be tested by someone who knows the game.

I take no credit for this, since the code was handed to me through sev from "Keith" (Kaisershot?). There seems to have been some cut and paste error, because instead of choosing between the regular and first time door opening animation, it was choosing between the first time and breaking in animation, always picking the first time one.

The break in animation is presumably always handled by droppedItem(), so it shouldn't even have come into consideration here. I think. The regular door opening animation isn't even the same type of transition, which may explain why I was completely unable to find it.

Integrated upstreams code for playing the correct animation when opening
the door to Da Vinci's study. I take no credit for this, since the
complete solution was just handed to me and I could never have figured
it out on my own.
@Thunderforge
Copy link
Contributor

@Thunderforge Thunderforge commented Sep 15, 2021

Just tested it and it's working great! I tested it with both the metal bar and the key and it's working fine.

Jumping

(The double cursor in the GIF is a screen capture artifact).

@bluegr
Copy link
Member

@bluegr bluegr commented Sep 16, 2021

Great! Thanks for the work done and for testing the fix

Merging

@bluegr bluegr merged commit e8fb4b4 into scummvm:master Sep 16, 2021
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants