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

Rename

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

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

@ -57,7 +57,7 @@ class LegoPathStruct : public LegoPathStructBase {
// FUNCTION: LEGO1 0x10047470 // FUNCTION: LEGO1 0x10047470
~LegoPathStruct() override {} ~LegoPathStruct() override {}
virtual void TriggerPathStruct(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data); // vtable+0x04 virtual void HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data); // vtable+0x04
inline void SetWorld(LegoWorld* p_world) { m_world = p_world; } inline void SetWorld(LegoWorld* p_world) { m_world = p_world; }
inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; } inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; }

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; LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot1 && m_unk0x4c[i].m_unk0x08 < dot2) { if (m_unk0x4c[i].m_unk0x08 >= dot1 && m_unk0x4c[i].m_unk0x08 < dot2) {
s->TriggerPathStruct(p_actor, TRUE, m_unk0x4c[i].m_data); s->HandleTrigger(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; LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
if (m_unk0x4c[i].m_unk0x08 >= dot2 && m_unk0x4c[i].m_unk0x08 < dot1) { if (m_unk0x4c[i].m_unk0x08 >= dot2 && m_unk0x4c[i].m_unk0x08 < dot1) {
s->TriggerPathStruct(p_actor, FALSE, m_unk0x4c[i].m_data); s->HandleTrigger(p_actor, FALSE, m_unk0x4c[i].m_data);
} }
} }
} }

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

@ -23,7 +23,7 @@ extern MxU32 g_unk0x100f1198;
MxBool g_unk0x100f119c = FALSE; MxBool g_unk0x100f119c = FALSE;
// FUNCTION: LEGO1 0x1001b700 // FUNCTION: LEGO1 0x1001b700
void LegoPathStruct::TriggerPathStruct(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data) void LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data)
{ {
if (!HandleTrigger(p_actor, p_direction, p_data, FALSE) && g_unk0x100f119c) { if (!HandleTrigger(p_actor, p_direction, p_data, FALSE) && g_unk0x100f119c) {
HandleTrigger(p_actor, p_direction, p_data, TRUE); HandleTrigger(p_actor, p_direction, p_data, TRUE);