isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix names

Browse Source
This commit is contained in:
Christian Semmler 2024-02-22 16:03:09 -05:00
parent 03f7c98b52
commit 322ddacfeb
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,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_inputMgr; }
LegoTextureContainer* GetLegoTextureContainer() { return m_LegoTextureContainer; } 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; }
IslePathActor* GetCurrentVehicle() { return m_currentVehicle; } IslePathActor* GetCurrentVehicle() { return m_currentVehicle; }
@ -236,24 +236,24 @@ class LegoOmni : public MxOmni {
// LegoOmni::`scalar deleting destructor' // LegoOmni::`scalar deleting destructor'
private: private:
ScriptContainer* m_scripts; // 0x68 ScriptContainer* m_scripts; // 0x68
ViewLODListManager* m_viewLODListManager; // 0x6c ViewLODListManager* m_viewLODListManager; // 0x6c
LegoInputManager* m_inputMgr; // 0x70 LegoInputManager* m_inputMgr; // 0x70
LegoTextureContainer* m_LegoTextureContainer; // 0x74 LegoTextureContainer* m_textureContainer; // 0x74
LegoWorldList* m_worldList; // 0x78 LegoWorldList* m_worldList; // 0x78
LegoWorld* m_currentWorld; // 0x7c LegoWorld* m_currentWorld; // 0x7c
MxBool m_exit; // 0x80 MxBool m_exit; // 0x80
LegoNavController* m_navController; // 0x84 LegoNavController* m_navController; // 0x84
IslePathActor* m_currentVehicle; // 0x88 IslePathActor* m_currentVehicle; // 0x88
LegoUnkSaveDataWriter* m_saveDataWriter; // 0x8c LegoUnkSaveDataWriter* m_saveDataWriter; // 0x8c
LegoPlantManager* m_plantManager; // 0x90 LegoPlantManager* m_plantManager; // 0x90
LegoAnimationManager* m_animationManager; // 0x94 LegoAnimationManager* m_animationManager; // 0x94
LegoBuildingManager* m_buildingManager; // 0x98 LegoBuildingManager* m_buildingManager; // 0x98
LegoGameState* m_gameState; // 0x9c LegoGameState* m_gameState; // 0x9c
MxDSAction m_action; // 0xa0 MxDSAction m_action; // 0xa0
MxBackgroundAudioManager* m_bkgAudioManager; // 0x134 MxBackgroundAudioManager* m_bkgAudioManager; // 0x134
MxTransitionManager* m_transitionManager; // 0x138 MxTransitionManager* m_transitionManager; // 0x138
MxBool m_unk0x13c; // 0x13c MxBool m_unk0x13c; // 0x13c
}; };
MxBackgroundAudioManager* BackgroundAudioManager(); MxBackgroundAudioManager* BackgroundAudioManager();
@ -275,7 +275,7 @@ ViewManager* GetViewManager();
LegoPlantManager* PlantManager(); LegoPlantManager* PlantManager();
LegoWorld* CurrentWorld(); LegoWorld* CurrentWorld();
LegoUnkSaveDataWriter* UnkSaveDataWriter(); LegoUnkSaveDataWriter* UnkSaveDataWriter();
LegoTextureContainer* GetLegoTextureContainer(); LegoTextureContainer* GetTextureContainer();
void FUN_10015820(MxBool p_disable, MxU16 p_flags); void FUN_10015820(MxBool p_disable, MxU16 p_flags);
void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c); void SetROIUnknown0x0c(const char* p_name, undefined p_unk0x0c);
LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid); LegoWorld* FindWorld(const MxAtomId& p_atom, MxS32 p_entityid);

2
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -233,7 +233,7 @@ void Score::Enable(MxBool p_enable)
// FUNCTION: LEGO1 0x100019d0 // FUNCTION: LEGO1 0x100019d0
void Score::Paint() void Score::Paint()
{ {
TextureData* gd = GetLegoTextureContainer()->Get("bigcube.gif"); TextureData* gd = GetTextureContainer()->Get("bigcube.gif");
if (gd) { if (gd) {
RaceState* l78 = (RaceState*) GameState()->GetState("JetskiRaceState"); RaceState* l78 = (RaceState*) GameState()->GetState("JetskiRaceState");

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

@ -215,9 +215,9 @@ LegoBuildingManager* BuildingManager()
} }
// FUNCTION: LEGO1 0x10015800 // FUNCTION: LEGO1 0x10015800
LegoTextureContainer* GetLegoTextureContainer() LegoTextureContainer* GetTextureContainer()
{ {
return LegoOmni::GetInstance()->GetLegoTextureContainer(); return LegoOmni::GetInstance()->GetTextureContainer();
} }
// FUNCTION: LEGO1 0x10015820 // FUNCTION: LEGO1 0x10015820
@ -468,7 +468,7 @@ void LegoOmni::Init()
m_scripts = NULL; m_scripts = NULL;
m_inputMgr = NULL; m_inputMgr = NULL;
m_viewLODListManager = NULL; m_viewLODListManager = NULL;
m_LegoTextureContainer = NULL; m_textureContainer = NULL;
m_worldList = NULL; m_worldList = NULL;
m_currentWorld = NULL; m_currentWorld = NULL;
m_exit = FALSE; m_exit = FALSE;
@ -520,9 +520,9 @@ void LegoOmni::Destroy()
m_buildingManager = NULL; m_buildingManager = NULL;
} }
if (m_LegoTextureContainer) { if (m_textureContainer) {
delete m_LegoTextureContainer; delete m_textureContainer;
m_LegoTextureContainer = NULL; m_textureContainer = NULL;
} }
if (m_viewLODListManager) { if (m_viewLODListManager) {
@ -605,8 +605,8 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
} }
m_viewLODListManager = new ViewLODListManager(); m_viewLODListManager = new ViewLODListManager();
m_LegoTextureContainer = new LegoTextureContainer(); m_textureContainer = new LegoTextureContainer();
m_LegoTextureContainer->SetOwnership(FALSE); m_textureContainer->SetOwnership(FALSE);
// FUN_10046c10 // FUN_10046c10
m_saveDataWriter = new LegoUnkSaveDataWriter(); m_saveDataWriter = new LegoUnkSaveDataWriter();
@ -616,7 +616,7 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p_param)
m_gameState = new LegoGameState(); m_gameState = new LegoGameState();
m_worldList = new LegoWorldList(TRUE); 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) { !m_animationManager || !m_buildingManager) {
goto done; goto done;
} }