Refactor mxomni into mxomni/mxmisc

CMakeLists.txt

@@ -217,6 +217,7 @@ add_library(omni STATIC
   LEGO1/omni/src/common/mxcore.cpp
   LEGO1/omni/src/common/mxmediamanager.cpp
   LEGO1/omni/src/common/mxmediapresenter.cpp
+  LEGO1/omni/src/common/mxmisc.cpp
   LEGO1/omni/src/common/mxobjectfactory.cpp
   LEGO1/omni/src/common/mxpresenter.cpp
   LEGO1/omni/src/common/mxstring.cpp

ISLE/isleapp.cpp

@@ -6,12 +6,12 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legomodelpresenter.h"
-#include "legoomni.h"
 #include "legopartpresenter.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsaction.h"
+#include "mxmisc.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"

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

LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp

@@ -1,6 +1,7 @@
 #include "legosoundmanager.h"
 
 #include "mxautolocker.h"
+#include "mxomni.h"
 
 // FUNCTION: LEGO1 0x100298a0
 LegoSoundManager::LegoSoundManager()

LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp

@@ -3,7 +3,7 @@
 #include "legoomni.h"
 #include "mxcompositepresenter.h"
 #include "mxdssound.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
 #include "mxstreamer.h"
 #include "mxticklemanager.h"

LEGO1/lego/legoomni/src/build/buildingentity.cpp

@@ -1,6 +1,6 @@
 #include "buildingentity.h"
 
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 // FUNCTION: LEGO1 0x10014e20

LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp

@@ -6,7 +6,7 @@
 #include "legoutil.h"
 #include "mxcompositepresenter.h"
 #include "mxmediapresenter.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxticklemanager.h"
 

LEGO1/lego/legoomni/src/common/legocharactermanager.cpp

@@ -1,7 +1,7 @@
 #include "legocharactermanager.h"
 
 #include "legogamestate.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "roi/legoroi.h"
 
 DECOMP_SIZE_ASSERT(LegoCharacterManager, 0x08)

LEGO1/lego/legoomni/src/common/legogamestate.cpp

@@ -19,6 +19,7 @@
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxobjectfactory.h"
 #include "mxstring.h"
 #include "mxvariabletable.h"

LEGO1/lego/legoomni/src/common/legoutil.cpp

@@ -6,8 +6,8 @@
 #include "legoworld.h"
 #include "legoworldlist.h"
 #include "mxdsaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxstreamer.h"
 #include "mxtypes.h"
 

LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp

@@ -6,6 +6,7 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxmediapresenter.h"
+#include "mxmisc.h"
 #include "mxobjectfactory.h"
 #include "mxtimer.h"
 

LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp

@@ -4,6 +4,7 @@
 #include "legoomni.h"
 #include "legovideomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 

LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp

@@ -3,6 +3,7 @@
 #include "define.h"
 #include "legocontrolmanager.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxutil.h"

LEGO1/lego/legoomni/src/entity/legoentity.cpp

@@ -8,6 +8,7 @@
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "mxmisc.h"
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)
 

LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp

@@ -4,29 +4,41 @@
 #include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "mxmisc.h"
 
 // GLOBAL: LEGO1 0x100f4c28
 int g_mouseDeadzone = 40;
+
 // GLOBAL: LEGO1 0x100f4c2c
 float g_zeroThreshold = 0.001f;
+
 // GLOBAL: LEGO1 0x100f4c30
 float g_movementMaxSpeed = 40.0f;
+
 // GLOBAL: LEGO1 0x100f4c34
 float g_turnMaxSpeed = 20.0f;
+
 // GLOBAL: LEGO1 0x100f4c38
 float g_movementMaxAccel = 15.0f;
+
 // GLOBAL: LEGO1 0x100f4c3c
 float g_turnMaxAccel = 30.0f;
+
 // GLOBAL: LEGO1 0x100f4c40
 float g_movementMinAccel = 4.0f;
+
 // GLOBAL: LEGO1 0x100f4c44
 float g_turnMinAccel = 15.0f;
+
 // GLOBAL: LEGO1 0x100f4c48
 float g_movementDecel = 50.0f;
+
 // GLOBAL: LEGO1 0x100f4c4c
 float g_turnDecel = 50.0f;
+
 // GLOBAL: LEGO1 0x100f4c50
 float g_turnSensitivity = 0.4f;
+
 // GLOBAL: LEGO1 0x100f4c54
 MxBool g_turnUseVelocity = FALSE;
 

LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp

@@ -1,6 +1,7 @@
 #include "legonavcontroller.h"
 #include "legoomni.h"
 #include "legopointofviewcontroller.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(LegoMouseController, 0x20);

LEGO1/lego/legoomni/src/entity/legorace.cpp

@@ -1,5 +1,6 @@
 #include "legorace.h"
 
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 DECOMP_SIZE_ASSERT(LegoRace, 0x144)

