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

Merge branch 'pr-151'

This commit is contained in:
Phillip Stephens 2020-02-13 14:17:40 -08:00
parent 0bdad38175 da4dde2437
commit f251c73e6a
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,8 @@ void CAtomicBeta::Think(float dt, CStateManager& mgr) {
if (!movementVec.isZero()) if (!movementVec.isZero())
x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(movementVec, x5f4_, 1.f)); x450_bodyController->GetCommandMgr().DeliverCmd(CBCLocomotionCmd(movementVec, x5f4_, 1.f));
float mag = const float mag =
x63c_ * std::max(1.f - (mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() / (x640_ / x640_), 0.f); x63c_ * std::max(1.f - (mgr.GetPlayer().GetTranslation() - GetTranslation()).magSquared() / (x640_ * x640_), 0.f);
if (!zeus::close_enough(mag, 0.f)) if (!zeus::close_enough(mag, 0.f))
mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), mag, 0.5f); mgr.GetPlayerState()->GetStaticInterference().AddSource(GetUniqueId(), mag, 0.5f);