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 'teamplay-monitor-items' into 'master'

Browse source 
Teamplay: Allow allies to pick up monitor paperitems

Closes ring-racers#217

See merge request kart-krew-dev/ring-racers-internal!2893
This commit is contained in:
Eidolon 2025-09-24 21:36:15 -05:00
commit b7f8afd5ef
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_inter.c
View file

@ -408,8 +408,15 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
case MT_FLOATINGITEM: // SRB2Kart
if (special->extravalue1 > 0 && toucher != special->tracer)
{
player->pflags |= PF_CASTSHADOW;
return;
if (special->tracer && !P_MobjWasRemoved(special->tracer) && special->tracer->player)
{
if (!G_SameTeam(special->tracer->player, player))
{
player->pflags |= PF_CASTSHADOW;
return;
}
}
}
if (special->threshold >= FIRSTPOWERUP)