Fix for ships blowing up with live debris submodels #7139
Conversation
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
Baezon
added
fix
Goober5000
approved these changes
Dec 16, 2025
Contributor
Goober5000
left a comment
Goober5000
left a comment
There was a problem hiding this comment.
Very good cleanup. 👍 One non-binding comment.
| // if not blown off, blow it off | ||
| shipfx_subsystem_maybe_create_live_debris(ship_objp, shipp, pss, &exp_center, 3.0f); | ||
| ship_subsys* pss = nullptr; | ||
| for (pss = GET_FIRST(&shipp->subsys_list); pss != END_OF_LIST(&shipp->subsys_list); pss = GET_NEXT(pss)) { |
Contributor
There was a problem hiding this comment.
You could use list_range here to make the loop a bit tidier.
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.
Instead of searching for live debris, and then searching for that debris' parent, and then blowing them up, simply search for the submodels with live debris and blow them up directly. This simplifies the code and entirely skips needing and allows for the deletion of
model_get_parent_submodel_for_live_debriswhich is good because it only handled submodels with live debris if they were a direct child of detail0, and would error if a ship with such a submodel were destroyed.