From 61380fae5c6a671010a458dca59e76e60c3142ba Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 14 Feb 2024 11:38:35 -0500 Subject: [PATCH] Style/naming --- LEGO1/lego/legoomni/include/radio.h | 6 +++--- LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp | 2 +- LEGO1/lego/legoomni/src/isle/radio.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h index 23ddb276..7e3cff87 100644 --- a/LEGO1/lego/legoomni/include/radio.h +++ b/LEGO1/lego/legoomni/include/radio.h @@ -40,9 +40,9 @@ class Radio : public MxCore { private: void CreateRadioState(); - RadioState* m_state; // 0x08 - MxBool m_unk0x0c; // 0x0c - MxBool m_bgAudioPreviouslyEnabled; // 0x0d + RadioState* m_state; // 0x08 + MxBool m_unk0x0c; // 0x0c + MxBool m_audioEnabled; // 0x0d MxLong HandleEndAction(MxEndActionNotificationParam& p_param); MxLong HandleClick(LegoControlManagerEvent& p_param); diff --git a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp index 4168275a..47d81510 100644 --- a/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp +++ b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp @@ -78,8 +78,8 @@ void JukeBoxEntity::StartAction() action.SetAtomId(*g_jukeboxScript); action.SetObjectId(GameState()->GetUnknown0x41c()); - m_audioEnabled = BackgroundAudioManager()->GetEnabled(); + m_audioEnabled = BackgroundAudioManager()->GetEnabled(); if (!m_audioEnabled) { BackgroundAudioManager()->Enable(TRUE); } diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp index 17f67d15..c0a4e44d 100644 --- a/LEGO1/lego/legoomni/src/isle/radio.cpp +++ b/LEGO1/lego/legoomni/src/isle/radio.cpp @@ -61,8 +61,8 @@ void Radio::Play() action.SetAtomId(*g_jukeboxScript); action.SetLoopCount(1); - m_bgAudioPreviouslyEnabled = BackgroundAudioManager()->GetEnabled(); - if (!m_bgAudioPreviouslyEnabled) { + m_audioEnabled = BackgroundAudioManager()->GetEnabled(); + if (!m_audioEnabled) { BackgroundAudioManager()->Enable(TRUE); } @@ -84,7 +84,7 @@ void Radio::Stop() } BackgroundAudioManager()->Stop(); - BackgroundAudioManager()->Enable(m_bgAudioPreviouslyEnabled); + BackgroundAudioManager()->Enable(m_audioEnabled); m_state->SetActive(FALSE); } }