isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 19:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Christian Semmler 2024-02-02 14:34:05 -05:00
parent b7e274f902
commit 0b09bbe1a6
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
View File

@ -80,16 +80,15 @@ MxResult MxBackgroundAudioManager::Tickle()
switch (m_unk0x13c) { switch (m_unk0x13c) {
case MxPresenter::e_starting: case MxPresenter::e_starting:
FadeInOrFadeOut(); FadeInOrFadeOut();
return SUCCESS; break;
case MxPresenter::e_streaming: case MxPresenter::e_streaming:
FUN_1007ee70(); FUN_1007ee70();
return SUCCESS; break;
case MxPresenter::e_repeating: case MxPresenter::e_repeating:
FUN_1007ef40(); FUN_1007ef40();
return SUCCESS;
default:
return SUCCESS;
} }
return SUCCESS;
} }
// FUNCTION: LEGO1 0x1007ee70 // FUNCTION: LEGO1 0x1007ee70
@ -112,19 +111,22 @@ void MxBackgroundAudioManager::FUN_1007ee70()
// FUNCTION: LEGO1 0x1007ef40 // FUNCTION: LEGO1 0x1007ef40
void MxBackgroundAudioManager::FUN_1007ef40() void MxBackgroundAudioManager::FUN_1007ef40()
{ {
MxU32 compare; MxS32 compare, volume;
MxU32 volume;
if (m_unk0xa0 == NULL) { if (m_unk0xa0 == NULL) {
if (m_unk0x138) { if (m_unk0x138) {
compare = 30; compare = 30;
if (m_unk0x148 == 0) { if (m_unk0x148 == 0) {
compare = m_unk0x148; compare = m_targetVolume;
} }
volume = m_unk0x138->GetVolume(); volume = m_unk0x138->GetVolume();
if (volume < compare) { if (volume < compare) {
if (m_unk0x140 + m_unk0x138->GetVolume() <= compare) { if (m_unk0x140 + m_unk0x138->GetVolume() <= compare) {
compare = m_unk0x140 + compare; compare = m_unk0x140 + m_unk0x138->GetVolume();
} }
m_unk0x138->SetVolume(compare); m_unk0x138->SetVolume(compare);
} }
else { else {
@ -143,12 +145,14 @@ void MxBackgroundAudioManager::FUN_1007ef40()
DeleteObject(*m_unk0xa0->GetAction()); DeleteObject(*m_unk0xa0->GetAction());
} }
else { else {
compare = m_unk0xa0->GetVolume(); if (m_unk0xa0->GetVolume() - m_unk0x140 > 0) {
volume = 0;
if (compare != m_unk0x140 && -1 < compare - m_unk0x140) {
volume = m_unk0xa0->GetVolume() - m_unk0x140; volume = m_unk0xa0->GetVolume() - m_unk0x140;
} }
m_unk0x138->SetVolume(volume); else {
volume = 0;
}
m_unk0xa0->SetVolume(volume);
} }
} }
} }