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

Lots of bug fixes; working CPhazonSuitFilter

Browse Source
This commit is contained in:
Jack Andersen
2017-12-19 20:06:54 -10:00
parent 1c44f8d1bc
commit c00cc6cea9
41 changed files with 322 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Character/IMetaAnim.cpp
View File

@@ -11,13 +11,13 @@ std::shared_ptr<CAnimTreeNode>
IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
if (orders.x44_)
if (orders.x44_singleAdvance)
{
std::shared_ptr<CAnimTreeNode> tree =
VGetAnimationTree(animSys, CMetaAnimTreeBuildOrders::NoSpecialOrders());
if (orders.x44_->IsTime() || orders.x44_->IsString())
if (orders.x44_singleAdvance->IsTime() || orders.x44_singleAdvance->IsString())
{
CCharAnimTime time = GetTime(*orders.x44_, *tree);
CCharAnimTime time = GetTime(*orders.x44_singleAdvance, *tree);
AdvanceAnim(*tree, time);
}
return tree;