From 6c7cddae1cf047d3ba7002aa5663bee133a28e97 Mon Sep 17 00:00:00 2001 From: Ramen2X <64166386+Ramen2X@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:26:59 -0400 Subject: [PATCH] implement/match global ControlManager() function --- LEGO1/legoinputmanager.h | 2 ++ LEGO1/legoomni.cpp | 7 +++++++ LEGO1/legoomni.h | 1 + 3 files changed, 10 insertions(+) diff --git a/LEGO1/legoinputmanager.h b/LEGO1/legoinputmanager.h index a44aef32..d2fe26de 100644 --- a/LEGO1/legoinputmanager.h +++ b/LEGO1/legoinputmanager.h @@ -41,6 +41,8 @@ class LegoInputManager : public MxPresenter void SetTimer(); void KillTimer(); + inline LegoControlManager *GetControlManager() { return m_controlManager; } + //private: MxCriticalSection m_criticalSection; MxList *m_unk0x5c; // list or hash table diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 7e306af1..d4ab47ea 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -5,6 +5,7 @@ #include "legogamestate.h" #include "legoutil.h" #include "legoobjectfactory.h" +#include "legoinputmanager.h" // 0x100f4588 MxAtomId *g_nocdSourceName = NULL; @@ -205,6 +206,12 @@ LegoInputManager *InputManager() return LegoOmni::GetInstance()->GetInputManager(); } +// OFFSET: LEGO1 0x10015750 +LegoControlManager *ControlManager() +{ + return LegoOmni::GetInstance()->GetInputManager()->GetControlManager(); +} + // OFFSET: LEGO1 0x10015760 LegoGameState *GameState() { diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h index 37d3ef4b..40c152e9 100644 --- a/LEGO1/legoomni.h +++ b/LEGO1/legoomni.h @@ -11,6 +11,7 @@ class LegoBuildingManager; class LegoEntity; class LegoGameState; class LegoInputManager; +class LegoControlManager; class LegoNavController; class LegoPathBoundary; class LegoPlantManager;