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

Disable CPatterned branches in CScriptActorKeyframe for now, update submodules

This commit is contained in:
Phillip Stephens 2018-05-20 08:38:44 -07:00
parent f6259cc8c6
commit f4bd59bb2f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/CScriptActorKeyframe.cpp
View File

@ -95,6 +95,9 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
animData->EnableLooping(false); animData->EnableLooping(false);
} }
} }
// TODO: Re-enable this
#if 0
else if (TCastToPtr<CPatterned> ai = ent) else if (TCastToPtr<CPatterned> ai = ent)
{ {
CAnimData* animData = ai->ModelData()->AnimationData(); CAnimData* animData = ai->ModelData()->AnimationData();
@ -108,6 +111,7 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
ai->BodyController()->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::ExitState)); ai->BodyController()->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::ExitState));
} }
} }
#endif
} }
CEntity::Think(dt, mgr); CEntity::Think(dt, mgr);
@ -142,6 +146,8 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr)
} }
} }
} }
// TODO: Re-enable this
#if 0
else if (TCastToPtr<CPatterned> ai = ent) else if (TCastToPtr<CPatterned> ai = ent)
{ {
CAnimData* animData = ai->ModelData()->AnimationData(); CAnimData* animData = ai->ModelData()->AnimationData();
@ -155,5 +161,6 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr)
CBCScriptedCmd(x34_animationId, x44_24_looping, x44_27_timedLoop, x38_initialLifetime)); CBCScriptedCmd(x34_animationId, x44_24_looping, x44_27_timedLoop, x38_initialLifetime));
} }
} }
#endif
} }
} }

2
amuse

@ -1 +1 @@
Subproject commit 1fefba66e7fc96cb6fc1b1b014c365da2e0b7a43 Subproject commit e3c936648b40345997445326b95cfdda50dc32c8

2
hecl

@ -1 +1 @@
Subproject commit c26f24fb90da308ef6428b3198522d13569df50d Subproject commit c8f9d4cc050dc5dc0e4ae78beee80814b352bd8c