From 17d25899c488a38c7d2149ed4c6a689980dbce0f Mon Sep 17 00:00:00 2001
From: Joshua Peisach <itzswirlz2020@outlook.com>
Date: Sat, 8 Jul 2023 17:53:28 -0400
Subject: [PATCH] Start MxEntity

---
 LEGO1/mxentity.cpp | 18 +++++++-----------
 LEGO1/mxentity.h   | 10 +++++-----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/LEGO1/mxentity.cpp b/LEGO1/mxentity.cpp
index 7459dd24..ade6490e 100644
--- a/LEGO1/mxentity.cpp
+++ b/LEGO1/mxentity.cpp
@@ -1,19 +1,15 @@
 #include "mxentity.h"
 
-// OFFSET: LEGO1 0x1001d190 STUB
+// OFFSET: LEGO1 0x1001d190
 MxEntity::MxEntity()
 {
-  // TODO
+  // FIXME: This won't match because of m_atom. How would it access m_internal?
+  this->m_atom = NULL;
+  this->m_mxEntityId = -1;
 }
 
-// OFFSET: LEGO1 0x1000c110 STUB
+// OFFSET: LEGO1 0x1000c110
 MxEntity::~MxEntity()
 {
-  // TODO
-}
-
-// OFFSET: LEGO1 0x10001070 STUB
-void MxEntity::Destroy()
-{
-  // TODO
-}
+  *this->m_atom;
+}
\ No newline at end of file
diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h
index 7123abbf..dfbf2e7b 100644
--- a/LEGO1/mxentity.h
+++ b/LEGO1/mxentity.h
@@ -1,7 +1,9 @@
 #ifndef MXENTITY_H
 #define MXENTITY_H
 
+#include "mxatomid.h"
 #include "mxcore.h"
+#include "mxtypes.h"
 
 // VTABLE 0x100d5390
 class MxEntity : public MxCore
@@ -22,11 +24,9 @@ class MxEntity : public MxCore
   {
     return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name);
   }
-
-  virtual void Destroy(); // vtable+0x1c
-
-  // 0x8: MxResult
-  // 0xc MxAtomId
+private:
+  MxS32 m_mxEntityId; // 0x8
+  MxAtomId* m_atom; // 0xc
 };
 
 #endif // MXENTITY_H