From 7ff8f85d65353c52cca119645c7e65191d45e4b9 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 22 Mar 2024 11:35:05 -0400 Subject: [PATCH] Fix LegoCarRaceActor constructor Fix function name in LegoRaceCar --- LEGO1/lego/legoomni/include/legoracecar.h | 2 +- .../legoomni/src/entity/legocarraceactor.cpp | 36 +++++++++---------- LEGO1/lego/legoomni/src/race/legoracecar.cpp | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h index 8c86cb2f..bff4dd17 100644 --- a/LEGO1/lego/legoomni/include/legoracecar.h +++ b/LEGO1/lego/legoomni/include/legoracecar.h @@ -40,7 +40,7 @@ public: void VTable0x9c() override; // vtable+0x9c virtual void FUN_10012ea0(float p_worldSpeed); - virtual void FUN_10012bf0(float); + virtual void FUN_10012ff0(float); virtual MxBool FUN_10013130(float); // SYNTHETIC: LEGO1 0x10014230 diff --git a/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp index a1c4b74e..145cc29d 100644 --- a/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp @@ -7,24 +7,6 @@ // STRING: LEGO1 0x100f7ae4 const char* g_fuel = "FUEL"; -// FUNCTION: LEGO1 0x10080350 -LegoCarRaceActor::LegoCarRaceActor() -{ - m_unk0x08 = 1.0f; - m_unk0x70 = 0.0f; - m_unk0x0c = 0; - m_unk0x13c = 0.0f; - m_unk0x68 = 1.0f; - m_unk0x1c = 0.65f; - m_unk0x10 = 0.65f; - m_unk0x14 = 0.03f; - m_unk0x18 = 0.6f; - m_unk0x140 = 0.1f; - m_unk0x150 = -5.0f; - m_unk0x148 = 1; - VariableTable()->SetVariable(g_fuel, "0.8"); -} - // STUB: LEGO1 0x10014130 void LegoCarRaceActor::VTable0x68() { @@ -45,6 +27,24 @@ MxS32 LegoCarRaceActor::VTable0x94() return 0; } +// FUNCTION: LEGO1 0x10080350 +LegoCarRaceActor::LegoCarRaceActor() +{ + m_unk0x08 = 1.0f; + m_unk0x70 = 0.0f; + m_unk0x0c = 0; + m_unk0x13c = 0.0f; + m_unk0x68 = 1.0f; + m_unk0x1c = 0; + m_unk0x10 = 0.65f; + m_unk0x14 = 0.03f; + m_unk0x18 = 0.6f; + m_unk0x140 = 0.1f; + m_unk0x150 = -5.0f; + m_unk0x148 = 1; + VariableTable()->SetVariable(g_fuel, "0.8"); +} + // STUB: LEGO1 0x10080590 void LegoCarRaceActor::FUN_10080590() { diff --git a/LEGO1/lego/legoomni/src/race/legoracecar.cpp b/LEGO1/lego/legoomni/src/race/legoracecar.cpp index eb6095c4..eca8b80c 100644 --- a/LEGO1/lego/legoomni/src/race/legoracecar.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracecar.cpp @@ -30,7 +30,7 @@ void LegoRaceCar::FUN_10012ea0(float p_worldSpeed) } // STUB: LEGO1 0x10012ff0 -void LegoRaceCar::FUN_10012bf0(float) +void LegoRaceCar::FUN_10012ff0(float) { // TODO }