Refactor files based on beta debug build (#645)

* Rename LegoUnkSaveDataWriter -> LegoCharacterManager

* Refactor mxomni into mxomni/mxmisc

* Refactor legoomni into legoomni/misc

* Resolve deps

* Refactor atom

* Refactor mxutil

* Refactor mxio

* Rename/relocate files

* Fix format

LEGO1/omni/src/common/mxatom.cpp

@@ -1,7 +1,13 @@
-#include "mxatomid.h"
+#include "mxatom.h"
 
+#include "decomp.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 
+DECOMP_SIZE_ASSERT(MxAtomId, 0x04);
+DECOMP_SIZE_ASSERT(MxAtomIdCounter, 0x14);
+DECOMP_SIZE_ASSERT(MxAtomIdCounterSet, 0x10);
+
 // FUNCTION: LEGO1 0x100acf90
 MxAtomId::MxAtomId(const char* p_str, LookupMode p_mode)
 {
@@ -107,3 +113,17 @@ void MxAtomId::Clear()
 	Destroy();
 	m_internal = NULL;
 }
+
+// FUNCTION: LEGO1 0x100ad7f0
+void MxAtomIdCounter::Inc()
+{
+	m_value++;
+}
+
+// FUNCTION: LEGO1 0x100ad800
+void MxAtomIdCounter::Dec()
+{
+	if (m_value) {
+		m_value--;
+	}
+}

LEGO1/omni/src/common/mxatomidcounter.cpp

@@ -1,20 +0,0 @@
-#include "mxatomidcounter.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(MxAtomIdCounter, 0x14);
-DECOMP_SIZE_ASSERT(MxAtomIdCounterSet, 0x10);
-
-// FUNCTION: LEGO1 0x100ad7f0
-void MxAtomIdCounter::Inc()
-{
-	m_value++;
-}
-
-// FUNCTION: LEGO1 0x100ad800
-void MxAtomIdCounter::Dec()
-{
-	if (m_value) {
-		m_value--;
-	}
-}

LEGO1/omni/src/common/mxcompositepresenter.cpp

@@ -3,6 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 

LEGO1/omni/src/common/mxmediapresenter.cpp

@@ -3,6 +3,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
 #include "mxcompositepresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"

LEGO1/omni/src/common/mxmisc.cpp

@@ -0,0 +1,81 @@
+#include "mxmisc.h"
+
+#include "mxomni.h"
+
+// FUNCTION: LEGO1 0x100acea0
+MxObjectFactory* ObjectFactory()
+{
+	return MxOmni::GetInstance()->GetObjectFactory();
+}
+
+// FUNCTION: LEGO1 0x100aceb0
+MxNotificationManager* NotificationManager()
+{
+	return MxOmni::GetInstance()->GetNotificationManager();
+}
+
+// FUNCTION: LEGO1 0x100acec0
+MxTickleManager* TickleManager()
+{
+	return MxOmni::GetInstance()->GetTickleManager();
+}
+
+// FUNCTION: LEGO1 0x100aced0
+MxTimer* Timer()
+{
+	return MxOmni::GetInstance()->GetTimer();
+}
+
+// FUNCTION: LEGO1 0x100acee0
+MxAtomIdCounterSet* AtomIdCounterSet()
+{
+	return MxOmni::GetInstance()->GetAtomIdCounterSet();
+}
+
+// FUNCTION: LEGO1 0x100acef0
+MxStreamer* Streamer()
+{
+	return MxOmni::GetInstance()->GetStreamer();
+}
+
+// FUNCTION: LEGO1 0x100acf00
+MxSoundManager* MSoundManager()
+{
+	return MxOmni::GetInstance()->GetSoundManager();
+}
+
+// FUNCTION: LEGO1 0x100acf10
+MxVideoManager* MVideoManager()
+{
+	return MxOmni::GetInstance()->GetVideoManager();
+}
+
+// FUNCTION: LEGO1 0x100acf20
+MxVariableTable* VariableTable()
+{
+	return MxOmni::GetInstance()->GetVariableTable();
+}
+
+// FUNCTION: LEGO1 0x100acf30
+MxMusicManager* MusicManager()
+{
+	return MxOmni::GetInstance()->GetMusicManager();
+}
+
+// FUNCTION: LEGO1 0x100acf40
+MxEventManager* EventManager()
+{
+	return MxOmni::GetInstance()->GetEventManager();
+}
+
+// FUNCTION: LEGO1 0x100acf50
+MxResult Start(MxDSAction* p_dsAction)
+{
+	return MxOmni::GetInstance()->Start(p_dsAction);
+}
+
+// FUNCTION: LEGO1 0x100acf70
+void DeleteObject(MxDSAction& p_dsAction)
+{
+	MxOmni::GetInstance()->DeleteObject(p_dsAction);
+}

LEGO1/omni/src/common/mxpresenter.cpp

@@ -8,11 +8,13 @@
 #include "mxdsanim.h"
 #include "mxdssound.h"
 #include "mxentity.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
+#include "mxomni.h"
 #include "mxparam.h"
 #include "mxstreamer.h"
-#include "mxutil.h"
+#include "mxutilities.h"
 
 #include <string.h>
 

LEGO1/omni/src/common/mxticklemanager.cpp

@@ -1,7 +1,7 @@
 #include "mxticklemanager.h"
 
 #include "decomp.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtypes.h"
 

LEGO1/omni/src/common/mxutilities.cpp

@@ -1,4 +1,4 @@
-#include "mxutil.h"
+#include "mxutilities.h"
 
 #include "mxcompositepresenter.h"
 #include "mxdsaction.h"