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

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-02-09 18:36:15 -05:00
parent 1d92c1580f
commit 0a4401f389
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class LegoEntity : public MxEntity {
virtual void VTable0x4c(); // vtable+0x4c virtual void VTable0x4c(); // vtable+0x4c
void FUN_10010c30(); void FUN_10010c30();
void FUN_100114e0(MxU8 p_val); void FUN_100114e0(MxU8 p_unk0x59);
void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool); void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
inline LegoROI* GetROI() { return m_roi; } inline LegoROI* GetROI() { return m_roi; }

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

@ -38,7 +38,7 @@ class LegoModelPresenter : public MxVideoPresenter {
AutoROI* m_unk0x64; // 0x64 AutoROI* m_unk0x64; // 0x64
MxBool m_addedToView; // 0x68 MxBool m_addedToView; // 0x68
void LoadModel(MxStreamChunk* p_chunk); undefined4 LoadModel(MxStreamChunk* p_chunk);
}; };
#endif // LEGOMODELPRESENTER_H #endif // LEGOMODELPRESENTER_H

4
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View File

@ -164,9 +164,9 @@ void LegoEntity::VTable0x4c()
} }
// FUNCTION: LEGO1 0x100114e0 // FUNCTION: LEGO1 0x100114e0
void LegoEntity::FUN_100114e0(MxU8 p_val) void LegoEntity::FUN_100114e0(MxU8 p_unk0x59)
{ {
m_unk0x59 = p_val; m_unk0x59 = p_unk0x59;
} }
// STUB: LEGO1 0x100114f0 // STUB: LEGO1 0x100114f0

11
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@ -28,15 +28,17 @@ void LegoModelPresenter::Destroy(MxBool p_fromDestructor)
m_unk0x64 = 0; m_unk0x64 = 0;
m_addedToView = FALSE; m_addedToView = FALSE;
m_criticalSection.Leave(); m_criticalSection.Leave();
if (!p_fromDestructor) { if (!p_fromDestructor) {
MxVideoPresenter::Destroy(FALSE); MxVideoPresenter::Destroy(FALSE);
} }
} }
// STUB: LEGO1 0x1007f6b0 // STUB: LEGO1 0x1007f6b0
void LegoModelPresenter::LoadModel(MxStreamChunk* p_chunk) undefined4 LegoModelPresenter::LoadModel(MxStreamChunk* p_chunk)
{ {
// TODO // TODO
return 0;
} }
// FUNCTION: LEGO1 0x10080050 // FUNCTION: LEGO1 0x10080050
@ -68,14 +70,16 @@ void LegoModelPresenter::ReadyTickle()
} }
else { else {
MxStreamChunk* chunk = m_subscriber->CurrentChunk(); MxStreamChunk* chunk = m_subscriber->CurrentChunk();
if (chunk != NULL && chunk->GetTime() <= m_action->GetElapsedTime()) { if (chunk != NULL && chunk->GetTime() <= m_action->GetElapsedTime()) {
chunk = m_subscriber->NextChunk(); chunk = m_subscriber->NextChunk();
LoadModel(chunk); undefined4 und = LoadModel(chunk);
m_subscriber->DestroyChunk(chunk); m_subscriber->DestroyChunk(chunk);
if (chunk == NULL) { if (und == 0) {
VideoManager()->Get3DManager()->GetLego3DView()->Add(*m_unk0x64); VideoManager()->Get3DManager()->GetLego3DView()->Add(*m_unk0x64);
VideoManager()->Get3DManager()->GetLego3DView()->Moved(*m_unk0x64); VideoManager()->Get3DManager()->GetLego3DView()->Moved(*m_unk0x64);
if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoEntityPresenter")) { if (m_compositePresenter != NULL && m_compositePresenter->IsA("LegoEntityPresenter")) {
((LegoEntityPresenter*) m_compositePresenter) ((LegoEntityPresenter*) m_compositePresenter)
->GetEntity() ->GetEntity()
@ -93,7 +97,6 @@ void LegoModelPresenter::ReadyTickle()
EndAction(); EndAction();
} }
return;
} }
} }