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

Name some functions

Browse Source
This commit is contained in:
Christian Semmler 2024-05-21 14:53:56 -04:00
parent ce34c7b330
commit 4a207a1048
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/legopathstruct.h
View File

@ -57,15 +57,15 @@ class LegoPathStruct : public LegoPathStructBase {
// FUNCTION: LEGO1 0x10047470
~LegoPathStruct() override {}
virtual void VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04
virtual void TriggerPathStruct(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04
inline void SetWorld(LegoWorld* p_world) { m_world = p_world; }
inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; }
private:
MxBool FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2);
void FUN_1001bc40(const char* p_name, MxU32 p_objectId, MxBool p_bool);
void FUN_1001bd10(MxBool p_direction, MxU32 p_data);
MxBool HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2);
void FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_bool);
void PlayMusic(MxBool p_direction, MxU32 p_data);
LegoWorld* m_world; // 0x0c
MxAtomId m_atomId; // 0x10

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

@ -64,7 +64,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot1 && m_unk0x4c[i].m_unk0x08 < dot2) {
s->VTable0x04(p_actor, 1, m_unk0x4c[i].m_data);
s->TriggerPathStruct(p_actor, TRUE, m_unk0x4c[i].m_data);
}
}
}
@ -73,7 +73,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot2 && m_unk0x4c[i].m_unk0x08 < dot1) {
s->VTable0x04(p_actor, 0, m_unk0x4c[i].m_data);
s->TriggerPathStruct(p_actor, FALSE, m_unk0x4c[i].m_data);
}
}
}

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

@ -23,19 +23,19 @@ extern MxU32 g_unk0x100f1198;
MxBool g_unk0x100f119c = FALSE;
// FUNCTION: LEGO1 0x1001b700
void LegoPathStruct::VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data)
void LegoPathStruct::TriggerPathStruct(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data)
{
if (!FUN_1001b740(p_actor, p_bool1, p_data, FALSE) && g_unk0x100f119c) {
FUN_1001b740(p_actor, p_bool1, p_data, TRUE);
if (!HandleTrigger(p_actor, p_direction, p_data, FALSE) && g_unk0x100f119c) {
HandleTrigger(p_actor, p_direction, p_data, TRUE);
}
}
// FUNCTION: LEGO1 0x1001b740
// FUNCTION: BETA10 0x100c26c5
MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2)
MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2)
{
MxBool triggered = FALSE;
MxBool bool3 = p_bool2 ? !p_bool1 : p_bool1;
MxBool bool3 = p_bool2 ? !p_direction : p_direction;
MxU32 flags = bool3 ? c_bit5 : c_bit6;
flags |= p_actor->GetCameraFlag() ? c_bit1 : (c_bit2 | c_bit3 | c_bit4);
@ -76,7 +76,7 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
}
case c_music:
if (g_unk0x100f1198 & Isle::c_bit7) {
FUN_1001bd10(p_bool1, p_data);
PlayMusic(p_direction, p_data);
}
break;
case c_s: {
@ -126,7 +126,7 @@ void LegoPathStruct::FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_boo
// FUNCTION: LEGO1 0x1001bd10
// FUNCTION: BETA10 0x100c2b4a
void LegoPathStruct::FUN_1001bd10(MxBool p_direction, MxU32 p_data)
void LegoPathStruct::PlayMusic(MxBool p_direction, MxU32 p_data)
{
JukeBoxState* state = (JukeBoxState*) GameState()->GetState("JukeBoxState");
if (state != NULL && state->m_active) {