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

Merge pull request #180 from lioncash/flamethrower 

CFlameThrower: Amend virtual interface discrepancies
This commit is contained in:
Luke Street 2020-03-04 13:42:21 -05:00 committed by GitHub
parent 4db9f341a0 88cb5acdca
commit 74d01debe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CFlameThrower.cpp
View File

@ -95,6 +95,12 @@ void CFlameThrower::AddToRenderer(const zeus::CFrustum&, const CStateManager& mg
EnsureRendered(mgr, x2e8_flameXf.origin, GetRenderBounds()); EnsureRendered(mgr, x2e8_flameXf.origin, GetRenderBounds());
} }
void CFlameThrower::Render(const CStateManager&) const {}
std::optional<zeus::CAABox> CFlameThrower::GetTouchBounds() const { return std::nullopt; }
void CFlameThrower::Touch(CActor&, CStateManager&) {}
void CFlameThrower::SetFlameLightActive(CStateManager& mgr, bool active) { void CFlameThrower::SetFlameLightActive(CStateManager& mgr, bool active) {
if (x2c8_projectileLight == kInvalidUniqueId) if (x2c8_projectileLight == kInvalidUniqueId)
return; return;

3
Runtime/Weapon/CFlameThrower.hpp
View File

@ -57,6 +57,9 @@ public:
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override; void Think(float, CStateManager&) override;
void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const override; void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const override;
void Render(const CStateManager& mgr) const override;
std::optional<zeus::CAABox> GetTouchBounds() const override;
void Touch(CActor& actor, CStateManager& mgr) override;
void SetTransform(const zeus::CTransform& xf, float); void SetTransform(const zeus::CTransform& xf, float);
void Reset(CStateManager&, bool); void Reset(CStateManager&, bool);
void Fire(const zeus::CTransform&, CStateManager&, bool); void Fire(const zeus::CTransform&, CStateManager&, bool);