From 4c53a91abaf53deec75f658d97bb407e871dc6cf Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 1 Jan 2025 11:39:27 -0700 Subject: [PATCH] Fix inlining --- LEGO1/lego/legoomni/src/actors/helicopter.cpp | 3 +- LEGO1/mxgeometry/mxgeometry4d.h | 46 +++++++++---------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index bdec74e4..c08e8520 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -482,8 +482,7 @@ void Helicopter::FUN_100042a0(const Matrix4& p_matrix) m_unk0x1f0 = Timer()->GetTime(); - m_unk0x1f4.BETA_1004a9f0(local48); - m_unk0x1f4.FUN_10004620(local90); + m_unk0x1f4.BETA_1004a9b0(local48, local90); m_unk0x1f4.FUN_10004520(); } diff --git a/LEGO1/mxgeometry/mxgeometry4d.h b/LEGO1/mxgeometry/mxgeometry4d.h index 349854c1..051056e6 100644 --- a/LEGO1/mxgeometry/mxgeometry4d.h +++ b/LEGO1/mxgeometry/mxgeometry4d.h @@ -55,6 +55,29 @@ class UnknownMx4DPointFloat { UnknownMx4DPointFloat() : m_unk0x30(0) {} + // FUNCTION: LEGO1 0x10004520 + inline long FUN_10004520() + { + if (!m_unk0x30) { + return -1; + } + + Mx4DPointFloat v1; + Mx4DPointFloat v2; + + v1 = m_unk0x00; + v1 += m_unk0x18; + + v2 = m_unk0x00; + v2 -= m_unk0x18; + + if (v1.Dot(v1, v1) < v2.Dot(v2, v2)) { + m_unk0x18 *= -1.0f; + } + + return 0; + } + // FUNCTION: BETA10 0x1004a9b0 void BETA_1004a9b0(Matrix4& p_m1, Matrix4& p_m2) { @@ -108,29 +131,6 @@ class UnknownMx4DPointFloat { return -1; } - // FUNCTION: LEGO1 0x10004520 - inline long FUN_10004520() - { - if (!m_unk0x30) { - return -1; - } - - Mx4DPointFloat v1; - Mx4DPointFloat v2; - - v1 = m_unk0x00; - v1 += m_unk0x18; - - v2 = m_unk0x00; - v2 -= m_unk0x18; - - if (v1.Dot(v1, v1) < v2.Dot(v2, v2)) { - m_unk0x18 *= -1.0f; - } - - return 0; - } - private: // FUNCTION: LEGO1 0x100040a0 // FUNCTION: BETA10 0x1004ab10