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

CCharAnimTime & CPOINode: Fix operator<

This commit is contained in:
Luke Street 2020-08-24 18:42:43 -04:00
parent bd882edee6
commit 87437881a0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Character/CCharAnimTime.cpp
View File

@ -107,12 +107,12 @@ bool CCharAnimTime::operator<(const CCharAnimTime& other) const {
if (other.x4_type == EType::NonZero) if (other.x4_type == EType::NonZero)
return other.x0_time > 0.f; return other.x0_time > 0.f;
return other.x0_time < 0.f; return other.x0_time > 0.f; // ?
} else {
if (x4_type == EType::Infinity)
return x0_time < 0.f && other.x0_time > 0.f;
return x0_time < other.x0_time;
} }
if (other.x4_type == EType::Infinity)
return x0_time < 0.f && other.x0_time > 0.f;
return x0_time < 0.f;
} }
CCharAnimTime& CCharAnimTime::operator*=(const CCharAnimTime& other) { CCharAnimTime& CCharAnimTime::operator*=(const CCharAnimTime& other) {

4
Runtime/Character/CPOINode.cpp
View File

@ -31,9 +31,9 @@ CPOINode::CPOINode(CInputStream& in)
, x30_charIdx(in.readInt32Big()) , x30_charIdx(in.readInt32Big())
, x34_flags(in.readInt32Big()) {} , x34_flags(in.readInt32Big()) {}
bool CPOINode::operator>(const CPOINode& other) const { return x1c_time < other.x1c_time; } bool CPOINode::operator>(const CPOINode& other) const { return x1c_time > other.x1c_time; }
bool CPOINode::operator<(const CPOINode& other) const { return x1c_time > other.x1c_time; } bool CPOINode::operator<(const CPOINode& other) const { return x1c_time < other.x1c_time; }
template <class T> template <class T>
size_t _getPOIList(const CCharAnimTime& time, T* listOut, size_t capacity, size_t iterator, u32 unk1, size_t _getPOIList(const CCharAnimTime& time, T* listOut, size_t capacity, size_t iterator, u32 unk1,