From 7516fd7fcb8722ac1a34867b128af854afe19be7 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Tue, 21 May 2024 14:56:05 -0400 Subject: [PATCH] Rename --- LEGO1/lego/legoomni/include/legopathstruct.h | 2 +- LEGO1/lego/legoomni/src/paths/legopathboundary.cpp | 4 ++-- LEGO1/lego/legoomni/src/paths/legopathstruct.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legopathstruct.h b/LEGO1/lego/legoomni/include/legopathstruct.h index 561b9138..062da938 100644 --- a/LEGO1/lego/legoomni/include/legopathstruct.h +++ b/LEGO1/lego/legoomni/include/legopathstruct.h @@ -57,7 +57,7 @@ class LegoPathStruct : public LegoPathStructBase { // FUNCTION: LEGO1 0x10047470 ~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 SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; } diff --git a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp index 28a23552..67116bf0 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp @@ -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->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; 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); } } } diff --git a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp index 83554127..e4150852 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp @@ -23,7 +23,7 @@ extern MxU32 g_unk0x100f1198; MxBool g_unk0x100f119c = FALSE; // 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) { HandleTrigger(p_actor, p_direction, p_data, TRUE);