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

Improve match for Act3Ammo::Animate (#1612)

Browse Source 
* Improve Act3Ammo

* Early return
This commit is contained in:
MS
2025-07-09 14:09:49 -04:00
committed by GitHub
parent 5d3b6884e0
commit 4ebc5b453f
3 changed files with 86 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ public:
// Act3Ammo::`scalar deleting destructor' // Act3Ammo::`scalar deleting destructor'
private: private:
MxResult FUN_10053db0(float p_param1, const Matrix4& p_param2); MxResult FUN_10053db0(float p_param1, Matrix4& p_param2);
static Mx3DPointFloat g_unk0x10104f08; static Mx3DPointFloat g_unk0x10104f08;

8
LEGO1/lego/legoomni/include/legopathboundary.h
View File

@@ -75,7 +75,7 @@ private:
// _Tree<LegoPathActor *,LegoPathActor *,set<LegoPathActor *,LegoPathActorSetCompare,allocator<LegoPathActor *> >::_Kfn,LegoPathActorSetCompare,allocator<LegoPathActor *> >::erase // _Tree<LegoPathActor *,LegoPathActor *,set<LegoPathActor *,LegoPathActorSetCompare,allocator<LegoPathActor *> >::_Kfn,LegoPathActorSetCompare,allocator<LegoPathActor *> >::erase
// TEMPLATE: LEGO1 0x1002c440 // TEMPLATE: LEGO1 0x1002c440
// TEMPLATE: BETA10 0x100b6480 // TEMPLATE: BETA10 0x10020480
// _Tree<LegoPathActor *,LegoPathActor *,set<LegoPathActor *,LegoPathActorSetCompare,allocator<LegoPathActor *> >::_Kfn,LegoPathActorSetCompare,allocator<LegoPathActor *> >::find // _Tree<LegoPathActor *,LegoPathActor *,set<LegoPathActor *,LegoPathActorSetCompare,allocator<LegoPathActor *> >::_Kfn,LegoPathActorSetCompare,allocator<LegoPathActor *> >::find
// TEMPLATE: LEGO1 0x1002c4c0 // TEMPLATE: LEGO1 0x1002c4c0
@@ -190,6 +190,12 @@ private:
// TEMPLATE: BETA10 0x10082b40 // TEMPLATE: BETA10 0x10082b40
// _Tree<LegoAnimPresenter *,LegoAnimPresenter *,set<LegoAnimPresenter *,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::_Kfn,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::const_iterator::operator* // _Tree<LegoAnimPresenter *,LegoAnimPresenter *,set<LegoAnimPresenter *,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::_Kfn,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::const_iterator::operator*
// TEMPLATE: BETA10 0x100b6440
// set<LegoAnimPresenter *,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::find
// TEMPLATE: BETA10 0x100b6480
// _Tree<LegoAnimPresenter *,LegoAnimPresenter *,set<LegoAnimPresenter *,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::_Kfn,LegoAnimPresenterSetCompare,allocator<LegoAnimPresenter *> >::find
// TEMPLATE: BETA10 0x10021dc0 // TEMPLATE: BETA10 0x10021dc0
// ??0?$Set@PAVLegoPathActor@@ULegoPathActorSetCompare@@@@QAE@ABV0@@Z // ??0?$Set@PAVLegoPathActor@@ULegoPathActorSetCompare@@@@QAE@ABV0@@Z

144
LEGO1/lego/legoomni/src/actors/act3ammo.cpp
View File

@@ -200,7 +200,7 @@ MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c)
// FUNCTION: LEGO1 0x10053db0 // FUNCTION: LEGO1 0x10053db0
// FUNCTION: BETA10 0x1001e0f0 // FUNCTION: BETA10 0x1001e0f0
MxResult Act3Ammo::FUN_10053db0(float p_param1, const Matrix4& p_param2) MxResult Act3Ammo::FUN_10053db0(float p_param1, Matrix4& p_param2)
{ {
float local34 = p_param1 * p_param1; float local34 = p_param1 * p_param1;
@@ -384,6 +384,8 @@ void Act3Ammo::Animate(float p_time)
m_world->RemoveDonut(*this); m_world->RemoveDonut(*this);
m_world->TriggerHitSound(4); m_world->TriggerHitSound(4);
} }
return;
} }
else { else {
if (IsPizza()) { if (IsPizza()) {
@@ -394,89 +396,99 @@ void Act3Ammo::Animate(float p_time)
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("stickdn", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("stickdn", NULL, FALSE);
} }
}
LegoPathActorSet& plpas = m_boundary->GetActors(); LegoPathActorSet& plpas = m_boundary->GetActors();
LegoPathActorSet lpas(plpas); LegoPathActorSet lpas(plpas);
for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) { for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
if (plpas.find(*itpa) != plpas.end() && this != *itpa) { if (plpas.find(*itpa) == plpas.end()) {
LegoROI* r = (*itpa)->GetROI(); continue;
assert(r); }
if (!strncmp(r->GetName(), "pammo", 5)) { if (this == *itpa) {
Mx3DPointFloat local1c8; continue;
Mx3DPointFloat local1b4; }
local1c8 = r->GetLocal2World()[3]; LegoROI* r = (*itpa)->GetROI();
local1b4 = m_roi->GetLocal2World()[3]; assert(r);
local1b4 -= local1c8; if (!strncmp(r->GetName(), "pammo", 5)) {
Mx3DPointFloat local1c8;
Mx3DPointFloat local1b4;
float radius = r->GetWorldBoundingSphere().Radius(); local1c8 = r->GetLocal2World()[3];
if (local1b4.LenSquared() <= radius * radius) { local1b4 = m_roi->GetLocal2World()[3];
MxS32 index = -1;
if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0);
}
assert(m_world); local1b4 -= local1c8;
if (m_world->m_pizzas[index].IsValid() && !m_world->m_pizzas[index].IsSharkFood()) { float radius = r->GetWorldBoundingSphere().Radius();
m_world->EatPizza(index); if (local1b4.LenSquared() <= radius * radius) {
m_world->m_brickster->FUN_100417c0(); MxS32 index = -1;
} if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0);
if (IsDonut()) {
assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE);
m_world->RemoveDonut(*this);
local14 = TRUE;
break;
}
}
} }
else if (!strncmp(r->GetName(), "dammo", 5)) {
Mx3DPointFloat local1f8;
Mx3DPointFloat local1e4;
local1f8 = r->GetLocal2World()[3]; assert(m_world);
local1e4 = m_roi->GetLocal2World()[3];
local1e4 -= local1f8; #ifdef BETA10
m_world->EatPizza(index);
#else
if (m_world->m_pizzas[index].IsValid() && !m_world->m_pizzas[index].IsSharkFood()) {
m_world->EatPizza(index);
m_world->m_brickster->FUN_100417c0();
}
#endif
float radius = r->GetWorldBoundingSphere().Radius(); if (IsDonut()) {
if (local1e4.LenSquared() <= radius * radius) { assert(SoundManager()->GetCacheSoundManager());
MxS32 index = -1; SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE);
if (sscanf(r->GetName(), "dammo%d", &index) != 1) { m_world->RemoveDonut(*this);
assert(0); local14 = TRUE;
} break;
assert(m_world);
m_world->EatDonut(index);
if (IsPizza()) {
assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE);
m_world->RemovePizza(*this);
local14 = TRUE;
break;
}
}
} }
} }
} }
else if (!strncmp(r->GetName(), "dammo", 5)) {
Mx3DPointFloat local1f8;
Mx3DPointFloat local1e4;
if (!local14) { local1f8 = r->GetLocal2World()[3];
if (IsPizza()) { local1e4 = m_roi->GetLocal2World()[3];
m_world->FUN_10073360(*this, local68);
}
else {
m_world->FUN_10073390(*this, local68);
}
m_worldSpeed = -1.0f; local1e4 -= local1f8;
float radius = r->GetWorldBoundingSphere().Radius();
if (local1e4.LenSquared() <= radius * radius) {
MxS32 index = -1;
if (sscanf(r->GetName(), "dammo%d", &index) != 1) {
assert(0);
}
assert(m_world);
m_world->EatDonut(index);
if (IsPizza()) {
assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE);
m_world->RemovePizza(*this);
local14 = TRUE;
break;
}
}
} }
} }
if (!local14) {
if (IsPizza()) {
m_world->FUN_10073360(*this, local68);
}
else {
m_world->FUN_10073390(*this, local68);
}
m_worldSpeed = -1.0f;
}
} }
} }