isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 03:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Christian Semmler 2024-02-22 16:05:35 -05:00
parent 322ddacfeb
commit e8cf0201cb
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoomni.h
View File

@ -211,7 +211,7 @@ class LegoOmni : public MxOmni {
LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; } LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
LegoInputManager* GetInputManager() { return m_inputMgr; } LegoInputManager* GetInputManager() { return m_inputManager; }
LegoTextureContainer* GetTextureContainer() { return m_textureContainer; } LegoTextureContainer* GetTextureContainer() { return m_textureContainer; }
LegoWorld* GetCurrentWorld() { return m_currentWorld; } LegoWorld* GetCurrentWorld() { return m_currentWorld; }
LegoNavController* GetNavController() { return m_navController; } LegoNavController* GetNavController() { return m_navController; }
@ -238,7 +238,7 @@ class LegoOmni : public MxOmni {
private: private:
ScriptContainer* m_scripts; // 0x68 ScriptContainer* m_scripts; // 0x68
ViewLODListManager* m_viewLODListManager; // 0x6c ViewLODListManager* m_viewLODListManager; // 0x6c
LegoInputManager* m_inputMgr; // 0x70 LegoInputManager* m_inputManager; // 0x70
LegoTextureContainer* m_textureContainer; // 0x74 LegoTextureContainer* m_textureContainer; // 0x74
LegoWorldList* m_worldList; // 0x78 LegoWorldList* m_worldList; // 0x78
LegoWorld* m_currentWorld; // 0x7c LegoWorld* m_currentWorld; // 0x7c

24
LEGO1/lego/legoomni/src/main/legoomni.cpp
View File

@ -466,7 +466,7 @@ void LegoOmni::Init()
{ {
MxOmni::Init(); MxOmni::Init();
m_scripts = NULL; m_scripts = NULL;
m_inputMgr = NULL; m_inputManager = NULL;
m_viewLODListManager = NULL; m_viewLODListManager = NULL;
m_textureContainer = NULL; m_textureContainer = NULL;
m_worldList = NULL; m_worldList = NULL;
@ -530,14 +530,14 @@ void LegoOmni::Destroy()
m_viewLODListManager = NULL; m_viewLODListManager = NULL;
} }
if (m_inputMgr) { if (m_inputManager) {
delete m_inputMgr; delete m_inputManager;
m_inputMgr = NULL; m_inputManager = NULL;
} }
if (m_inputMgr) { if (m_inputManager) {
delete m_inputMgr; delete m_inputManager;
m_inputMgr = NULL; m_inputManager = NULL;
} }
// todo FUN_10046de0 // todo FUN_10046de0
@ -598,9 +598,9 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
goto done; goto done;
} }
if (!(m_inputMgr = new LegoInputManager()) || m_inputMgr->Create(p_param.GetWindowHandle()) != SUCCESS) { if (!(m_inputManager = new LegoInputManager()) || m_inputManager->Create(p_param.GetWindowHandle()) != SUCCESS) {
delete m_inputMgr; delete m_inputManager;
m_inputMgr = NULL; m_inputManager = NULL;
goto done; goto done;
} }
@ -900,7 +900,7 @@ void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags)
{ {
if (p_disable) { if (p_disable) {
if (p_flags & c_disableInput) { if (p_flags & c_disableInput) {
m_inputMgr->DisableInputProcessing(); m_inputManager->DisableInputProcessing();
} }
if (p_flags & c_disable3d) { if (p_flags & c_disable3d) {
@ -912,7 +912,7 @@ void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags)
} }
} }
else { else {
m_inputMgr->EnableInputProcessing(); m_inputManager->EnableInputProcessing();
((LegoVideoManager*) m_videoManager)->SetRender3D(TRUE); ((LegoVideoManager*) m_videoManager)->SetRender3D(TRUE);
((LegoVideoManager*) m_videoManager)->UpdateView(0, 0, 0, 0); ((LegoVideoManager*) m_videoManager)->UpdateView(0, 0, 0, 0);
} }