From 9e5dc627eaf16d629464c4bbe4e041307af74a84 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 9 Mar 2020 14:47:34 -0400 Subject: [PATCH] CWaveBuster: Implement GetTouchBounds() Implements GetTouchBounds() according to the implementation within the GM8E v0 binary. Fills out the implementation of CWaveBuster a little bit. --- Runtime/Weapon/CWaveBuster.cpp | 8 ++++++++ Runtime/Weapon/CWaveBuster.hpp | 2 ++ 2 files changed, 10 insertions(+) diff --git a/Runtime/Weapon/CWaveBuster.cpp b/Runtime/Weapon/CWaveBuster.cpp index b20534d60..6bcd86368 100644 --- a/Runtime/Weapon/CWaveBuster.cpp +++ b/Runtime/Weapon/CWaveBuster.cpp @@ -37,4 +37,12 @@ void CWaveBuster::ResetBeam(bool deactivate) {} void CWaveBuster::SetNewTarget(TUniqueId id) {} +std::optional CWaveBuster::GetTouchBounds() const { + if (x3d0_28_) { + return std::nullopt; + } + + return GetProjectileBounds(); +} + } // namespace urde diff --git a/Runtime/Weapon/CWaveBuster.hpp b/Runtime/Weapon/CWaveBuster.hpp index c6701b1f5..d15269cca 100644 --- a/Runtime/Weapon/CWaveBuster.hpp +++ b/Runtime/Weapon/CWaveBuster.hpp @@ -54,6 +54,8 @@ public: void UpdateFx(const zeus::CTransform& xf, float dt, CStateManager& mgr); void ResetBeam(bool deactivate); void SetNewTarget(TUniqueId id); + + std::optional GetTouchBounds() const override; }; } // namespace urde