AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-06-23 13:53:28 +00:00
Code Issues Projects Releases Wiki Activity

Silly compile fixes

Browse Source
This commit is contained in:
Phillip Stephens 2019-06-20 14:27:50 -07:00
parent a67ea52617
commit eb43e9bdee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/World/CFlaahgra.cpp
View File

@ -887,8 +887,8 @@ void CFlaahgra::Attack(CStateManager& mgr, EStateMsg msg, float) {
x450_bodyController->GetCommandMgr().SetTargetVector(x78c_); x450_bodyController->GetCommandMgr().SetTargetVector(x78c_);
} }
} else if (msg == EStateMsg::Deactivate) { } else if (msg == EStateMsg::Deactivate) {
SetCollisionActorBounds(x79c_leftArmCollision, {}); SetCollisionActorBounds(mgr, x79c_leftArmCollision, {});
SetCollisionActorBounds(x7a0_rightArmCollision, {}); SetCollisionActorBounds(mgr, x7a0_rightArmCollision, {});
if (sub801ae670()) if (sub801ae670())
x7c0_ = (1.f + x788_) / (x308_attackTimeVariation * mgr.GetActiveRandom()->Float() + x304_averageAttackTime); x7c0_ = (1.f + x788_) / (x308_attackTimeVariation * mgr.GetActiveRandom()->Float() + x304_averageAttackTime);
@ -938,7 +938,7 @@ void CFlaahgraPlants::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, C
xe8_elementGen->SetParticleEmission(true); xe8_elementGen->SetParticleEmission(true);
if (x16c_colAct == kInvalidUniqueId) { if (x16c_colAct == kInvalidUniqueId) {
x16c_colAct = mgr.AllocateUniqueId(); x16c_colAct = mgr.AllocateUniqueId();
CCollisionActor* colAct = new CCollisionActor(x16c_, GetAreaIdAlways(), GetUniqueId(), CCollisionActor* colAct = new CCollisionActor(x16c_colAct, GetAreaIdAlways(), GetUniqueId(),
x130_obbox.extents + zeus::CVector3f(10.f, 0.f, 10.f), {}, true, x130_obbox.extents + zeus::CVector3f(10.f, 0.f, 10.f), {}, true,
0.001f, "Flaahgra Plants"sv); 0.001f, "Flaahgra Plants"sv);
@ -953,7 +953,7 @@ void CFlaahgraPlants::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, C
mgr.AddObject(colAct); mgr.AddObject(colAct);
mgr.SetActorAreaId(*colAct, GetAreaIdAlways()); mgr.SetActorAreaId(*colAct, GetAreaIdAlways());
} }
} else if (msg == EScriptObjectMessage::Deleted && (x16c_colAct != kInvalidUniqueId) { } else if (msg == EScriptObjectMessage::Deleted && x16c_colAct != kInvalidUniqueId) {
mgr.FreeScriptObject(x16c_colAct); mgr.FreeScriptObject(x16c_colAct);
} }
} }