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

requested changes

Browse Source
This commit is contained in:
Korbo 2025-06-30 14:14:45 -05:00
parent 4c5ed89c54
commit 2d7ca72f77
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ class Act3 : public LegoWorld {
void RemoveDonut(Act3Ammo& p_p); void RemoveDonut(Act3Ammo& p_p);
MxResult ShootPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); MxResult ShootPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up);
MxResult ShootDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); MxResult ShootDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up);
void HandleHitSound(undefined4 p_param1); void TriggerHitSound(undefined4 p_param1);
MxResult FUN_10073360(Act3Ammo& p_ammo, const Vector3& p_param2); MxResult FUN_10073360(Act3Ammo& p_ammo, const Vector3& p_param2);
MxResult FUN_10073390(Act3Ammo& p_ammo, const Vector3& p_param2); MxResult FUN_10073390(Act3Ammo& p_ammo, const Vector3& p_param2);
void SetBrickster(Act3Brickster* p_brickster); void SetBrickster(Act3Brickster* p_brickster);

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

@ -579,7 +579,7 @@ void Act3Brickster::Animate(float p_time)
} }
if (m_unk0x54 < p_time) { if (m_unk0x54 < p_time) {
((Act3*) m_world)->HandleHitSound(5); ((Act3*) m_world)->TriggerHitSound(5);
m_unk0x54 = p_time + 15000.0f; m_unk0x54 = p_time + 15000.0f;
} }
@ -595,7 +595,7 @@ void Act3Brickster::Animate(float p_time)
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
if (m_unk0x58 >= 8) { if (m_unk0x58 >= 8) {
((Act3*) m_world)->HandleHitSound(6); ((Act3*) m_world)->TriggerHitSound(6);
} }
else { else {
SoundManager()->GetCacheSoundManager()->Play("eatpz", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("eatpz", NULL, FALSE);

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

@ -378,11 +378,11 @@ void Act3Ammo::Animate(float p_time)
if (IsBit4()) { if (IsBit4()) {
if (IsPizza()) { if (IsPizza()) {
m_world->RemovePizza(*this); m_world->RemovePizza(*this);
m_world->HandleHitSound(2); m_world->TriggerHitSound(2);
} }
else { else {
m_world->RemoveDonut(*this); m_world->RemoveDonut(*this);
m_world->HandleHitSound(4); m_world->TriggerHitSound(4);
} }
} }
else { else {

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

@ -403,7 +403,7 @@ MxResult Act3::ShootDonut(LegoPathController* p_controller, Vector3& p_location,
// FUNCTION: LEGO1 0x10072ad0 // FUNCTION: LEGO1 0x10072ad0
// FUNCTION: BETA10 0x10015eec // FUNCTION: BETA10 0x10015eec
void Act3::HandleHitSound(undefined4 p_param1) void Act3::TriggerHitSound(undefined4 p_param1)
{ {
float time = Timer()->GetTime(); float time = Timer()->GetTime();
Act3Script::Script objectId; Act3Script::Script objectId;
@ -700,7 +700,7 @@ MxResult Act3::FUN_10073360(Act3Ammo& p_ammo, const Vector3& p_param2)
{ {
assert(m_brickster); assert(m_brickster);
m_brickster->FUN_100417a0(p_ammo, p_param2); m_brickster->FUN_100417a0(p_ammo, p_param2);
HandleHitSound(1); TriggerHitSound(1);
return SUCCESS; return SUCCESS;
} }
@ -717,7 +717,7 @@ MxResult Act3::FUN_10073390(Act3Ammo& p_ammo, const Vector3& p_param2)
m_cop2->FUN_10040350(p_ammo, p_param2); m_cop2->FUN_10040350(p_ammo, p_param2);
} }
HandleHitSound(3); TriggerHitSound(3);
g_unk0x100f7814++; g_unk0x100f7814++;
return SUCCESS; return SUCCESS;
} }