thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-05 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

When markedfordeath phase through objects

Browse source 
Unless its funny
This commit is contained in:
Ashnal 2025-09-14 11:56:39 -04:00
parent c316924792
commit e7d28a7536
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_map.c
View file

@ -651,6 +651,12 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
return BMIT_CONTINUE; // force no collide
}
if (g_tm.thing->player && g_tm.thing->player->markedfordeath && (K_IsMissileOrKartItem(thing) || thing->type == MT_INSTAWHIP))
return BMIT_CONTINUE;
if (thing->player && thing->player->markedfordeath && (K_IsMissileOrKartItem(g_tm.thing) || g_tm.thing->type == MT_INSTAWHIP))
return BMIT_CONTINUE;
// Blend-Eye internal noclip
if ((thing->type == MT_BLENDEYE_GLASS || thing->type == MT_BLENDEYE_SHIELD || thing->type == MT_BLENDEYE_EGGBEATER)
&& (g_tm.thing->type == MT_BLENDEYE_MAIN || g_tm.thing->type == MT_BLENDEYE_EYE || g_tm.thing->type == MT_BLENDEYE_PUYO))