mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix Amy and Fang being able to attack other players in MP Special Stages
This commit is contained in:
parent
ebcd9923b1
commit
14673656c3
1 changed files with 11 additions and 0 deletions
|
|
@ -3426,6 +3426,17 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
|
||||||
if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super])
|
if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Don't allow players to hurt one another,
|
||||||
|
// unless cv_friendlyfire is on.
|
||||||
|
if (!cv_friendlyfire.value)
|
||||||
|
{
|
||||||
|
if (inflictor->type == MT_LHRT)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (source->player->ctfteam == player->ctfteam)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
|
if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
|
||||||
{
|
{
|
||||||
P_RemoveShield(player);
|
P_RemoveShield(player);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue