diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp index 61f7b1a9..818650eb 100644 --- a/LEGO1/realtime/matrix.cpp +++ b/LEGO1/realtime/matrix.cpp @@ -28,12 +28,6 @@ void Matrix4Impl::AnotherSetData(Matrix4& p_data) m_data = &p_data; } -// FUNCTION: LEGO1 0x10002370 -void Matrix4Impl::SetData(Matrix4& p_data) -{ - m_data = &p_data; -} - // FUNCTION: LEGO1 0x10002380 const Matrix4* Matrix4Impl::GetData() const { diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h index 58db7a9f..c087d331 100644 --- a/LEGO1/realtime/matrix.h +++ b/LEGO1/realtime/matrix.h @@ -35,12 +35,13 @@ class Matrix4 { // SIZE 0x8 class Matrix4Impl { public: - inline Matrix4Impl(Matrix4& p_data) : m_data(&p_data) {} + inline Matrix4Impl(Matrix4& p_data) { SetData(p_data); } // vtable + 0x00 virtual void EqualsMatrixImpl(const Matrix4Impl* p_other); virtual void EqualsMatrixData(const Matrix4& p_matrix); - virtual void SetData(Matrix4& p_data); + // FUNCTION: LEGO1 0x10002370 + virtual void SetData(Matrix4& p_data) { m_data = &p_data; } virtual void AnotherSetData(Matrix4& p_data); // vtable + 0x10 diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h index 5c31f24e..1af21c9a 100644 --- a/LEGO1/realtime/vector.h +++ b/LEGO1/realtime/vector.h @@ -61,7 +61,7 @@ struct Vector4 { class Vector2Impl { public: // FUNCTION: LEGO1 0x1000c0f0 - inline Vector2Impl(float* p_data) { this->SetData(p_data); } + inline Vector2Impl(float* p_data) { SetData(p_data); } // vtable + 0x00 (no virtual destructor) virtual void AddScalarImpl(float p_value) = 0; @@ -74,7 +74,7 @@ class Vector2Impl { virtual void DivScalarImpl(float* p_value) = 0; virtual float DotImpl(float* p_a, float* p_b) const = 0; // FUNCTION: LEGO1 0x10002060 - virtual void SetData(float* p_data) { this->m_data = p_data; } + virtual void SetData(float* p_data) { m_data = p_data; } // vtable + 0x20 virtual void EqualsImpl(float* p_data) = 0;