zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116 from skiff/main

Browse Source 
fix: T6 - allow sound aliases without explicit files
This commit is contained in:
Jan 2024-02-13 00:04:48 +01:00 committed by GitHub
commit 741fc3857e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp
View File

@ -122,14 +122,15 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow&
if (name.empty()) if (name.empty())
return false; return false;
const auto& aliasFileName = row.GetValue("file", true);
if (aliasFileName.empty())
return false;
alias->name = memory->Dup(name.data()); alias->name = memory->Dup(name.data());
alias->id = Common::SND_HashName(name.data()); alias->id = Common::SND_HashName(name.data());
alias->assetFileName = memory->Dup(aliasFileName.data());
alias->assetId = Common::SND_HashName(aliasFileName.data()); const auto aliasFileName = row.GetValue("file");
if (!aliasFileName.empty())
{
alias->assetFileName = memory->Dup(aliasFileName.data());
alias->assetId = Common::SND_HashName(aliasFileName.data());
}
const auto secondaryName = row.GetValue("secondary"); const auto secondaryName = row.GetValue("secondary");
if (!secondaryName.empty()) if (!secondaryName.empty())
@ -529,10 +530,13 @@ bool AssetLoaderSoundBank::LoadFromRaw(
{ {
const auto* alias = &aliasList->head[j]; const auto* alias = &aliasList->head[j];
if (sabsWriter && alias->flags.loadType == SA_STREAMED) if (alias->assetFileName && alias->assetId)
sabsWriter->AddSound(GetSoundFilePath(alias), alias->assetId, alias->flags.looping, true); {
else if (sablWriter) if (sabsWriter && alias->flags.loadType == SA_STREAMED)
sablWriter->AddSound(GetSoundFilePath(alias), alias->assetId, alias->flags.looping); sabsWriter->AddSound(GetSoundFilePath(alias), alias->assetId, alias->flags.looping, true);
else if (sablWriter)
sablWriter->AddSound(GetSoundFilePath(alias), alias->assetId, alias->flags.looping);
}
} }
} }