tr2: migrate to common BOUNDS_16 #2255
Merged
+180
−194
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
This replaces TR2's BOUNDS_16 to use the same as TR1, so we have two XYZ16s rather than individual values for each component.
TR2 frame bounds can now be assigned in the same way as TR1.
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
aredfan
approved these changes
Jan 11, 2025
rr-
approved these changes
Jan 11, 2025
|
Found an issue with smashable windows and bells, they're a bit awkward to shoot now. Investigating. |
The original approach relied on the layout of BOUNDS_16 to check smashables, so this updates the checks to use exactly the properties we need.
|
Fixed. Would appreciate a glance over and test to confirm. Will squash the separate commit into the main one later. The original code relied on the layout of |
aredfan
approved these changes
Jan 11, 2025
rr-
approved these changes
Jan 11, 2025
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.
Checklist
Description
This replaces TR2's
BOUNDS_16to use the same as TR1, so we have twoXYZ16s rather than individual values for each component. No logical changes, this is pretty much just renaming properties.TR2 frame rot expansion next, which should get us to equal handling for both games.