From 572bffcd8337bafc2f146c43b5b76d5e3bd2851e Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 23 Feb 2020 16:38:32 -0300
Subject: [PATCH] Award pink shields in friendly gametypes
---
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 a24f9bf032..cc8d5db6b1 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3158,7 +3158,7 @@ static boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj_t *sou
// In COOP/RACE, you can't hurt other players unless cv_friendlyfire is on
if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && (G_PlatformGametype()))
{
- if (gametype == GT_COOP && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only
+ if ((gametyperules & GTR_FRIENDLY) && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only
{
if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
{
--
GitLab