mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match Act3Ammo::Animate (#1221)

Browse Source 
* Implement/match `Act3Ammo::Animate`

* Match

* Rename

* Rename

* Rename
This commit is contained in:
Christian Semmler
2024-12-13 14:56:26 -07:00
committed by GitHub
parent 6da2faa48c
commit 1aeb458be1
8 changed files with 335 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@@ -30,6 +30,9 @@ DECOMP_SIZE_ASSERT(Act3State, 0x0c)
DECOMP_SIZE_ASSERT(Act3ListElement, 0x0c)
DECOMP_SIZE_ASSERT(Act3List, 0x10)
// GLOBAL: LEGO1 0x100f7814
MxU8 g_unk0x100f7814 = 0;
// GLOBAL: LEGO1 0x100d95e8
Act3Script::Script g_unk0x100d95e8[] =
{Act3Script::c_tlp053in_RunAnim, Act3Script::c_tlp064la_RunAnim, Act3Script::c_tlp068in_RunAnim};
@@ -333,6 +336,13 @@ MxResult Act3::ShootDonut(LegoPathController* p_controller, Vector3& p_location,
return FAILURE;
}
// STUB: LEGO1 0x10072ad0
// STUB: BETA10 0x10015eec
void Act3::FUN_10072ad0(undefined4 p_param1)
{
// TODO
}
// FUNCTION: LEGO1 0x10072c30
// FUNCTION: BETA10 0x100160fb
MxResult Act3::Create(MxDSAction& p_dsAction)
@@ -563,6 +573,34 @@ MxResult Act3::Tickle()
return SUCCESS;
}
// FUNCTION: LEGO1 0x10073360
// FUNCTION: BETA10 0x100169d5
MxResult Act3::FUN_10073360(Act3Ammo& p_ammo, const Vector3& p_param2)
{
assert(m_brickster);
m_brickster->FUN_100417a0(p_ammo, p_param2);
FUN_10072ad0(1);
return SUCCESS;
}
// FUNCTION: LEGO1 0x10073390
// FUNCTION: BETA10 0x10016a40
MxResult Act3::FUN_10073390(Act3Ammo& p_ammo, const Vector3& p_param2)
{
assert(m_cop1 && m_cop2);
if (!(g_unk0x100f7814 & 1)) {
m_cop1->FUN_10040350(p_ammo, p_param2);
}
else {
m_cop2->FUN_10040350(p_ammo, p_param2);
}
FUN_10072ad0(3);
g_unk0x100f7814++;
return SUCCESS;
}
// FUNCTION: LEGO1 0x100733f0
// FUNCTION: BETA10 0x10016ba2
void Act3::SetBrickster(Act3Brickster* p_brickster)