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

SCI: Script patch for LB1 input/collision lockups #1353

Merged
merged 2 commits into from Oct 23, 2018

Conversation

@sluicebox
Copy link
Member

@sluicebox sluicebox commented Oct 9, 2018

Fixes 20+ lockups in the original game, bug #10733

Fixes 20+ lockups in the original game, bug #10733
@digitall
Copy link
Member

@digitall digitall commented Oct 9, 2018

@sluicebox : Thanks for looking at this. Hopefully the SCI engine devs will have time to review this soon. Please standby.

@digitall digitall requested review from bluegr and m-kiewitz Oct 9, 2018
David Turner
@digitall
Copy link
Member

@digitall digitall commented Oct 22, 2018

Ugh. Mea Culpa. This will need to be manually rebased and committed since it appears the "Resolve Conflicts" ends up with a tangled mess.

@bluegr
Copy link
Member

@bluegr bluegr commented Oct 22, 2018

I can't reproduce the bug in room 43... can you be a bit more specific on how to reproduce this?

@sluicebox
Copy link
Member Author

@sluicebox sluicebox commented Oct 22, 2018

Sure! I should have included a screenshot from the start. The goal is make this happen:

cb

The key here is you're entering the command while Laura has bumped into an obstacle but is still displayed as walking (leg up). The easiest way to deliberately do that is to slow down the game, walk up to the closet until you bump into it and stop, and then push the arrow key again, which will switch Laura to a walking frame, and then quickly push a letter key to bring up the input box before she goes back to standing.

@bluegr
Copy link
Member

@bluegr bluegr commented Oct 23, 2018

OK, I managed to trigger the bug, and reviewed the changes. Quite an obscure bug, kudos for finding it out and fixing this! The changes seem harmless enough, and with a quick check there don't seem to be any obvious regressions from this change.

Merging

@bluegr bluegr merged commit 2b28bf9 into scummvm:master Oct 23, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@dafioram
Copy link
Member

@dafioram dafioram commented Oct 23, 2018

Does this also resolve Trac#9870, Trac#9906, and Trac#9949?

@sluicebox
Copy link
Member Author

@sluicebox sluicebox commented Oct 23, 2018

It resolves the first two, the third is something else.

I'm really excited about this one, I'd been hunting it for an embarrassingly long time but it always seemed so random and impossible to reproduce. It always happens at the worst times! ...Several programs have been made over the years to flush it out.

@digitall
Copy link
Member

@digitall digitall commented Oct 23, 2018

@sluicebox: Have closed out the first two tickets... Good luck on tracking down the cause of the third.

@sluicebox sluicebox deleted the sluicebox:laurabow1obstaclecollisionfix branch Jun 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.