Fix assert for flag list and player ships#7415
Merged
wookieejedi merged 1 commit intoscp-fs2open:masterfrom May 1, 2026
Merged
Fix assert for flag list and player ships#7415wookieejedi merged 1 commit intoscp-fs2open:masterfrom
wookieejedi merged 1 commit intoscp-fs2open:masterfrom
Conversation
JohnAFernandez
approved these changes
Apr 30, 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.
In #7402 I set up the Ship Flag list to filter out some flags that aren't allowed or don't make sense for player ships. This included some flags that are checked on initialize for the flag dialog box. When the dialog box is opened for Player Ships this causes an assert because the flag isn't found.
So we make the assert a little smarter and we touch up the initialize code to only process flags that are valid for the current selection.
Fixes #7413