From 0e0d6890adb8322b5294f1c5ab2b14dfec125871 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 21 Apr 2024 10:41:38 -0400 Subject: [PATCH] Fix SwitchHat (#835) --- LEGO1/lego/legoomni/include/legocharactermanager.h | 2 +- LEGO1/lego/legoomni/src/common/legocharactermanager.cpp | 4 ++-- LEGO1/lego/legoomni/src/entity/legoentity.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legocharactermanager.h b/LEGO1/lego/legoomni/include/legocharactermanager.h index 08c56cbd..038c31e8 100644 --- a/LEGO1/lego/legoomni/include/legocharactermanager.h +++ b/LEGO1/lego/legoomni/include/legocharactermanager.h @@ -66,7 +66,7 @@ class LegoCharacterManager { LegoExtraActor* GetActor(const char* p_key); LegoCharacterData* GetData(const char* p_key); LegoCharacterData* GetData(LegoROI* p_roi); - MxBool FUN_10084ec0(LegoROI* p_roi); + MxBool SwitchHat(LegoROI* p_roi); MxU32 FUN_10085140(LegoROI* p_roi, MxBool p_und); LegoROI* FUN_10085210(const char* p_name, const char* p_lodName, MxBool p_createEntity); LegoROI* FUN_10085a80(const char* p_name, const char* p_lodName, MxBool p_createEntity); diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp index 4dd6881c..8bc6ecc2 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -644,7 +644,7 @@ LegoROI* LegoCharacterManager::FindChildROI(LegoROI* p_roi, const char* p_name) } // FUNCTION: LEGO1 0x10084ec0 -MxBool LegoCharacterManager::FUN_10084ec0(LegoROI* p_roi) +MxBool LegoCharacterManager::SwitchHat(LegoROI* p_roi) { LegoCharacterData* data = GetData(p_roi->GetName()); @@ -662,7 +662,7 @@ MxBool LegoCharacterManager::FUN_10084ec0(LegoROI* p_roi) unk0x00 = part.m_unk0x00[part.m_unk0x08]; } - LegoROI* childROI = FindChildROI(p_roi, g_characterLODs[1].m_name); + LegoROI* childROI = FindChildROI(p_roi, g_characterLODs[2].m_name); if (childROI != NULL) { char lodName[256]; diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index 151f7cf6..c5df0ee7 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -282,7 +282,7 @@ void LegoEntity::VTable0x3c() { switch (m_unk0x59) { case 0: - CharacterManager()->FUN_10084ec0(m_roi); + CharacterManager()->SwitchHat(m_roi); break; case 2: PlantManager()->FUN_100269e0(this);