From 401fa7674e110fe2b7696735e6442f601d6e880b Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 16 Mar 2025 14:19:11 -0700
Subject: [PATCH] Match `MxBackgroundAudioManager::FadeInOrFadeOut` (#1413)
---
LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
index 49b4c28d..d89f5cd4 100644
--- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
+++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
@@ -163,6 +163,7 @@ void MxBackgroundAudioManager::FUN_1007ef40()
}
// FUNCTION: LEGO1 0x1007f0e0
+// FUNCTION: BETA10 0x100e8d8d
void MxBackgroundAudioManager::FadeInOrFadeOut()
{
MxS32 volume, compare;
@@ -178,12 +179,10 @@ void MxBackgroundAudioManager::FadeInOrFadeOut()
}
if (volume < compare) {
- volume = Min(volume + m_speed, compare);
- m_unk0xa0->SetVolume(volume);
+ m_unk0xa0->SetVolume(volume + m_speed < compare ? volume + m_speed : compare);
}
else if (compare < volume) {
- volume = Max(volume - m_speed, compare);
- m_unk0xa0->SetVolume(volume);
+ m_unk0xa0->SetVolume(volume - m_speed > compare ? volume - m_speed : compare);
}
else {
m_unk0xa0->SetVolume(volume);