From 582888849c199dc9f3099180f869d2a6084292a4 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 13 Oct 2023 12:40:22 -0400 Subject: [PATCH] More rename fixes --- LEGO1/legoentity.cpp | 2 +- LEGO1/legoentity.h | 2 +- LEGO1/mxloopingflcpresenter.cpp | 2 +- LEGO1/mxloopingflcpresenter.h | 2 +- LEGO1/mxloopingsmkpresenter.cpp | 3 +-- LEGO1/mxloopingsmkpresenter.h | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp index 4247e18e..c4e52dd1 100644 --- a/LEGO1/legoentity.cpp +++ b/LEGO1/legoentity.cpp @@ -46,7 +46,7 @@ MxResult LegoEntity::InitFromMxDSObject(MxDSObject& p_object) } // OFFSET: LEGO1 0x10010810 STUB -void LegoEntity::Destroy(MxBool) +void LegoEntity::Destroy(MxBool p_fromDestructor) { if (m_unk54) { // TODO diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h index 66043492..fc5117ea 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/legoentity.h @@ -36,7 +36,7 @@ class LegoEntity : public MxEntity } virtual MxResult InitFromMxDSObject(MxDSObject& p_object); // vtable+0x18 - virtual void Destroy(MxBool); // vtable+0x1c + virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c virtual void ParseAction(char *); // vtable+0x20 protected: diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp index 58b066f6..f525e31e 100644 --- a/LEGO1/mxloopingflcpresenter.cpp +++ b/LEGO1/mxloopingflcpresenter.cpp @@ -25,7 +25,7 @@ void MxLoopingFlcPresenter::Init() } // OFFSET: LEGO1 0x100b4432 STUB -void MxLoopingFlcPresenter::Destroy(MxBool p_param) +void MxLoopingFlcPresenter::Destroy(MxBool p_fromDestructor) { // TODO } diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/mxloopingflcpresenter.h index 209e2a53..449a0a86 100644 --- a/LEGO1/mxloopingflcpresenter.h +++ b/LEGO1/mxloopingflcpresenter.h @@ -22,7 +22,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter private: void Init(); - void Destroy(MxBool); + void Destroy(MxBool p_fromDestructor); undefined4 m_unk68; }; diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp index f51e2750..ff85c5ff 100644 --- a/LEGO1/mxloopingsmkpresenter.cpp +++ b/LEGO1/mxloopingsmkpresenter.cpp @@ -25,7 +25,6 @@ void MxLoopingSmkPresenter::Init() } // OFFSET: LEGO1 0x100b49d0 STUB -void MxLoopingSmkPresenter::Destroy(MxBool p_bool) +void MxLoopingSmkPresenter::Destroy(MxBool p_fromDestructor) { - // TODO - theres a chain of destroy and free function calls here (FUN_100b4300 -> FUN_100b3900 -> FUN_100c5d40 -> function at 0x100b27b0) } diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/mxloopingsmkpresenter.h index ae9cfa05..4b903598 100644 --- a/LEGO1/mxloopingsmkpresenter.h +++ b/LEGO1/mxloopingsmkpresenter.h @@ -22,7 +22,7 @@ class MxLoopingSmkPresenter : public MxSmkPresenter private: void Init(); - void Destroy(MxBool); + void Destroy(MxBool p_fromDestructor); undefined4 m_unk720; };