Fixed overlapping vehicle parts check #37079
Merged
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
curstwist
added
<Bugfix>
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.
Summary
SUMMARY: Bugfixes "Fixed overlapping vehicle parts check"Purpose of change
Fixes #36638
Describe the solution
Rearranged condition check in
vehicle::smashto make it correctly check overlapping parts with no location specified (like vehicle controls).For example, see similar check in
vehicle::can_mount.Describe alternatives you've considered
None
Testing
Tested like described in #36638: no controls was destroyed immediately. Some damage starts to accumulate after a few juggernaut's smashes (usually on the outer parts first).
Looks correct.
cata_test-tiles - all tests passed
Additional context
None