Implement/match Act3Brickster::HitActor (#1212)

* Implement/match `Act3Brickster::HitActor`

* Fixes

* Fixes

* Fixes

* Add `Act3Cop::VTable0x9c`

* Fix
This commit is contained in:
Christian Semmler
2024-12-12 09:10:44 -07:00
committed by GitHub
parent fe57a94416
commit aceba71fbb
25 changed files with 166 additions and 78 deletions

View File

@@ -180,6 +180,14 @@ Act3::~Act3()
TickleManager()->UnregisterClient(this);
}
// FUNCTION: LEGO1 0x10072780
// FUNCTION: BETA10 0x100156ac
void Act3::EatPizza(MxS32 p_index)
{
assert(p_index < MAX_PIZZAS);
RemovePizza(m_pizzas[p_index]);
}
// FUNCTION: LEGO1 0x100727a0
// FUNCTION: BETA10 0x1001570d
void Act3::EatDonut(MxS32 p_index)
@@ -188,6 +196,25 @@ void Act3::EatDonut(MxS32 p_index)
RemoveDonut(m_donuts[p_index]);
}
// FUNCTION: LEGO1 0x100727c0
// FUNCTION: BETA10 0x1001576e
void Act3::RemovePizza(Act3Ammo& p_p)
{
#ifdef _DEBUG
MxS32 i;
for (i = 0; i < MAX_PIZZAS; i++) {
if (&m_pizzas[i] == &p_p) {
break;
}
}
assert(i != MAX_PIZZAS);
#endif
assert(p_p.IsValid());
p_p.Remove();
}
// FUNCTION: LEGO1 0x100727d0
// FUNCTION: BETA10 0x10015828
void Act3::RemoveDonut(Act3Ammo& p_p)
@@ -534,8 +561,8 @@ MxResult Act3::Tickle()
return SUCCESS;
}
// STUB: LEGO1 0x100733f0
// STUB: BETA10 0x10016ba2
// FUNCTION: LEGO1 0x100733f0
// FUNCTION: BETA10 0x10016ba2
void Act3::SetBrickster(Act3Brickster* p_brickster)
{
m_brickster = p_brickster;