diff options
author | Rémy Raes <raes.remy@gmail.com> | 2024-07-06 12:40:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-06 12:40:36 +0200 |
commit | 497945bbbd18b4ff9cd264dc6a9d6cf8ba6bf08e (patch) | |
tree | 14c2aace20c8356fa2b64f4cb4a641aba40ebcba /primedev/client/audio.h | |
parent | 3edcc91c72c96c33f8eae76a7078f78126bbea28 (diff) | |
download | NorthstarLauncher-497945bbbd18b4ff9cd264dc6a9d6cf8ba6bf08e.tar.gz NorthstarLauncher-497945bbbd18b4ff9cd264dc6a9d6cf8ba6bf08e.zip |
Fix multiple audio file overrides (#677)v1.26.3-rc1v1.26.2v1.26.1-rc5v1.26.1-rc4v1.26.1
This basically prevents audio files from being loaded into memory if matching audio event has already been overriden by a previous mod, preventing a crash from occurring.
This means that audio mods now respect the load priority, i.e. mods with higher priority (= lower int value) will have priority over other mods on audio overrides.
Diffstat (limited to 'primedev/client/audio.h')
-rw-r--r-- | primedev/client/audio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/primedev/client/audio.h b/primedev/client/audio.h index 15fd1a35..7cd0ddd1 100644 --- a/primedev/client/audio.h +++ b/primedev/client/audio.h @@ -15,7 +15,7 @@ enum class AudioSelectionStrategy class EventOverrideData { public: - EventOverrideData(const std::string&, const fs::path&); + EventOverrideData(const std::string&, const fs::path&, const std::vector<std::string>& registeredEvents); EventOverrideData(); public: @@ -35,7 +35,7 @@ public: class CustomAudioManager { public: - bool TryLoadAudioOverride(const fs::path&); + bool TryLoadAudioOverride(const fs::path&, std::string modName); void ClearAudioOverrides(); std::shared_mutex m_loadingMutex; |