mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes custom sequences not being listed in Audio Manager dropdowns, and adds a check to the shuffle function to make sure sequences with `canBeUsedAsReplacement = false` can't be shuffled in. (#3324)

This commit is contained in:
Malkierian 2023-10-25 11:14:26 -07:00 committed by GitHub
parent 4fc0d5a753
commit b47164a110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/audio/AudioCollection.cpp
View File

@ -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);
}

2
soh/soh/Enhancements/audio/AudioEditor.cpp
View File

@ -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);
}
}