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

Clear unknowns in Act3Ammo

Browse Source
This commit is contained in:
Fabian Neundorf 2025-07-31 11:37:02 +02:00
parent 812202f650
commit cfdbc5c9d8
3 changed files with 140 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ class Act3Ammo : public LegoPathActor {
c_pizza = 0x01, c_pizza = 0x01,
c_donut = 0x02, c_donut = 0x02,
c_valid = 0x04, c_valid = 0x04,
c_bit4 = 0x08, c_withoutBoundary = 0x08,
c_sharkFood = 0x10 c_sharkFood = 0x10
}; };
@ -28,10 +28,10 @@ class Act3Ammo : public LegoPathActor {
MxU32 IsValid() { return m_ammoFlag & c_valid; } MxU32 IsValid() { return m_ammoFlag & c_valid; }
// FUNCTION: BETA10 0x100177b0 // FUNCTION: BETA10 0x100177b0
Mx3DPointFloat* GetUnknown0x160() { return m_eq; } Mx3DPointFloat* GetCoefficients() { return m_coefficients; }
// FUNCTION: BETA10 0x100177e0 // FUNCTION: BETA10 0x100177e0
MxFloat* GetUnknown0x19c() { return &m_unk0x19c; } MxFloat* GetApexParameter() { return &m_apexParameter; }
// FUNCTION: BETA10 0x1001fbd0 // FUNCTION: BETA10 0x1001fbd0
void SetValid(MxBool p_valid) void SetValid(MxBool p_valid)
@ -51,18 +51,18 @@ class Act3Ammo : public LegoPathActor {
MxU32 IsDonut() { return m_ammoFlag & c_donut; } MxU32 IsDonut() { return m_ammoFlag & c_donut; }
// FUNCTION: BETA10 0x1001fcb0 // FUNCTION: BETA10 0x1001fcb0
void SetBit4(MxBool p_bit4) void SetShootWithoutBoundary(MxBool p_withoutBoundary)
{ {
if (p_bit4) { if (p_withoutBoundary) {
m_ammoFlag |= c_bit4; m_ammoFlag |= c_withoutBoundary;
} }
else { else {
m_ammoFlag &= ~c_bit4; m_ammoFlag &= ~c_withoutBoundary;
} }
} }
// FUNCTION: BETA10 0x10021d90 // FUNCTION: BETA10 0x10021d90
MxU32 IsBit4() { return m_ammoFlag & c_bit4; } MxU32 IsShootWithoutBoundary() { return m_ammoFlag & c_withoutBoundary; }
void SetSharkFood(MxBool p_sharkFood) void SetSharkFood(MxBool p_sharkFood)
{ {
@ -76,29 +76,29 @@ class Act3Ammo : public LegoPathActor {
MxU32 IsSharkFood() { return m_ammoFlag & c_sharkFood; } MxU32 IsSharkFood() { return m_ammoFlag & c_sharkFood; }
MxFloat GetUnknown0x158() { return m_unk0x158; } MxFloat GetRotateTimeout() { return m_rotateTimeout; }
void SetUnknown0x158(MxFloat p_unk0x158) { m_unk0x158 = p_unk0x158; } void SetRotateTimeout(MxFloat p_rotateTimeout) { m_rotateTimeout = p_rotateTimeout; }
MxResult Remove(); MxResult Remove();
MxResult Create(Act3* p_world, MxU32 p_isPizza, MxS32 p_index); MxResult Create(Act3* p_world, MxU32 p_isPizza, MxS32 p_index);
MxResult FUN_10053b40(const Vector3& p_srcLoc, const Vector3& p_srcDir, const Vector3& p_srcUp); MxResult CalculateArc(const Vector3& p_srcLoc, const Vector3& p_srcDir, const Vector3& p_srcUp);
MxResult FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_boundary, MxFloat p_unk0x19c); MxResult Shoot(LegoPathController* p_p, LegoPathBoundary* p_boundary, MxFloat p_apexParameter);
MxResult FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c); MxResult Shoot(LegoPathController* p_p, MxFloat p_apexParameter);
// SYNTHETIC: LEGO1 0x10053880 // SYNTHETIC: LEGO1 0x10053880
// Act3Ammo::`scalar deleting destructor' // Act3Ammo::`scalar deleting destructor'
private: private:
MxResult FUN_10053db0(float p_param1, Matrix4& p_param2); MxResult CalculateTransform(float p_curveParameter, Matrix4& p_transform);
static Mx3DPointFloat g_unk0x10104f08; static Mx3DPointFloat g_hitTranslation;
MxU16 m_ammoFlag; // 0x154 MxU16 m_ammoFlag; // 0x154
MxFloat m_unk0x158; // 0x158 MxFloat m_rotateTimeout; // 0x158
Act3* m_world; // 0x15c Act3* m_world; // 0x15c
Mx3DPointFloat m_eq[3]; // 0x160 Mx3DPointFloat m_coefficients[3]; // 0x160
MxFloat m_unk0x19c; // 0x19c MxFloat m_apexParameter; // 0x19c
}; };
#endif // ACT3AMMO_H #endif // ACT3AMMO_H

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

@ -17,7 +17,7 @@ DECOMP_SIZE_ASSERT(Act3Ammo, 0x1a0)
// Initialized at LEGO1 0x100537c0 // Initialized at LEGO1 0x100537c0
// GLOBAL: LEGO1 0x10104f08 // GLOBAL: LEGO1 0x10104f08
Mx3DPointFloat Act3Ammo::g_unk0x10104f08 = Mx3DPointFloat(0.0, 5.0, 0.0); Mx3DPointFloat Act3Ammo::g_hitTranslation = Mx3DPointFloat(0.0, 5.0, 0.0);
// FUNCTION: LEGO1 0x100537f0 // FUNCTION: LEGO1 0x100537f0
// FUNCTION: BETA10 0x1001d648 // FUNCTION: BETA10 0x1001d648
@ -111,43 +111,44 @@ MxResult Act3Ammo::Create(Act3* p_world, MxU32 p_isPizza, MxS32 p_index)
// FUNCTION: LEGO1 0x10053b40 // FUNCTION: LEGO1 0x10053b40
// FUNCTION: BETA10 0x1001db2a // FUNCTION: BETA10 0x1001db2a
MxResult Act3Ammo::FUN_10053b40(const Vector3& p_srcLoc, const Vector3& p_srcDir, const Vector3& p_srcUp) MxResult Act3Ammo::CalculateArc(const Vector3& p_srcLoc, const Vector3& p_srcDir, const Vector3& p_srcUp)
{ {
assert(p_srcDir[1] != 0); assert(p_srcDir[1] != 0);
MxFloat local1c = -(p_srcLoc[1] / p_srcDir[1]); MxFloat yRatioLocDir = -(p_srcLoc[1] / p_srcDir[1]);
Mx3DPointFloat local18(p_srcDir); Mx3DPointFloat groundPoint(p_srcDir);
Mx3DPointFloat local34; Mx3DPointFloat negNormalUp;
local18 *= local1c; groundPoint *= yRatioLocDir;
local18 += p_srcLoc; groundPoint += p_srcLoc;
local34[0] = local34[2] = 0.0f; negNormalUp[0] = negNormalUp[2] = 0.0f;
local34[1] = -1.0f; negNormalUp[1] = -1.0f;
m_eq[1] = p_srcUp; m_coefficients[1] = p_srcUp;
m_eq[2] = p_srcLoc; m_coefficients[2] = p_srcLoc;
Mx3DPointFloat local48(local34); Mx3DPointFloat upRelative(negNormalUp);
local48 -= m_eq[1]; upRelative -= m_coefficients[1];
for (MxS32 i = 0; i < 3; i++) { for (MxS32 i = 0; i < 3; i++) {
if (local18[0] == p_srcLoc[0]) { if (groundPoint[0] == p_srcLoc[0]) {
return FAILURE; return FAILURE;
} }
m_eq[0][i] = (local48[i] * local48[i] + local48[i] * m_eq[1][i] * 2.0f) / ((local18[i] - p_srcLoc[i]) * 4.0f); m_coefficients[0][i] = (upRelative[i] * upRelative[i] + upRelative[i] * m_coefficients[1][i] * 2.0f) /
((groundPoint[i] - p_srcLoc[i]) * 4.0f);
} }
assert(m_eq[0][0] > 0.000001 || m_eq[0][0] < -0.000001); assert(m_coefficients[0][0] > 0.000001 || m_coefficients[0][0] < -0.000001);
m_unk0x19c = local48[0] / (m_eq[0][0] * 2.0f); m_apexParameter = upRelative[0] / (m_coefficients[0][0] * 2.0f);
return SUCCESS; return SUCCESS;
} }
// FUNCTION: LEGO1 0x10053cb0 // FUNCTION: LEGO1 0x10053cb0
// FUNCTION: BETA10 0x1001ddf4 // FUNCTION: BETA10 0x1001ddf4
MxResult Act3Ammo::FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_boundary, MxFloat p_unk0x19c) MxResult Act3Ammo::Shoot(LegoPathController* p_p, LegoPathBoundary* p_boundary, MxFloat p_apexParameter)
{ {
assert(p_p); assert(p_p);
assert(IsValid()); assert(IsValid());
@ -164,7 +165,7 @@ MxResult Act3Ammo::FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_bou
m_pathController = p_p; m_pathController = p_p;
m_boundary = p_boundary; m_boundary = p_boundary;
m_BADuration = 10000.0f; m_BADuration = 10000.0f;
m_unk0x19c = p_unk0x19c; m_apexParameter = p_apexParameter;
m_unk0x7c = 0.0f; m_unk0x7c = 0.0f;
m_lastTime = -1.0f; m_lastTime = -1.0f;
m_actorState = c_one; m_actorState = c_one;
@ -173,12 +174,12 @@ MxResult Act3Ammo::FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_bou
// FUNCTION: LEGO1 0x10053d30 // FUNCTION: LEGO1 0x10053d30
// FUNCTION: BETA10 0x1001df73 // FUNCTION: BETA10 0x1001df73
MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c) MxResult Act3Ammo::Shoot(LegoPathController* p_p, MxFloat p_apexParameter)
{ {
assert(p_p); assert(p_p);
assert(IsValid()); assert(IsValid());
SetBit4(TRUE); SetShootWithoutBoundary(TRUE);
if (IsPizza()) { if (IsPizza()) {
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
@ -191,7 +192,7 @@ MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c)
m_pathController = p_p; m_pathController = p_p;
m_BADuration = 10000.0f; m_BADuration = 10000.0f;
m_unk0x19c = p_unk0x19c; m_apexParameter = p_apexParameter;
m_unk0x7c = 0.0f; m_unk0x7c = 0.0f;
m_lastTime = -1.0f; m_lastTime = -1.0f;
m_actorState = c_one; m_actorState = c_one;
@ -200,49 +201,49 @@ 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, Matrix4& p_param2) MxResult Act3Ammo::CalculateTransform(float p_curveParameter, Matrix4& p_transform)
{ {
float local34 = p_param1 * p_param1; float curveParameterSquare = p_curveParameter * p_curveParameter;
Vector3 local14(p_param2[0]); Vector3 right(p_transform[0]);
Vector3 local3c(p_param2[1]); Vector3 up(p_transform[1]);
Vector3 localc(p_param2[2]); Vector3 dir(p_transform[2]);
Vector3 local30(p_param2[3]); Vector3 pos(p_transform[3]);
Mx3DPointFloat local28; Mx3DPointFloat sndCoeff;
local28 = m_eq[1]; sndCoeff = m_coefficients[1];
local28 *= p_param1; sndCoeff *= p_curveParameter;
local30 = m_eq[0]; pos = m_coefficients[0];
local30 *= local34; pos *= curveParameterSquare;
local30 += local28; pos += sndCoeff;
local30 += m_eq[2]; pos += m_coefficients[2];
localc = m_eq[0]; dir = m_coefficients[0];
localc *= 2.0f; dir *= 2.0f;
localc *= p_param1; dir *= p_curveParameter;
localc += m_eq[1]; dir += m_coefficients[1];
localc *= -1.0f; dir *= -1.0f;
if (localc.Unitize() != 0) { if (dir.Unitize() != 0) {
assert(0); assert(0);
return FAILURE; return FAILURE;
} }
local14[1] = local14[2] = 0.0f; right[1] = right[2] = 0.0f;
local14[0] = 1.0f; right[0] = 1.0f;
local3c.EqualsCross(localc, local14); up.EqualsCross(dir, right);
if (local3c.Unitize() != 0) { if (up.Unitize() != 0) {
local14[0] = local14[1] = 0.0f; right[0] = right[1] = 0.0f;
local14[2] = 1.0f; right[2] = 1.0f;
local3c.EqualsCross(localc, local14); up.EqualsCross(dir, right);
if (local3c.Unitize() != 0) { if (up.Unitize() != 0) {
assert(0); assert(0);
return FAILURE; return FAILURE;
} }
} }
local14.EqualsCross(local3c, localc); right.EqualsCross(up, dir);
return SUCCESS; return SUCCESS;
} }
@ -257,7 +258,7 @@ void Act3Ammo::Animate(float p_time)
case c_one: case c_one:
break; break;
case c_two: case c_two:
m_unk0x158 = p_time + 2000.0f; m_rotateTimeout = p_time + 2000.0f;
m_actorState = c_three; m_actorState = c_three;
return; return;
case c_three: case c_three:
@ -266,7 +267,7 @@ void Act3Ammo::Animate(float p_time)
transform = m_roi->GetLocal2World(); transform = m_roi->GetLocal2World();
if (m_unk0x158 > p_time) { if (m_rotateTimeout > p_time) {
Mx3DPointFloat position; Mx3DPointFloat position;
position = positionRef; position = positionRef;
@ -279,9 +280,9 @@ void Act3Ammo::Animate(float p_time)
} }
else { else {
m_actorState = c_initial; m_actorState = c_initial;
m_unk0x158 = 0; m_rotateTimeout = 0;
positionRef -= g_unk0x10104f08; positionRef -= g_hitTranslation;
m_roi->SetLocal2World(transform); m_roi->SetLocal2World(transform);
m_roi->WrappedUpdateWorldData(); m_roi->WrappedUpdateWorldData();
return; return;
@ -297,15 +298,15 @@ void Act3Ammo::Animate(float p_time)
m_unk0x7c = 0.0f; m_unk0x7c = 0.0f;
} }
MxMatrix local104; MxMatrix transform;
MxMatrix local60; MxMatrix additionalTransform;
float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime; float f = (m_BADuration - m_unk0x7c) / m_worldSpeed + m_lastTime;
undefined4 localb4 = 0; undefined4 unused1 = 0;
undefined4 localbc = 0; undefined4 unused2 = 0;
MxU32 local14 = FALSE; MxU32 annihilated = FALSE;
MxU32 localb8 = FALSE; MxU32 reachedTarget = FALSE;
if (f >= p_time) { if (f >= p_time) {
m_actorTime = (p_time - m_lastTime) * m_worldSpeed + m_actorTime; m_actorTime = (p_time - m_lastTime) * m_worldSpeed + m_actorTime;
@ -313,69 +314,69 @@ void Act3Ammo::Animate(float p_time)
m_lastTime = p_time; m_lastTime = p_time;
} }
else { else {
localb8 = TRUE; reachedTarget = TRUE;
m_unk0x7c = m_BADuration; m_unk0x7c = m_BADuration;
m_lastTime = p_time; m_lastTime = p_time;
} }
local104.SetIdentity(); transform.SetIdentity();
MxResult r = FUN_10053db0((m_unk0x7c / m_BADuration) * m_unk0x19c, local104); MxResult r = CalculateTransform((m_unk0x7c / m_BADuration) * m_apexParameter, transform);
assert(r == 0); // SUCCESS assert(r == 0); // SUCCESS
local60.SetIdentity(); additionalTransform.SetIdentity();
if (IsPizza()) { if (IsPizza()) {
local60.Scale(2.0f, 2.0f, 2.0f); additionalTransform.Scale(2.0f, 2.0f, 2.0f);
} }
else { else {
local60.Scale(5.0f, 5.0f, 5.0f); additionalTransform.Scale(5.0f, 5.0f, 5.0f);
} }
if (localb8) { if (reachedTarget) {
if (m_boundary != NULL) { if (m_boundary != NULL) {
Vector3 local17c(local104[0]); Vector3 right(transform[0]);
Vector3 local184(local104[1]); Vector3 up(transform[1]);
Vector3 local174(local104[2]); Vector3 dir(transform[2]);
if (IsPizza()) { if (IsPizza()) {
local184 = *m_boundary->GetUp(); up = *m_boundary->GetUp();
local17c[0] = 1.0f; right[0] = 1.0f;
local17c[1] = local17c[2] = 0.0f; right[1] = right[2] = 0.0f;
local174.EqualsCross(local17c, local184); dir.EqualsCross(right, up);
local174.Unitize(); dir.Unitize();
local17c.EqualsCross(local184, local174); right.EqualsCross(up, dir);
} }
else { else {
local17c = *m_boundary->GetUp(); right = *m_boundary->GetUp();
local184[0] = 1.0f; up[0] = 1.0f;
local184[1] = local184[2] = 0.0f; up[1] = up[2] = 0.0f;
local174.EqualsCross(local17c, local184); dir.EqualsCross(right, up);
local174.Unitize(); dir.Unitize();
local184.EqualsCross(local174, local17c); up.EqualsCross(dir, right);
} }
} }
m_actorState = c_initial; m_actorState = c_initial;
} }
else { else {
local60.RotateX(m_actorTime / 10.0f); additionalTransform.RotateX(m_actorTime / 10.0f);
local60.RotateY(m_actorTime / 6.0f); additionalTransform.RotateY(m_actorTime / 6.0f);
} }
MxMatrix localb0(local104); MxMatrix transformCopy(transform);
local104.Product(local60, localb0); transform.Product(additionalTransform, transformCopy);
m_roi->SetLocal2World(local104); m_roi->SetLocal2World(transform);
m_roi->WrappedUpdateWorldData(); m_roi->WrappedUpdateWorldData();
if (m_BADuration <= m_unk0x7c) { if (m_BADuration <= m_unk0x7c) {
m_worldSpeed = 0.0f; m_worldSpeed = 0.0f;
} }
Vector3 local68(local104[3]); Vector3 position(transform[3]);
if (localb8) { if (reachedTarget) {
if (IsBit4()) { if (IsShootWithoutBoundary()) {
if (IsPizza()) { if (IsPizza()) {
m_world->RemovePizza(*this); m_world->RemovePizza(*this);
m_world->TriggerHitSound(2); m_world->TriggerHitSound(2);
@ -414,16 +415,16 @@ void Act3Ammo::Animate(float p_time)
assert(r); assert(r);
if (!strncmp(r->GetName(), "pammo", 5)) { if (!strncmp(r->GetName(), "pammo", 5)) {
Mx3DPointFloat local1c8; Mx3DPointFloat otherPosition;
Mx3DPointFloat local1b4; Mx3DPointFloat distance;
local1c8 = r->GetLocal2World()[3]; otherPosition = r->GetLocal2World()[3];
local1b4 = m_roi->GetLocal2World()[3]; distance = m_roi->GetLocal2World()[3];
local1b4 -= local1c8; distance -= otherPosition;
float radius = r->GetWorldBoundingSphere().Radius(); float radius = r->GetWorldBoundingSphere().Radius();
if (local1b4.LenSquared() <= radius * radius) { if (distance.LenSquared() <= radius * radius) {
MxS32 index = -1; MxS32 index = -1;
if (sscanf(r->GetName(), "pammo%d", &index) != 1) { if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0); assert(0);
@ -444,22 +445,22 @@ void Act3Ammo::Animate(float p_time)
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE);
m_world->RemoveDonut(*this); m_world->RemoveDonut(*this);
local14 = TRUE; annihilated = TRUE;
break; break;
} }
} }
} }
else if (!strncmp(r->GetName(), "dammo", 5)) { else if (!strncmp(r->GetName(), "dammo", 5)) {
Mx3DPointFloat local1f8; Mx3DPointFloat otherPosition;
Mx3DPointFloat local1e4; Mx3DPointFloat distance;
local1f8 = r->GetLocal2World()[3]; otherPosition = r->GetLocal2World()[3];
local1e4 = m_roi->GetLocal2World()[3]; distance = m_roi->GetLocal2World()[3];
local1e4 -= local1f8; distance -= otherPosition;
float radius = r->GetWorldBoundingSphere().Radius(); float radius = r->GetWorldBoundingSphere().Radius();
if (local1e4.LenSquared() <= radius * radius) { if (distance.LenSquared() <= radius * radius) {
MxS32 index = -1; MxS32 index = -1;
if (sscanf(r->GetName(), "dammo%d", &index) != 1) { if (sscanf(r->GetName(), "dammo%d", &index) != 1) {
assert(0); assert(0);
@ -473,19 +474,19 @@ void Act3Ammo::Animate(float p_time)
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE);
m_world->RemovePizza(*this); m_world->RemovePizza(*this);
local14 = TRUE; annihilated = TRUE;
break; break;
} }
} }
} }
} }
if (!local14) { if (!annihilated) {
if (IsPizza()) { if (IsPizza()) {
m_world->FUN_10073360(*this, local68); m_world->FUN_10073360(*this, position);
} }
else { else {
m_world->FUN_10073390(*this, local68); m_world->FUN_10073390(*this, position);
} }
m_worldSpeed = -1.0f; m_worldSpeed = -1.0f;

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

@ -330,15 +330,15 @@ MxResult Act3::ShootPizza(LegoPathController* p_controller, Vector3& p_location,
m_pizzas[nextPizza].Create(this, TRUE, nextPizza); m_pizzas[nextPizza].Create(this, TRUE, nextPizza);
if (m_pizzas[nextPizza].FUN_10053b40(p_location, p_direction, p_up) != SUCCESS) { if (m_pizzas[nextPizza].CalculateArc(p_location, p_direction, p_up) != SUCCESS) {
return FAILURE; return FAILURE;
} }
MxFloat unk0x19c = *m_pizzas[nextPizza].GetUnknown0x19c(); MxFloat unk0x19c = *m_pizzas[nextPizza].GetApexParameter();
if (p_controller->FUN_1004a380( if (p_controller->FUN_1004a380(
p_location, p_location,
p_direction, p_direction,
m_pizzas[nextPizza].GetUnknown0x160(), m_pizzas[nextPizza].GetCoefficients(),
boundary, boundary,
unk0x19c unk0x19c
) == SUCCESS) { ) == SUCCESS) {
@ -353,7 +353,7 @@ MxResult Act3::ShootPizza(LegoPathController* p_controller, Vector3& p_location,
direction -= m_brickster->GetROI()->GetLocal2World()[3]; direction -= m_brickster->GetROI()->GetLocal2World()[3];
local18 = FALSE; local18 = FALSE;
if (m_pizzas[nextPizza].FUN_10053cb0(p_controller, boundary, unk0x19c) == SUCCESS) { if (m_pizzas[nextPizza].Shoot(p_controller, boundary, unk0x19c) == SUCCESS) {
p_controller->PlaceActor(&m_pizzas[nextPizza]); p_controller->PlaceActor(&m_pizzas[nextPizza]);
boundary->AddActor(&m_pizzas[nextPizza]); boundary->AddActor(&m_pizzas[nextPizza]);
m_pizzas[nextPizza].SetWorldSpeed(10.0f); m_pizzas[nextPizza].SetWorldSpeed(10.0f);
@ -361,7 +361,7 @@ MxResult Act3::ShootPizza(LegoPathController* p_controller, Vector3& p_location,
} }
} }
if (local18 && m_pizzas[nextPizza].FUN_10053d30(p_controller, unk0x19c) == SUCCESS) { if (local18 && m_pizzas[nextPizza].Shoot(p_controller, unk0x19c) == SUCCESS) {
p_controller->PlaceActor(&m_pizzas[nextPizza]); p_controller->PlaceActor(&m_pizzas[nextPizza]);
m_pizzas[nextPizza].SetWorldSpeed(10.0f); m_pizzas[nextPizza].SetWorldSpeed(10.0f);
return SUCCESS; return SUCCESS;
@ -385,26 +385,26 @@ MxResult Act3::ShootDonut(LegoPathController* p_controller, Vector3& p_location,
m_donuts[nextDonut].Create(this, FALSE, nextDonut); m_donuts[nextDonut].Create(this, FALSE, nextDonut);
if (m_donuts[nextDonut].FUN_10053b40(p_location, p_direction, p_up) != SUCCESS) { if (m_donuts[nextDonut].CalculateArc(p_location, p_direction, p_up) != SUCCESS) {
return FAILURE; return FAILURE;
} }
MxFloat unk0x19c = *m_donuts[nextDonut].GetUnknown0x19c(); MxFloat unk0x19c = *m_donuts[nextDonut].GetApexParameter();
if (p_controller->FUN_1004a380( if (p_controller->FUN_1004a380(
p_location, p_location,
p_direction, p_direction,
m_donuts[nextDonut].GetUnknown0x160(), m_donuts[nextDonut].GetCoefficients(),
boundary, boundary,
unk0x19c unk0x19c
) == SUCCESS) { ) == SUCCESS) {
if (m_donuts[nextDonut].FUN_10053cb0(p_controller, boundary, unk0x19c) == SUCCESS) { if (m_donuts[nextDonut].Shoot(p_controller, boundary, unk0x19c) == SUCCESS) {
p_controller->PlaceActor(&m_donuts[nextDonut]); p_controller->PlaceActor(&m_donuts[nextDonut]);
boundary->AddActor(&m_donuts[nextDonut]); boundary->AddActor(&m_donuts[nextDonut]);
m_donuts[nextDonut].SetWorldSpeed(10.0f); m_donuts[nextDonut].SetWorldSpeed(10.0f);
return SUCCESS; return SUCCESS;
} }
} }
else if (m_donuts[nextDonut].FUN_10053d30(p_controller, unk0x19c) == SUCCESS) { else if (m_donuts[nextDonut].Shoot(p_controller, unk0x19c) == SUCCESS) {
p_controller->PlaceActor(&m_donuts[nextDonut]); p_controller->PlaceActor(&m_donuts[nextDonut]);
m_donuts[nextDonut].SetWorldSpeed(10.0f); m_donuts[nextDonut].SetWorldSpeed(10.0f);
return SUCCESS; return SUCCESS;
@ -936,7 +936,7 @@ void Act3::Enable(MxBool p_enable)
if (m_pizzas[i].IsValid()) { if (m_pizzas[i].IsValid()) {
m_pizzas[i].SetLastTime(m_pizzas[i].GetLastTime() + delta); m_pizzas[i].SetLastTime(m_pizzas[i].GetLastTime() + delta);
m_pizzas[i].SetActorTime(m_pizzas[i].GetActorTime() + delta); m_pizzas[i].SetActorTime(m_pizzas[i].GetActorTime() + delta);
m_pizzas[i].SetUnknown0x158(m_pizzas[i].GetUnknown0x158() + delta); m_pizzas[i].SetRotateTimeout(m_pizzas[i].GetRotateTimeout() + delta);
} }
} }
@ -944,7 +944,7 @@ void Act3::Enable(MxBool p_enable)
if (m_donuts[i].IsValid()) { if (m_donuts[i].IsValid()) {
m_donuts[i].SetLastTime(m_donuts[i].GetLastTime() + delta); m_donuts[i].SetLastTime(m_donuts[i].GetLastTime() + delta);
m_donuts[i].SetActorTime(m_donuts[i].GetActorTime() + delta); m_donuts[i].SetActorTime(m_donuts[i].GetActorTime() + delta);
m_donuts[i].SetUnknown0x158(m_donuts[i].GetUnknown0x158() + delta); m_donuts[i].SetRotateTimeout(m_donuts[i].GetRotateTimeout() + delta);
} }
} }