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

don't report OrNext chain as conflicting #363

Merged

Conversation

Jamiras
Copy link
Member

@Jamiras Jamiras commented Aug 16, 2024

Fixes a bug introduced by #336 where an OrNext chain would be reported as conflicting if the OrNext addresses matched and the last conditions conflicted.

OrNext byte 0x1234 = 1
       byte 0x2345 = 2

and

OrNext byte 0x1234 = 2
       byte 0x2345 = 3

Because 0x2345 couldn't be both 2 and 3 at the same time, and both OrNexts were looking at 0x1234, it would be reported as conflicting.

@Jamiras Jamiras added this to the 11.6.0 milestone Aug 16, 2024
@Jamiras Jamiras merged commit b9e7ba4 into RetroAchievements:develop Aug 19, 2024
7 checks passed
@Jamiras Jamiras deleted the bugfix/validate_ornext_chain branch August 19, 2024 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant