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

35
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View File

@@ -120,13 +120,13 @@ MxResult Act3Cop::HitActor(LegoPathActor* p_actor, MxBool p_bool)
LegoROI* roi = p_actor->GetROI();
if (p_bool && !strncmp(roi->GetName(), "dammo", 5)) {
MxS32 count = -1;
if (sscanf(roi->GetName(), "dammo%d", &count) != 1) {
MxS32 index = -1;
if (sscanf(roi->GetName(), "dammo%d", &index) != 1) {
assert(0);
}
assert(m_world);
((Act3*) m_world)->EatDonut(count);
((Act3*) m_world)->EatDonut(index);
m_unk0x20 = m_lastTime + 2000;
SetWorldSpeed(6.0);
@@ -161,11 +161,19 @@ void Act3Cop::Animate(float p_time)
// TODO
}
// FUNCTION: LEGO1 0x10040350
// FUNCTION: BETA10 0x10018c4a
MxResult Act3Cop::FUN_10040350(Act3Ammo& p_ammo, const Vector3&)
{
return FUN_10040360();
}
// STUB: LEGO1 0x10040360
// STUB: BETA10 0x10018c6a
void Act3Cop::FUN_10040360()
MxResult Act3Cop::FUN_10040360()
{
// TODO
return SUCCESS;
}
// FUNCTION: LEGO1 0x10040d20
@@ -248,15 +256,15 @@ MxResult Act3Brickster::HitActor(LegoPathActor* p_actor, MxBool p_bool)
if (a3->m_cop1->GetROI() != r && a3->m_cop2->GetROI() != r) {
if (!strncmp(r->GetName(), "pammo", 5)) {
MxS32 count = -1;
if (sscanf(r->GetName(), "pammo%d", &count) != 1) {
MxS32 index = -1;
if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0);
}
assert(m_world);
if (a3->m_pizzas[count].IsValid() && !a3->m_pizzas[count].IsBit5()) {
a3->EatPizza(count);
if (a3->m_pizzas[index].IsValid() && !a3->m_pizzas[index].IsBit5()) {
a3->EatPizza(index);
}
m_unk0x38 = 2;
@@ -270,6 +278,17 @@ MxResult Act3Brickster::HitActor(LegoPathActor* p_actor, MxBool p_bool)
return SUCCESS;
}
// FUNCTION: LEGO1 0x100417a0
// FUNCTION: BETA10 0x1001a3cf
MxResult Act3Brickster::FUN_100417a0(Act3Ammo& p_ammo, const Vector3&)
{
if (m_unk0x58 < 8) {
return FUN_100417c0();
}
return SUCCESS;
}
// STUB: LEGO1 0x100417c0
// STUB: BETA10 0x1001a407
MxResult Act3Brickster::FUN_100417c0()