fix a few bugs in model loading#7421
Open
Goober5000 wants to merge 2 commits intoscp-fs2open:masterfrom
Open
Conversation
BMagnu
requested changes
May 5, 2026
Member
BMagnu
left a comment
There was a problem hiding this comment.
Should this not rather be part of the model_load call then, when supplied with a sip?
Contributor
Author
I actually started to do that, while removing the existing assignments to the ship class, and then I rolled that all back. But yes, that would be more future-proof. |
Each time `model_load` is called with a `ship_info` pointer, which causes it to load subsystems, the model number MUST be assigned to the ship_info.
601843e to
2b6e203
Compare
BMagnu
approved these changes
May 6, 2026
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
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.
Each time
model_loadis called with aship_infopointer, which causes it to load subsystems, the model number MUST be assigned to the ship_info.