isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-27 10:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name var

Browse Source
This commit is contained in:
Christian Semmler 2024-05-18 14:28:10 -04:00
parent ff8919718a
commit 4677f148a8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legotraninfo.h
View File

@ -23,7 +23,7 @@ struct LegoTranInfo {
m_unk0x08 = NULL; m_unk0x08 = NULL;
m_unk0x0c = NULL; m_unk0x0c = NULL;
m_unk0x10 = 0; m_unk0x10 = 0;
m_unk0x12 = -1; m_location = -1;
m_unk0x14 = FALSE; m_unk0x14 = FALSE;
m_unk0x1c = NULL; m_unk0x1c = NULL;
m_unk0x20 = NULL; m_unk0x20 = NULL;
@ -42,7 +42,7 @@ struct LegoTranInfo {
LegoROI* m_unk0x08; // 0x08 LegoROI* m_unk0x08; // 0x08
MxMatrix* m_unk0x0c; // 0x0c MxMatrix* m_unk0x0c; // 0x0c
MxU8 m_unk0x10; // 0x10 MxU8 m_unk0x10; // 0x10
MxS16 m_unk0x12; // 0x12 MxS16 m_location; // 0x12
MxBool m_unk0x14; // 0x14 MxBool m_unk0x14; // 0x14
MxBool m_unk0x15; // 0x15 MxBool m_unk0x15; // 0x15
MxU32 m_objectId; // 0x18 MxU32 m_objectId; // 0x18

6
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -958,7 +958,7 @@ MxResult LegoAnimationManager::FUN_100605e0(
tranInfo->m_index = ++m_unk0x1c; tranInfo->m_index = ++m_unk0x1c;
tranInfo->m_unk0x10 = 0; tranInfo->m_unk0x10 = 0;
tranInfo->m_unk0x08 = p_roi; 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_unk0x14 = p_unk0x0a;
tranInfo->m_objectId = animInfo.m_objectId; tranInfo->m_objectId = animInfo.m_objectId;
tranInfo->m_unk0x15 = p_bool2; 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_index = ++m_unk0x1c;
info->m_unk0x10 = 0; info->m_unk0x10 = 0;
info->m_unk0x08 = NULL; info->m_unk0x08 = NULL;
info->m_unk0x12 = -1; info->m_location = -1;
info->m_unk0x14 = FALSE; info->m_unk0x14 = FALSE;
info->m_objectId = p_objectId; info->m_objectId = p_objectId;
@ -1211,7 +1211,7 @@ void LegoAnimationManager::FUN_10061010(MxBool p_und)
// TODO: Match // TODO: Match
MxU32 flags = tranInfo->m_flags; 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; LegoAnim* anim;
if (tranInfo->m_presenter->GetPresenter() != NULL && if (tranInfo->m_presenter->GetPresenter() != NULL &&

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

@ -427,7 +427,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time)
LegoROI* viewROI = VideoManager()->GetViewROI(); LegoROI* viewROI = VideoManager()->GetViewROI();
IslePathActor* actor = CurrentActor(); 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) { if (m_unk0x64 != NULL) {
undefined4 und = 1; undefined4 und = 1;