From 04786c10785b27312c1d3b50a1447a2417d383ce Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 9 Nov 2024 09:57:04 -0700 Subject: [PATCH] Match function --- LEGO1/lego/legoomni/include/doors.h | 2 +- LEGO1/lego/legoomni/src/actors/doors.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/doors.h b/LEGO1/lego/legoomni/include/doors.h index bc64d8f2..83c551b0 100644 --- a/LEGO1/lego/legoomni/include/doors.h +++ b/LEGO1/lego/legoomni/include/doors.h @@ -7,7 +7,7 @@ // SIZE 0x1f8 class Doors : public LegoPathActor { public: - Doors() : m_unk0x154(0), m_unk0x15c(0), m_unk0x160(0), m_unk0x1f4(0) {} + Doors() : m_unk0x154(0), m_unk0x15c(NULL), m_unk0x160(NULL), m_unk0x1f4(0) {} // FUNCTION: LEGO1 0x1000e430 const char* ClassName() const override // vtable+0x0c diff --git a/LEGO1/lego/legoomni/src/actors/doors.cpp b/LEGO1/lego/legoomni/src/actors/doors.cpp index 57a72c37..2ac676b3 100644 --- a/LEGO1/lego/legoomni/src/actors/doors.cpp +++ b/LEGO1/lego/legoomni/src/actors/doors.cpp @@ -10,18 +10,12 @@ MxResult Doors::VTable0x94(LegoPathActor* p_actor, MxBool p_bool) { if (m_unk0x154 == 1) { m_unk0x154 = 2; - m_unk0x158 = Timer()->GetTime(); - - m_unk0x164 = *m_unk0x15c; - m_unk0x1ac = *m_unk0x160; + m_unk0x164 = m_unk0x15c[2]; + m_unk0x1ac = m_unk0x160[2]; } - if (m_unk0x1f4 < 0.001) { - return SUCCESS; - } - - return FAILURE; + return m_unk0x1f4 < 0.001 ? SUCCESS : FAILURE; } // STUB: LEGO1 0x10066250