Fix player sounds being cut off by item pickups in vanilla complevels #486
Conversation
This file contains 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
When picking up an item, the vanilla code calls S_StartSound with a NULL origin, so the pickup sound does not cut off player sounds, which use player->mo as the origin. Boom changes the origin to the player and makes weapon pickups audible to other players, but also changes s_sound.c to distinguish between pickup sounds and non-pickup sounds so they don't cut each other off. comp_sound disables the pickup sound logic in s_sound.c, but did not change the sound origin back to NULL until this commit.
kraflab
approved these changes
Mar 21, 2024
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.
This is a different fix to the same problem that coelckers/prboom-plus#330 was trying to solve.
When picking up an item, the vanilla code calls
S_StartSoundwith aNULLorigin, so the pickup sound does not cut off player sounds, which useplayer->moas the origin. Boom changes the origin to the player and makes weapon pickups audible to other players, but also changess_sound.cto distinguish between pickup sounds and non-pickup sounds so they don't cut each other off.comp_sounddisables the pickup sound logic ins_sound.c, but did not change the sound origin back toNULLuntil this commit.