LEGO1/lego/legoomni/src/entity/legoworld.cpp

@@ -15,9 +15,9 @@
 #include "legovideomanager.h"
 #include "mxactionnotificationparam.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
-#include "mxomni.h"
 #include "mxticklemanager.h"
 
 DECOMP_SIZE_ASSERT(LegoWorld, 0xf8)

LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp

@@ -19,6 +19,7 @@
 #include "mxdschunk.h"
 #include "mxdsmediaaction.h"
 #include "mxdsmultiaction.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
 #include "mxpresenter.h"

LEGO1/lego/legoomni/src/gasstation/gasstation.cpp

@@ -4,6 +4,7 @@
 #include "legogamestate.h"
 #include "legoinputmanager.h"
 #include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxticklemanager.h"
 

LEGO1/lego/legoomni/src/hospital/hospital.cpp

@@ -1,7 +1,7 @@
 #include "hospital.h"
 
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(Hospital, 0x12c)
 

LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp

@@ -7,8 +7,8 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "legovariables.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc)

LEGO1/lego/legoomni/src/infocenter/infocenter.cpp

@@ -18,6 +18,7 @@
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"

LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp

@@ -5,9 +5,9 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 

LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp

@@ -6,6 +6,7 @@
 #include "legoinputmanager.h"
 #include "legoomni.h"
 #include "mxactionnotificationparam.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtimer.h"
 

LEGO1/lego/legoomni/src/infocenter/score.cpp

@@ -5,8 +5,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "misc/legocontainer.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxnotificationparam.h"
 #include "mxtransitionmanager.h"

LEGO1/lego/legoomni/src/isle/historybook.cpp

@@ -3,9 +3,8 @@
 #include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(HistoryBook, 0x3e4)

LEGO1/lego/legoomni/src/isle/isle.cpp

@@ -6,8 +6,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "legoutil.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 #include "pizza.h"

LEGO1/lego/legoomni/src/isle/jukebox.cpp

@@ -5,9 +5,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxstillpresenter.h"
 #include "mxticklemanager.h"
 #include "mxtransitionmanager.h"

LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp

@@ -6,6 +6,7 @@
 #include "legogamestate.h"
 #include "legoutil.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 

LEGO1/lego/legoomni/src/isle/radio.cpp

@@ -5,6 +5,7 @@
 #include "legoomni.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 
 DECOMP_SIZE_ASSERT(Radio, 0x10);

LEGO1/lego/legoomni/src/isle/radiostate.cpp

@@ -2,6 +2,7 @@
 
 #include "jukebox.h"
 #include "legoomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 
 // GLOBAL: LEGO1 0x100f3218

LEGO1/lego/legoomni/src/isle/skateboard.cpp

@@ -1,8 +1,8 @@
 #include "skateboard.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(SkateBoard, 0x168);
 

LEGO1/lego/legoomni/src/main/legoomni.cpp

@@ -18,6 +18,7 @@
 #include "mxautolocker.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsfile.h"
+#include "mxmisc.h"
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparam.h"
 #include "mxstreamer.h"

LEGO1/lego/legoomni/src/pizzeria/pizza.cpp

@@ -1,5 +1,8 @@
 #include "pizza.h"
 
+#include "mxmisc.h"
+#include "mxticklemanager.h"
+
 DECOMP_SIZE_ASSERT(Pizza, 0x9c);
 
 // FUNCTION: LEGO1 0x10037ef0

LEGO1/lego/legoomni/src/police/police.cpp

@@ -4,8 +4,8 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"
 #include "policestate.h"

LEGO1/lego/legoomni/src/police/policestate.cpp

@@ -3,7 +3,7 @@
 #include "islepathactor.h"
 #include "legoomni.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "police.h"
 
 #include <stdlib.h>

LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp

@@ -7,6 +7,7 @@
 #include "legoworld.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
+#include "mxmisc.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"
 #include "mxvideomanager.h"

LEGO1/lego/legoomni/src/video/legovideomanager.cpp

@@ -1,6 +1,6 @@
 #include "legovideomanager.h"
 
-#include "legoomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
 #include "realtime/matrix.h"

LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp

@@ -5,6 +5,7 @@
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
 

LEGO1/omni/include/mxmisc.h

