mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

Allow multiple asset pack overrides

Browse Source
This commit is contained in:
Ted John
2022-10-01 12:07:42 +01:00
parent b264a73247
commit b2d5e356ab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/AssetPackManager.cpp
View File

@@ -107,7 +107,7 @@ void AssetPackManager::LoadSamplesForObject(std::string_view id, AudioSampleTabl
{ {
if (assetPack->IsEnabled() && assetPack->ContainsObject(id)) if (assetPack->IsEnabled() && assetPack->ContainsObject(id))
{ {
return assetPack->LoadSamplesForObject(id, objectTable); assetPack->LoadSamplesForObject(id, objectTable);
} }
} }
} }

2
src/openrct2/object/AudioObject.cpp
View File

@@ -21,7 +21,7 @@ using namespace OpenRCT2::Audio;
void AudioObject::Load() void AudioObject::Load()
{ {
// Start with base images // Start with base samples
_loadedSampleTable.LoadFrom(_sampleTable, 0, _sampleTable.GetCount()); _loadedSampleTable.LoadFrom(_sampleTable, 0, _sampleTable.GetCount());
// Override samples from asset packs // Override samples from asset packs