From 322ddacfeb57ea5373bf9942b46b127d0e499560 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 22 Feb 2024 16:03:09 -0500 Subject: [PATCH] Fix names --- LEGO1/lego/legoomni/include/legoomni.h | 40 ++++++++++---------- LEGO1/lego/legoomni/src/infocenter/score.cpp | 2 +- LEGO1/lego/legoomni/src/main/legoomni.cpp | 18 ++++----- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h index 371a3c05..0b48820d 100644 --- a/LEGO1/lego/legoomni/include/legoomni.h +++ b/LEGO1/lego/legoomni/include/legoomni.h @@ -212,7 +212,7 @@ class LegoOmni : public MxOmni { LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } LegoInputManager* GetInputManager() { return m_inputMgr; } - LegoTextureContainer* GetLegoTextureContainer() { return m_LegoTextureContainer; } + LegoTextureContainer* GetTextureContainer() { return m_textureContainer; } LegoWorld* GetCurrentWorld() { return m_currentWorld; } LegoNavController* GetNavController() { return m_navController; } IslePathActor* GetCurrentVehicle() { return m_currentVehicle; } @@ -236,24 +236,24 @@ class LegoOmni : public MxOmni { // LegoOmni::`scalar deleting destructor' private: - ScriptContainer* m_scripts; // 0x68 - ViewLODListManager* m_viewLODListManager; // 0x6c - LegoInputManager* m_inputMgr; // 0x70 - LegoTextureContainer* m_LegoTextureContainer; // 0x74 - LegoWorldList* m_worldList; // 0x78 - LegoWorld* m_currentWorld; // 0x7c - MxBool m_exit; // 0x80 - LegoNavController* m_navController; // 0x84 - IslePathActor* m_currentVehicle; // 0x88 - LegoUnkSaveDataWriter* m_saveDataWriter; // 0x8c - LegoPlantManager* m_plantManager; // 0x90 - LegoAnimationManager* m_animationManager; // 0x94 - LegoBuildingManager* m_buildingManager; // 0x98 - LegoGameState* m_gameState; // 0x9c - MxDSAction m_action; // 0xa0 - MxBackgroundAudioManager* m_bkgAudioManager; // 0x134 - MxTransitionManager* m_transitionManager; // 0x138 - MxBool m_unk0x13c; // 0x13c + ScriptContainer* m_scripts; // 0x68 + ViewLODListManager* m_viewLODListManager; // 0x6c + LegoInputManager* m_inputMgr; // 0x70 + LegoTextureContainer* m_textureContainer; // 0x74 + LegoWorldList* m_worldList; // 0x78 + LegoWorld* m_currentWorld; // 0x7c + MxBool m_exit; // 0x80 + LegoNavController* m_navController; // 0x84 + IslePathActor* m_currentVehicle; // 0x88 + LegoUnkSaveDataWriter* m_saveDataWriter; // 0x8c + LegoPlantManager* m_plantManager; // 0x90 + LegoAnimationManager* m_animationManager; // 0x94 + LegoBuildingManager* m_buildingManager; // 0x98 + LegoGameState* m_gameState; // 0x9c + MxDSAction m_action; // 0xa0 + MxBackgroundAudioManager* m_bkgAudioManager; // 0x134 + MxTransitionManager* m_transitionManager; // 0x138 + MxBool m_unk0x13c; // 0x13c }; MxBackgroundAudioManager* BackgroundAudioManager(); @@ -275,7 +275,7 @@ ViewManager* GetViewManager(); LegoPlantManager* PlantManager(); LegoWorld* CurrentWorld(); LegoUnkSaveDataWriter* UnkSaveDataWriter(); -LegoTextureContainer* GetLegoTextureContainer(); +LegoTextureContainer* GetTextureContainer(); void FUN_10015820(MxBool p_disable, MxU16 p_flags); void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c); LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid); diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp index a95f86f8..40c8f98c 100644 --- a/LEGO1/lego/legoomni/src/infocenter/score.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp @@ -233,7 +233,7 @@ void Score::Enable(MxBool p_enable) // FUNCTION: LEGO1 0x100019d0 void Score::Paint() { - TextureData* gd = GetLegoTextureContainer()->Get("bigcube.gif"); + TextureData* gd = GetTextureContainer()->Get("bigcube.gif"); if (gd) { RaceState* l78 = (RaceState*) GameState()->GetState("JetskiRaceState"); diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index 4a312e0f..b8fa3109 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -215,9 +215,9 @@ LegoBuildingManager* BuildingManager() } // FUNCTION: LEGO1 0x10015800 -LegoTextureContainer* GetLegoTextureContainer() +LegoTextureContainer* GetTextureContainer() { - return LegoOmni::GetInstance()->GetLegoTextureContainer(); + return LegoOmni::GetInstance()->GetTextureContainer(); } // FUNCTION: LEGO1 0x10015820 @@ -468,7 +468,7 @@ void LegoOmni::Init() m_scripts = NULL; m_inputMgr = NULL; m_viewLODListManager = NULL; - m_LegoTextureContainer = NULL; + m_textureContainer = NULL; m_worldList = NULL; m_currentWorld = NULL; m_exit = FALSE; @@ -520,9 +520,9 @@ void LegoOmni::Destroy() m_buildingManager = NULL; } - if (m_LegoTextureContainer) { - delete m_LegoTextureContainer; - m_LegoTextureContainer = NULL; + if (m_textureContainer) { + delete m_textureContainer; + m_textureContainer = NULL; } if (m_viewLODListManager) { @@ -605,8 +605,8 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param) } m_viewLODListManager = new ViewLODListManager(); - m_LegoTextureContainer = new LegoTextureContainer(); - m_LegoTextureContainer->SetOwnership(FALSE); + m_textureContainer = new LegoTextureContainer(); + m_textureContainer->SetOwnership(FALSE); // FUN_10046c10 m_saveDataWriter = new LegoUnkSaveDataWriter(); @@ -616,7 +616,7 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param) m_gameState = new LegoGameState(); m_worldList = new LegoWorldList(TRUE); - if (!m_viewLODListManager || !m_LegoTextureContainer || !m_worldList || !m_saveDataWriter || !m_plantManager || + if (!m_viewLODListManager || !m_textureContainer || !m_worldList || !m_saveDataWriter || !m_plantManager || !m_animationManager || !m_buildingManager) { goto done; }