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

Merge pull request #208 from lioncash/wave 

CWaveBuster: Implement GetTouchBounds()
This commit is contained in:
Phillip Stephens 2020-03-12 15:09:57 -07:00 committed by GitHub
parent 196a545f9a 9e5dc627ea
commit ac46b898bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Weapon/CWaveBuster.cpp
View File

@ -37,4 +37,12 @@ void CWaveBuster::ResetBeam(bool deactivate) {}
void CWaveBuster::SetNewTarget(TUniqueId id) {} void CWaveBuster::SetNewTarget(TUniqueId id) {}
std::optional<zeus::CAABox> CWaveBuster::GetTouchBounds() const {
if (x3d0_28_) {
return std::nullopt;
}
return GetProjectileBounds();
}
} // namespace urde } // namespace urde

2
Runtime/Weapon/CWaveBuster.hpp
View File

@ -54,6 +54,8 @@ public:
void UpdateFx(const zeus::CTransform& xf, float dt, CStateManager& mgr); void UpdateFx(const zeus::CTransform& xf, float dt, CStateManager& mgr);
void ResetBeam(bool deactivate); void ResetBeam(bool deactivate);
void SetNewTarget(TUniqueId id); void SetNewTarget(TUniqueId id);
std::optional<zeus::CAABox> GetTouchBounds() const override;
}; };
} // namespace urde } // namespace urde