@@ -0,0 +1,33 @@
+#ifndef MXMISC_H
+#define MXMISC_H
+
+#include "mxtypes.h"
+
+class MxAtomIdCounterSet;
+class MxDSAction;
+class MxEventManager;
+class MxMusicManager;
+class MxNotificationManager;
+class MxObjectFactory;
+class MxSoundManager;
+class MxStreamer;
+class MxTickleManager;
+class MxTimer;
+class MxVariableTable;
+class MxVideoManager;
+
+MxTickleManager* TickleManager();
+MxTimer* Timer();
+MxStreamer* Streamer();
+MxSoundManager* MSoundManager();
+MxVariableTable* VariableTable();
+MxMusicManager* MusicManager();
+MxEventManager* EventManager();
+MxResult Start(MxDSAction*);
+MxNotificationManager* NotificationManager();
+MxVideoManager* MVideoManager();
+MxAtomIdCounterSet* AtomIdCounterSet();
+MxObjectFactory* ObjectFactory();
+void DeleteObject(MxDSAction& p_dsAction);
+
+#endif // MXMISC_H

LEGO1/omni/include/mxomni.h

@@ -5,9 +5,9 @@
 #include "mxcriticalsection.h"
 #include "mxstring.h"
 
-class MxAtomId;
 class MxAtomIdCounterSet;
 class MxDSAction;
+class MxEntity;
 class MxEventManager;
 class MxMusicManager;
 class MxNotificationManager;
@@ -17,12 +17,11 @@ class MxOmniCreateParam;
 class MxPresenter;
 class MxSoundManager;
 class MxStreamer;
+class MxStreamController;
 class MxTickleManager;
 class MxTimer;
 class MxVariableTable;
 class MxVideoManager;
-class MxEntity;
-class MxStreamController;
 
 // VTABLE: LEGO1 0x100dc168
 // SIZE 0x68
@@ -96,19 +95,4 @@ class MxOmni : public MxCore {
 	MxBool m_timerRunning;                        // 0x64
 };
 
-MxTickleManager* TickleManager();
-MxTimer* Timer();
-MxStreamer* Streamer();
-MxSoundManager* MSoundManager();
-MxVariableTable* VariableTable();
-MxMusicManager* MusicManager();
-MxEventManager* EventManager();
-MxResult Start(MxDSAction*);
-MxNotificationManager* NotificationManager();
-
-MxVideoManager* MVideoManager();
-MxAtomIdCounterSet* AtomIdCounterSet();
-MxObjectFactory* ObjectFactory();
-void DeleteObject(MxDSAction& p_dsAction);
-
 #endif // MXOMNI_H

LEGO1/omni/include/mxpresenter.h

@@ -5,7 +5,6 @@
 #include "mxcore.h"
 #include "mxcriticalsection.h"
 #include "mxdsaction.h"
-#include "mxomni.h"
 #include "mxpoint32.h"
 
 class MxCompositePresenter;

LEGO1/omni/include/mxsoundpresenter.h

@@ -2,7 +2,6 @@
 #define MXSOUNDPRESENTER_H
 
 #include "mxaudiopresenter.h"
-#include "mxomni.h"
 
 // VTABLE: LEGO1 0x100d4b08
 // SIZE 0x54

LEGO1/omni/src/action/mxdsaction.cpp

@@ -1,6 +1,6 @@
 #include "mxdsaction.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxutil.h"
 

LEGO1/omni/src/action/mxdsselectaction.cpp

@@ -1,6 +1,6 @@
 #include "mxdsselectaction.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxvariabletable.h"
 

LEGO1/omni/src/audio/mxloopingmidipresenter.cpp

@@ -2,8 +2,8 @@
 
 #include "decomp.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58);
 

LEGO1/omni/src/audio/mxmidipresenter.cpp

@@ -3,6 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
 
 DECOMP_SIZE_ASSERT(MxMIDIPresenter, 0x58);

LEGO1/omni/src/audio/mxmusicmanager.cpp

@@ -1,6 +1,6 @@
 #include "mxmusicmanager.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxticklemanager.h"
 
 #include <windows.h>

LEGO1/omni/src/audio/mxmusicpresenter.cpp

@@ -1,8 +1,8 @@
 #include "mxmusicpresenter.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
-#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(MxMusicPresenter, 0x54);
 

LEGO1/omni/src/audio/mxsoundmanager.cpp

@@ -2,8 +2,9 @@
 
 #include "define.h"
 #include "mxautolocker.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpresenter.h"
+#include "mxomni.h"
 #include "mxticklemanager.h"
 #include "mxwavepresenter.h"
 

LEGO1/omni/src/audio/mxsoundpresenter.cpp

@@ -1,6 +1,7 @@
 #include "mxsoundpresenter.h"
 
 #include "decomp.h"
+#include "mxmisc.h"
 #include "mxsoundmanager.h"
 
 DECOMP_SIZE_ASSERT(MxSoundPresenter, 0x54)

LEGO1/omni/src/audio/mxwavepresenter.cpp

@@ -4,6 +4,7 @@
 #include "define.h"
 #include "mxautolocker.h"
 #include "mxdssound.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxsoundmanager.h"
 #include "mxutil.h"

LEGO1/omni/src/common/mxatomid.cpp

@@ -1,5 +1,6 @@
 #include "mxatomid.h"
 
