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

style

Browse Source
This commit is contained in:
Christian Semmler 2024-04-14 09:58:13 -04:00
parent 510f656df2
commit 86187532f7
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@ -295,7 +295,10 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
return result; return result;
} }
else { else {
if (p_time >= 0 && m_worldSpeed > 0) { if (p_time < 0 || m_worldSpeed <= 0) {
return -1;
}
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime; float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
if (f < p_time) { if (f < p_time) {
@ -311,8 +314,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
m_actorTime += (f - m_lastTime) * m_worldSpeed; m_actorTime += (f - m_lastTime) * m_worldSpeed;
m_lastTime = f; m_lastTime = f;
p_transform.SetIdentity(); p_transform.SetIdentity();
m_unk0x8c m_unk0x8c.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), !m_userNavFlag);
.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), !m_userNavFlag);
Vector3 pos1(p_transform[3]); Vector3 pos1(p_transform[3]);
Vector3 pos2(m_unk0xec[3]); Vector3 pos2(m_unk0xec[3]);
Mx3DPointFloat p1; Mx3DPointFloat p1;
@ -330,7 +332,6 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
return 0; return 0;
} }
} }
}
return -1; return -1;
} }