From 4677f148a81dec97a428778a1eef513611eaf0c0 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 18 May 2024 14:28:10 -0400 Subject: [PATCH] Name var --- LEGO1/lego/legoomni/include/legotraninfo.h | 4 ++-- LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp | 6 +++--- LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legotraninfo.h b/LEGO1/lego/legoomni/include/legotraninfo.h index aa35f31c..d84ac175 100644 --- a/LEGO1/lego/legoomni/include/legotraninfo.h +++ b/LEGO1/lego/legoomni/include/legotraninfo.h @@ -23,7 +23,7 @@ struct LegoTranInfo { m_unk0x08 = NULL; m_unk0x0c = NULL; m_unk0x10 = 0; - m_unk0x12 = -1; + m_location = -1; m_unk0x14 = FALSE; m_unk0x1c = NULL; m_unk0x20 = NULL; @@ -42,7 +42,7 @@ struct LegoTranInfo { LegoROI* m_unk0x08; // 0x08 MxMatrix* m_unk0x0c; // 0x0c MxU8 m_unk0x10; // 0x10 - MxS16 m_unk0x12; // 0x12 + MxS16 m_location; // 0x12 MxBool m_unk0x14; // 0x14 MxBool m_unk0x15; // 0x15 MxU32 m_objectId; // 0x18 diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index e5daa507..031fe940 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -958,7 +958,7 @@ MxResult LegoAnimationManager::FUN_100605e0( tranInfo->m_index = ++m_unk0x1c; tranInfo->m_unk0x10 = 0; tranInfo->m_unk0x08 = p_roi; - tranInfo->m_unk0x12 = m_anims[p_index].m_location; + tranInfo->m_location = m_anims[p_index].m_location; tranInfo->m_unk0x14 = p_unk0x0a; tranInfo->m_objectId = animInfo.m_objectId; tranInfo->m_unk0x15 = p_bool2; @@ -1024,7 +1024,7 @@ MxResult LegoAnimationManager::FUN_100609f0(MxU32 p_objectId, MxMatrix* p_matrix info->m_index = ++m_unk0x1c; info->m_unk0x10 = 0; info->m_unk0x08 = NULL; - info->m_unk0x12 = -1; + info->m_location = -1; info->m_unk0x14 = FALSE; info->m_objectId = p_objectId; @@ -1211,7 +1211,7 @@ void LegoAnimationManager::FUN_10061010(MxBool p_und) // TODO: Match MxU32 flags = tranInfo->m_flags; - if (tranInfo->m_unk0x14 && tranInfo->m_unk0x12 != -1 && p_und) { + if (tranInfo->m_unk0x14 && tranInfo->m_location != -1 && p_und) { LegoAnim* anim; if (tranInfo->m_presenter->GetPresenter() != NULL && diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp index 0a3e882b..d1c73605 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp @@ -427,7 +427,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time) LegoROI* viewROI = VideoManager()->GetViewROI(); IslePathActor* actor = CurrentActor(); - if (m_tranInfo != NULL && m_tranInfo->m_unk0x14 && m_tranInfo->m_unk0x12 != -1 && actor != NULL) { + if (m_tranInfo != NULL && m_tranInfo->m_unk0x14 && m_tranInfo->m_location != -1 && actor != NULL) { if (m_unk0x64 != NULL) { undefined4 und = 1;