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

Run clang-format

Browse Source
This commit is contained in:
Joshua Peisach 2024-03-29 13:51:38 -04:00
parent 9c15e01e8a
commit e9a18fd476
No known key found for this signature in database
GPG Key ID: 41C3D4189AFEDB5A
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp
View File

@ -36,4 +36,4 @@ MxLong GasStationEntity::VTable0x50(MxParam& p_param)
} }
return 1; return 1;
} }

18
LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp
View File

@ -17,20 +17,20 @@ DECOMP_SIZE_ASSERT(BeachHouseEntity, 0x68)
// FUNCTION: LEGO1 0x100153b0 // FUNCTION: LEGO1 0x100153b0
MxLong BeachHouseEntity::VTable0x50(MxParam& p_param) MxLong BeachHouseEntity::VTable0x50(MxParam& p_param)
{ {
if (FUN_1003ef60()) { if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State"); Act1State* state = (Act1State*) GameState()->GetState("Act1State");
state->SetUnknown18(0); state->SetUnknown18(0);
if (CurrentActor()->GetActorId() != GameState()->GetActorId()) { if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
CurrentActor()->VTable0xe4(); CurrentActor()->VTable0xe4();
} }
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle); Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
isle->SetDestLocation(LegoGameState::Area::e_jetskibuild); isle->SetDestLocation(LegoGameState::Area::e_jetskibuild);
AnimationManager()->FUN_10061010(NULL); AnimationManager()->FUN_10061010(NULL);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
return 1; return 1;
} }

18
LEGO1/lego/legoomni/src/race/racestandsentity.cpp
View File

@ -17,20 +17,20 @@ DECOMP_SIZE_ASSERT(RaceStandsEntity, 0x68)
// FUNCTION: LEGO1 0x10015450 // FUNCTION: LEGO1 0x10015450
MxLong RaceStandsEntity::VTable0x50(MxParam& p_param) MxLong RaceStandsEntity::VTable0x50(MxParam& p_param)
{ {
if (FUN_1003ef60()) { if (FUN_1003ef60()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State"); Act1State* state = (Act1State*) GameState()->GetState("Act1State");
state->SetUnknown18(0); state->SetUnknown18(0);
if (CurrentActor()->GetActorId() != GameState()->GetActorId()) { if (CurrentActor()->GetActorId() != GameState()->GetActorId()) {
CurrentActor()->VTable0xe4(); CurrentActor()->VTable0xe4();
} }
Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle); Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
isle->SetDestLocation(LegoGameState::Area::e_racecarbuild); isle->SetDestLocation(LegoGameState::Area::e_racecarbuild);
AnimationManager()->FUN_10061010(NULL); AnimationManager()->FUN_10061010(NULL);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
return 1; return 1;
} }