From 5cc1cd799ac2adabcbb5b154b58a5dc6b782a4b2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 7 May 2020 11:50:21 -0400 Subject: [PATCH] CScriptSteam: Brace conditionals where applicable --- Runtime/World/CScriptSteam.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Runtime/World/CScriptSteam.cpp b/Runtime/World/CScriptSteam.cpp index a07ecc462..eca0a01a6 100644 --- a/Runtime/World/CScriptSteam.cpp +++ b/Runtime/World/CScriptSteam.cpp @@ -20,8 +20,9 @@ CScriptSteam::CScriptSteam(TUniqueId uid, std::string_view name, const CEntityIn float r3 = (aabb.max.z() < aabb.max.y() ? aabb.max.z() : aabb.max.y()); r3 = (r3 < aabb.max.x() ? r3 : aabb.max.x()); - if (zeus::close_enough(f4, 0.f)) + if (zeus::close_enough(f4, 0.f)) { r3 = (r3 < f2 ? r3 : f4); + } x164_ = r3; x168_ = 1.f / x164_; @@ -30,28 +31,32 @@ CScriptSteam::CScriptSteam(TUniqueId uid, std::string_view name, const CEntityIn void CScriptSteam::Accept(IVisitor& visitor) { visitor.Visit(this); } void CScriptSteam::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { - if (msg == EScriptObjectMessage::Deactivate) + if (msg == EScriptObjectMessage::Deactivate) { mgr.Player()->SetVisorSteam(0.f, x158_, x160_alphaOutDur, CAssetId(), x150_); + } CScriptTrigger::AcceptScriptMsg(msg, uid, mgr); } void CScriptSteam::Think(float dt, CStateManager& mgr) { - if (!GetActive()) + if (!GetActive()) { return; + } CScriptTrigger::Think(dt, mgr); if (x148_28_playerTriggerProc && mgr.GetCameraManager()->GetFluidCounter() == 0) { - zeus::CVector3f eyePos = mgr.GetPlayer().GetEyePosition(); - zeus::CVector3f posDiff = (GetTranslation() - eyePos); - float mag = posDiff.magnitude(); - float distance = (mag >= x164_ ? 0.f : std::cos((1.5707964f * mag) * x168_) * x158_); + const zeus::CVector3f eyePos = mgr.GetPlayer().GetEyePosition(); + const zeus::CVector3f posDiff = (GetTranslation() - eyePos); + const float mag = posDiff.magnitude(); + const float distance = (mag >= x164_ ? 0.f : std::cos((1.5707964f * mag) * x168_) * x158_); mgr.Player()->SetVisorSteam(distance, x15c_alphaInDur, x160_alphaOutDur, x154_texture, x150_); - if (x150_) + if (x150_) { mgr.GetEnvFxManager()->SetSplashRate(2.f * distance); - } else + } + } else { mgr.Player()->SetVisorSteam(0.f, x15c_alphaInDur, x160_alphaOutDur, CAssetId(), x150_); + } } } // namespace urde