From 0836402d035c4901e3dedae3c764e46ae47c1004 Mon Sep 17 00:00:00 2001 From: jonschz Date: Sat, 16 Nov 2024 13:53:32 +0100 Subject: [PATCH] Cleanup, add BETA10 --- LEGO1/lego/legoomni/include/jetskirace.h | 4 ++++ LEGO1/lego/legoomni/include/legopathstruct.h | 3 +++ LEGO1/lego/legoomni/src/race/jetskirace.cpp | 21 ++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h index fd644446..778c7af5 100644 --- a/LEGO1/lego/legoomni/include/jetskirace.h +++ b/LEGO1/lego/legoomni/include/jetskirace.h @@ -71,6 +71,10 @@ class JetskiRace : public LegoRace { }; // SYNTHETIC: LEGO1 0x1000f530 +// SYNTHETIC: BETA10 0x100a9b70 // JetskiRace::`scalar deleting destructor' +// SYNTHETIC: BETA10 0x100aa150 +// JetskiRace::~JetskiRace + #endif // JETSKIRACE_H diff --git a/LEGO1/lego/legoomni/include/legopathstruct.h b/LEGO1/lego/legoomni/include/legopathstruct.h index 4412c5f1..162438f5 100644 --- a/LEGO1/lego/legoomni/include/legopathstruct.h +++ b/LEGO1/lego/legoomni/include/legopathstruct.h @@ -28,7 +28,10 @@ class LegoPathStructNotificationParam : public MxNotificationParam { return new LegoPathStructNotificationParam(m_type, m_sender, m_trigger, m_data); } // vtable+0x04 + // FUNCTION: BETA10 0x10024270 MxU8 GetTrigger() { return m_trigger; } + + // FUNCTION: BETA10 0x100242a0 MxS16 GetData() { return m_data; } protected: diff --git a/LEGO1/lego/legoomni/src/race/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp index 65f4ae57..8bda3e7f 100644 --- a/LEGO1/lego/legoomni/src/race/jetskirace.cpp +++ b/LEGO1/lego/legoomni/src/race/jetskirace.cpp @@ -172,6 +172,7 @@ inline MxS32 JetskiRace::PossiblyGetPlaceOfPlayer() } // FUNCTION: LEGO1 0x100166a0 +// FUNCTION: BETA10 0x100c8085 MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) { LegoChar buffer[20]; @@ -285,26 +286,26 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) // FUNCTION: LEGO1 0x10016930 void JetskiRace::FUN_10016930(MxS32 p_param1, MxS16 p_param2) { - MxS32 local_4; - MxStillPresenter* piVar1; + MxS32 local4; + MxStillPresenter* presenter; MxS32 x, y; if (p_param1 == 11) { - piVar1 = m_unk0x128; - local_4 = m_unk0xfc; + presenter = m_unk0x128; + local4 = m_unk0xfc; } else if (p_param1 == 12) { - piVar1 = m_unk0x12c; - local_4 = m_unk0x100; + presenter = m_unk0x12c; + local4 = m_unk0x100; } - if (piVar1) { + if (presenter) { x = m_unk0x130.GetLeft() + 0.5 + - (m_unk0x130.GetRight() - m_unk0x130.GetLeft() + 1) * (local_4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); + (m_unk0x130.GetRight() - m_unk0x130.GetLeft() + 1) * (local4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); y = m_unk0x130.GetTop() + 0.5 + - (m_unk0x130.GetBottom() - m_unk0x130.GetTop() + 1) * (local_4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); + (m_unk0x130.GetBottom() - m_unk0x130.GetTop() + 1) * (local4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); - piVar1->SetPosition(x, y); + presenter->SetPosition(x, y); } }