Merge branch 'bomb-punt-fixes' into 'master'

Fix punting a fully deployed mine if you are invincible

See merge request KartKrew/Kart!815
This commit is contained in:
Sal 2022-12-18 06:40:47 +00:00
commit 2410ea7988

View file

@ -343,7 +343,7 @@ boolean K_MineCollide(mobj_t *t1, mobj_t *t2)
// Bomb punting
if ((t1->state >= &states[S_SSMINE1] && t1->state <= &states[S_SSMINE4])
|| (t1->state >= &states[S_SSMINE_DEPLOY8] && t1->state <= &states[S_SSMINE_DEPLOY13]))
|| (t1->state >= &states[S_SSMINE_DEPLOY8] && t1->state <= &states[S_SSMINE_EXPLODE2]))
{
P_KillMobj(t1, t2, t2, DMG_NORMAL);
}