From d5e91ed8d77277fd355c15ab62d37193205fb5ea Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 21 Jun 2019 12:35:37 +0100 Subject: [PATCH] Don't give SH_PINK in Race/Competition. They're your opponents! --- src/p_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_inter.c b/src/p_inter.c index a8e716123..49916c858 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2922,7 +2922,7 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj // In COOP/RACE, you can't hurt other players unless cv_friendlyfire is on if (!cv_friendlyfire.value && (G_PlatformGametype())) { - if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) + if (gametype == GT_COOP && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only { if (player->spinitem != MT_LHRT && player->revitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers. {