From 14eefcb56e977d13b576d8a007fcd9f0304b4530 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 22 May 2024 14:00:20 -0400 Subject: [PATCH] Name enum constants --- LEGO1/lego/legoomni/include/isle.h | 5 ++--- LEGO1/lego/legoomni/src/paths/legopathstruct.cpp | 4 ++-- LEGO1/lego/legoomni/src/worlds/isle.cpp | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h index 39ab1527..76971271 100644 --- a/LEGO1/lego/legoomni/include/isle.h +++ b/LEGO1/lego/legoomni/include/isle.h @@ -24,10 +24,9 @@ class Act1State; // SIZE 0x140 class Isle : public LegoWorld { public: - // For g_unk0x100f1198 enum { - c_bit6 = 0x20, - c_bit7 = 0x40 + c_playCamAnims = 0x20, + c_playMusic = 0x40 }; Isle(); diff --git a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp index 69dc0523..db2cc767 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp @@ -45,7 +45,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, switch (m_name[2]) { case c_camAnim: - if (g_isleFlags & Isle::c_bit6) { + if (g_isleFlags & Isle::c_playCamAnims) { PlayCamAnim(p_actor, bool2, p_data, TRUE); } break; @@ -75,7 +75,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, break; } case c_music: - if (g_isleFlags & Isle::c_bit7) { + if (g_isleFlags & Isle::c_playMusic) { PlayMusic(p_direction, p_data); } break; diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 19e0e2a1..9d787a8d 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -724,7 +724,7 @@ void Isle::Enable(MxBool p_enable) AnimationManager()->FUN_1005f6d0(FALSE); AnimationManager()->EnableCamAnims(FALSE); - g_isleFlags &= ~c_bit7; + g_isleFlags &= ~c_playMusic; m_towtrack->FUN_1004dab0(); break; case 9: @@ -733,7 +733,7 @@ void Isle::Enable(MxBool p_enable) AnimationManager()->FUN_1005f6d0(FALSE); AnimationManager()->EnableCamAnims(FALSE); - g_isleFlags &= ~c_bit7; + g_isleFlags &= ~c_playMusic; m_ambulance->FUN_10036e60(); break; case 11: