Merge branch 'item-soften-crash' into 'master'

Don't try to soften removed/null traps

See merge request kart-krew-dev/ring-racers-internal!2813
This commit is contained in:
Oni VelocitOni 2025-09-14 22:06:25 +00:00
commit 9ee0395f3e

View file

@ -7506,9 +7506,12 @@ mobj_t *K_ThrowKartItemEx(player_t *player, boolean missile, mobjtype_t mapthing
}
// Missiles set as traps inflict a nocollide stumble
if (dir < 0 && (mapthing == MT_ORBINAUT || mapthing == MT_ORBINAUT_SHIELD || mapthing == MT_JAWZ || mapthing == MT_JAWZ_SHIELD || mapthing == MT_GACHABOM))
if (mo && !P_MobjWasRemoved(mo))
{
mo->cvmem = 1;
if (dir < 0 && (mapthing == MT_ORBINAUT || mapthing == MT_ORBINAUT_SHIELD || mapthing == MT_JAWZ || mapthing == MT_JAWZ_SHIELD || mapthing == MT_GACHABOM))
{
mo->cvmem = 1;
}
}
return mo;