Merge branch 'iamnobump' into 'master'

I am no bump

See merge request KartKrew/Kart!548
This commit is contained in:
James R 2022-02-17 05:05:24 +00:00
commit 8f303f03d2

View file

@ -3823,10 +3823,19 @@ void P_BouncePlayerMove(mobj_t *mo)
if (P_IsLineTripWire(bestslideline))
{
// TRIPWIRE CANNOT BE MADE NONBOUNCY
K_ApplyTripWire(mo->player, TRIP_BLOCKED);
}
else
{
// Some walls aren't bouncy even if you are
if (bestslideline && (bestslideline->flags & ML_NOTBOUNCY))
{
// SRB2Kart: Non-bouncy line!
P_SlideMove(mo);
return;
}
K_SpawnBumpEffect(mo);
}