Merge branch 'blow-away' into 'master'

Tripwire leniency = Toxomister immunity

See merge request kart-krew-dev/ring-racers-internal!2784
This commit is contained in:
Oni VelocitOni 2025-08-31 00:45:48 +00:00
commit cbf8b19603

View file

@ -294,6 +294,12 @@ struct Cloud : Mobj
return false;
}
if (follow()->player->tripwireLeniency)
{
remove();
return false;
}
move_origin(follow()->pos());
momx = 0;
momy = 0;
@ -358,6 +364,9 @@ struct Cloud : Mobj
if (K_PuntCollide(this, toucher))
return true;
if (toucher->player && toucher->player->tripwireLeniency)
return true;
if (toucher->player && target() && !P_MobjWasRemoved(target()) && target()->player && G_SameTeam(toucher->player, target()->player))
return false;