Skip to content

Commit

Permalink
Fixes custom sequences not being listed in Audio Manager dropdowns, a…
Browse files Browse the repository at this point in the history
…nd adds a check to the shuffle function to make sure sequences with `canBeUsedAsReplacement = false` can't be shuffled in. (HarbourMasters#3324)
  • Loading branch information
Malkierian authored Oct 25, 2023
1 parent 4fc0d5a commit b47164a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/audio/AudioCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ void AudioCollection::AddToCollection(char* otrPath, uint16_t seqNum) {
SequenceInfo info = {seqNum,
sequenceName,
StringHelper::Replace(StringHelper::Replace(StringHelper::Replace(sequenceName, " ", "_"), "~", "-"),".", ""),
type, false, false};
type, false, true};
sequenceMap.emplace(seqNum, info);
}

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/audio/AudioEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void RandomizeGroup(SeqType type) {
// use a while loop to add duplicates if we don't have enough included sequences
while (values.size() < AuthenticCountBySequenceType(type)) {
for (const auto& seqData : AudioCollection::Instance->GetIncludedSequences()) {
if (seqData->category & type) {
if (seqData->category & type && seqData->canBeUsedAsReplacement) {
values.push_back(seqData->sequenceId);
}
}
Expand Down

0 comments on commit b47164a

Please sign in to comment.