From 51bd4b1806c2f0185eb903999d219a474b39144f Mon Sep 17 00:00:00 2001 From: jonschz Date: Sat, 16 Nov 2024 20:16:54 +0100 Subject: [PATCH] Address review comments --- LEGO1/lego/legoomni/include/isle.h | 2 ++ LEGO1/lego/legoomni/include/legorace.h | 3 --- LEGO1/lego/legoomni/src/race/jetskirace.cpp | 2 +- LEGO1/lego/legoomni/src/worlds/isle.cpp | 7 ++++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h index f75d3273..9783e4ec 100644 --- a/LEGO1/lego/legoomni/include/isle.h +++ b/LEGO1/lego/legoomni/include/isle.h @@ -102,6 +102,7 @@ class Act1State : public LegoState { }; // VTABLE: LEGO1 0x100d6fb8 +// VTABLE: BETA10 0x101b9cc8 // SIZE 0x140 class Isle : public LegoWorld { public: @@ -116,6 +117,7 @@ class Isle : public LegoWorld { MxLong Notify(MxParam& p_param) override; // vtable+0x04 // FUNCTION: LEGO1 0x10030910 + // FUNCTION: BETA10 0x10035d70 const char* ClassName() const override // vtable+0x0c { // STRING: LEGO1 0x100f0458 diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h index 051738b1..22fe734b 100644 --- a/LEGO1/lego/legoomni/include/legorace.h +++ b/LEGO1/lego/legoomni/include/legorace.h @@ -81,9 +81,6 @@ class RaceState : public LegoState { Entry* GetState(MxU8 p_id); - undefined4 GetUnknown0x28() { return m_unk0x28; } - void SetUnknown0x28(undefined4 p_unk0x28) { m_unk0x28 = p_unk0x28; } - // SYNTHETIC: LEGO1 0x1000f6f0 // RaceState::~RaceState diff --git a/LEGO1/lego/legoomni/src/race/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp index 8474dd0b..e2af449d 100644 --- a/LEGO1/lego/legoomni/src/race/jetskirace.cpp +++ b/LEGO1/lego/legoomni/src/race/jetskirace.cpp @@ -199,7 +199,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) VariableTable()->SetVariable(g_raceState, ""); VariableTable()->SetVariable(g_strHIT_WALL_SOUND, ""); LegoRaceCar::FUN_10012de0(); - m_raceState->SetUnknown0x28(2); + m_raceState->m_unk0x28 = 2; RaceState::Entry* raceStateEntry = m_raceState->GetState(GameState()->GetActorId()); raceStateEntry->m_unk0x02 = sVar6; diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 2e76e1a3..190ad2ef 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -529,6 +529,7 @@ MxLong Isle::HandlePathStruct(LegoPathStructNotificationParam& p_param) } // FUNCTION: LEGO1 0x10031820 +// FUNCTION: BETA10 0x10034158 void Isle::Enable(MxBool p_enable) { if (m_set0xd0.empty() == p_enable) { @@ -595,7 +596,7 @@ void Isle::Enable(MxBool p_enable) SetIsWorldActive(FALSE); break; case LegoGameState::e_jetrace2: - if (((JetskiRaceState*) GameState()->GetState("JetskiRaceState"))->GetUnknown0x28() == 2) { + if (((JetskiRaceState*) GameState()->GetState("JetskiRaceState"))->m_unk0x28 == 2) { m_act1state->m_unk0x018 = 5; } @@ -738,7 +739,7 @@ void Isle::Enable(MxBool p_enable) ); JetskiRaceState* raceState = (JetskiRaceState*) GameState()->GetState("JetskiRaceState"); - if (raceState->GetUnknown0x28() == 2) { + if (raceState->m_unk0x28 == 2) { IsleScript::Script script = IsleScript::c_noneIsle; switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) { @@ -771,7 +772,7 @@ void Isle::Enable(MxBool p_enable) ); CarRaceState* raceState = (CarRaceState*) GameState()->GetState("CarRaceState"); - if (raceState->GetUnknown0x28() == 2) { + if (raceState->m_unk0x28 == 2) { IsleScript::Script script = IsleScript::c_noneIsle; switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) {