From 9e0e924529bbd86835b86fb76b935df77f47097b Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sun, 18 Jun 2023 22:01:18 -0700
Subject: [PATCH] added more information, fixed formatting issues

---
 LEGO1/mxdsfile.cpp |  7 ++++---
 LEGO1/mxomni.h     | 35 +++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/mxdsfile.cpp
index 9e3efd73..27d6668d 100644
--- a/LEGO1/mxdsfile.cpp
+++ b/LEGO1/mxdsfile.cpp
@@ -1,5 +1,6 @@
 #include "mxdsfile.h"
 
-unsigned long MxDSFile::GetBufferSize() {
-    return this->m_buffersize;
-}
\ No newline at end of file
+unsigned long MxDSFile::GetBufferSize()
+{
+  return this->m_buffersize;
+}
diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h
index 1cbca1a7..1a94fd3d 100644
--- a/LEGO1/mxomni.h
+++ b/LEGO1/mxomni.h
@@ -9,8 +9,7 @@
 #include "mxomnicreateflags.h"
 #include "mxtimer.h"
 
-
-class MxOmni
+class MxOmni : public MxCore
 {
 public:
   __declspec(dllexport) static void DestroyInstance();
@@ -27,15 +26,27 @@ class MxOmni
   MxTimer* GetTimer() const { return this->m_Timer; } 
 
 private:
-  static MxOmni* m_instance; // INCORRECT, PLACEHOLDER
-  char m_unknown[0x10];
-  MxVariableTable* m_variabletable; //0x20
-  MxTickleManager* m_ticklemanager; //0x24
-  MxNotificationManager* m_notificationmanager; //0x28
-  char m_unknown2[0x4]; //0x2C
-  MxSoundManager* m_soundmanager; //0x30
-  MxMusicManager* m_musicmanager; //0x34
-  MxEventManager* m_eventmanager; //0x38
-  MxTimer* m_Timer; //0x3C
+  static MxOmni* m_instance;
+
+  MxString m_mediaPath; // 0x8
+  HWND *m_windowHandle; // 0x18;
+  MxObjectFactory *m_objectFactory; // 0x1C
+  MxVariableTable* m_variableTable; //0x20
+  MxTickleManager* m_tickleManager; //0x24
+  MxNotificationManager* m_notificationManager; //0x28
+  MxVideoManager *m_videoManager; //0x2C
+  MxSoundManager* m_soundManager; //0x30
+  MxMusicManager* m_musicManager; //0x34
+  MxEventManager* m_eventManager; //0x38
+  MxTimer* m_timer; //0x3C
   MxStreamer* m_streamer; //0x40
+
+  char unknown44[0x4]; // 0x44
+
+  MxCriticalSection m_criticalsection; // 0x48
+
+  char unknown64[0x4]; // 0x64
+
 };
+
+#endif // MXOMNI_H