isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
jonschz 2024-11-16 20:16:54 +01:00
parent 60f065e9e7
commit 51bd4b1806
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/isle.h
View File

@ -102,6 +102,7 @@ class Act1State : public LegoState {
}; };
// VTABLE: LEGO1 0x100d6fb8 // VTABLE: LEGO1 0x100d6fb8
// VTABLE: BETA10 0x101b9cc8
// SIZE 0x140 // SIZE 0x140
class Isle : public LegoWorld { class Isle : public LegoWorld {
public: public:
@ -116,6 +117,7 @@ class Isle : public LegoWorld {
MxLong Notify(MxParam& p_param) override; // vtable+0x04 MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10030910 // FUNCTION: LEGO1 0x10030910
// FUNCTION: BETA10 0x10035d70
const char* ClassName() const override // vtable+0x0c const char* ClassName() const override // vtable+0x0c
{ {
// STRING: LEGO1 0x100f0458 // STRING: LEGO1 0x100f0458

3
LEGO1/lego/legoomni/include/legorace.h
View File

@ -81,9 +81,6 @@ class RaceState : public LegoState {
Entry* GetState(MxU8 p_id); Entry* GetState(MxU8 p_id);
undefined4 GetUnknown0x28() { return m_unk0x28; }
void SetUnknown0x28(undefined4 p_unk0x28) { m_unk0x28 = p_unk0x28; }
// SYNTHETIC: LEGO1 0x1000f6f0 // SYNTHETIC: LEGO1 0x1000f6f0
// RaceState::~RaceState // RaceState::~RaceState

2
LEGO1/lego/legoomni/src/race/jetskirace.cpp
View File

@ -199,7 +199,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
VariableTable()->SetVariable(g_raceState, ""); VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, ""); VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
LegoRaceCar::FUN_10012de0(); LegoRaceCar::FUN_10012de0();
m_raceState->SetUnknown0x28(2); m_raceState->m_unk0x28 = 2;
RaceState::Entry* raceStateEntry = m_raceState->GetState(GameState()->GetActorId()); RaceState::Entry* raceStateEntry = m_raceState->GetState(GameState()->GetActorId());
raceStateEntry->m_unk0x02 = sVar6; raceStateEntry->m_unk0x02 = sVar6;

7
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@ -529,6 +529,7 @@ MxLong Isle::HandlePathStruct(LegoPathStructNotificationParam& p_param)
} }
// FUNCTION: LEGO1 0x10031820 // FUNCTION: LEGO1 0x10031820
// FUNCTION: BETA10 0x10034158
void Isle::Enable(MxBool p_enable) void Isle::Enable(MxBool p_enable)
{ {
if (m_set0xd0.empty() == p_enable) { if (m_set0xd0.empty() == p_enable) {
@ -595,7 +596,7 @@ void Isle::Enable(MxBool p_enable)
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
break; break;
case LegoGameState::e_jetrace2: case LegoGameState::e_jetrace2:
if (((JetskiRaceState*) GameState()->GetState("JetskiRaceState"))->GetUnknown0x28() == 2) { if (((JetskiRaceState*) GameState()->GetState("JetskiRaceState"))->m_unk0x28 == 2) {
m_act1state->m_unk0x018 = 5; m_act1state->m_unk0x018 = 5;
} }
@ -738,7 +739,7 @@ void Isle::Enable(MxBool p_enable)
); );
JetskiRaceState* raceState = (JetskiRaceState*) GameState()->GetState("JetskiRaceState"); JetskiRaceState* raceState = (JetskiRaceState*) GameState()->GetState("JetskiRaceState");
if (raceState->GetUnknown0x28() == 2) { if (raceState->m_unk0x28 == 2) {
IsleScript::Script script = IsleScript::c_noneIsle; IsleScript::Script script = IsleScript::c_noneIsle;
switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) { switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) {
@ -771,7 +772,7 @@ void Isle::Enable(MxBool p_enable)
); );
CarRaceState* raceState = (CarRaceState*) GameState()->GetState("CarRaceState"); CarRaceState* raceState = (CarRaceState*) GameState()->GetState("CarRaceState");
if (raceState->GetUnknown0x28() == 2) { if (raceState->m_unk0x28 == 2) {
IsleScript::Script script = IsleScript::c_noneIsle; IsleScript::Script script = IsleScript::c_noneIsle;
switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) { switch (raceState->GetState(GameState()->GetActorId())->GetUnknown0x02()) {