From 61753cd307483fd9515ac631268dba2b0d004ff8 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:47:39 -0700 Subject: [PATCH] Fix volume config handling. --- MarathonRecomp/app.cpp | 7 ------- MarathonRecomp/patches/audio_patches.cpp | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/MarathonRecomp/app.cpp b/MarathonRecomp/app.cpp index f7e277a8f..eb1990630 100644 --- a/MarathonRecomp/app.cpp +++ b/MarathonRecomp/app.cpp @@ -20,13 +20,6 @@ void App::Restart(std::vector restartArgs) void App::Exit() { - // TODO (Hyper): remove this once the new options menu is implemented. - if (auto pAudioEngine = Sonicteam::AudioEngineXenon::GetInstance()) - { - Config::MusicVolume = pAudioEngine->m_MusicVolume; - Config::EffectsVolume = pAudioEngine->m_EffectsVolume; - } - Config::Save(); #ifdef _WIN32 diff --git a/MarathonRecomp/patches/audio_patches.cpp b/MarathonRecomp/patches/audio_patches.cpp index 3db02fa4f..13afebeac 100644 --- a/MarathonRecomp/patches/audio_patches.cpp +++ b/MarathonRecomp/patches/audio_patches.cpp @@ -32,6 +32,7 @@ void AudioPatches::Update(float deltaTime) if (!pAudioEngine) return; + const float musicVolume = Config::MusicVolume * Config::MasterVolume; if (Config::MusicAttenuation && CanAttenuate()) { auto time = 1.0f - expf(2.5f * -deltaTime); @@ -42,11 +43,11 @@ void AudioPatches::Update(float deltaTime) } else { - pAudioEngine->m_MusicVolume = std::lerp(pAudioEngine->m_MusicVolume, Config::MusicVolume, time); + pAudioEngine->m_MusicVolume = std::lerp(pAudioEngine->m_MusicVolume, musicVolume, time); } } else { - pAudioEngine->m_MusicVolume = Config::MusicVolume; + pAudioEngine->m_MusicVolume = musicVolume; } }