AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 03:07:44 +00:00
Code Issues Projects Releases Wiki Activity

Various movement and HUD bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-12-18 17:05:50 -10:00
parent 1bb7e882a0
commit 1c44f8d1bc
37 changed files with 84 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CMorphBall.cpp
View File

@@ -2016,7 +2016,7 @@ void CMorphBall::CollidedWith(TUniqueId id, const CCollisionInfoList& list, CSta
zeus::CVector3f vel = x0_player.GetVelocity();
float velMag = vel.magnitude();
EMaterialTypes wakeMaterial = EMaterialTypes::Unknown;
EMaterialTypes wakeMaterial = EMaterialTypes::NoStepLogic;
if (velMag > 7.f && x0_player.GetFluidCounter() == 0)
{
bool hitWall = false;
@@ -2037,7 +2037,7 @@ void CMorphBall::CollidedWith(TUniqueId id, const CCollisionInfoList& list, CSta
}
}
if (wakeMaterial == EMaterialTypes::Unknown)
if (wakeMaterial == EMaterialTypes::NoStepLogic)
{
if (info.GetMaterialLeft().HasMaterial(EMaterialTypes::Floor))
{
@@ -2063,7 +2063,7 @@ void CMorphBall::CollidedWith(TUniqueId id, const CCollisionInfoList& list, CSta
tmpMaterial = EMaterialTypes::Phazon;
wakeMaterial = tmpMaterial;
if (tmpMaterial != EMaterialTypes::Unknown)
if (tmpMaterial != EMaterialTypes::NoStepLogic)
{
int mappedIdx = skWakeEffectMap[int(tmpMaterial)];
if (mappedIdx == 0) // Phazon
@@ -2098,7 +2098,7 @@ void CMorphBall::CollidedWith(TUniqueId id, const CCollisionInfoList& list, CSta
}
}
if (wakeMaterial == EMaterialTypes::Unknown && x1c0c_wakeEffectIdx != -1)
if (wakeMaterial == EMaterialTypes::NoStepLogic && x1c0c_wakeEffectIdx != -1)
x1bc8_wakeEffectGens[int(wakeMaterial)]->SetParticleEmission(false);
x1954_isProjectile = false;