isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name enum constants

Browse Source
This commit is contained in:
Christian Semmler 2024-05-22 14:00:20 -04:00
parent 28c4a786b3
commit 14eefcb56e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LEGO1/lego/legoomni/include/isle.h
View File

@ -24,10 +24,9 @@ class Act1State;
// SIZE 0x140 // SIZE 0x140
class Isle : public LegoWorld { class Isle : public LegoWorld {
public: public:
// For g_unk0x100f1198
enum { enum {
c_bit6 = 0x20, c_playCamAnims = 0x20,
c_bit7 = 0x40 c_playMusic = 0x40
}; };
Isle(); Isle();

4
LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
View File

@ -45,7 +45,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction,
switch (m_name[2]) { switch (m_name[2]) {
case c_camAnim: case c_camAnim:
if (g_isleFlags & Isle::c_bit6) { if (g_isleFlags & Isle::c_playCamAnims) {
PlayCamAnim(p_actor, bool2, p_data, TRUE); PlayCamAnim(p_actor, bool2, p_data, TRUE);
} }
break; break;
@ -75,7 +75,7 @@ MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction,
break; break;
} }
case c_music: case c_music:
if (g_isleFlags & Isle::c_bit7) { if (g_isleFlags & Isle::c_playMusic) {
PlayMusic(p_direction, p_data); PlayMusic(p_direction, p_data);
} }
break; break;

4
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@ -724,7 +724,7 @@ void Isle::Enable(MxBool p_enable)
AnimationManager()->FUN_1005f6d0(FALSE); AnimationManager()->FUN_1005f6d0(FALSE);
AnimationManager()->EnableCamAnims(FALSE); AnimationManager()->EnableCamAnims(FALSE);
g_isleFlags &= ~c_bit7; g_isleFlags &= ~c_playMusic;
m_towtrack->FUN_1004dab0(); m_towtrack->FUN_1004dab0();
break; break;
case 9: case 9:
@ -733,7 +733,7 @@ void Isle::Enable(MxBool p_enable)
AnimationManager()->FUN_1005f6d0(FALSE); AnimationManager()->FUN_1005f6d0(FALSE);
AnimationManager()->EnableCamAnims(FALSE); AnimationManager()->EnableCamAnims(FALSE);
g_isleFlags &= ~c_bit7; g_isleFlags &= ~c_playMusic;
m_ambulance->FUN_10036e60(); m_ambulance->FUN_10036e60();
break; break;
case 11: case 11: