From 373cb876652e87c0e6bc7e714547fc89fd3a53ee Mon Sep 17 00:00:00 2001 From: Joshua Peisach Date: Sat, 22 Jul 2023 19:45:19 -0400 Subject: [PATCH] Small implementations in MxEntity/MxEventManager --- LEGO1/mxentity.cpp | 8 ++++++++ LEGO1/mxentity.h | 2 ++ LEGO1/mxeventmanager.cpp | 16 ++++++++++++---- LEGO1/mxeventmanager.h | 2 ++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/LEGO1/mxentity.cpp b/LEGO1/mxentity.cpp index 1b5ea84f..f6fd86fd 100644 --- a/LEGO1/mxentity.cpp +++ b/LEGO1/mxentity.cpp @@ -9,4 +9,12 @@ MxEntity::MxEntity() // OFFSET: LEGO1 0x1000c110 MxEntity::~MxEntity() { +} + +// OFFSET: LEGO1 0x10001070 +MxResult MxEntity::SetEntityId(MxS32 p_id, MxAtomId *p_atom) +{ + this->m_mxEntityId = p_id; + // FIXME: MxAtomId operator call, probably it will be return whatever the comparison is for comparing this->m_atom to the p_atom + return FALSE; } \ No newline at end of file diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h index a7e26e37..d37fea80 100644 --- a/LEGO1/mxentity.h +++ b/LEGO1/mxentity.h @@ -24,6 +24,8 @@ class MxEntity : public MxCore { return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name); } + + virtual MxResult MxEntity::SetEntityId(MxS32 p_id, MxAtomId *p_atom); private: MxS32 m_mxEntityId; // 0x8 MxAtomId m_atom; // 0xc diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/mxeventmanager.cpp index 786420bc..47321191 100644 --- a/LEGO1/mxeventmanager.cpp +++ b/LEGO1/mxeventmanager.cpp @@ -1,13 +1,21 @@ #include "mxeventmanager.h" -// OFFSET: LEGO1 0x100c0360 STUB +// OFFSET: LEGO1 0x100c0360 MxEventManager::MxEventManager() { - // TODO + Init(); } -// OFFSET: LEGO1 0x100c03f0 STUB +// OFFSET: LEGO1 0x100c03f0 MxEventManager::~MxEventManager() { - // TODO + // TODO: MxMediaManager::TerminateThread call } + +// OFFSET: LEGO1 0x100c0450 +void MxEventManager::Init() +{ + // huh? + // imagine if the devs actually put this here to troll us + return; +} \ No newline at end of file diff --git a/LEGO1/mxeventmanager.h b/LEGO1/mxeventmanager.h index be5a796c..1fe7daeb 100644 --- a/LEGO1/mxeventmanager.h +++ b/LEGO1/mxeventmanager.h @@ -11,6 +11,8 @@ class MxEventManager : public MxUnknown100dc6b0 MxEventManager(); virtual ~MxEventManager() override; +private: + void Init(); }; #endif // MXEVENTMANAGER_H