isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 02:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clear unknowns in CarRace (#1707)

Browse Source 
* Clear unknowns in `Carrace`

* Clear unknowns in `CarRace`

---------

Co-authored-by: Florian Kaiser <mail@floriankaiser.org>
This commit is contained in:
Fabian Neundorf 2026-01-05 20:28:46 +01:00 committed by GitHub
parent e7a15d7270
commit c0c56be530
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 78 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
LEGO1/lego/legoomni/include/carrace.h
View File

@ -66,22 +66,22 @@ class CarRace : public LegoRace {
// FUNCTION: BETA10 0x100f16f0 // FUNCTION: BETA10 0x100f16f0
void SetSkeleton(RaceSkel* p_skeleton) { m_skeleton = p_skeleton; } void SetSkeleton(RaceSkel* p_skeleton) { m_skeleton = p_skeleton; }
void FUN_10017820(MxS32 p_param1, MxS16 p_param2); void SetProgressPosition(MxS32 p_actorId, MxS16 p_progress);
// SYNTHETIC: LEGO1 0x10016c70 // SYNTHETIC: LEGO1 0x10016c70
// CarRace::`scalar deleting destructor' // CarRace::`scalar deleting destructor'
private: private:
static MxS32 g_unk0x100d5d10[]; static MxS32 g_introAnimations[];
static MxS32 g_unk0x100d5d30[]; static MxS32 g_studsWinsAnimations[];
static MxS32 g_unk0x100d5d40[]; static MxS32 g_studsLoosesAnimation[];
static MxS32 g_unk0x100d5d50[]; static MxS32 g_rhodaWinsAnimations[];
static MxS32 g_unk0x100d5d60[]; static MxS32 g_rhodaLoosesAnimation[];
MxS32 m_unk0x144; // 0x144 MxS32 m_introAnimation; // 0x144
MxS32 m_unk0x148; // 0x148 MxS32 m_firstFinishAnimation; // 0x148
MxS32 m_unk0x14c; // 0x14c MxS32 m_secondFinishAnimation; // 0x14c
RaceSkel* m_skeleton; // 0x150 RaceSkel* m_skeleton; // 0x150
}; };
#endif // CARRACE_H #endif // CARRACE_H

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

