Skip to content

modular table fix for cinematic warp#7014

Merged
Goober5000 merged 2 commits into
scp-fs2open:masterfrom
Goober5000:cinematic_followup
Sep 14, 2025
Merged

modular table fix for cinematic warp#7014
Goober5000 merged 2 commits into
scp-fs2open:masterfrom
Goober5000:cinematic_followup

Conversation

@Goober5000

@Goober5000 Goober5000 commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

Small and subtle fix: move the CINEMATIC options inside the preceding if() block in the same way that the flare style options are inside their preceding if() block. This prevents the CINEMATIC options from being reset to their default values in subsequent modular table parsing. Followup to #6500.

This PR should be reviewed using the "ignore whitespace" option.

Small and subtle fix: move the CINEMATIC options inside the preceding if() block in the same way that the flare style options are inside their preceding if() block.  This prevents the CINEMATIC options from being reset to their default values in subsequent modular table parsing.  Followup to scp-fs2open#6500.
@Goober5000 Goober5000 added fix A fix for bugs, not-a-bugs, and/or regressions. graphics A feature or issue related to graphics (2d and 3d) labels Sep 4, 2025

@wookieejedi wookieejedi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense and is straightforward

@Goober5000 Goober5000 merged commit a023a1a into scp-fs2open:master Sep 14, 2025
20 checks passed
@Goober5000 Goober5000 deleted the cinematic_followup branch September 14, 2025 23:43
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. graphics A feature or issue related to graphics (2d and 3d)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants