TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 19:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename m_unk0x64 to m_world in LegoAnimMMPresenter (#1461)

Browse Source
This commit is contained in:
Florian Kaiser 2025-05-09 20:55:22 +02:00 committed by GitHub
parent 81ce446628
commit c59343c220
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimmmpresenter.h
View File

@ -90,7 +90,7 @@ private:
MxU8 m_unk0x59; // 0x59 MxU8 m_unk0x59; // 0x59
MxU32 m_animmanId; // 0x5c MxU32 m_animmanId; // 0x5c
LegoTranInfo* m_tranInfo; // 0x60 LegoTranInfo* m_tranInfo; // 0x60
LegoWorld* m_unk0x64; // 0x64 LegoWorld* m_world; // 0x64
MxMatrix* m_unk0x68; // 0x68 MxMatrix* m_unk0x68; // 0x68
LegoROI** m_roiMap; // 0x6c LegoROI** m_roiMap; // 0x6c
MxU32 m_roiMapSize; // 0x70 MxU32 m_roiMapSize; // 0x70

20
LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
View File

@ -30,7 +30,7 @@ LegoAnimMMPresenter::LegoAnimMMPresenter()
m_unk0x59 = 0; m_unk0x59 = 0;
m_tranInfo = NULL; m_tranInfo = NULL;
m_unk0x54 = 0; m_unk0x54 = 0;
m_unk0x64 = NULL; m_world = NULL;
m_unk0x68 = NULL; m_unk0x68 = NULL;
m_roiMap = NULL; m_roiMap = NULL;
m_roiMapSize = 0; m_roiMapSize = 0;
@ -101,9 +101,9 @@ MxResult LegoAnimMMPresenter::StartAction(MxStreamController* p_controller, MxDS
} }
} }
m_unk0x64 = CurrentWorld(); m_world = CurrentWorld();
if (m_unk0x64) { if (m_world) {
m_unk0x64->Add(this); m_world->Add(this);
} }
VideoManager()->RegisterPresenter(*this); VideoManager()->RegisterPresenter(*this);
@ -133,8 +133,8 @@ void LegoAnimMMPresenter::EndAction()
if (m_action != NULL) { if (m_action != NULL) {
MxCompositePresenter::EndAction(); MxCompositePresenter::EndAction();
if (m_unk0x64 != NULL) { if (m_world != NULL) {
m_unk0x64->Remove(this); m_world->Remove(this);
} }
} }
} }
@ -429,11 +429,11 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time)
LegoPathActor* actor = UserActor(); LegoPathActor* actor = UserActor();
if (m_tranInfo != NULL && m_tranInfo->m_unk0x14 && m_tranInfo->m_location != -1 && actor != NULL) { 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; undefined4 und = 1;
if (m_presenter != NULL) { if (m_presenter != NULL) {
m_unk0x64->RemoveActor(actor); m_world->RemoveActor(actor);
if (m_tranInfo->m_unk0x29) { if (m_tranInfo->m_unk0x29) {
Mx3DPointFloat position, direction; Mx3DPointFloat position, direction;
@ -442,7 +442,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time)
direction = viewROI->GetWorldDirection(); direction = viewROI->GetWorldDirection();
position[1] -= 1.25; position[1] -= 1.25;
und = m_unk0x64->PlaceActor(actor, m_presenter, position, direction); und = m_world->PlaceActor(actor, m_presenter, position, direction);
} }
else { else {
und = 0; und = 0;
@ -452,7 +452,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time)
if (und != 0) { if (und != 0) {
viewROI->WrappedSetLocalTransform(m_tranInfo->m_unk0x2c); viewROI->WrappedSetLocalTransform(m_tranInfo->m_unk0x2c);
VideoManager()->Get3DManager()->Moved(*viewROI); VideoManager()->Get3DManager()->Moved(*viewROI);
m_unk0x64->PlaceActor(actor); m_world->PlaceActor(actor);
} }
if (m_tranInfo->m_unk0x29) { if (m_tranInfo->m_unk0x29) {