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/lego/legoomni/include/legoactioncontrolpresenter.h

@@ -2,7 +2,7 @@
 #define LEGOACTIONCONTROLPRESENTER_H
 
 #include "decomp.h"
-#include "legoutil.h"
+#include "legoutils.h"
 #include "mxmediapresenter.h"
 
 // VTABLE: LEGO1 0x100d5118

LEGO1/lego/legoomni/include/legoactor.h

@@ -2,7 +2,7 @@
 #define LEGOACTOR_H
 
 #include "decomp.h"
-#include "legocachesound.h"
+#include "legocachsound.h"
 #include "legoentity.h"
 
 // VTABLE: LEGO1 0x100d6d68

LEGO1/lego/legoomni/include/legocachesoundlist.h

@@ -1,11 +1,10 @@
 #ifndef LEGOCACHESOUNDLIST_H
 #define LEGOCACHESOUNDLIST_H
 
+#include "legocachsound.h"
 #include "mxlist.h"
 #include "mxtypes.h"
 
-class LegoCacheSound;
-
 // VTABLE: LEGO1 0x100d63b0
 // class MxCollection<LegoCacheSound *>
 

LEGO1/lego/legoomni/include/legocachsound.h

@@ -1,5 +1,5 @@
-#ifndef LEGOCACHESOUND_H
-#define LEGOCACHESOUND_H
+#ifndef LEGOCACHSOUND_H
+#define LEGOCACHSOUND_H
 
 #include "decomp.h"
 #include "legounknown100d5778.h"
@@ -60,4 +60,4 @@ private:
 	undefined m_unk0x84;            // 0x84
 };
 
-#endif // LEGOCACHESOUND_H
+#endif // LEGOCACHSOUND_H

LEGO1/lego/legoomni/include/legocharactermanager.h

@@ -1,5 +1,5 @@
-#ifndef LEGOUNKSAVEDATAWRITER_H
-#define LEGOUNKSAVEDATAWRITER_H
+#ifndef LEGOCHARACTERMANAGER_H
+#define LEGOCHARACTERMANAGER_H
 
 #include "decomp.h"
 #include "legovariables.h"
@@ -51,9 +51,9 @@ struct LegoSaveDataEntry3 {
 };
 
 // SIZE 0x08
