From 14cb3e621a1c57e293c608cf384881391c1cec90 Mon Sep 17 00:00:00 2001 From: Nathan M Gilbert Date: Sat, 6 Apr 2024 06:49:22 -0400 Subject: [PATCH] Implement/Match LegoPathActor ctor (#772) * Implement/Match LegoPathActor ctor * style --------- Co-authored-by: Christian Semmler --- LEGO1/lego/legoomni/include/legopathactor.h | 16 ++++++--- .../lego/legoomni/src/paths/legopathactor.cpp | 34 +++++++++++++++++-- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h index e78cae8b..85fe8286 100644 --- a/LEGO1/lego/legoomni/include/legopathactor.h +++ b/LEGO1/lego/legoomni/include/legopathactor.h @@ -8,6 +8,13 @@ class LegoPathController; +struct LegoActorStruct { + LegoActorStruct(); + ~LegoActorStruct(); + + Mx3DPointFloat m_unk0x00[4]; // 0x00 +}; + // VTABLE: LEGO1 0x100d6e28 // SIZE 0x154 class LegoPathActor : public LegoActor { @@ -101,16 +108,15 @@ class LegoPathActor : public LegoActor { MxFloat m_actorTime; // 0x80 MxFloat m_lastTime; // 0x84 LegoPathBoundary* m_boundary; // 0x88 - undefined m_unk0x8c[0x14]; // 0x8c - MxFloat m_unk0xa0; // 0xa0 - undefined m_unk0xa4[0x38]; // 0xa4 + LegoActorStruct m_unk0x8c; // 0x8c MxU32 m_state; // 0xdc Edge* m_destEdge; // 0xe0 undefined4 m_unk0xe4; // 0xe4 - undefined2 m_unk0xe8; // 0xe8 + undefined m_unk0xe8; // 0xe8 + undefined m_unk0xe9; // 0xe9 MxBool m_userNavFlag; // 0xea MxMatrix m_unk0xec; // 0xec - undefined4 m_unk0x134; // 0x134 + undefined* m_unk0x134; // 0x134 LegoPathController* m_controller; // 0x138 MxFloat m_unk0x13c; // 0x13c MxFloat m_unk0x140; // 0x140 diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp index e389d1b8..d4ccc35c 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp @@ -2,16 +2,31 @@ DECOMP_SIZE_ASSERT(LegoPathActor, 0x154) -// STUB: LEGO1 0x1002d700 +// FUNCTION: LEGO1 0x1002d700 LegoPathActor::LegoPathActor() { - // TODO + m_boundary = NULL; + m_actorTime = 0; + m_lastTime = 0; + m_unk0x7c = 0; + m_userNavFlag = FALSE; + m_state = 0; + m_unk0x134 = NULL; + m_controller = NULL; + m_unk0xe8 = 0; + m_unk0x148 = 0; + m_unk0x14c = 0; + m_unk0x140 = 0.0099999998f; + m_unk0x144 = 0.80000001f; + m_unk0x150 = 2.0f; } // STUB: LEGO1 0x1002d820 LegoPathActor::~LegoPathActor() { - // TODO + if (m_unk0x134) { + delete m_unk0x134; + } } // STUB: LEGO1 0x1002d8d0 @@ -92,3 +107,16 @@ void LegoPathActor::VTable0xa8() { // TODO } + +// FUNCTION: LEGO1 0x1009a0f0 +LegoActorStruct::LegoActorStruct() +{ + for (MxS32 i = 0; i < _countof(m_unk0x00); i++) { + m_unk0x00[i].Clear(); + } +} + +// FUNCTION: LEGO1 0x1009a130 +LegoActorStruct::~LegoActorStruct() +{ +}