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

Initial CParasite implementation

Browse Source
This commit is contained in:
Phillip Stephens
2018-09-16 16:22:35 -07:00
parent ac33e46590
commit 02d54fd5ca
20 changed files with 564 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CAnimData.cpp
View File

@@ -237,7 +237,7 @@ bool CAnimData::IsAdditiveAnimationActive(u32 idx) const
return search->second.IsActive();
}
void CAnimData::DelAdditiveAnimation(u32 idx)
void CAnimData::DelAdditiveAnimation(s32 idx)
{
u32 animIdx = xc_charInfo.GetAnimationIndex(idx);
for (std::pair<u32, CAdditiveAnimPlayback>& anim : x434_additiveAnims)
@@ -252,7 +252,7 @@ void CAnimData::DelAdditiveAnimation(u32 idx)
}
}
void CAnimData::AddAdditiveAnimation(u32 idx, float weight, bool active, bool fadeOut)
void CAnimData::AddAdditiveAnimation(s32 idx, float weight, bool active, bool fadeOut)
{
u32 animIdx = xc_charInfo.GetAnimationIndex(idx);
for (std::pair<u32, CAdditiveAnimPlayback>& anim : x434_additiveAnims)