AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScriptRipple: Brace conditionals where applicable

This commit is contained in:
Lioncash 2020-05-07 12:29:43 -04:00
parent 2bf190048d
commit 1315189990
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/World/CScriptRipple.cpp
View File

@ -14,23 +14,27 @@ CScriptRipple::CScriptRipple(TUniqueId uid, std::string_view name, const CEntity
void CScriptRipple::Accept(IVisitor& visitor) { visitor.Visit(this); } void CScriptRipple::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptRipple::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CScriptRipple::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
if (msg == EScriptObjectMessage::Play) { if (msg != EScriptObjectMessage::Play) {
if (!GetActive()) CEntity::AcceptScriptMsg(msg, uid, mgr);
return; return;
}
if (!GetActive()) {
return;
}
for (const SConnection& conn : x20_conns) { for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Active || conn.x4_msg != EScriptObjectMessage::Next) if (conn.x0_state != EScriptObjectState::Active || conn.x4_msg != EScriptObjectMessage::Next) {
continue; continue;
}
auto search = mgr.GetIdListForScript(conn.x8_objId); const auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it) { for (auto it = search.first; it != search.second; ++it) {
if (TCastToPtr<CScriptWater> water = mgr.ObjectById(it->second)) if (const TCastToPtr<CScriptWater> water = mgr.ObjectById(it->second)) {
water->GetFluidPlane().AddRipple(x34_magnitude, GetUniqueId(), x38_center, *water, mgr); water->GetFluidPlane().AddRipple(x34_magnitude, GetUniqueId(), x38_center, *water, mgr);
} }
} }
return;
} }
CEntity::AcceptScriptMsg(msg, uid, mgr);
} }
} // namespace urde } // namespace urde