Refactor sample index storage #675
Merged
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
This wasn't working properly due to how the indices are calculated in game. We now sort by default on write and only reference the first sample, the rest are determined by the game.
Pickup was missed, so they were playing just by crossing the tile.
Required for change in TR2SoundEffect
Required for change in TR3SoundEffect
rr-
approved these changes
May 17, 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.
Part of #653.
Checklist
Description
Fixes a bug with how TR2/3 sample indices were being stored. Although it worked for OG, starting to change things during randomization highlighted issues where the indices weren't being written back properly. We now only refer to the first sample for each sound effect and store the count, as this is what the engine does - the "next" ones always proceed the first. Writing back also enforces the required sorting, otherwise the game crashes due to the way it reads
MAIN.SFX.This change required a regeneration of the object cache, otherwise imported enemies would be silent.
TR1/4/5 are fine as they store the WAV data in the levels anyway, so when changing things we just move the sample data around.