+#include "mxmisc.h"
 #include "mxomni.h"
 
 // FUNCTION: LEGO1 0x100acf90

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,8 +8,10 @@
 #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"

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/event/mxeventmanager.cpp

@@ -1,7 +1,7 @@
 #include "mxeventmanager.h"
 
 #include "mxcriticalsection.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxthread.h"
 #include "mxticklemanager.h"
 

LEGO1/omni/src/event/mxeventpresenter.cpp

@@ -3,7 +3,7 @@
 #include "decomp.h"
 #include "mxautolocker.h"
 #include "mxeventmanager.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxvariabletable.h"
 
 DECOMP_SIZE_ASSERT(MxEventPresenter, 0x54);

LEGO1/omni/src/main/mxomni.cpp

@@ -5,6 +5,7 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxeventmanager.h"
+#include "mxmisc.h"
 #include "mxmusicmanager.h"
 #include "mxnotificationmanager.h"
 #include "mxobjectfactory.h"
@@ -28,84 +29,6 @@ MxBool g_use3dSound = FALSE;
 // GLOBAL: LEGO1 0x101015b0
 MxOmni* MxOmni::g_instance = NULL;
 
-// 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);
-}
-
 // FUNCTION: LEGO1 0x100aef10
 MxOmni::MxOmni()
 {

LEGO1/omni/src/notify/mxnotificationmanager.cpp

@@ -3,7 +3,7 @@
 #include "compat.h"
 #include "decomp.h"
 #include "mxautolocker.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxparam.h"
 #include "mxticklemanager.h"
 #include "mxtypes.h"

LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp

@@ -4,6 +4,7 @@
 #include "mxautolocker.h"
 #include "mxdiskstreamprovider.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxticklemanager.h"
 

LEGO1/omni/src/stream/mxdsbuffer.cpp

@@ -3,6 +3,7 @@
 #include "mxdiskstreamcontroller.h"
 #include "mxdschunk.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxstreamchunk.h"
 #include "mxstreamcontroller.h"

LEGO1/omni/src/stream/mxstreamcontroller.cpp

@@ -3,8 +3,8 @@
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxdsstreamingaction.h"
+#include "mxmisc.h"
 #include "mxnextactiondatastart.h"
-#include "mxomni.h"
 #include "mxstl/stlcompat.h"
 #include "mxstreamchunk.h"
 #include "mxtimer.h"

LEGO1/omni/src/stream/mxstreamer.cpp

@@ -1,8 +1,8 @@
 #include "mxstreamer.h"
 
 #include "mxdiskstreamcontroller.h"
+#include "mxmisc.h"
 #include "mxnotificationmanager.h"
-#include "mxomni.h"
 #include "mxramstreamcontroller.h"
 
 #include <algorithm>

LEGO1/omni/src/system/mxthread.cpp

@@ -1,7 +1,7 @@
 #include "mxthread.h"
 
 #include "decomp.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxtimer.h"
 
 #include <process.h>

LEGO1/omni/src/video/mxdisplaysurface.cpp

@@ -1,5 +1,7 @@
 #include "mxdisplaysurface.h"
 
+#include "mxmisc.h"
+#include "mxomni.h"
 #include "mxutil.h"
 #include "mxvideomanager.h"
 

LEGO1/omni/src/video/mxflcpresenter.cpp

@@ -3,7 +3,7 @@
 #include "decomp.h"
 #include "mxbitmap.h"
 #include "mxdsmediaaction.h"
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxpalette.h"
 #include "mxvideomanager.h"
 

LEGO1/omni/src/video/mxpalette.cpp

@@ -1,6 +1,6 @@
 #include "mxpalette.h"
 
-#include "mxomni.h"
+#include "mxmisc.h"
 #include "mxvideomanager.h"
 
 // GLOBAL: LEGO1 0x10102188

LEGO1/omni/src/video/mxsmkpresenter.cpp

@@ -2,6 +2,7 @@
 
 #include "decomp.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxSmkPresenter, 0x720);

LEGO1/omni/src/video/mxstillpresenter.cpp

@@ -4,6 +4,7 @@
 #include "define.h"
 #include "mxcompositepresenter.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxomni.h"
 #include "mxutil.h"
 #include "mxvideomanager.h"

LEGO1/omni/src/video/mxvideomanager.cpp

@@ -1,6 +1,8 @@
 #include "mxvideomanager.h"
 
 #include "mxautolocker.h"
+#include "mxmisc.h"
+#include "mxomni.h"
 #include "mxpresenter.h"
 #include "mxticklemanager.h"
 

LEGO1/omni/src/video/mxvideopresenter.cpp

@@ -2,6 +2,7 @@
 
 #include "mxautolocker.h"
 #include "mxdsmediaaction.h"
+#include "mxmisc.h"
 #include "mxregioncursor.h"
 #include "mxvideomanager.h"