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

Fix CI errors

Browse Source
This commit is contained in:
jonschz 2024-12-09 11:03:12 +01:00
parent a307193a35
commit 040764551f
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ class Act2Actor : public LegoAnimActor {
MxS32 VTable0xa0() override; // vtable+0xa0 MxS32 VTable0xa0() override; // vtable+0xa0
void FUN_10018980(); 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_10019520();
void FUN_10019560(); void FUN_10019560();
undefined4 FUN_10019700(MxFloat p_param); undefined4 FUN_10019700(MxFloat p_param);

18
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@ -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: LEGO1 0x10019280
// FUNCTION: BETA10 0x1000d4a6 // FUNCTION: BETA10 0x1000d4a6
void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed) void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed)
@ -317,15 +326,6 @@ void Act2Actor::SetWorldSpeed(MxFloat p_worldSpeed)
m_unk0x44 = 0; 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: LEGO1 0x100192a0
// FUNCTION: BETA10 0x1000d4d6 // FUNCTION: BETA10 0x1000d4d6
void Act2Actor::FUN_100192a0(undefined4 p_param) void Act2Actor::FUN_100192a0(undefined4 p_param)

12
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View File

@ -667,6 +667,12 @@ MxResult LegoAct2::FUN_100516b0()
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x100517b0
void LegoAct2::FUN_100517b0()
{
// TODO
}
// FUNCTION: LEGO1 0x10051840 // FUNCTION: LEGO1 0x10051840
void LegoAct2::PlayMusic(JukeboxScript::Script p_objectId) void LegoAct2::PlayMusic(JukeboxScript::Script p_objectId)
{ {
@ -716,12 +722,6 @@ void LegoAct2::FUN_10051960()
((LegoPathActor*) m_pepper->GetEntity())->SetState(0); ((LegoPathActor*) m_pepper->GetEntity())->SetState(0);
} }
// STUB: LEGO1 0x100517b0
void LegoAct2::FUN_100517b0()
{
// TODO
}
// FUNCTION: LEGO1 0x100519c0 // FUNCTION: LEGO1 0x100519c0
void LegoAct2::VTable0x60() void LegoAct2::VTable0x60()
{ {