diff --git a/LEGO1/lego/legoomni/include/act3actors.h b/LEGO1/lego/legoomni/include/act3actors.h index 2fce23b3..9b1d941d 100644 --- a/LEGO1/lego/legoomni/include/act3actors.h +++ b/LEGO1/lego/legoomni/include/act3actors.h @@ -20,7 +20,7 @@ class Act3Actor : public LegoAnimActor { return "Act3Actor"; } - MxU32 VTable0x90(float p_float, Matrix4& p_transform) override; // vtable+0x90 + MxU32 VTable0x90(float p_time, Matrix4& p_transform) override; // vtable+0x90 MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94 // SYNTHETIC: LEGO1 0x10043330 diff --git a/LEGO1/lego/legoomni/include/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h index 82819531..54e3b1f8 100644 --- a/LEGO1/lego/legoomni/include/legoextraactor.h +++ b/LEGO1/lego/legoomni/include/legoextraactor.h @@ -45,7 +45,7 @@ class LegoExtraActor : public virtual LegoAnimActor { ) override; // vtable+0x6c void VTable0x70(float p_time) override; // vtable+0x70 void VTable0x74(Matrix4& p_transform) override; // vtable+0x74 - MxU32 VTable0x90(float p_float, Matrix4& p_matrix) override; // vtable+0x90 + MxU32 VTable0x90(float p_time, Matrix4& p_matrix) override; // vtable+0x90 MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94 MxResult VTable0x9c() override; // vtable+0x9c void VTable0xa4(MxBool& p_und1, MxS32& p_und2) override; // vtable+0xa4 diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h index 6fa69eff..0d759f36 100644 --- a/LEGO1/lego/legoomni/include/legoraceactor.h +++ b/LEGO1/lego/legoomni/include/legoraceactor.h @@ -31,7 +31,7 @@ class LegoRaceActor : public virtual LegoAnimActor { } MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override; // vtable+0x68 - MxU32 VTable0x90(float p_float, Matrix4& p_matrix) override; // vtable+0x90 + MxU32 VTable0x90(float p_time, Matrix4& p_matrix) override; // vtable+0x90 MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94 // FUNCTION: LEGO1 0x10014aa0 diff --git a/LEGO1/lego/legoomni/src/actors/act3actors.cpp b/LEGO1/lego/legoomni/src/actors/act3actors.cpp index 7756cb45..6b56f30f 100644 --- a/LEGO1/lego/legoomni/src/actors/act3actors.cpp +++ b/LEGO1/lego/legoomni/src/actors/act3actors.cpp @@ -15,7 +15,7 @@ Act3Actor::Act3Actor() } // FUNCTION: LEGO1 0x1003fb70 -MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform) +MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform) { // Note: Code duplication with LegoExtraActor::VTable0x90 switch (m_state & 0xff) { @@ -23,10 +23,10 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform) case 1: return TRUE; case 2: - m_unk0x1c = p_float + 2000.0f; + m_unk0x1c = p_time + 2000.0f; m_state = 3; - m_actorTime += (p_float - m_lastTime) * m_worldSpeed; - m_lastTime = p_float; + m_actorTime += (p_time - m_lastTime) * m_worldSpeed; + m_lastTime = p_time; return FALSE; case 3: assert(!m_userNavFlag); @@ -34,7 +34,7 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform) p_transform = m_roi->GetLocal2World(); - if (m_unk0x1c > p_float) { + if (m_unk0x1c > p_time) { Mx3DPointFloat position; position = positionRef; @@ -42,8 +42,8 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform) p_transform.RotateX(0.6); positionRef = position; - m_actorTime += (p_float - m_lastTime) * m_worldSpeed; - m_lastTime = p_float; + m_actorTime += (p_time - m_lastTime) * m_worldSpeed; + m_lastTime = p_time; VTable0x74(p_transform); return FALSE; diff --git a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp index e640b812..c0462c6c 100644 --- a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp +++ b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp @@ -45,7 +45,7 @@ MxS32 LegoRaceActor::VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) // FUNCTION: LEGO1 0x100147f0 // FUNCTION: BETA10 0x100c9c93 -MxU32 LegoRaceActor::VTable0x90(float p_float, Matrix4& p_transform) +MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform) { // Note: Code duplication with LegoExtraActor::VTable0x90 switch (m_state) { @@ -54,10 +54,10 @@ MxU32 LegoRaceActor::VTable0x90(float p_float, Matrix4& p_transform) return 1; case 2: - m_unk0x08 = p_float + 2000.0f; + m_unk0x08 = p_time + 2000.0f; m_state = 3; - m_actorTime += (p_float - m_lastTime) * m_worldSpeed; - m_lastTime = p_float; + m_actorTime += (p_time - m_lastTime) * m_worldSpeed; + m_lastTime = p_time; return 0; case 3: @@ -66,7 +66,7 @@ MxU32 LegoRaceActor::VTable0x90(float p_float, Matrix4& p_transform) p_transform = m_roi->GetLocal2World(); - if (m_unk0x08 > p_float) { + if (m_unk0x08 > p_time) { Mx3DPointFloat position; position = positionRef; @@ -74,8 +74,8 @@ MxU32 LegoRaceActor::VTable0x90(float p_float, Matrix4& p_transform) p_transform.RotateX(0.6); positionRef = position; - m_actorTime += (p_float - m_lastTime) * m_worldSpeed; - m_lastTime = p_float; + m_actorTime += (p_time - m_lastTime) * m_worldSpeed; + m_lastTime = p_time; VTable0x74(p_transform); return 0;