Small fix for laser animation curve outputs#6858
Merged
Merged
Conversation
wookieejedi
reviewed
Jul 24, 2025
wookieejedi
left a comment
wookieejedi
left a comment
Member
There was a problem hiding this comment.
Makes sense to me, but will also wait to merge until @BMagnu has had a time to check these 2 new lines over!
BMagnu
approved these changes
Jul 24, 2025
BMagnu
left a comment
BMagnu
left a comment
Member
There was a problem hiding this comment.
LGTM.
For posterity:
Eventually we want stuff like "state add" to just be part of "state" and have the user say "this curve is added, this one is multiplied", but that's explicitly for a future upgrade of the modular curve system itself.
Kestrellius
added a commit
to Kestrellius/fs2open.github.com
that referenced
this pull request
Jul 26, 2025
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
3 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.
When a weapon is using a laser animation state curve, this overrides the default animation behavior. However, the bool governing this had failed to check for the auxiliary "animation state add" output, which meant that when anim-state-add was used in the absence of regular anim-state it did nothing. I fix this by making sure we override if either output has a curve, and also make sure that both values have a default of 0, since that is the intuitive behavior in this case.