@ -87,7 +87,7 @@ class LegoGameState {
e_carrace, e_carrace,
e_carraceExterior, e_carraceExterior,
e_racecarbuildExited, e_racecarbuildExited,
e_unk21, e_carraceFinished,
e_pizzeriaExterior, e_pizzeriaExterior,
e_unk23, e_unk23,
e_unk24, e_unk24,

2
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@ -271,7 +271,7 @@ void IslePathActor::RegisterSpawnLocations()
JukeboxScript::c_CentralNorthRoad_Music JukeboxScript::c_CentralNorthRoad_Music
); );
g_spawnLocations[9] = SpawnLocation( g_spawnLocations[9] = SpawnLocation(
LegoGameState::e_unk21, LegoGameState::e_carraceFinished,
g_isleScript, g_isleScript,
0, 0,
"INT62", "INT62",

2
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -874,7 +874,7 @@ void LegoGameState::SwitchArea(Area p_area)
case e_jetskibuildExited: case e_jetskibuildExited:
case e_carraceExterior: case e_carraceExterior:
case e_racecarbuildExited: case e_racecarbuildExited:
case e_unk21: case e_carraceFinished:
case e_pizzeriaExterior: case e_pizzeriaExterior:
case e_garageExterior: case e_garageExterior:
case e_hospitalExterior: case e_hospitalExterior:

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

@ -25,7 +25,7 @@
DECOMP_SIZE_ASSERT(CarRace, 0x154) DECOMP_SIZE_ASSERT(CarRace, 0x154)
// GLOBAL: LEGO1 0x100d5d10 // GLOBAL: LEGO1 0x100d5d10
MxS32 CarRace::g_unk0x100d5d10[] = { MxS32 CarRace::g_introAnimations[] = {
CarraceScript::c_srt001sl_RunAnim, CarraceScript::c_srt001sl_RunAnim,
CarraceScript::c_srt002sl_RunAnim, CarraceScript::c_srt002sl_RunAnim,
CarraceScript::c_srt003sl_RunAnim, CarraceScript::c_srt003sl_RunAnim,
@ -37,7 +37,7 @@ MxS32 CarRace::g_unk0x100d5d10[] = {
}; };
// GLOBAL: LEGO1 0x100d5d30 // GLOBAL: LEGO1 0x100d5d30
MxS32 CarRace::g_unk0x100d5d30[] = { MxS32 CarRace::g_studsWinsAnimations[] = {
CarraceScript::c_srt011sl_RunAnim, CarraceScript::c_srt011sl_RunAnim,
CarraceScript::c_srt012sl_RunAnim, CarraceScript::c_srt012sl_RunAnim,
CarraceScript::c_srt013sl_RunAnim, CarraceScript::c_srt013sl_RunAnim,
@ -45,15 +45,15 @@ MxS32 CarRace::g_unk0x100d5d30[] = {
}; };
// GLOBAL: LEGO1 0x100d5d40 // GLOBAL: LEGO1 0x100d5d40
MxS32 CarRace::g_unk0x100d5d40[] = MxS32 CarRace::g_studsLoosesAnimation[] =
{CarraceScript::c_srt015sl_RunAnim, CarraceScript::c_srt016sl_RunAnim, CarraceScript::c_srt017sl_RunAnim}; {CarraceScript::c_srt015sl_RunAnim, CarraceScript::c_srt016sl_RunAnim, CarraceScript::c_srt017sl_RunAnim};
// GLOBAL: LEGO1 0x100d5d50 // GLOBAL: LEGO1 0x100d5d50
MxS32 CarRace::g_unk0x100d5d50[] = MxS32 CarRace::g_rhodaWinsAnimations[] =
{CarraceScript::c_srt007rh_RunAnim, CarraceScript::c_srt008rh_RunAnim, CarraceScript::c_srt009rh_RunAnim}; {CarraceScript::c_srt007rh_RunAnim, CarraceScript::c_srt008rh_RunAnim, CarraceScript::c_srt009rh_RunAnim};
// GLOBAL: LEGO1 0x100d5d60 // GLOBAL: LEGO1 0x100d5d60
MxS32 CarRace::g_unk0x100d5d60[] = MxS32 CarRace::g_rhodaLoosesAnimation[] =
{CarraceScript::c_srt010rh_RunAnim, CarraceScript::c_srt011rh_RunAnim, CarraceScript::c_srt012rh_RunAnim}; {CarraceScript::c_srt010rh_RunAnim, CarraceScript::c_srt011rh_RunAnim, CarraceScript::c_srt012rh_RunAnim};
// GLOBAL: LEGO1 0x100f0c70 // GLOBAL: LEGO1 0x100f0c70
@ -65,7 +65,7 @@ const LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6";
const LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0"; const LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0";
// GLOBAL: LEGO1 0x100f0c7c // GLOBAL: LEGO1 0x100f0c7c
MxS32 g_unk0x100f0c7c = 2; MxS32 g_lapsCount = 2;
// FUNCTION: LEGO1 0x10016a90 // FUNCTION: LEGO1 0x10016a90
// FUNCTION: BETA10 0x100c82e8 // FUNCTION: BETA10 0x100c82e8
@ -97,15 +97,15 @@ MxResult CarRace::Create(MxDSAction& p_dsAction)
m_raceState = raceState; m_raceState = raceState;
m_act1State->m_state = Act1State::e_transitionToRacecar; m_act1State->m_state = Act1State::e_transitionToRacecar;
m_unk0x144 = -1; m_introAnimation = -1;
m_unk0x148 = -1; m_firstFinishAnimation = -1;
m_unk0x14c = -1; m_secondFinishAnimation = -1;
LegoRaceCar::InitSoundIndices(); LegoRaceCar::InitSoundIndices();
MxS32 streamId = MxS32 raceCarDashboardStreamId =
DuneBuggy::GetColorOffset(g_strCRCEDGEY0) + (DuneBuggy::GetColorOffset(g_strCRCFRNTY6) * 5 + 15) * 2; DuneBuggy::GetColorOffset(g_strCRCEDGEY0) + (DuneBuggy::GetColorOffset(g_strCRCFRNTY6) * 5 + 15) * 2;
InvokeAction(Extra::e_start, m_atomId, streamId, NULL); InvokeAction(Extra::e_start, m_atomId, raceCarDashboardStreamId, NULL);
InvokeAction(Extra::e_start, m_atomId, CarraceScript::c_RaceCarDashboard, NULL); InvokeAction(Extra::e_start, m_atomId, CarraceScript::c_RaceCarDashboard, NULL);
return result; return result;
@ -127,10 +127,10 @@ void CarRace::ReadyWorld()
AnimationManager()->Resume(); AnimationManager()->Resume();
Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
m_unk0x144 = g_unk0x100d5d10[rand() & 7]; m_introAnimation = g_introAnimations[rand() & 7];
AnimationManager() AnimationManager()
->FUN_10060dc0(m_unk0x144, NULL, TRUE, LegoAnimationManager::e_unk0, NULL, FALSE, TRUE, FALSE, TRUE); ->FUN_10060dc0(m_introAnimation, NULL, TRUE, LegoAnimationManager::e_unk0, NULL, FALSE, TRUE, FALSE, TRUE);
m_opponent1Locator = (MxStillPresenter*) Find("MxPresenter", "CarLocator2"); m_opponent1Locator = (MxStillPresenter*) Find("MxPresenter", "CarLocator2");
m_opponent1Locator->SetPosition(m_progressBarRect.GetLeft(), m_progressBarRect.GetTop()); m_opponent1Locator->SetPosition(m_progressBarRect.GetLeft(), m_progressBarRect.GetTop());
@ -150,7 +150,7 @@ MxLong CarRace::HandleEndAction(MxEndActionNotificationParam& p_param)
MxDSAction* action = p_param.GetAction(); MxDSAction* action = p_param.GetAction();
MxU32 objectId = action->GetObjectId(); MxU32 objectId = action->GetObjectId();
if (m_unk0x144 == objectId) { if (m_introAnimation == objectId) {
InvokeAction(Extra::e_start, *g_carraceScript, CarraceScript::c_irtx08ra_PlayWav, NULL); InvokeAction(Extra::e_start, *g_carraceScript, CarraceScript::c_irtx08ra_PlayWav, NULL);
result = 1; result = 1;
} }
@ -162,11 +162,20 @@ MxLong CarRace::HandleEndAction(MxEndActionNotificationParam& p_param)
VariableTable()->SetVariable(g_raceState, g_racing); VariableTable()->SetVariable(g_raceState, g_racing);
result = 1; result = 1;
} }
else if (m_unk0x148 == objectId) { else if (m_firstFinishAnimation == objectId) {
AnimationManager() AnimationManager()->FUN_10060dc0(
->FUN_10060dc0(m_unk0x14c, NULL, TRUE, LegoAnimationManager::e_unk0, NULL, FALSE, TRUE, FALSE, TRUE); m_secondFinishAnimation,
NULL,
TRUE,
LegoAnimationManager::e_unk0,
NULL,
FALSE,
TRUE,
FALSE,
TRUE
);
} }
else if (m_unk0x14c == objectId) { else if (m_secondFinishAnimation == objectId) {
NotificationManager()->Send(this, MxNotificationParam()); NotificationManager()->Send(this, MxNotificationParam());
} }
} }
@ -185,7 +194,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
MxS32 paramData = p_param.GetData(); MxS32 paramData = p_param.GetData();
switch (sender->GetEntityId()) { switch (sender->GetEntityId()) {
case 10: case CarraceScript::c_UserCar_Actor:
if (paramData <= m_playerLastPathStruct || paramData >= m_playerLastPathStruct + 5) { if (paramData <= m_playerLastPathStruct || paramData >= m_playerLastPathStruct + 5) {
break; break;
} }
@ -195,7 +204,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
sprintf( sprintf(
buffer, buffer,
"%g", "%g",
0.036 + 0.928 * (m_playerLaps * 20.0 + m_playerLastPathStruct) / (g_unk0x100f0c7c * 20.0) 0.036 + 0.928 * (m_playerLaps * 20.0 + m_playerLastPathStruct) / (g_lapsCount * 20.0)
); );
VariableTable()->SetVariable("DISTANCE", buffer); VariableTable()->SetVariable("DISTANCE", buffer);
@ -203,7 +212,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
m_playerLastPathStruct = 0; m_playerLastPathStruct = 0;
m_playerLaps++; m_playerLaps++;
if (g_unk0x100f0c7c == m_playerLaps) { if (g_lapsCount == m_playerLaps) {
VariableTable()->SetVariable(g_raceState, ""); VariableTable()->SetVariable(g_raceState, "");
m_mapsLocators[0]->Mute(TRUE); m_mapsLocators[0]->Mute(TRUE);
@ -220,28 +229,28 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
RemoveActor(m_mapsLocators[2]); RemoveActor(m_mapsLocators[2]);
m_mapsLocators[2]->ClearMaps(); m_mapsLocators[2]->ClearMaps();
MxS32 position; MxS32 score;
if (m_opponent1Laps < m_playerLaps && m_opponent2Laps < m_playerLaps) { if (m_opponent1Laps < m_playerLaps && m_opponent2Laps < m_playerLaps) {
position = 3; score = 3;
m_unk0x148 = g_unk0x100d5d40[rand() % 3]; m_firstFinishAnimation = g_studsLoosesAnimation[rand() % 3];
m_unk0x14c = g_unk0x100d5d60[rand() % 3]; m_secondFinishAnimation = g_rhodaLoosesAnimation[rand() % 3];
} }
else if (m_opponent1Laps < m_playerLaps || m_opponent2Laps < m_playerLaps) { else if (m_opponent1Laps < m_playerLaps || m_opponent2Laps < m_playerLaps) {
position = 2; score = 2;
if (m_opponent1Laps == g_unk0x100f0c7c) { if (m_opponent1Laps == g_lapsCount) {
m_unk0x148 = g_unk0x100d5d30[rand() % 4]; m_firstFinishAnimation = g_studsWinsAnimations[rand() % 4];
m_unk0x14c = g_unk0x100d5d60[rand() % 3]; m_secondFinishAnimation = g_rhodaLoosesAnimation[rand() % 3];
} }
else { else {
m_unk0x148 = g_unk0x100d5d50[rand() % 3]; m_firstFinishAnimation = g_rhodaWinsAnimations[rand() % 3];
m_unk0x14c = g_unk0x100d5d40[rand() % 3]; m_secondFinishAnimation = g_studsLoosesAnimation[rand() % 3];
} }
} }
else { else {
position = 1; score = 1;
m_unk0x148 = g_unk0x100d5d30[rand() % 4]; m_firstFinishAnimation = g_studsWinsAnimations[rand() % 4];
m_unk0x14c = g_unk0x100d5d50[rand() % 3]; m_secondFinishAnimation = g_rhodaWinsAnimations[rand() % 3];
} }
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -253,14 +262,14 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
m_raceState->m_state = RaceState::e_finished; m_raceState->m_state = RaceState::e_finished;
RaceState::Entry* raceState = m_raceState->GetState(GameState()->GetActorId()); RaceState::Entry* raceState = m_raceState->GetState(GameState()->GetActorId());
raceState->m_lastScore = position; raceState->m_lastScore = score;
if (raceState->m_score < (MxS16) position) { if (raceState->m_score < (MxS16) score) {
raceState->m_score = position; raceState->m_score = score;
} }
AnimationManager()->FUN_10060dc0( AnimationManager()->FUN_10060dc0(
m_unk0x148, m_firstFinishAnimation,
NULL, NULL,
TRUE, TRUE,
LegoAnimationManager::e_unk0, LegoAnimationManager::e_unk0,
@ -276,19 +285,19 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
} }
break; break;
case 11: case CarraceScript::c_Studs_Actor:
if (paramData <= m_opponent1LastPathStruct || paramData >= m_opponent1LastPathStruct + 5) { if (paramData <= m_opponent1LastPathStruct || paramData >= m_opponent1LastPathStruct + 5) {
break; break;
} }
FUN_10017820(11, paramData); SetProgressPosition(CarraceScript::c_Studs_Actor, paramData);
m_opponent1LastPathStruct = paramData; m_opponent1LastPathStruct = paramData;
if (m_opponent1LastPathStruct == 0x14) { if (m_opponent1LastPathStruct == 0x14) {
m_opponent1LastPathStruct = 0; m_opponent1LastPathStruct = 0;
m_opponent1Laps++; m_opponent1Laps++;
if (g_unk0x100f0c7c == m_opponent1Laps) { if (g_lapsCount == m_opponent1Laps) {
m_mapsLocators[1]->SetMaxLinearVel(-1.0); m_mapsLocators[1]->SetMaxLinearVel(-1.0);
RemoveActor(m_mapsLocators[1]); RemoveActor(m_mapsLocators[1]);
m_mapsLocators[1]->ClearMaps(); m_mapsLocators[1]->ClearMaps();
@ -303,19 +312,19 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
} }
break; break;
case 12: case CarraceScript::c_Rhoda_Actor:
if (paramData <= m_opponent2LastPathStruct || paramData >= m_opponent2LastPathStruct + 5) { if (paramData <= m_opponent2LastPathStruct || paramData >= m_opponent2LastPathStruct + 5) {
break; break;
} }
FUN_10017820(12, paramData); SetProgressPosition(CarraceScript::c_Rhoda_Actor, paramData);
m_opponent2LastPathStruct = paramData; m_opponent2LastPathStruct = paramData;
if (m_opponent2LastPathStruct == 0x14) { if (m_opponent2LastPathStruct == 0x14) {
m_opponent2LastPathStruct = 0; m_opponent2LastPathStruct = 0;
m_opponent2Laps++; m_opponent2Laps++;
if (g_unk0x100f0c7c == m_opponent2Laps) { if (g_lapsCount == m_opponent2Laps) {
m_mapsLocators[2]->SetMaxLinearVel(-1.0); m_mapsLocators[2]->SetMaxLinearVel(-1.0);
RemoveActor(m_mapsLocators[2]); RemoveActor(m_mapsLocators[2]);
m_mapsLocators[2]->ClearMaps(); m_mapsLocators[2]->ClearMaps();
@ -377,7 +386,7 @@ MxLong CarRace::HandleControl(LegoControlManagerNotificationParam& p_param)
MxLong CarRace::HandleType0Notification(MxNotificationParam&) MxLong CarRace::HandleType0Notification(MxNotificationParam&)
{ {
if (m_raceState->m_state == RaceState::e_finished) { if (m_raceState->m_state == RaceState::e_finished) {
m_destLocation = LegoGameState::e_unk21; m_destLocation = LegoGameState::e_carraceFinished;
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
@ -385,28 +394,28 @@ MxLong CarRace::HandleType0Notification(MxNotificationParam&)
} }
// FUNCTION: LEGO1 0x10017820 // FUNCTION: LEGO1 0x10017820
void CarRace::FUN_10017820(MxS32 p_param1, MxS16 p_param2) void CarRace::SetProgressPosition(MxS32 p_actorId, MxS16 p_progress)
{ {
MxS32 local4; MxS32 laps;
MxStillPresenter* presenter; MxStillPresenter* presenter;
MxS32 x, y; MxS32 x, y;
if (p_param1 == 11) { if (p_actorId == CarraceScript::c_Studs_Actor) {
presenter = m_opponent1Locator; presenter = m_opponent1Locator;
local4 = m_opponent1Laps; laps = m_opponent1Laps;
} }
else if (p_param1 == 12) { else if (p_actorId == CarraceScript::c_Rhoda_Actor) {
presenter = m_opponent2Locator; presenter = m_opponent2Locator;
local4 = m_opponent2Laps; laps = m_opponent2Laps;
} }
if (presenter) { if (presenter) {
x = m_progressBarRect.GetLeft() + 0.5 + x = m_progressBarRect.GetLeft() + 0.5 +
(m_progressBarRect.GetRight() - m_progressBarRect.GetLeft() + 1) * (local4 * 20.0 + p_param2) / (m_progressBarRect.GetRight() - m_progressBarRect.GetLeft() + 1) * (laps * 20.0 + p_progress) /
(g_unk0x100f0c7c * 20.0); (g_lapsCount * 20.0);
y = m_progressBarRect.GetTop() + 0.5 + y = m_progressBarRect.GetTop() + 0.5 +
(m_progressBarRect.GetBottom() - m_progressBarRect.GetTop() + 1) * (local4 * 20.0 + p_param2) / (m_progressBarRect.GetBottom() - m_progressBarRect.GetTop() + 1) * (laps * 20.0 + p_progress) /
(g_unk0x100f0c7c * 20.0); (g_lapsCount * 20.0);
presenter->SetPosition(x, y); presenter->SetPosition(x, y);
} }

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

@ -765,7 +765,7 @@ void Isle::Enable(MxBool p_enable)
GameState()->m_currentArea = LegoGameState::e_carraceExterior; GameState()->m_currentArea = LegoGameState::e_carraceExterior;
((IslePathActor*) UserActor()) ((IslePathActor*) UserActor())
->SpawnPlayer( ->SpawnPlayer(
LegoGameState::e_unk21, LegoGameState::e_carraceFinished,
FALSE, FALSE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
); );