From dd088db26fcaad2eb69caced54b6a53e591a9d79 Mon Sep 17 00:00:00 2001 From: jonschz Date: Sun, 4 Aug 2024 20:25:21 +0200 Subject: [PATCH] Fix more CI issues --- LEGO1/lego/legoomni/include/legojetskiraceactor.h | 2 +- LEGO1/lego/legoomni/include/legopathcontroller.h | 9 ++++----- LEGO1/lego/legoomni/include/legoracespecial.h | 2 +- LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp | 3 +-- .../lego/legoomni/src/entity/legojetskiraceactor.cpp | 2 +- LEGO1/lego/legoomni/src/race/legoracespecial.cpp | 12 ++++++------ 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h index ffc007ff..c49351b1 100644 --- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h +++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h @@ -34,7 +34,7 @@ class LegoJetskiRaceActor : public virtual LegoCarRaceActor { Vector3& p_v3 ) override; // vtable+0x6c void VTable0x70(float p_float) override; // vtable+0x70 - MxS32 VTable0x1c(undefined4 param_1, LegoEdge* p_edge) override; // vtable+0x1c + MxS32 VTable0x1c(undefined4 p_param1, LegoEdge* p_edge) override; // vtable+0x1c // SYNTHETIC: LEGO1 0x10081d50 // LegoJetskiRaceActor::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h index e58aebcc..ad0b5791 100644 --- a/LEGO1/lego/legoomni/include/legopathcontroller.h +++ b/LEGO1/lego/legoomni/include/legopathcontroller.h @@ -122,15 +122,14 @@ class LegoPathController : public MxCore { static MxResult Reset(); // FUNCTION: BETA10 0x100cf580 - static LegoUnknown100db7f4* GetControlEdgeA(MxS32 index) { return g_ctrlEdgesA[index].m_edge; } + static LegoUnknown100db7f4* GetControlEdgeA(MxS32 p_index) { return g_ctrlEdgesA[p_index].m_edge; } // FUNCTION: BETA10 0x100cf5b0 - static LegoPathBoundary* GetControlBoundaryA(MxS32 index) { return g_ctrlBoundariesA[index].m_boundary; } + static LegoPathBoundary* GetControlBoundaryA(MxS32 p_index) { return g_ctrlBoundariesA[p_index].m_boundary; } // These two are an educated guess because BETA10 does not have the g_ctrl.*B globals - static LegoUnknown100db7f4* GetControlEdgeB(MxS32 index) { return g_ctrlEdgesB[index].m_edge; } - - static LegoPathBoundary* GetControlBoundaryB(MxS32 index) { return g_ctrlBoundariesB[index].m_boundary; } + static LegoUnknown100db7f4* GetControlEdgeB(MxS32 p_index) { return g_ctrlEdgesB[p_index].m_edge; } + static LegoPathBoundary* GetControlBoundaryB(MxS32 p_index) { return g_ctrlBoundariesB[p_index].m_boundary; } private: void FUN_10046970(); diff --git a/LEGO1/lego/legoomni/include/legoracespecial.h b/LEGO1/lego/legoomni/include/legoracespecial.h index 5b7794fc..3db9838f 100644 --- a/LEGO1/lego/legoomni/include/legoracespecial.h +++ b/LEGO1/lego/legoomni/include/legoracespecial.h @@ -64,7 +64,7 @@ class LegoCarRaceActor : public virtual LegoRaceActor { // FUNCTION: LEGO1 0x10012c00 virtual float FUN_10012c00() { return m_unk0x18; } - virtual MxS32 VTable0x1c(undefined4 param_1, LegoEdge* p_edge); // vtable+0x1c + virtual MxS32 VTable0x1c(undefined4 p_param1, LegoEdge* p_edge); // vtable+0x1c // SYNTHETIC: LEGO1 0x10012c30 // LegoCarRaceActor::`vbase destructor' diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp index 4709eaff..4eebe624 100644 --- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp +++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp @@ -324,8 +324,7 @@ MxCore* LegoObjectFactory::Create(const char* p_name) else if (m_idCarRace == atom) { object = new CarRace(); } - else if (m_idLegoRaceCarBuildState == atom || m_idLegoCopterBuildState == atom || - m_idLegoDuneCarBuildState == atom || m_idLegoJetskiBuildState == atom) { + else if (m_idLegoRaceCarBuildState == atom || m_idLegoCopterBuildState == atom || m_idLegoDuneCarBuildState == atom || m_idLegoJetskiBuildState == atom) { object = new LegoVehicleBuildState(p_name); } else if (m_idHospitalState == atom) { diff --git a/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp index 07f87e93..6ebf975e 100644 --- a/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp @@ -12,7 +12,7 @@ LegoJetskiRaceActor::LegoJetskiRaceActor() } // STUB: LEGO1 0x10081120 -MxS32 LegoJetskiRaceActor::VTable0x1c(undefined4 param_1, LegoEdge* p_edge) +MxS32 LegoJetskiRaceActor::VTable0x1c(undefined4 p_param1, LegoEdge* p_edge) { // TODO return 0; diff --git a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp index 612b7898..5e38bbaa 100644 --- a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp @@ -93,9 +93,9 @@ void LegoCarRaceActor::FUN_10080590(float p_float) // FUNCTION: LEGO1 0x10080740 // FUNCTION: BETA10 0x100cece0 -MxS32 LegoCarRaceActor::VTable0x1c(undefined4 param_1, LegoEdge* p_edge) +MxS32 LegoCarRaceActor::VTable0x1c(undefined4 p_param1, LegoEdge* p_edge) { - Mx3DPointFloat unknownPoint; + Mx3DPointFloat pointUnknown; Mx3DPointFloat destEdgeUnknownVector; Mx3DPointFloat crossProduct; @@ -148,9 +148,9 @@ MxS32 LegoCarRaceActor::VTable0x1c(undefined4 param_1, LegoEdge* p_edge) Vector3* v2 = m_destEdge->CWVertex(*m_boundary); assert(v1 && v2); - unknownPoint[0] = (*v1)[0] + ((*v2)[0] - (*v1)[0]) * m_unk0xe4; - unknownPoint[1] = (*v1)[1] + ((*v2)[1] - (*v1)[1]) * m_unk0xe4; - unknownPoint[2] = (*v1)[2] + ((*v2)[2] - (*v1)[2]) * m_unk0xe4; + pointUnknown[0] = (*v1)[0] + ((*v2)[0] - (*v1)[0]) * m_unk0xe4; + pointUnknown[1] = (*v1)[1] + ((*v2)[1] - (*v1)[1]) * m_unk0xe4; + pointUnknown[2] = (*v1)[2] + ((*v2)[2] - (*v1)[2]) * m_unk0xe4; m_destEdge->FUN_1002ddc0(*m_boundary, destEdgeUnknownVector); @@ -167,7 +167,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(undefined4 param_1, LegoEdge* p_edge) ((Vector3*) &crossProduct)->Mul(5.0f); MxResult callResult = - VTable0x80(Vector3(m_roi->GetWorldPosition()), worldDirection, unknownPoint, crossProduct); + VTable0x80(Vector3(m_roi->GetWorldPosition()), worldDirection, pointUnknown, crossProduct); if (callResult) { m_unk0x7c = 0;