Qt: Allow loading custom pnach patches and bundled patches simultaneously #10322
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
Currently if one has patches from the patch folder, no bundled patches from the .zip file will be displayed. This changes it so that we can display both the folder patches AND the .zip bundled patches as long as their names don't collide. If there's a collision, the folder patch will override the bundled patch. Also, if an unlabeled patch is loaded from the folder then all bundled patches will be hidden (like they did prior) since we can't guarantee there's no collision.
Bundled patches don't display when unlabeled patches are loaded (since we can't guarantee they don't collide). This warns the user that bundled patches are hidden when unlabeled patches are loaded. (The warning hides when no unlabeled patches are loaded)
Daniel-McCarthy
changed the title
Fixes syntax error with console write format to display warning when bundled patches are hidden due to unlabeled patches being loaded.
CookiePLMonster
suggested changes
Nov 26, 2023
Daniel-McCarthy
commented
Nov 26, 2023
Daniel-McCarthy
commented
Nov 26, 2023
Daniel-McCarthy
commented
Nov 26, 2023
Daniel-McCarthy
commented
Nov 26, 2023
Co-authored-by: Silent <[email protected]>
….com/Daniel-McCarthy/pcsx2 into AllowCustomPatchesWithDefaultPatches
Adds a better worded log statement for informing the user that a patch with a duplicate name was found and not loaded to avoid conflict. The common expected reason this can happen is a bundled patch having the same name as a /patches/ pnach patch having the same name. By default it will prioritize the folder patch over the bundled patch. Makes it more clear/less confusing in phrasing.
stenzek
reviewed
Nov 28, 2023
stenzek
reviewed
Nov 28, 2023
stenzek
reviewed
Nov 28, 2023
Addresses feedback to use consistent naming conventions as most variables are using snake_case. Also no longer passes string_view by reference as per feedback.
Fixed unintentionally non-sensical wording in log warning to inform the user that a patch was skipped over since a patch with the same name had already been loaded.
CookiePLMonster
approved these changes
Nov 29, 2023
Mrlinkwii
approved these changes
Nov 30, 2023
JordanTheToaster
approved these changes
Dec 1, 2023
kamfretoz
approved these changes
Dec 3, 2023
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.
Description of Changes
Implements #10242
Allow loading patch files from
/patchesfolder and the bundledpatches.zipfile simultaneously./patchesfolder and thepatches.ziphave the same name, it loads the/patchesfolder version instead./patchesfolder is loaded, no bundled patches will be loaded. (Since we can't guarantee they won't collide with a bundled patch)Also, updates the patches UI to display a warning when unlabeled patches are loaded and causing the bundled patches to not display in the Patches Settings window.
Rationale behind Changes
To allow users to use the bundled no-interlacing & widescreen patches with their custom patches. As long as there's no collisions, there's no need to stop them from using both.
Suggested Testing Steps
/patchespatch is shown in Patch Settings window.description=Should override bundled patchfield to the patch).In my case, I tested this in GTA 3 with this pnach file: