Refactor legoomni into legoomni/misc

CMakeLists.txt

@@ -315,6 +315,7 @@ add_library(lego1 SHARED
   LEGO1/lego/legoomni/src/common/legotextureinfo.cpp
   LEGO1/lego/legoomni/src/common/legoutil.cpp
   LEGO1/lego/legoomni/src/common/legovariables.cpp
+  LEGO1/lego/legoomni/src/common/misc.cpp
   LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
   LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp
   LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp

ISLE/isleapp.cpp

@@ -9,6 +9,7 @@
 #include "legopartpresenter.h"
 #include "legovideomanager.h"
 #include "legoworldpresenter.h"
+#include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxdsaction.h"
 #include "mxmisc.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 LegoCharacterManager;
+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;
@@ -258,39 +255,12 @@ class LegoOmni : public MxOmni {
 	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();
-LegoCharacterManager* CharacterManager();
-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/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/src/audio/legocachesound.cpp

@@ -1,7 +1,7 @@
 #include "legocachesound.h"
 
-#include "legoomni.h"
 #include "legosoundmanager.h"
+#include "misc.h"
 #include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(LegoCacheSound, 0x88)

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

@@ -1,7 +1,8 @@
 #include "legounknown100d5778.h"
 
 #include "legocharactermanager.h"
-#include "legoomni.h"
+#include "misc.h"
+#include "mxomni.h"
 
 DECOMP_SIZE_ASSERT(LegoUnknown100d5778, 0x30)
 

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

@@ -1,7 +1,7 @@
 #include "legounknown100d6b4c.h"
 
-#include "legoomni.h"
 #include "legoworld.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(Element100d6b4c, 0x08)
 DECOMP_SIZE_ASSERT(LegoUnknown100d6b4c, 0x20)

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

@@ -1,6 +1,7 @@
 #include "mxbackgroundaudiomanager.h"
 
 #include "legoomni.h"
+#include "misc.h"
 #include "mxcompositepresenter.h"
 #include "mxdssound.h"
 #include "mxmisc.h"

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

@@ -7,9 +7,9 @@
 #include "legoanimationmanager.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
-#include "legoomni.h"
 #include "legoutil.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(Helicopter, 0x230)

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

@@ -1,7 +1,7 @@
 #include "racecar.h"
 
 #include "legocontrolmanager.h"
-#include "legoomni.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(RaceCar, 0x164);
 

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

@@ -1,9 +1,9 @@
 #include "legobackgroundcolor.h"
 
 #include "decomp.h"
-#include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
 

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

@@ -1,8 +1,8 @@
 #include "legofullscreenmovie.h"
 
 #include "decomp.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxtypes.h"
 
 DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)

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

@@ -18,6 +18,7 @@
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxobjectfactory.h"

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

@@ -1,7 +1,7 @@
 #include "legotextureinfo.h"
 
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "misc/legoimage.h"
 #include "misc/legotexture.h"
 #include "tgl/d3drm/impl.h"

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

@@ -5,6 +5,7 @@
 #include "legoomni.h"
 #include "legoworld.h"
 #include "legoworldlist.h"
+#include "misc.h"
 #include "mxdsaction.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"

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

@@ -2,8 +2,8 @@
 
 #include "legobuildingmanager.h"
 #include "legocharactermanager.h"
-#include "legoomni.h"
 #include "legoplantmanager.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(VisibilityVariable, 0x24)
 DECOMP_SIZE_ASSERT(CameraLocationVariable, 0x24)

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

@@ -0,0 +1,198 @@
+#include "misc.h"
+
+#include "legoinputmanager.h"
+#include "legoomni.h"
+#include "legovideomanager.h"
+#include "mxbackgroundaudiomanager.h"
+#include "mxmisc.h"
+
+// GLOBAL: LEGO1 0x100f4c58
+MxBool g_isWorldActive = TRUE;
+
+// FUNCTION: LEGO1 0x10015700
+LegoOmni* Lego()
+{
+	return LegoOmni::GetInstance();
+}
+
+// FUNCTION: LEGO1 0x10015710
+LegoSoundManager* SoundManager()
+{
+	return LegoOmni::GetInstance()->GetSoundManager();
+}
+
+// FUNCTION: LEGO1 0x10015720
+LegoVideoManager* VideoManager()
+{
+	return LegoOmni::GetInstance()->GetVideoManager();
+}
+
+// FUNCTION: LEGO1 0x10015730
+MxBackgroundAudioManager* BackgroundAudioManager()
+{
+	return LegoOmni::GetInstance()->GetBackgroundAudioManager();
+}
+
+// FUNCTION: LEGO1 0x10015740
+LegoInputManager* InputManager()
+{
+	return LegoOmni::GetInstance()->GetInputManager();
+}
+
+// FUNCTION: LEGO1 0x10015750
+LegoControlManager* ControlManager()
+{
+	return LegoOmni::GetInstance()->GetInputManager()->GetControlManager();
+}
+
+// FUNCTION: LEGO1 0x10015760
+LegoGameState* GameState()
+{
+	return LegoOmni::GetInstance()->GetGameState();
+}
+
+// FUNCTION: LEGO1 0x10015770
+LegoAnimationManager* AnimationManager()
+{
+	return LegoOmni::GetInstance()->GetAnimationManager();
+}
+
+// FUNCTION: LEGO1 0x10015780
+LegoNavController* NavController()
+{
+	return LegoOmni::GetInstance()->GetNavController();
+}
+
+// FUNCTION: LEGO1 0x10015790
+IslePathActor* CurrentActor()
+{
+	return LegoOmni::GetInstance()->GetCurrentActor();
+}
+
+// FUNCTION: LEGO1 0x100157a0
+LegoWorld* CurrentWorld()
+{
+	return LegoOmni::GetInstance()->GetCurrentWorld();
+}
+
+// FUNCTION: LEGO1 0x100157b0
+LegoCharacterManager* CharacterManager()
+{
+	return LegoOmni::GetInstance()->GetCharacterManager();
+}
+
+// FUNCTION: LEGO1 0x100157c0
+ViewManager* GetViewManager()
+{
+	return VideoManager()->Get3DManager()->GetLego3DView()->GetViewManager();
+}
+
+// FUNCTION: LEGO1 0x100157e0
+LegoPlantManager* PlantManager()
+{
+	return LegoOmni::GetInstance()->GetLegoPlantManager();
+}
+
+// FUNCTION: LEGO1 0x100157f0
+LegoBuildingManager* BuildingManager()
+{
+	return LegoOmni::GetInstance()->GetLegoBuildingManager();
+}
+
+// FUNCTION: LEGO1 0x10015800
+LegoTextureContainer* TextureContainer()
+{
+	return LegoOmni::GetInstance()->GetTextureContainer();
+}
+
+// FUNCTION: LEGO1 0x10015810
+ViewLODListManager* GetViewLODListManager()
+{
+	return LegoOmni::GetInstance()->GetViewLODListManager();
+}
+
+// FUNCTION: LEGO1 0x10015820
+void FUN_10015820(MxBool p_disable, MxU16 p_flags)
+{
+	LegoOmni::GetInstance()->FUN_1005b4f0(p_disable, p_flags);
+}
+
+// FUNCTION: LEGO1 0x10015840
+LegoROI* FindROI(const char* p_name)
+{
+	return LegoOmni::GetInstance()->FindROI(p_name);
+}
+
+// FUNCTION: LEGO1 0x10015860
+void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c)
+{
+	LegoROI* roi = FindROI(p_name);
+
+	if (roi) {
+		roi->SetUnknown0x0c(p_unk0x0c);
+	}
+}
+
+// FUNCTION: LEGO1 0x10015880
+void SetCurrentActor(IslePathActor* p_currentActor)
+{
+	LegoOmni::GetInstance()->SetCurrentActor(p_currentActor);
+}
+
+// FUNCTION: LEGO1 0x100158c0
+LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
+{
+	return LegoOmni::GetInstance()->FindWorld(p_atom, p_entityid);
+}
+
+// FUNCTION: LEGO1 0x100158e0
+MxDSAction& GetCurrentAction()
+{
+	return LegoOmni::GetInstance()->GetCurrentAction();
+}
+
+// FUNCTION: LEGO1 0x100158f0
+void SetCurrentWorld(LegoWorld* p_world)
+{
+	LegoOmni::GetInstance()->SetCurrentWorld(p_world);
+}
+
+// FUNCTION: LEGO1 0x10015900
+MxTransitionManager* TransitionManager()
+{
+	return LegoOmni::GetInstance()->GetTransitionManager();
+}
+
+// FUNCTION: LEGO1 0x10015910
+void PlayMusic(MxU32 p_index)
+{
+	// index is the entityid of the music in jukebox.si
+	MxDSAction action;
+	action.SetAtomId(*g_jukeboxScript);
+	action.SetObjectId(p_index);
+
+	LegoOmni::GetInstance()->GetBackgroundAudioManager()->PlayMusic(action, 5, 4);
+}
+
+// FUNCTION: LEGO1 0x100159c0
+void SetIsWorldActive(MxBool p_isWorldActive)
+{
+	if (!p_isWorldActive) {
+		LegoOmni::GetInstance()->GetInputManager()->SetCamera(NULL);
+	}
+	g_isWorldActive = p_isWorldActive;
+}
+
+// FUNCTION: LEGO1 0x100159e0
+void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last)
+{
+	MxDSAction action;
+
+	action.SetAtomId(*p_id);
+	action.SetUnknown24(-2);
+
+	for (MxS32 first = p_first, last = p_last; first <= last; first++) {
+		action.SetObjectId(first);
+		DeleteObject(action);
+	}
+}

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

@@ -1,8 +1,8 @@
 #include "mxcompositemediapresenter.h"
 
-#include "legoomni.h"
 #include "legosoundmanager.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxautolocker.h"
 #include "mxdsmultiaction.h"
 #include "mxmediapresenter.h"

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

@@ -1,8 +1,8 @@
 #include "legocontrolmanager.h"
 
 #include "legoeventnotificationparam.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"
 #include "mxpresenter.h"

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

@@ -1,7 +1,7 @@
 #include "legoactorpresenter.h"
 
 #include "legoentity.h"
-#include "legoomni.h"
+#include "misc.h"
 
 // FUNCTION: LEGO1 0x10076c30
 void LegoActorPresenter::ReadyTickle()

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

@@ -2,8 +2,8 @@
 
 #include "legoinputmanager.h"
 #include "legonotify.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8);
 

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

@@ -3,11 +3,11 @@
 #include "define.h"
 #include "legobuildingmanager.h"
 #include "legocharactermanager.h"
-#include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "mxmisc.h"
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)

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

@@ -1,8 +1,8 @@
 #include "legoentitypresenter.h"
 
 #include "islepathactor.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(LegoEntityPresenter, 0x50);
 

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

@@ -1,9 +1,9 @@
 #include "legonavcontroller.h"
 
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxmisc.h"
 
 // GLOBAL: LEGO1 0x100f4c28

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

@@ -13,6 +13,7 @@
 #include "legosoundmanager.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"

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

@@ -12,6 +12,7 @@
 #include "legotexturepresenter.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "modeldb/modeldb.h"
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"

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

@@ -3,7 +3,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxticklemanager.h"

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

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

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

@@ -11,10 +11,10 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
 #include "legoplantmanager.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"

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

@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"

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

@@ -4,7 +4,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
-#include "legoomni.h"
+#include "misc.h"
 #include "mxactionnotificationparam.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"

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

@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "misc.h"
 #include "misc/legocontainer.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"

LEGO1/lego/legoomni/src/input/legoinputmanager.cpp

@@ -3,6 +3,7 @@
 #include "legocontrolmanager.h"
 #include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxautolocker.h"
 #include "roi/legoroi.h"
 

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

@@ -5,6 +5,7 @@
 #include "legoomni.h"
 #include "legoutil.h"
 #include "legoworld.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(Bike, 0x164);
 

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

@@ -3,6 +3,7 @@
 #include "jukebox.h"
 #include "legocontrolmanager.h"
 #include "legoinputmanager.h"
+#include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxtransitionmanager.h"

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

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

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

@@ -5,6 +5,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "misc.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"
 #include "mxstillpresenter.h"

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

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

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

@@ -3,6 +3,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
+#include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxcontrolpresenter.h"
 #include "mxmisc.h"

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

@@ -13,6 +13,7 @@
 #include "legovideomanager.h"
 #include "legoworld.h"
 #include "legoworldlist.h"
+#include "misc.h"
 #include "misc/legocontainer.h"
 #include "mxactionnotificationparam.h"
 #include "mxautolocker.h"
@@ -119,200 +120,9 @@ MxAtomId* g_nocdSourceName = NULL;
 // STRING: LEGO1 0x100f6710
 const char* g_current = "current";
 
-// GLOBAL: LEGO1 0x100f4c58
-MxBool g_isWorldActive = TRUE;
-
 // GLOBAL: LEGO1 0x10102b28
 LegoOmni::PathContainer g_extraPaths[29];
 
-// FUNCTION: LEGO1 0x10015700
-LegoOmni* Lego()
-{
-	return LegoOmni::GetInstance();
-}
-
-// FUNCTION: LEGO1 0x10015710
-LegoSoundManager* SoundManager()
-{
-	return LegoOmni::GetInstance()->GetSoundManager();
-}
-
-// FUNCTION: LEGO1 0x10015720
-LegoVideoManager* VideoManager()
-{
-	return LegoOmni::GetInstance()->GetVideoManager();
-}
-
-// FUNCTION: LEGO1 0x10015730
-MxBackgroundAudioManager* BackgroundAudioManager()
-{
-	return LegoOmni::GetInstance()->GetBackgroundAudioManager();
-}
-
-// FUNCTION: LEGO1 0x10015740
-LegoInputManager* InputManager()
-{
-	return LegoOmni::GetInstance()->GetInputManager();
-}
-
-// FUNCTION: LEGO1 0x10015750
-LegoControlManager* ControlManager()
-{
-	return LegoOmni::GetInstance()->GetInputManager()->GetControlManager();
-}
-
-// FUNCTION: LEGO1 0x10015760
-LegoGameState* GameState()
-{
-	return LegoOmni::GetInstance()->GetGameState();
-}
-
-// FUNCTION: LEGO1 0x10015770
-LegoAnimationManager* AnimationManager()
-{
-	return LegoOmni::GetInstance()->GetAnimationManager();
-}
-
-// FUNCTION: LEGO1 0x10015780
-LegoNavController* NavController()
-{
-	return LegoOmni::GetInstance()->GetNavController();
-}
-
-// FUNCTION: LEGO1 0x10015790
-IslePathActor* CurrentActor()
-{
-	return LegoOmni::GetInstance()->GetCurrentActor();
-}
-
-// FUNCTION: LEGO1 0x100157a0
-LegoWorld* CurrentWorld()
-{
-	return LegoOmni::GetInstance()->GetCurrentWorld();
-}
-
-// FUNCTION: LEGO1 0x100157b0
-LegoCharacterManager* CharacterManager()
-{
-	return LegoOmni::GetInstance()->GetCharacterManager();
-}
-
-// FUNCTION: LEGO1 0x100157c0
-ViewManager* GetViewManager()
-{
-	return VideoManager()->Get3DManager()->GetLego3DView()->GetViewManager();
-}
-
-// FUNCTION: LEGO1 0x100157e0
-LegoPlantManager* PlantManager()
-{
-	return LegoOmni::GetInstance()->GetLegoPlantManager();
-}
-
-// FUNCTION: LEGO1 0x100157f0
-LegoBuildingManager* BuildingManager()
-{
-	return LegoOmni::GetInstance()->GetLegoBuildingManager();
-}
-
-// FUNCTION: LEGO1 0x10015800
-LegoTextureContainer* TextureContainer()
-{
-	return LegoOmni::GetInstance()->GetTextureContainer();
-}
-
-// FUNCTION: LEGO1 0x10015810
-ViewLODListManager* GetViewLODListManager()
-{
-	return LegoOmni::GetInstance()->GetViewLODListManager();
-}
-
-// FUNCTION: LEGO1 0x10015820
-void FUN_10015820(MxBool p_disable, MxU16 p_flags)
-{
-	LegoOmni::GetInstance()->FUN_1005b4f0(p_disable, p_flags);
-}
-
-// FUNCTION: LEGO1 0x10015840
-LegoROI* FindROI(const char* p_name)
-{
-	return LegoOmni::GetInstance()->FindROI(p_name);
-}
-
-// FUNCTION: LEGO1 0x10015860
-void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c)
-{
-	LegoROI* roi = FindROI(p_name);
-
-	if (roi) {
-		roi->SetUnknown0x0c(p_unk0x0c);
-	}
-}
-
-// FUNCTION: LEGO1 0x10015880
-void SetCurrentActor(IslePathActor* p_currentActor)
-{
-	LegoOmni::GetInstance()->SetCurrentActor(p_currentActor);
-}
-
-// FUNCTION: LEGO1 0x100158c0
-LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid)
-{
-	return LegoOmni::GetInstance()->FindWorld(p_atom, p_entityid);
-}
-
-// FUNCTION: LEGO1 0x100158e0
-MxDSAction& GetCurrentAction()
-{
-	return LegoOmni::GetInstance()->GetCurrentAction();
-}
-
-// FUNCTION: LEGO1 0x100158f0
-void SetCurrentWorld(LegoWorld* p_world)
-{
-	LegoOmni::GetInstance()->SetCurrentWorld(p_world);
-}
-
-// FUNCTION: LEGO1 0x10015900
-MxTransitionManager* TransitionManager()
-{
-	return LegoOmni::GetInstance()->GetTransitionManager();
-}
-
-// FUNCTION: LEGO1 0x10015910
-void PlayMusic(MxU32 p_index)
-{
-	// index is the entityid of the music in jukebox.si
-	MxDSAction action;
-	action.SetAtomId(*g_jukeboxScript);
-	action.SetObjectId(p_index);
-
-	LegoOmni::GetInstance()->GetBackgroundAudioManager()->PlayMusic(action, 5, 4);
-}
-
-// FUNCTION: LEGO1 0x100159c0
-void SetIsWorldActive(MxBool p_isWorldActive)
-{
-	if (!p_isWorldActive) {
-		LegoOmni::GetInstance()->GetInputManager()->SetCamera(NULL);
-	}
-	g_isWorldActive = p_isWorldActive;
-}
-
-// FUNCTION: LEGO1 0x100159e0
-void DeleteObjects(MxAtomId* p_id, MxS32 p_first, MxS32 p_last)
-{
-	MxDSAction action;
-
-	action.SetAtomId(*p_id);
-	action.SetUnknown24(-2);
-
-	for (MxS32 first = p_first, last = p_last; first <= last; first++) {
-		action.SetObjectId(first);
-		DeleteObject(action);
-	}
-}
-
 // FUNCTION: LEGO1 0x1001a700
 void RegisterExtraPaths()
 {

LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp

@@ -1,7 +1,7 @@
 #include "legopathpresenter.h"
 
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "mxautolocker.h"
 
 DECOMP_SIZE_ASSERT(LegoPathPresenter, 0x54);

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

@@ -4,6 +4,7 @@
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoinputmanager.h"
+#include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxnotificationmanager.h"

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

@@ -2,6 +2,7 @@
 
 #include "islepathactor.h"
 #include "legoomni.h"
+#include "misc.h"
 #include "mxdsaction.h"
 #include "mxmisc.h"
 #include "police.h"

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

@@ -2,9 +2,9 @@
 
 #include "legoanimmmpresenter.h"
 #include "legocharactermanager.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "mxcompositepresenter.h"
 #include "mxdsanim.h"
 #include "mxmisc.h"

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

@@ -2,6 +2,7 @@
 
 #include "legoomni.h"
 #include "legoworld.h"
+#include "misc.h"
 
 DECOMP_SIZE_ASSERT(LegoLocomotionAnimPresenter, 0xd8)
 

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

@@ -5,9 +5,9 @@
 #include "legocharactermanager.h"
 #include "legoentity.h"
 #include "legoentitypresenter.h"
-#include "legoomni.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "misc/legocontainer.h"
 #include "misc/legotexture.h"
 #include "misc/version.h"

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

@@ -1,7 +1,7 @@
 #include "legopalettepresenter.h"
 
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "misc/legostorage.h"
 #include "mxstreamchunk.h"
 

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

@@ -1,7 +1,7 @@
 #include "legopartpresenter.h"
 
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "misc/legocontainer.h"
 #include "misc/legostorage.h"
 #include "misc/legotexture.h"

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

@@ -1,7 +1,7 @@
 #include "legotexturepresenter.h"
 
-#include "legoomni.h"
 #include "legovideomanager.h"
+#include "misc.h"
 #include "misc/legocontainer.h"
 #include "misc/legoimage.h"
 #include "misc/legostorage.h"

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

@@ -1,5 +1,6 @@
 #include "legovideomanager.h"
 
+#include "misc.h"
 #include "mxmisc.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"

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

@@ -4,6 +4,7 @@
 #include "legoutil.h"
 #include "legovideomanager.h"
 #include "legoworld.h"
+#include "misc.h"
 #include "mxbackgroundaudiomanager.h"
 #include "mxmisc.h"
 #include "mxparam.h"

LEGO1/lego/sources/misc/legocontainer.cpp

@@ -1,7 +1,7 @@
 #include "legocontainer.h"
 
-#include "lego/legoomni/include/legoomni.h"
 #include "lego/legoomni/include/legovideomanager.h"
+#include "lego/legoomni/include/misc.h"
 #include "tgl/d3drm/impl.h"
 
 DECOMP_SIZE_ASSERT(LegoContainerInfo<LegoTexture>, 0x10);