Fix Save Prompt Cursor on Quest/Misc Item Tracker Windows#4694
Merged
Malkierian merged 2 commits intoHarbourMasters:developfrom Dec 18, 2024
Merged
Fix Save Prompt Cursor on Quest/Misc Item Tracker Windows#4694Malkierian merged 2 commits intoHarbourMasters:developfrom
Malkierian merged 2 commits intoHarbourMasters:developfrom
Conversation
…mpt. Fix misc item tracker also being able to select R and L/Z in save prompt. Include MigrationAction entry removal from item count fix PR.
Archez
approved these changes
Dec 16, 2024
Contributor
Archez
left a comment
There was a problem hiding this comment.
Changes look good, but can you please switch all the else/else if blocks back to being on the same line as closing brace? Would align with the clang rules we have everywhere else.
Contributor
Author
|
What do you mean? I added an additional if block, the indentation is standard for inside of if statements, isn't it? |
Contributor
|
I mean changing these lines: - }
- else {
+ } else {and - }
- else if (...) {
+ } else if (...) { |
Contributor
Author
|
Oh, ffs VS... Did I get all of them? |
Contributor
|
Yup, looks good now! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
z_kaleido_collect.cwas missing some code that decomp has at the first public SoH commit that I believe was fine before dpad support was added to the menus. Certainly after that point, when bringing up the save prompt on the Quest subscreen, it would exhibit this behavior (sound on!):soh_8eJoQUJ6sQ.mp4
As you can see, a similar thing was happening with the Misc Items Tracker screen, it just didn't have any subslots for the cursor to iterate over. This PR fixes this by pulling over enough of that code from decomp to isolate the behavior, and mirroring those changes in the Misc Items Tracker draw code.
soh_4NeufTXGvf.mp4
The one thing I couldn't figure out was where it was failing to remove the cursor if you bring up the save prompt on the Quest subscreen while the cursor was on R or L/Z, but I can live with that until kaleido is updated to current decomp, as I believe that will be resolved at that point.
I also included the MigratorAction entry removal that I forgot in the Item Count Defaults PR.
Fixes #4447
Build Artifacts