SHERLOCK: RT: Fix opcode 0xAE (cmdMouseOnOff()) #5318
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Calling showCursor() every time the cursor changes is unnecessary and breaks hiding it via Rose Tattoo's cmdMouseOnOff(). Instead, call showCursor() only once on game start.
The regression was introduced by the recent change to not call showCursor() every time the cursor is changed.
Visibility of the cursor is not synced, so saving should be impossible while it is hidden.
Fixes opcode 0xAE (handled by TattooTalk::cmdMouseOnOff()). Depending on its argument, the opcode does the following in the original game: 0x01: Hide the cursor and disable user input 0x02: Unhide the cursor and re-enable user input Cursor visibility toggling was already implemented, so this change makes the opcode behave like in the original game (with the exception that skipping dialogue is still possibile as a QoL improvement). Fixes #14610
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depending on its argument, the opcode does the following in the original game:
0x01: Hide the cursor and disable user input
0x02: Unhide the cursor and re-enable user input
In ScummVM, the opcode was only hiding/unhiding the cursor.
However, this was broken due to frequent showCursor() calls from setCursor().
So this PR does the following:
Fixes #14610