summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalkierian <malkierian@gmail.com>2023-11-13 16:11:29 -0700
committerGitHub <noreply@github.com>2023-11-13 18:11:29 -0500
commit78ffb41cd2d8fa3e68ee9fcb1fb496ddeede878e (patch)
treedafea296c9b14c9ea9e82e7696361cb1758d46bd
parent30ab8e9ed75f222ee16289a624a1cab0fd393857 (diff)
Moved the check for `!seqInfo.canBeUsedAsReplacement` in `InitializeShufflePool` to exclude them before modifying either shuffle pool. (#3370)
-rw-r--r--soh/soh/Enhancements/audio/AudioCollection.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index a5499bd4f..9da742f91 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -400,8 +400,9 @@ void AudioCollection::InitializeShufflePool() {
if (shufflePoolInitialized) return;
for (auto& [seqId, seqInfo] : sequenceMap) {
+ if (!seqInfo.canBeUsedAsReplacement) continue;
const std::string cvarKey = "gAudioEditor.Excluded." + seqInfo.sfxKey;
- if (CVarGetInteger(cvarKey.c_str(), 0) && !seqInfo.canBeUsedAsReplacement) {
+ if (CVarGetInteger(cvarKey.c_str(), 0)) {
excludedSequences.insert(&seqInfo);
} else {
includedSequences.insert(&seqInfo);