From b2d5e356abfd52a0c4247ae3c2fe0791ef28d2d7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 1 Oct 2022 12:07:42 +0100 Subject: [PATCH] Allow multiple asset pack overrides --- src/openrct2/AssetPackManager.cpp | 2 +- src/openrct2/object/AudioObject.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/AssetPackManager.cpp b/src/openrct2/AssetPackManager.cpp index a291d42572..1637e1cb7b 100644 --- a/src/openrct2/AssetPackManager.cpp +++ b/src/openrct2/AssetPackManager.cpp @@ -107,7 +107,7 @@ void AssetPackManager::LoadSamplesForObject(std::string_view id, AudioSampleTabl { if (assetPack->IsEnabled() && assetPack->ContainsObject(id)) { - return assetPack->LoadSamplesForObject(id, objectTable); + assetPack->LoadSamplesForObject(id, objectTable); } } } diff --git a/src/openrct2/object/AudioObject.cpp b/src/openrct2/object/AudioObject.cpp index c4c219f541..a0c328bfce 100644 --- a/src/openrct2/object/AudioObject.cpp +++ b/src/openrct2/object/AudioObject.cpp @@ -21,7 +21,7 @@ using namespace OpenRCT2::Audio; void AudioObject::Load() { - // Start with base images + // Start with base samples _loadedSampleTable.LoadFrom(_sampleTable, 0, _sampleTable.GetCount()); // Override samples from asset packs