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

CScriptAiJumpPoint: Fix GetInUse

This commit is contained in:
Luke Street 2020-04-29 03:03:14 -04:00
parent abfd5a464f
commit 1578a9481b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptAiJumpPoint.cpp
View File

@ -45,7 +45,7 @@ void CScriptAiJumpPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId oth
std::optional<zeus::CAABox> CScriptAiJumpPoint::GetTouchBounds() const { return xec_touchBounds; } std::optional<zeus::CAABox> CScriptAiJumpPoint::GetTouchBounds() const { return xec_touchBounds; }
bool CScriptAiJumpPoint::GetInUse(TUniqueId uid) const { bool CScriptAiJumpPoint::GetInUse(TUniqueId uid) const {
return x108_24 || x110_timeRemaining > 0.f || x10a_occupant != kInvalidUniqueId || uid != kInvalidUniqueId || return x108_24_inUse || x110_timeRemaining > 0.f ||
uid != x10a_occupant; (x10a_occupant != kInvalidUniqueId && uid != kInvalidUniqueId && x10a_occupant != uid);
} }
} // namespace urde } // namespace urde

2
Runtime/World/CScriptAiJumpPoint.hpp
View File

@ -12,7 +12,7 @@ class CScriptAiJumpPoint : public CActor {
private: private:
float xe8_apex; float xe8_apex;
zeus::CAABox xec_touchBounds; zeus::CAABox xec_touchBounds;
bool x108_24 : 1 = false; bool x108_24_inUse : 1 = false;
TUniqueId x10a_occupant = kInvalidUniqueId; TUniqueId x10a_occupant = kInvalidUniqueId;
TUniqueId x10c_currentWaypoint = kInvalidUniqueId; TUniqueId x10c_currentWaypoint = kInvalidUniqueId;
TUniqueId x10e_nextWaypoint = kInvalidUniqueId; TUniqueId x10e_nextWaypoint = kInvalidUniqueId;