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

Space pirate bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-12-14 20:29:41 -10:00
parent ccf87925b9
commit dac8fc3eb5
32 changed files with 294 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Character/CCharacterFactory.cpp
View File

@@ -100,7 +100,7 @@ CAssetId CCharacterFactory::GetEventResourceIdForAnimResourceId(CAssetId id) con
return search->second;
}
const CAdditiveAnimationInfo& CCharacterFactory::FindAdditiveInfo(u32 idx) const {
const CAdditiveAnimationInfo& CCharacterFactory::FindAdditiveInfo(s32 idx) const {
auto search = rstl::binary_find(x40_additiveInfo.cbegin(), x40_additiveInfo.cend(), idx,
[](const auto& anim) { return anim.first; });
@@ -109,7 +109,7 @@ const CAdditiveAnimationInfo& CCharacterFactory::FindAdditiveInfo(u32 idx) const
return search->second;
}
bool CCharacterFactory::HasAdditiveInfo(u32 idx) const {
bool CCharacterFactory::HasAdditiveInfo(s32 idx) const {
auto search = rstl::binary_find(x40_additiveInfo.cbegin(), x40_additiveInfo.cend(), idx,
[](const auto& anim) { return anim.first; });
return search != x40_additiveInfo.cend();