mirror of https://github.com/AxioDL/metaforce.git
CScriptEMPulse: Brace conditionals where applicable
This commit is contained in:
parent
51ffc0ef26
commit
e4abedf16f
|
@ -32,27 +32,32 @@ CScriptEMPulse::CScriptEMPulse(TUniqueId uid, std::string_view name, const CEnti
|
|||
void CScriptEMPulse::Accept(IVisitor& visitor) { visitor.Visit(this); }
|
||||
|
||||
void CScriptEMPulse::Think(float dt, CStateManager& mgr) {
|
||||
if (!GetActive())
|
||||
if (!GetActive()) {
|
||||
return;
|
||||
}
|
||||
|
||||
xf0_currentRadius += ((xec_finalRadius - xf4_initialRadius) / xe8_duration) * dt;
|
||||
if (xf0_currentRadius < xec_finalRadius)
|
||||
if (xf0_currentRadius < xec_finalRadius) {
|
||||
mgr.FreeScriptObject(GetUniqueId());
|
||||
}
|
||||
|
||||
x114_particleGen->Update(dt);
|
||||
}
|
||||
|
||||
void CScriptEMPulse::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
|
||||
CActor::AcceptScriptMsg(msg, uid, mgr);
|
||||
if (msg == EScriptObjectMessage::Activate) {
|
||||
x114_particleGen = std::make_unique<CElementGen>(x108_particleDesc, CElementGen::EModelOrientationType::Normal,
|
||||
CElementGen::EOptionalSystemFlags::One);
|
||||
|
||||
x114_particleGen->SetOrientation(GetTransform().getRotation());
|
||||
x114_particleGen->SetGlobalTranslation(GetTranslation());
|
||||
x114_particleGen->SetParticleEmission(true);
|
||||
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), x100_interferenceMag, xf8_interferenceDur);
|
||||
if (msg != EScriptObjectMessage::Activate) {
|
||||
return;
|
||||
}
|
||||
|
||||
x114_particleGen = std::make_unique<CElementGen>(x108_particleDesc, CElementGen::EModelOrientationType::Normal,
|
||||
CElementGen::EOptionalSystemFlags::One);
|
||||
|
||||
x114_particleGen->SetOrientation(GetTransform().getRotation());
|
||||
x114_particleGen->SetGlobalTranslation(GetTranslation());
|
||||
x114_particleGen->SetParticleEmission(true);
|
||||
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), x100_interferenceMag, xf8_interferenceDur);
|
||||
}
|
||||
|
||||
void CScriptEMPulse::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) {
|
||||
|
@ -67,21 +72,23 @@ void CScriptEMPulse::CalculateRenderBounds() { x9c_renderBounds = CalculateBound
|
|||
std::optional<zeus::CAABox> CScriptEMPulse::GetTouchBounds() const { return {CalculateBoundingBox()}; }
|
||||
|
||||
void CScriptEMPulse::Touch(CActor& act, CStateManager& mgr) {
|
||||
if (!GetActive())
|
||||
if (!GetActive()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (TCastToPtr<CPlayer> pl = act) {
|
||||
zeus::CVector3f posDiff = GetTranslation() - pl->GetTranslation();
|
||||
if (const TCastToPtr<CPlayer> pl = act) {
|
||||
const zeus::CVector3f posDiff = GetTranslation() - pl->GetTranslation();
|
||||
if (posDiff.magnitude() < xec_finalRadius) {
|
||||
float dur =
|
||||
const float dur =
|
||||
((1.f - (posDiff.magnitude() / xec_finalRadius)) * (xfc_ - xf8_interferenceDur)) + xf8_interferenceDur;
|
||||
float mag =
|
||||
const float mag =
|
||||
((1.f - (posDiff.magnitude() / xec_finalRadius)) * (x104_ - xf8_interferenceDur)) + x100_interferenceMag;
|
||||
|
||||
if (dur > pl->GetStaticTimer())
|
||||
if (dur > pl->GetStaticTimer()) {
|
||||
pl->SetHudDisable(dur, 0.5f, 2.5f);
|
||||
else
|
||||
} else {
|
||||
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), mag, dur);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue