thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'markedfordeath-phase-through-most-objects' into 'master'

Browse source 
When markedfordeath phase through most objects

See merge request kart-krew-dev/ring-racers-internal!2839
This commit is contained in:
Oni VelocitOni 2025-09-14 22:20:26 +00:00
commit f5fa6f138a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_map.c
View file

@ -651,6 +651,13 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
return BMIT_CONTINUE; // force no collide
}
// markedfordeath players will phase through most things, unless its funny
if (g_tm.thing->player && g_tm.thing->player->markedfordeath && !(K_IsMissileOrKartItem(thing) || thing->type == MT_INSTAWHIP || thing->type == MT_PLAYER))
return BMIT_CONTINUE;
if (thing->player && thing->player->markedfordeath && !(K_IsMissileOrKartItem(g_tm.thing) || g_tm.thing->type == MT_INSTAWHIP || g_tm.thing->type == MT_PLAYER))
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))