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

Fix boost ball and other collision issues

Browse Source
This commit is contained in:
Jack Andersen
2018-06-21 19:11:20 -10:00
parent f4b01e9c3f
commit bc9d225c89
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CMorphBall.cpp
View File

@@ -1274,7 +1274,7 @@ void CMorphBall::UpdateEffects(float dt, CStateManager& mgr)
else
{
x1c34_boostLightFactor = std::max(x1de8_boostChargeTime / g_tweakBall->GetBoostBallMaxChargeTime(),
x1c34_boostLightFactor);
x1c34_boostLightFactor);
x1c34_boostLightFactor = std::min(x1c34_boostLightFactor, 1.f);
}
UpdateMorphBallTransitionFlash(dt);
@@ -1735,7 +1735,8 @@ void CMorphBall::Render(const CStateManager& mgr, const CActorLights* lights) co
}
else
{
x58_ballModel->Render(mgr, ballToWorld, nullptr, flags);
// Lights used to be nullptr here, but we keep it due to PC's increased dynamic lighting range
x58_ballModel->Render(mgr, ballToWorld, lights, flags);
}
if (x1c1c_rainSplashGen && x1c1c_rainSplashGen->IsRaining())