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

more fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-04-14 09:53:14 -04:00
parent d1a7da3ac2
commit 510f656df2
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,8 +249,9 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
m_boundary->FUN_100575b0(p4, p2, this); m_boundary->FUN_100575b0(p4, p2, this);
} }
LegoPathBoundary* oldBoundary = m_boundary;
if (m_unk0xe9 != 0) { if (m_unk0xe9 != 0) {
LegoPathBoundary* oldBoundary = m_boundary;
WaitForAnimation(); WaitForAnimation();
if (m_boundary == oldBoundary) { if (m_boundary == oldBoundary) {
@ -259,6 +260,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
if (time - g_unk0x100f3308 > 1000) { if (time - g_unk0x100f3308 > 1000) {
g_unk0x100f3308 = time; g_unk0x100f3308 = time;
const char* var = VariableTable()->GetVariable(g_strHIT_WALL_SOUND); const char* var = VariableTable()->GetVariable(g_strHIT_WALL_SOUND);
if (var && var[0] != 0) { if (var && var[0] != 0) {
SoundManager()->GetCacheSoundManager()->FUN_1003dae0(var, NULL, FALSE); SoundManager()->GetCacheSoundManager()->FUN_1003dae0(var, NULL, FALSE);
} }
@ -267,28 +269,30 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
m_worldSpeed *= m_unk0x144; m_worldSpeed *= m_unk0x144;
nav->SetLinearVel(m_worldSpeed); nav->SetLinearVel(m_worldSpeed);
Mx3DPointFloat p7(p2); Mx3DPointFloat p7(p2);
p7.Sub(&p6); ((Vector3&) p7).Sub(&p6);
if (p7.Unitize() == SUCCESS) { if (p7.Unitize() == 0) {
float f = sqrtf(p1.LenSquared()) * m_unk0x140; float f = sqrt(p1.LenSquared()) * m_unk0x140;
p7.Mul(f); ((Vector3&) p7).Mul(f);
p7.Add(&p1); ((Vector3&) p1).Add(&p7);
} }
} }
p_transform.SetIdentity();
Vector3 right(p_transform[0]);
Vector3 up(p_transform[1]);
Vector3 dir(p_transform[2]);
Vector3 pos(p_transform[3]);
dir = p1;
up = *m_boundary->GetUnknown0x14();
right.EqualsCross(&up, &dir);
right.Unitize();
dir.EqualsCross(&right, &up);
pos = p2;
return result;
} }
p_transform.SetIdentity();
Vector3 right(p_transform[0]);
Vector3 up(p_transform[1]);
Vector3 dir(p_transform[2]);
Vector3 pos(p_transform[3]);
dir = p1;
up = *m_boundary->GetUnknown0x14();
right.EqualsCross(&up, &dir);
right.Unitize();
dir.EqualsCross(&right, &up);
pos = p2;
return result;
} }
else { else {
if (p_time >= 0 && m_worldSpeed > 0) { if (p_time >= 0 && m_worldSpeed > 0) {