From c59343c220791165fc88a27eb1da005fa1aeff60 Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Fri, 9 May 2025 20:55:22 +0200 Subject: [PATCH] Rename `m_unk0x64` to `m_world` in `LegoAnimMMPresenter` (#1461) --- .../legoomni/include/legoanimmmpresenter.h | 2 +- .../src/common/legoanimmmpresenter.cpp | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h index d73cd55d..5c972176 100644 --- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h @@ -90,7 +90,7 @@ private: MxU8 m_unk0x59; // 0x59 MxU32 m_animmanId; // 0x5c LegoTranInfo* m_tranInfo; // 0x60 - LegoWorld* m_unk0x64; // 0x64 + LegoWorld* m_world; // 0x64 MxMatrix* m_unk0x68; // 0x68 LegoROI** m_roiMap; // 0x6c MxU32 m_roiMapSize; // 0x70 diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp index 21bad45d..d579beb1 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp @@ -30,7 +30,7 @@ LegoAnimMMPresenter::LegoAnimMMPresenter() m_unk0x59 = 0; m_tranInfo = NULL; m_unk0x54 = 0; - m_unk0x64 = NULL; + m_world = NULL; m_unk0x68 = NULL; m_roiMap = NULL; m_roiMapSize = 0; @@ -101,9 +101,9 @@ MxResult LegoAnimMMPresenter::StartAction(MxStreamController* p_controller, MxDS } } - m_unk0x64 = CurrentWorld(); - if (m_unk0x64) { - m_unk0x64->Add(this); + m_world = CurrentWorld(); + if (m_world) { + m_world->Add(this); } VideoManager()->RegisterPresenter(*this); @@ -133,8 +133,8 @@ void LegoAnimMMPresenter::EndAction() if (m_action != NULL) { MxCompositePresenter::EndAction(); - if (m_unk0x64 != NULL) { - m_unk0x64->Remove(this); + if (m_world != NULL) { + m_world->Remove(this); } } } @@ -429,11 +429,11 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time) LegoPathActor* actor = UserActor(); if (m_tranInfo != NULL && m_tranInfo->m_unk0x14 && m_tranInfo->m_location != -1 && actor != NULL) { - if (m_unk0x64 != NULL) { + if (m_world != NULL) { undefined4 und = 1; if (m_presenter != NULL) { - m_unk0x64->RemoveActor(actor); + m_world->RemoveActor(actor); if (m_tranInfo->m_unk0x29) { Mx3DPointFloat position, direction; @@ -442,7 +442,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time) direction = viewROI->GetWorldDirection(); position[1] -= 1.25; - und = m_unk0x64->PlaceActor(actor, m_presenter, position, direction); + und = m_world->PlaceActor(actor, m_presenter, position, direction); } else { und = 0; @@ -452,7 +452,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time) if (und != 0) { viewROI->WrappedSetLocalTransform(m_tranInfo->m_unk0x2c); VideoManager()->Get3DManager()->Moved(*viewROI); - m_unk0x64->PlaceActor(actor); + m_world->PlaceActor(actor); } if (m_tranInfo->m_unk0x29) {