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

Merge pull request #262 from lioncash/nullopt 

CBeamProjectile: Explicitly return std::nullopt in GetTouchBounds()
This commit is contained in:
Phillip Stephens 2020-03-23 23:27:54 -07:00 committed by GitHub
parent 1c841d10f8 bf590dd855
commit dbbf9e33fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Weapon/CBeamProjectile.cpp
View File

@ -25,13 +25,16 @@ CBeamProjectile::CBeamProjectile(const TToken<CWeaponDescription>& wDesc, std::s
} }
std::optional<zeus::CAABox> CBeamProjectile::GetTouchBounds() const { std::optional<zeus::CAABox> CBeamProjectile::GetTouchBounds() const {
if (!GetActive()) if (!GetActive()) {
return {}; return std::nullopt;
}
if (x464_25_enableTouchDamage) { if (x464_25_enableTouchDamage) {
zeus::CVector3f pos = GetTranslation(); const zeus::CVector3f pos = GetTranslation();
return {{pos - 0.1f, pos + 0.1f}}; return {{pos - 0.1f, pos + 0.1f}};
} }
return {};
return std::nullopt;
} }
void CBeamProjectile::CalculateRenderBounds() { x9c_renderBounds = x354_.getTransformedAABox(x324_xf); } void CBeamProjectile::CalculateRenderBounds() { x9c_renderBounds = x354_.getTransformedAABox(x324_xf); }