-class LegoUnkSaveDataWriter {
+class LegoCharacterManager {
 public:
-	LegoUnkSaveDataWriter();
+	LegoCharacterManager();
 
 	MxResult WriteSaveData3(LegoStorage* p_storage);
 	MxResult ReadSaveData3(LegoStorage* p_storage);
@@ -80,7 +80,6 @@ private:
 };
 
 // clang-format off
-
 // FUNCTION: LEGO1 0x10082b90
 // _Tree<char *,pair<char * const,LegoUnkSaveDataMapValue *>,map<char *,LegoUnkSaveDataMapValue *,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >::_Kfn,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >::~_Tree<char *,pair<char * const,LegoUnkSaveDataMapValue *>,map<char *,LegoUnkSaveDataMapValue *,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >::_Kfn,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >
 
@@ -98,7 +97,6 @@ private:
 
 // GLOBAL: LEGO1 0x100fc508
 // _Tree<char *,pair<char * const,LegoUnkSaveDataMapValue *>,map<char *,LegoUnkSaveDataMapValue *,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >::_Kfn,LegoUnkSaveDataMapComparator,allocator<LegoUnkSaveDataMapValue *> >::_Nil
-
 // clang-format on
 
-#endif // LEGOUNKSAVEDATAWRITER_H
+#endif // LEGOCHARACTERMANAGER_H

LEGO1/lego/legoomni/include/legoomni.h

@@ -5,12 +5,11 @@
 #include "mxdsaction.h"
 #include "mxomni.h"
 
-class LegoTextureContainer;
 class Isle;
 class IslePathActor;
 class LegoAnimationManager;
 class LegoBuildingManager;
-class LegoControlManager;
+class LegoCharacterManager;
 class LegoEntity;
 class LegoGameState;
 class LegoInputManager;
@@ -19,16 +18,14 @@ class LegoPathBoundary;
 class LegoPlantManager;
 class LegoROI;
 class LegoSoundManager;
-class LegoUnkSaveDataWriter;
+class LegoTextureContainer;
 class LegoVideoManager;
 class LegoWorld;
 class LegoWorldList;
 class MxAtomId;
 class MxBackgroundAudioManager;
-class MxDSFile;
 class MxTransitionManager;
 class ViewLODListManager;
-class ViewManager;
 
 extern MxAtomId* g_copterScript;
 extern MxAtomId* g_dunecarScript;
@@ -224,7 +221,7 @@ public:
 	MxBackgroundAudioManager* GetBackgroundAudioManager() { return m_bkgAudioManager; }
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
-	LegoUnkSaveDataWriter* GetUnkSaveDataWriter() { return m_saveDataWriter; }
+	LegoCharacterManager* GetCharacterManager() { return m_characterManager; }
 	LegoWorldList* GetWorldList() { return m_worldList; }
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
@@ -247,7 +244,7 @@ private:
 	MxBool m_exit;                               // 0x80
 	LegoNavController* m_navController;          // 0x84
 	IslePathActor* m_currentActor;               // 0x88
-	LegoUnkSaveDataWriter* m_saveDataWriter;     // 0x8c
+	LegoCharacterManager* m_characterManager;    // 0x8c
 	LegoPlantManager* m_plantManager;            // 0x90
 	LegoAnimationManager* m_animationManager;    // 0x94
 	LegoBuildingManager* m_buildingManager;      // 0x98
@@ -258,39 +255,12 @@ private:
 	MxBool m_unk0x13c;                           // 0x13c
 };
 
-MxBackgroundAudioManager* BackgroundAudioManager();
-LegoGameState* GameState();
 const char* GetNoCD_SourceName();
-LegoInputManager* InputManager();
-LegoOmni* Lego();
+
 LegoEntity* PickEntity(MxLong, MxLong);
 LegoROI* PickROI(MxLong, MxLong);
-LegoSoundManager* SoundManager();
-MxTransitionManager* TransitionManager();
-LegoVideoManager* VideoManager();
-LegoAnimationManager* AnimationManager();
-LegoNavController* NavController();
-LegoBuildingManager* BuildingManager();
-LegoControlManager* ControlManager();
-IslePathActor* CurrentActor();
-ViewManager* GetViewManager();
-LegoPlantManager* PlantManager();
-LegoWorld* CurrentWorld();
-LegoUnkSaveDataWriter* UnkSaveDataWriter();
-LegoTextureContainer* TextureContainer();
-ViewLODListManager* GetViewLODListManager();
-void FUN_10015820(MxBool p_disable, MxU16 p_flags);
-void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c);
-void SetCurrentActor(IslePathActor* p_currentActor);
-LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
-LegoROI* FindROI(const char* p_name);
-MxDSAction& GetCurrentAction();
 
-void PlayMusic(MxU32 p_index);
-void SetIsWorldActive(MxBool p_isWorldActive);
-void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last);
 void CreateScripts();
 void DestroyScripts();
-void SetCurrentWorld(LegoWorld* p_world);
 
 #endif // LEGOOMNI_H

LEGO1/lego/legoomni/include/legounknown100d6b4c.h

@@ -2,7 +2,7 @@
 #define LEGOUNKNOWN100D6B4C_H
 
 #include "decomp.h"
-#include "legocachesound.h"
+#include "legocachsound.h"
 #include "mxstl/stlcompat.h"
 #include "mxtypes.h"
 

LEGO1/lego/legoomni/include/legoutils.h

@@ -1,12 +1,12 @@
-#ifndef LEGOUTIL_H
-#define LEGOUTIL_H
+#ifndef LEGOUTILS_H
+#define LEGOUTILS_H
 
 #include "extra.h"
 #include "misc/legostorage.h"
 #include "misc/legotexture.h"
 #include "mxstring.h"
 #include "mxtypes.h"
