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

Rename

Browse Source
This commit is contained in:
Christian Semmler 2024-12-13 14:41:59 -07:00
parent d41c94a853
commit 8cc1722f12
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ class Act3Ammo : public LegoPathActor {
MxU16 m_ammoFlag; // 0x154 MxU16 m_ammoFlag; // 0x154
MxFloat m_unk0x158; // 0x158 MxFloat m_unk0x158; // 0x158
Act3* m_a3; // 0x15c Act3* m_world; // 0x15c
Mx3DPointFloat m_eq[3]; // 0x160 Mx3DPointFloat m_eq[3]; // 0x160
MxFloat m_unk0x19c; // 0x19c MxFloat m_unk0x19c; // 0x19c
}; };

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

@ -24,7 +24,7 @@ Mx3DPointFloat Act3Ammo::g_unk0x10104f08 = Mx3DPointFloat(0.0, 5.0, 0.0);
Act3Ammo::Act3Ammo() Act3Ammo::Act3Ammo()
{ {
m_ammoFlag = 0; m_ammoFlag = 0;
m_a3 = NULL; m_world = NULL;
} }
// FUNCTION: LEGO1 0x100538a0 // FUNCTION: LEGO1 0x100538a0
@ -102,7 +102,7 @@ MxResult Act3Ammo::Create(Act3* p_a3, MxU32 p_isPizza, MxS32 p_index)
assert(m_roi); assert(m_roi);
} }
m_a3 = p_a3; m_world = p_a3;
SetValid(TRUE); SetValid(TRUE);
return SUCCESS; return SUCCESS;
} }
@ -335,12 +335,12 @@ void Act3Ammo::Animate(float p_time)
if (localb8) { if (localb8) {
if (IsBit4()) { if (IsBit4()) {
if (IsPizza()) { if (IsPizza()) {
m_a3->RemovePizza(*this); m_world->RemovePizza(*this);
m_a3->FUN_10072ad0(2); m_world->FUN_10072ad0(2);
} }
else { else {
m_a3->RemoveDonut(*this); m_world->RemoveDonut(*this);
m_a3->FUN_10072ad0(4); m_world->FUN_10072ad0(4);
} }
} }
else { else {
@ -377,17 +377,17 @@ void Act3Ammo::Animate(float p_time)
assert(0); assert(0);
} }
assert(m_a3); assert(m_world);
if (m_a3->m_pizzas[count].IsValid() && !m_a3->m_pizzas[count].IsBit5()) { if (m_world->m_pizzas[count].IsValid() && !m_world->m_pizzas[count].IsBit5()) {
m_a3->EatPizza(count); m_world->EatPizza(count);
m_a3->m_brickster->FUN_100417c0(); m_world->m_brickster->FUN_100417c0();
} }
if (IsDonut()) { if (IsDonut()) {
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE);
m_a3->RemoveDonut(*this); m_world->RemoveDonut(*this);
local14 = TRUE; local14 = TRUE;
break; break;
} }
@ -409,14 +409,14 @@ void Act3Ammo::Animate(float p_time)
assert(0); assert(0);
} }
assert(m_a3); assert(m_world);
m_a3->EatDonut(count); m_world->EatDonut(count);
if (IsPizza()) { if (IsPizza()) {
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE);
m_a3->RemovePizza(*this); m_world->RemovePizza(*this);
local14 = TRUE; local14 = TRUE;
break; break;
} }
@ -427,10 +427,10 @@ void Act3Ammo::Animate(float p_time)
if (!local14) { if (!local14) {
if (IsPizza()) { if (IsPizza()) {
m_a3->FUN_10073360(*this, local68); m_world->FUN_10073360(*this, local68);
} }
else { else {
m_a3->FUN_10073390(*this, local68); m_world->FUN_10073390(*this, local68);
} }
m_worldSpeed = -1.0f; m_worldSpeed = -1.0f;