stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 10:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bombs should check for teams in team match, not regular match

Browse source
This commit is contained in:
Sryder13 2017-10-25 15:04:08 +01:00
parent 0bb3bc2b7e
commit 2e2d4073b8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_enemy.c
View file

@ -3924,7 +3924,7 @@ static inline boolean PIT_GrenadeRing(mobj_t *thing)
if (thing->player && thing->player->kartstuff[k_bootaketimer]) if (thing->player && thing->player->kartstuff[k_bootaketimer])
return true; return true;
if ((gametype == GT_CTF || gametype == GT_MATCH) if ((gametype == GT_CTF || gametype == GT_TEAMMATCH)
&& !cv_friendlyfire.value && grenade->target->player && thing->player && !cv_friendlyfire.value && grenade->target->player && thing->player
&& grenade->target->player->ctfteam == thing->player->ctfteam) // Don't blow up at your teammates, unless friendlyfire is on && grenade->target->player->ctfteam == thing->player->ctfteam) // Don't blow up at your teammates, unless friendlyfire is on
return true; return true;