AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 07:47:43 +00:00
Code Issues Projects Releases Wiki Activity

CScriptActor: Brace statements where applicable

Browse Source 
Makes the code consistent.
This commit is contained in:
Lioncash
2020-05-07 08:14:39 -04:00
parent 63fda8f1c7
commit c81d6632bb
2 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Runtime/World/CScriptActorKeyframe.cpp
View File

@@ -28,12 +28,14 @@ void CScriptActorKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId u
if (GetActive()) {
if (!x44_25_isPassive) {
for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play)
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) {
continue;
}
auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it)
const auto search = mgr.GetIdListForScript(conn.x8_objId);
for (auto it = search.first; it != search.second; ++it) {
UpdateEntity(it->second, mgr);
}
}
}
@@ -62,19 +64,23 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr) {
x44_28_playing = false;
for (const SConnection& conn : x20_conns) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play)
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Play) {
continue;
}
CEntity* ent = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId));
if (TCastToPtr<CScriptActor> act = ent) {
if (const TCastToPtr<CScriptActor> act = ent) {
if (act->HasModelData() && act->GetModelData()->HasAnimData()) {
CAnimData* animData = act->GetModelData()->GetAnimationData();
if (animData->IsAdditiveAnimation(x34_animationId))
if (animData->IsAdditiveAnimation(x34_animationId)) {
animData->DelAdditiveAnimation(x34_animationId);
}
if (animData->GetDefaultAnimation() == x34_animationId)
if (animData->GetDefaultAnimation() == x34_animationId) {
animData->EnableLooping(false);
}
}
} else if (TCastToPtr<CPatterned> ai = ent) {
} else if (const TCastToPtr<CPatterned> ai = ent) {
CAnimData* animData = ai->GetModelData()->GetAnimationData();
if (animData->IsAdditiveAnimation(x34_animationId)) {
animData->DelAdditiveAnimation(x34_animationId);
@@ -98,8 +104,9 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr) {
}
if (act) {
if (!act->GetActive())
if (!act->GetActive()) {
mgr.SendScriptMsg(act, GetUniqueId(), EScriptObjectMessage::Activate);
}
act->SetDrawFlags({0, 0, 3, zeus::skWhite});
if (act->HasModelData() && act->GetModelData()->HasAnimData()) {
CAnimData* animData = act->GetModelData()->GetAnimationData();