2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -3,44 +3,32 @@
#include "CScriptWater.hpp"
#include "TCastTo.hpp"
namespace urde
{
namespace urde {
CScriptRipple::CScriptRipple(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CVector3f& vec, bool active, float f1)
: CEntity(uid, info, active, name)
, x34_magnitude(f1 >= 0.f ? f1 : 0.5f)
, x38_center(vec)
{
}
CScriptRipple::CScriptRipple(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& vec,
bool active, float f1)
: CEntity(uid, info, active, name), x34_magnitude(f1 >= 0.f ? f1 : 0.5f), x38_center(vec) {}
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)
{
if (msg == EScriptObjectMessage::Play)
{
if (!GetActive())
return;
void CScriptRipple::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
if (msg == EScriptObjectMessage::Play) {
if (!GetActive())
return;
for (const SConnection& conn : x20_conns)
{
if (conn.x0_state != EScriptObjectState::Active || conn.x4_msg != EScriptObjectMessage::Next)
continue;
for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Active || conn.x4_msg != EScriptObjectMessage::Next)
continue;
auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it)
{
if (TCastToPtr<CScriptWater> water = mgr.ObjectById(it->second))
water->GetFluidPlane().AddRipple(x34_magnitude, GetUniqueId(), x38_center, *water, mgr);
}
}
return;
auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it) {
if (TCastToPtr<CScriptWater> water = mgr.ObjectById(it->second))
water->GetFluidPlane().AddRipple(x34_magnitude, GetUniqueId(), x38_center, *water, mgr);
}
}
CEntity::AcceptScriptMsg(msg, uid, mgr);
}
return;
}
CEntity::AcceptScriptMsg(msg, uid, mgr);
}
} // namespace urde