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

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

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

@ -295,40 +295,41 @@ 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) {
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime; return -1;
}
if (f < p_time) { float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
m_unk0x7c = m_BADuration;
m_unk0xe9 = 1;
}
else {
f = p_time;
m_unk0xe9 = 0;
m_unk0x7c += (p_time - m_lastTime) * m_worldSpeed;
}
m_actorTime += (f - m_lastTime) * m_worldSpeed; if (f < p_time) {
m_lastTime = f; m_unk0x7c = m_BADuration;
p_transform.SetIdentity(); m_unk0xe9 = 1;
m_unk0x8c }
.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), !m_userNavFlag); else {
Vector3 pos1(p_transform[3]); f = p_time;
Vector3 pos2(m_unk0xec[3]); m_unk0xe9 = 0;
Mx3DPointFloat p1; m_unk0x7c += (p_time - m_lastTime) * m_worldSpeed;
}
if (VTable0x68(pos2, pos1, p1) > 0) { m_actorTime += (f - m_lastTime) * m_worldSpeed;
m_lastTime = p_time; m_lastTime = f;
return 1; p_transform.SetIdentity();
} m_unk0x8c.FUN_1009a1e0(m_BADuration / m_unk0x7c, p_transform, *m_boundary->GetUnknown0x14(), !m_userNavFlag);
Vector3 pos1(p_transform[3]);
Vector3 pos2(m_unk0xec[3]);
Mx3DPointFloat p1;
m_boundary->FUN_100575b0(pos2, pos1, this); if (VTable0x68(pos2, pos1, p1) > 0) {
pos2 = pos1; m_lastTime = p_time;
return 1;
}
if (m_unk0xe9 != 0) { m_boundary->FUN_100575b0(pos2, pos1, this);
WaitForAnimation(); pos2 = pos1;
return 0;
} if (m_unk0xe9 != 0) {
WaitForAnimation();
return 0;
} }
} }