Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow explicitly empty sounds #6352

Merged

Conversation

Goober5000
Copy link
Contributor

Make sounds that are specified as "empty" or "none" in sounds.tbl ineligible for treatment as placeholder sounds. Resolves #6350.

Make sounds that are specified as "empty" or "none" in sounds.tbl ineligible for treatment as placeholder sounds.  Resolves scp-fs2open#6350.
@Goober5000 Goober5000 added the sound A feature or issue specific to music and sound label Sep 13, 2024
@EatThePath
Copy link
Contributor

This does resolve that specific crop of warnings in my own testing. I haven't yet confirmed that the affected sound indexes actually behave properly in terms of what sounds they play(nor have I confirmed that they misbehave without this PR, for that matter) and I'd like to do that before getting out the LGTM stamp. I should be able to do that this weekend.

I'm also concerned by the growing code complexity with proliferating special cases, tying into the concerns about the general sound overhaul I've documented in #6354. I'd prefer to have a general consensus on all that before approving this, on my part, but I won't put a changes-required review over that.

@Goober5000 Goober5000 added this to the Release 24.2 milestone Sep 17, 2024
Copy link
Member

@wookieejedi wookieejedi left a comment

Choose a reason for hiding this comment

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

In combination with #6356, reported to work as expected on MediaVPs, retail, BtA, and FotG, Scroll, Inferno, BP, and Warmachine. Following discussion this looks good to me and also works in my tests.

@Goober5000 Goober5000 merged commit 56fc5b4 into scp-fs2open:master Sep 18, 2024
16 checks passed
@Goober5000 Goober5000 deleted the allow_explicitly_empty_sounds branch September 18, 2024 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sound A feature or issue specific to music and sound
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BPC 3.3.3 produces warnings on RC4 related to sounds.
3 participants