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

Reformat pass

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-07 12:29:18 -07:00
parent d7559823ea
commit a9bcb7a9ce
424 changed files with 4377 additions and 4790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ void CPuddleToadGamma::ShootPlayer(CStateManager& mgr, float speed) {
mgr.GetPlayer().ApplyImpulseWR(mgr.GetPlayer().GetMass() * shootDir * speed, {});
mgr.GetPlayer().SetMoveState(CPlayer::EPlayerMovementState::ApplyJump, mgr);
mgr.ApplyDamage(GetUniqueId(), mgr.GetPlayer().GetUniqueId(), GetUniqueId(), x570_playerShootDamage,
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), zeus::skZero3f);
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), zeus::skZero3f);
mgr.GetPlayer().GetMorphBall()->SetAsProjectile();
EntityList nearList;
mgr.BuildNearList(nearList, GetBoundingBox(), CMaterialFilter::MakeInclude({EMaterialTypes::Bomb}), this);
@@ -175,7 +175,7 @@ bool CPuddleToadGamma::PlayerInVortexArea(const CStateManager& mgr) const {
if (playerDist > 2.f) {
const CRayCastResult result =
mgr.RayStaticIntersection(suckPointToPlayer, 1.f / playerDist * suckPointToPlayer,
playerDist - player.GetMorphBall()->GetBallRadius(), skSolidFilter);
playerDist - player.GetMorphBall()->GetBallRadius(), skSolidFilter);
if (result.IsValid())
return false;
}