diff --git a/props/prop_base.h b/props/prop_base.h index 1d79fe1d1..904311c2b 100644 --- a/props/prop_base.h +++ b/props/prop_base.h @@ -768,11 +768,6 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac return false; } - virtual bool IsStab(const Vec3& diff) const { - return diff.x < -2.0 * sqrtf(diff.y * diff.y + diff.z * diff.z) && - fusor.swing_speed() < 150; - } - // Potentially called from interrupt! virtual void DoMotion(const Vec3& motion, bool clear) { fusor.DoMotion(motion, clear); @@ -816,7 +811,8 @@ class PropBase : CommandParser, Looper, protected SaberBase, public ModeInterfac if ( (accel_ - fusor.down()).len2() > (accel - fusor.down()).len2() ) { diff = -diff; } - bool stab = IsStab(diff); + bool stab = diff.x < - 2.0 * sqrtf(diff.y * diff.y + diff.z * diff.z) && + fusor.swing_speed() < 150; if (clash_pending1_) { pending_clash_strength1_ = std::max(v, (float)pending_clash_strength1_);