From e8cf0201cb24636afcfc7e25d2f588a7b7b4e9f1 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 22 Feb 2024 16:05:35 -0500 Subject: [PATCH] Rename --- LEGO1/lego/legoomni/include/legoomni.h | 4 ++-- LEGO1/lego/legoomni/src/main/legoomni.cpp | 24 +++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h index 0b48820d..e19189f7 100644 --- a/LEGO1/lego/legoomni/include/legoomni.h +++ b/LEGO1/lego/legoomni/include/legoomni.h @@ -211,7 +211,7 @@ class LegoOmni : public MxOmni { LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } - LegoInputManager* GetInputManager() { return m_inputMgr; } + LegoInputManager* GetInputManager() { return m_inputManager; } LegoTextureContainer* GetTextureContainer() { return m_textureContainer; } LegoWorld* GetCurrentWorld() { return m_currentWorld; } LegoNavController* GetNavController() { return m_navController; } @@ -238,7 +238,7 @@ class LegoOmni : public MxOmni { private: ScriptContainer* m_scripts; // 0x68 ViewLODListManager* m_viewLODListManager; // 0x6c - LegoInputManager* m_inputMgr; // 0x70 + LegoInputManager* m_inputManager; // 0x70 LegoTextureContainer* m_textureContainer; // 0x74 LegoWorldList* m_worldList; // 0x78 LegoWorld* m_currentWorld; // 0x7c diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index b8fa3109..25327e11 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -466,7 +466,7 @@ void LegoOmni::Init() { MxOmni::Init(); m_scripts = NULL; - m_inputMgr = NULL; + m_inputManager = NULL; m_viewLODListManager = NULL; m_textureContainer = NULL; m_worldList = NULL; @@ -530,14 +530,14 @@ void LegoOmni::Destroy() m_viewLODListManager = NULL; } - if (m_inputMgr) { - delete m_inputMgr; - m_inputMgr = NULL; + if (m_inputManager) { + delete m_inputManager; + m_inputManager = NULL; } - if (m_inputMgr) { - delete m_inputMgr; - m_inputMgr = NULL; + if (m_inputManager) { + delete m_inputManager; + m_inputManager = NULL; } // todo FUN_10046de0 @@ -598,9 +598,9 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param) goto done; } - if (!(m_inputMgr = new LegoInputManager()) || m_inputMgr->Create(p_param.GetWindowHandle()) != SUCCESS) { - delete m_inputMgr; - m_inputMgr = NULL; + if (!(m_inputManager = new LegoInputManager()) || m_inputManager->Create(p_param.GetWindowHandle()) != SUCCESS) { + delete m_inputManager; + m_inputManager = NULL; goto done; } @@ -900,7 +900,7 @@ void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags) { if (p_disable) { if (p_flags & c_disableInput) { - m_inputMgr->DisableInputProcessing(); + m_inputManager->DisableInputProcessing(); } if (p_flags & c_disable3d) { @@ -912,7 +912,7 @@ void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags) } } else { - m_inputMgr->EnableInputProcessing(); + m_inputManager->EnableInputProcessing(); ((LegoVideoManager*) m_videoManager)->SetRender3D(TRUE); ((LegoVideoManager*) m_videoManager)->UpdateView(0, 0, 0, 0); }