From d3aef0b10d0548329b7fb824856e5155509bd70c Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 2 Feb 2024 14:35:49 -0500 Subject: [PATCH] Match --- .../include/mxbackgroundaudiomanager.h | 20 +++++++++---------- .../src/audio/mxbackgroundaudiomanager.cpp | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h index 31fa01e5..3e7793f6 100644 --- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h +++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h @@ -56,16 +56,16 @@ class MxBackgroundAudioManager : public MxCore { MxResult OpenMusic(MxAtomId& p_script); void DestroyMusic(); - MxBool m_musicEnabled; // 0x08 - MxDSAction m_action1; // 0x0c - MxAudioPresenter* m_unk0xa0; - MxDSAction m_action2; // 0xa4 - MxAudioPresenter* m_unk0x138; - MxS32 m_unk0x13c; - MxS32 m_unk0x140; - MxS32 m_targetVolume; - MxS16 m_unk0x148; - MxAtomId m_script; + MxBool m_musicEnabled; // 0x08 + MxDSAction m_action1; // 0x0c + MxAudioPresenter* m_unk0xa0; // 0xa0 + MxDSAction m_action2; // 0xa4 + MxAudioPresenter* m_unk0x138; // 0x138 + MxS32 m_unk0x13c; // 0x13c + MxS32 m_unk0x140; // 0x140 + MxS32 m_targetVolume; // 0x144 + MxS16 m_unk0x148; // 0x148 + MxAtomId m_script; // 0x14c }; #endif // MXBACKGROUNDAUDIOMANAGER_H diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index 64caa9f2..581d97c5 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -115,9 +115,10 @@ void MxBackgroundAudioManager::FUN_1007ef40() if (m_unk0xa0 == NULL) { if (m_unk0x138) { - compare = 30; - - if (m_unk0x148 == 0) { + if (m_unk0x148 != 0) { + compare = 30; + } + else { compare = m_targetVolume; }