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

Attempted Windows build fix

This commit is contained in:
Jack Andersen 2018-03-02 21:53:50 -10:00
parent cb2988c9a4
commit d8eb8abc48
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/World/CPathFindSearch.cpp
View File

@ -165,8 +165,9 @@ CPathFindSearch::EResult CPathFindSearch::Search(const zeus::CVector3f& p1, cons
u32 lastPoint = 0; u32 lastPoint = 0;
do { do {
reg->Data()->GetParent()->SetLinkTo(reg->GetIndex()); reg->Data()->GetParent()->SetLinkTo(reg->GetIndex());
reg = reg->Data()->GetParent();
++lastPoint; ++lastPoint;
} while (reg->Data()->GetParent() != regions1Uniq[0]); } while (reg != regions1Uniq[0]);
/* Setup point range */ /* Setup point range */
bool includeP2 = true; bool includeP2 = true;

8
Runtime/rstl.hpp
View File

@ -74,6 +74,10 @@ public:
iterator& operator+=(std::ptrdiff_t i) { const_iterator::m_val += i; return *this; } iterator& operator+=(std::ptrdiff_t i) { const_iterator::m_val += i; return *this; }
iterator& operator-=(std::ptrdiff_t i) { const_iterator::m_val -= i; return *this; } iterator& operator-=(std::ptrdiff_t i) { const_iterator::m_val -= i; return *this; }
std::ptrdiff_t operator-(const iterator& it) const { return const_iterator::m_val - it.m_val; } std::ptrdiff_t operator-(const iterator& it) const { return const_iterator::m_val - it.m_val; }
bool operator>(const iterator& it) const { return const_iterator::m_val > it.m_val; }
bool operator<(const iterator& it) const { return const_iterator::m_val < it.m_val; }
bool operator>=(const iterator& it) const { return const_iterator::m_val >= it.m_val; }
bool operator<=(const iterator& it) const { return const_iterator::m_val <= it.m_val; }
T& operator[](std::ptrdiff_t i) const { return const_cast<T*>(const_iterator::m_val)[i]; } T& operator[](std::ptrdiff_t i) const { return const_cast<T*>(const_iterator::m_val)[i]; }
}; };
@ -128,6 +132,10 @@ public:
reverse_iterator& operator+=(std::ptrdiff_t i) { const_reverse_iterator::m_val -= i; return *this; } reverse_iterator& operator+=(std::ptrdiff_t i) { const_reverse_iterator::m_val -= i; return *this; }
reverse_iterator& operator-=(std::ptrdiff_t i) { const_reverse_iterator::m_val += i; return *this; } reverse_iterator& operator-=(std::ptrdiff_t i) { const_reverse_iterator::m_val += i; return *this; }
std::ptrdiff_t operator-(const reverse_iterator& it) const { return it.m_val - const_reverse_iterator::m_val; } std::ptrdiff_t operator-(const reverse_iterator& it) const { return it.m_val - const_reverse_iterator::m_val; }
bool operator>(const const_reverse_iterator& it) const { return it.m_val > const_reverse_iterator::m_val; }
bool operator<(const const_reverse_iterator& it) const { return it.m_val < const_reverse_iterator::m_val; }
bool operator>=(const const_reverse_iterator& it) const { return it.m_val >= const_reverse_iterator::m_val; }
bool operator<=(const const_reverse_iterator& it) const { return it.m_val <= const_reverse_iterator::m_val; }
T& operator[](std::ptrdiff_t i) const { return const_cast<T*>(const_reverse_iterator::m_val)[-i]; } T& operator[](std::ptrdiff_t i) const { return const_cast<T*>(const_reverse_iterator::m_val)[-i]; }
}; };