diff --git a/LEGO1/lego/legoomni/include/act2actor.h b/LEGO1/lego/legoomni/include/act2actor.h index 2bddb332..71121204 100644 --- a/LEGO1/lego/legoomni/include/act2actor.h +++ b/LEGO1/lego/legoomni/include/act2actor.h @@ -28,7 +28,7 @@ class Act2Actor : public LegoAnimActor { MxS32 VTable0xa0() override; // vtable+0xa0 void FUN_10018980(); - void FUN_10019250(MxFloat p_speed, MxFloat p_unk); + void FUN_10019250(MxFloat p_speed, MxFloat p_param2); void FUN_10019520(); void FUN_10019560(); undefined4 FUN_10019700(MxFloat p_param); diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp index fdb35262..1d8255a0 100644 --- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp +++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp @@ -309,6 +309,15 @@ void Act2Actor::VTable0x70(float p_time) } } +// FUNCTION: LEGO1 0x10019250 +// FUNCTION: BETA10 0x1000d45c +void Act2Actor::FUN_10019250(MxFloat p_speed, MxFloat p_param2) +{ + // The arguments have been changed from BETA10 to LEGO1 + SetWorldSpeed(p_speed); + m_unk0x44 = p_param2; +} + // FUNCTION: LEGO1 0x10019280 // FUNCTION: BETA10 0x1000d4a6 void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed) @@ -317,15 +326,6 @@ void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed) m_unk0x44 = 0; } -// FUNCTION: LEGO1 0x10019250 -// FUNCTION: BETA10 0x1000d45c -void Act2Actor::FUN_10019250(MxFloat p_speed, MxFloat p_unk) -{ - // The arguments have been changed from BETA10 to LEGO1 - SetWorldSpeed(p_speed); - m_unk0x44 = p_unk; -} - // FUNCTION: LEGO1 0x100192a0 // FUNCTION: BETA10 0x1000d4d6 void Act2Actor::FUN_100192a0(undefined4 p_param) diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp index 938d4037..f25a77ab 100644 --- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp +++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp @@ -667,6 +667,12 @@ MxResult LegoAct2::FUN_100516b0() return SUCCESS; } +// STUB: LEGO1 0x100517b0 +void LegoAct2::FUN_100517b0() +{ + // TODO +} + // FUNCTION: LEGO1 0x10051840 void LegoAct2::PlayMusic(JukeboxScript::Script p_objectId) { @@ -716,12 +722,6 @@ void LegoAct2::FUN_10051960() ((LegoPathActor*) m_pepper->GetEntity())->SetState(0); } -// STUB: LEGO1 0x100517b0 -void LegoAct2::FUN_100517b0() -{ - // TODO -} - // FUNCTION: LEGO1 0x100519c0 void LegoAct2::VTable0x60() {