2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +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

@@ -4,65 +4,52 @@
#include "CActorParameters.hpp"
#include "TCastTo.hpp"
namespace urde
{
namespace urde {
CFishCloudModifier::CFishCloudModifier(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& eInfo,
const zeus::CVector3f& pos, bool b2, bool b3, float f1, float f2)
: CActor(uid, active, name, eInfo, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(), {EMaterialTypes::NoStepLogic},
CActorParameters::None(), kInvalidUniqueId)
, xe8_(f1)
, xec_(f2)
, xf0_isRepulsor(b2)
, xf1_(b3)
{
const zeus::CVector3f& pos, bool b2, bool b3, float f1, float f2)
: CActor(uid, active, name, eInfo, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(),
{EMaterialTypes::NoStepLogic}, CActorParameters::None(), kInvalidUniqueId)
, xe8_(f1)
, xec_(f2)
, xf0_isRepulsor(b2)
, xf1_(b3) {}
void CFishCloudModifier::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CFishCloudModifier::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
CActor::AcceptScriptMsg(msg, uid, mgr);
if ((msg == EScriptObjectMessage::Activate || msg == EScriptObjectMessage::InitializedInArea) && GetActive())
AddSelf(mgr);
else if (msg == EScriptObjectMessage::Deactivate || msg == EScriptObjectMessage::Deleted)
RemoveSelf(mgr);
}
void CFishCloudModifier::Accept(IVisitor& visitor)
{
visitor.Visit(this);
}
void CFishCloudModifier::AddSelf(CStateManager& mgr) {
for (const SConnection& conn : GetConnectionList()) {
if (conn.x0_state != EScriptObjectState::Modify || conn.x4_msg != EScriptObjectMessage::Follow)
continue;
void CFishCloudModifier::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
{
CActor::AcceptScriptMsg(msg, uid, mgr);
if ((msg == EScriptObjectMessage::Activate || msg == EScriptObjectMessage::InitializedInArea) && GetActive())
AddSelf(mgr);
else if (msg == EScriptObjectMessage::Deactivate || msg == EScriptObjectMessage::Deleted)
RemoveSelf(mgr);
}
void CFishCloudModifier::AddSelf(CStateManager& mgr)
{
for (const SConnection& conn : GetConnectionList())
{
if (conn.x0_state != EScriptObjectState::Modify || conn.x4_msg != EScriptObjectMessage::Follow)
continue;
if (TCastToPtr<CFishCloud> fishCloud = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId)))
{
if (xf0_isRepulsor)
fishCloud->AddRepulsor(GetUniqueId(), xe8_, xec_);
else
fishCloud->AddAttractor(GetUniqueId(), xe8_, xec_);
}
if (TCastToPtr<CFishCloud> fishCloud = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId))) {
if (xf0_isRepulsor)
fishCloud->AddRepulsor(GetUniqueId(), xe8_, xec_);
else
fishCloud->AddAttractor(GetUniqueId(), xe8_, xec_);
}
}
}
void CFishCloudModifier::RemoveSelf(CStateManager& mgr)
{
for (const SConnection& conn : GetConnectionList())
{
if (conn.x0_state != EScriptObjectState::Modify || conn.x4_msg != EScriptObjectMessage::Follow)
continue;
void CFishCloudModifier::RemoveSelf(CStateManager& mgr) {
for (const SConnection& conn : GetConnectionList()) {
if (conn.x0_state != EScriptObjectState::Modify || conn.x4_msg != EScriptObjectMessage::Follow)
continue;
if (TCastToPtr<CFishCloud> fishCloud = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId)))
{
if (xf0_isRepulsor)
fishCloud->RemoveRepulsor(GetUniqueId());
else
fishCloud->RemoveAttractor(GetUniqueId());
}
if (TCastToPtr<CFishCloud> fishCloud = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId))) {
if (xf0_isRepulsor)
fishCloud->RemoveRepulsor(GetUniqueId());
else
fishCloud->RemoveAttractor(GetUniqueId());
}
}
}
}
} // namespace urde