Don't access sgSFX if sound is not initialized #6830
Merged
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.
Fixes a crash in timedemo when running the test on an MSVC Debug build. Now that the
sgSFX
collection gets populated by a TSV file, it is not guaranteed to be populated and will in fact remain empty when running timedemo headless. I added some guards to prevent OOB access in two of the affected functions, but I find it's unclear what to do aboutGetSFXLength()
. It makes me wonder if we should go ahead and load the TSV so we can have the option of testing towner dialogs with timedemo recordings.