-#include "mxutil.h"
+#include "mxutilities.h"
 
 #include <windows.h>
 
@@ -33,4 +33,4 @@ void WriteNamedTexture(LegoFile* p_file, LegoNamedTexture* p_texture);
 // SYNTHETIC: LEGO1 0x10034b40
 // LegoTexture::`scalar deleting destructor'
 
-#endif // LEGOUTIL_H
+#endif // LEGOUTILS_H

LEGO1/lego/legoomni/include/legoworld.h

@@ -1,8 +1,8 @@
 #ifndef LEGOWORLD_H
 #define LEGOWORLD_H
 
-#include "legocachesound.h"
 #include "legocachesoundlist.h"
+#include "legocachsound.h"
 #include "legocameracontroller.h"
 #include "legoentity.h"
 #include "legoentitylist.h"

LEGO1/lego/legoomni/include/misc.h

@@ -0,0 +1,58 @@
+#ifndef MISC_H
+#define MISC_H
+
+#include "decomp.h"
+#include "mxtypes.h"
+
+class IslePathActor;
+class LegoAnimationManager;
+class LegoBuildingManager;
+class LegoCharacterManager;
+class LegoControlManager;
+class LegoGameState;
+class LegoInputManager;
+class LegoNavController;
+class LegoOmni;
+class LegoPlantManager;
+class LegoROI;
+class LegoSoundManager;
+class LegoTextureContainer;
+class LegoVideoManager;
+class LegoWorld;
+class MxAtomId;
+class MxBackgroundAudioManager;
+class MxDSAction;
+class MxTransitionManager;
+class ViewLODListManager;
+class ViewManager;
+
+LegoOmni* Lego();
+LegoInputManager* InputManager();
+LegoSoundManager* SoundManager();
+MxBackgroundAudioManager* BackgroundAudioManager();
+LegoGameState* GameState();
+MxTransitionManager* TransitionManager();
+LegoVideoManager* VideoManager();
+LegoAnimationManager* AnimationManager();
+LegoNavController* NavController();
+LegoBuildingManager* BuildingManager();
+LegoControlManager* ControlManager();
+IslePathActor* CurrentActor();
+ViewManager* GetViewManager();
+LegoPlantManager* PlantManager();
+LegoWorld* CurrentWorld();
+LegoCharacterManager* CharacterManager();
+LegoTextureContainer* TextureContainer();
+ViewLODListManager* GetViewLODListManager();
+LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);
+LegoROI* FindROI(const char* p_name);
+MxDSAction& GetCurrentAction();
+void PlayMusic(MxU32 p_index);
+void SetIsWorldActive(MxBool p_isWorldActive);
+void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last);
+void SetCurrentWorld(LegoWorld* p_world);
+void FUN_10015820(MxBool p_disable, MxU16 p_flags);
+void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c);
+void SetCurrentActor(IslePathActor* p_currentActor);
+
+#endif // MISC_H

LEGO1/lego/legoomni/include/mxtransitionmanager.h

@@ -1,13 +1,15 @@
 #ifndef MXTRANSITIONMANAGER_H
 #define MXTRANSITIONMANAGER_H
 
-#include "legoomni.h"
+#include "decomp.h"
 #include "mxcore.h"
-#include "mxvideopresenter.h"
 
 #include <ddraw.h>
 
+class MxVideoPresenter;
+
 // VTABLE: LEGO1 0x100d7ea0
+// SIZE 0x900
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();

LEGO1/lego/legoomni/include/pizza.h

@@ -3,10 +3,6 @@
 
 #include "decomp.h"
 #include "isleactor.h"
-#include "mxcore.h"
-#include "mxomni.h"
-#include "mxticklemanager.h"
-#include "mxtypes.h"
 
 // VTABLE: LEGO1 0x100d7380
 // SIZE 0x9c