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

Early return

Browse Source
This commit is contained in:
disinvite 2025-07-09 11:14:03 -04:00
parent 7d334f83cd
commit 066771e366
1 changed files with 77 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,6 +396,7 @@ 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);
@ -428,10 +431,14 @@ void Act3Ammo::Animate(float p_time)
assert(m_world); assert(m_world);
#ifdef BETA10
m_world->EatPizza(index);
#else
if (m_world->m_pizzas[index].IsValid() && !m_world->m_pizzas[index].IsSharkFood()) { if (m_world->m_pizzas[index].IsValid() && !m_world->m_pizzas[index].IsSharkFood()) {
m_world->EatPizza(index); m_world->EatPizza(index);
m_world->m_brickster->FUN_100417c0(); m_world->m_brickster->FUN_100417c0();
} }
#endif
if (IsDonut()) { if (IsDonut()) {
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
@ -484,5 +491,4 @@ void Act3Ammo::Animate(float p_time)
m_worldSpeed = -1.0f; m_worldSpeed = -1.0f;
} }
} }
}
} }