AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 10:46:10 +00:00
Code Issues Projects Releases Wiki Activity

Revert some clang-tidy changes

Browse Source
This commit is contained in:
Luke Street
2020-03-30 19:42:11 -04:00
parent 571050245d
commit ed254b460e
6 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/World/CGrenadeLauncher.cpp
View File

@@ -37,7 +37,7 @@ CGrenadeLauncher::CGrenadeLauncher(TUniqueId uid, std::string_view name, const C
}
}
auto CGrenadeLauncher::GrenadeTarget(const CStateManager& mgr) -> zeus::CVector3f {
zeus::CVector3f CGrenadeLauncher::GrenadeTarget(const CStateManager& mgr) {
const zeus::CVector3f& aim = mgr.GetPlayer().GetAimPosition(mgr, 1.f);
if (mgr.GetPlayer().GetMorphballTransitionState() == CPlayer::EPlayerMorphBallState::Unmorphed) {
return aim - zeus::CVector3f{0.f, 0.f, 0.5f * mgr.GetPlayer().GetEyeHeight()};
@@ -121,7 +121,7 @@ void CGrenadeLauncher::AddToRenderer(const zeus::CFrustum& frustum, const CState
CActor::AddToRenderer(frustum, mgr);
}
auto CGrenadeLauncher::GetTouchBounds() const -> std::optional<zeus::CAABox> {
std::optional<zeus::CAABox> CGrenadeLauncher::GetTouchBounds() const {
return x328_cSphere.CalculateAABox(GetTransform());
}