Skip to content

un-consolidate model flags - #7693

Merged
The-E merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/model_flags
Aug 7, 2026
Merged

un-consolidate model flags#7693
The-E merged 1 commit into
scp-fs2open:masterfrom
Goober5000:fix/model_flags

Conversation

@Goober5000

Copy link
Copy Markdown
Contributor

Restore the original flag values that were consolidated in #7588. Since the flags are saved in the mission file as an integer, the original values must be preserved.

Since MR_ATTACHED_MODEL was removed in the original PR, that is renamed to MR_EMPTY_SLOT6.

Restore the original flag values that were consolidated in scp-fs2open#7588.  Since the flags are saved in the mission file as an integer, the original values must be preserved.

Since `MR_ATTACHED_MODEL` was removed in the original PR, that is renamed to `MR_EMPTY_SLOT6`.
@Goober5000 Goober5000 added regression A bug introduced by a new feature that breaks something which used to work. fix A fix for bugs, not-a-bugs, and/or regressions. labels Aug 7, 2026
@The-E
The-E merged commit 4d50a1b into scp-fs2open:master Aug 7, 2026
18 checks passed
@Goober5000
Goober5000 deleted the fix/model_flags branch August 7, 2026 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix A fix for bugs, not-a-bugs, and/or regressions. regression A bug introduced by a new feature that breaks something which used to work.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants