mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-12-16 02:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Name state field, getter and setter in Act1State (#1621)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-07-13 21:01:06 +02:00
committed by GitHub
parent 40c1a40d2b
commit 356c64ce0e
17 changed files with 122 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/src/race/carrace.cpp
View File

@@ -95,7 +95,7 @@ MxResult CarRace::Create(MxDSAction& p_dsAction)
m_raceState = raceState;
m_act1State->m_unk0x018 = 6;
m_act1State->m_state = Act1State::e_transitionToRacecar;
m_unk0x144 = -1;
m_unk0x148 = -1;
m_unk0x14c = -1;
@@ -339,7 +339,7 @@ MxLong CarRace::HandleControl(LegoControlManagerNotificationParam& p_param)
switch (p_param.m_clickedObjectId) {
case 3:
InvokeAction(Extra::e_stop, *g_carraceScript, CarraceScript::c_irtx08ra_PlayWav, NULL);
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
@@ -351,7 +351,7 @@ MxLong CarRace::HandleControl(LegoControlManagerNotificationParam& p_param)
break;
case 98:
InvokeAction(Extra::e_stop, *g_carraceScript, CarraceScript::c_irtx08ra_PlayWav, NULL);
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
@@ -413,7 +413,7 @@ MxBool CarRace::Escape()
AnimationManager()->FUN_10061010(FALSE);
DeleteObjects(&m_atomId, 500, 999);
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
VariableTable()->SetVariable(g_raceState, "");

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

@@ -127,7 +127,7 @@ MxLong JetskiRace::HandleControl(LegoControlManagerNotificationParam& p_param)
if (p_param.m_unk0x28 == 1) {
switch (p_param.m_clickedObjectId) {
case JetraceScript::c_JetskiArms_Ctl:
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
LegoRaceCar::InitYouCantStopSound();
@@ -135,7 +135,7 @@ MxLong JetskiRace::HandleControl(LegoControlManagerNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break;
case JetraceScript::c_JetskiInfo_Ctl:
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
LegoRaceCar::InitYouCantStopSound();
@@ -288,7 +288,7 @@ MxBool JetskiRace::Escape()
{
AnimationManager()->FUN_10061010(FALSE);
DeleteObjects(&m_atomId, 500, 999);
m_act1State->m_unk0x018 = 0;
m_act1State->m_state = Act1State::e_none;
VariableTable()->SetVariable(g_raceState, "");
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
m_destLocation = LegoGameState::e_infomain;