From 0637deea136bd2d3cc003c49be50db246dff0337 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 26 Jun 2024 13:17:45 +0200 Subject: [PATCH 1/2] m_extraCharacterId is an integer, not a pointer (#1045) --- LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index f5abb3c8..fa136321 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2954,7 +2954,7 @@ MxResult AnimState::Serialize(LegoFile* p_file) MxBool AnimState::SetFlag() { if (m_unk0x10 != NULL) { - m_extraCharacterId = NULL; + m_extraCharacterId = 0; for (MxS32 i = 0; i < m_unk0x0c; i++) { m_unk0x10[i] = 0; From 536aa4b1fe58b07937ed3c38cf9517e27823c098 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 26 Jun 2024 06:39:36 -0700 Subject: [PATCH 2/2] Implement/match LegoPlantManager::FUN_10027120 (#1046) --- .../legoomni/src/common/legoplantmanager.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp index 18d26315..263cdd94 100644 --- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp @@ -506,8 +506,23 @@ MxResult LegoPlantManager::Tickle() return 0; } -// STUB: LEGO1 0x10027120 +// FUNCTION: LEGO1 0x10027120 void LegoPlantManager::FUN_10027120() { - // TODO + LegoWorld* world = CurrentWorld(); + + for (MxS32 i = 0; i < sizeOfArray(g_plantInfo); i++) { + g_plantInfo[i].m_unk0x16 = -1; + g_plantInfo[i].m_initialUnk0x16 = -1; + FUN_10026860(i); + + if (g_plantInfo[i].m_entity != NULL) { + g_plantInfo[i].m_entity->SetLocation( + g_plantInfo[i].m_position, + g_plantInfo[i].m_direction, + g_plantInfo[i].m_up, + FALSE + ); + } + } }