From 2a761510e9d2d08149e667ad92c104d8e116f8b2 Mon Sep 17 00:00:00 2001 From: jonschz Date: Sun, 7 Jul 2024 07:23:00 +0200 Subject: [PATCH] Rename variable, add BETA10 vtables --- LEGO1/lego/legoomni/include/legoracecar.h | 5 +++++ LEGO1/lego/legoomni/src/race/legoracecar.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h index 45c631cf..bb824bb9 100644 --- a/LEGO1/lego/legoomni/include/legoracecar.h +++ b/LEGO1/lego/legoomni/include/legoracecar.h @@ -15,6 +15,11 @@ struct EdgeReference { // VTABLE: LEGO1 0x100d58b8 LegoPathActor // VTABLE: LEGO1 0x100d5984 LegoRaceMap // VTABLE: LEGO1 0x100d5988 LegoCarRaceActor +// VTABLE: BETA10 0x101be6ec LegoRaceActor +// VTABLE: BETA10 0x101be6f0 LegoAnimActor +// VTABLE: BETA10 0x101be708 LegoPathActor +// VTABLE: BETA10 0x101be7f8 LegoRaceMap +// VTABLE: BETA10 0x101be800 LegoCarRaceActor // SIZE 0x200 class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap { public: diff --git a/LEGO1/lego/legoomni/src/race/legoracecar.cpp b/LEGO1/lego/legoomni/src/race/legoracecar.cpp index 9df26733..da41b800 100644 --- a/LEGO1/lego/legoomni/src/race/legoracecar.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracecar.cpp @@ -172,16 +172,16 @@ void LegoRaceCar::FUN_10012ff0(float p_param) else if (a->GetAnimTreePtr()->GetCamAnim()) { MxMatrix transformationMatrix; - LegoWorld* currentWorld = CurrentWorld(); // called `r` in BETA10 - assert(currentWorld); + LegoWorld* r = CurrentWorld(); // called `r` in BETA10 + assert(r); transformationMatrix.SetIdentity(); // Possible bug in the original code: The first argument is not initialized a->GetAnimTreePtr()->GetCamAnim()->FUN_1009f490(deltaTime, transformationMatrix); - if (currentWorld->GetCamera()) { - currentWorld->GetCamera()->FUN_100123e0(transformationMatrix, 0); + if (r->GetCamera()) { + r->GetCamera()->FUN_100123e0(transformationMatrix, 0); } m_roi->FUN_100a58f0(transformationMatrix);