From 16d98d48c3333e747e508be309e39f7d32b17709 Mon Sep 17 00:00:00 2001
From: obligaron <obligaron@live.com>
Date: Sun, 26 Sep 2021 08:12:53 +0200
Subject: [PATCH] Fix melee friendly fire when sgOptions.Gameplay.bFriendlyFire
 is set

---
 Source/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/player.cpp b/Source/player.cpp
index 38a80e5d1..b89c03f69 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -1210,7 +1210,7 @@ bool DoAttack(int pnum)
 				m = -(dMonster[dx][dy] + 1);
 			}
 			didhit = PlrHitMonst(pnum, m);
-		} else if (dPlayer[dx][dy] != 0 && (!gbFriendlyMode || sgGameInitInfo.bFriendlyFire != 0)) {
+		} else if (dPlayer[dx][dy] != 0 && !gbFriendlyMode) {
 			BYTE p = dPlayer[dx][dy];
 			if (dPlayer[dx][dy] > 0) {
 				p = dPlayer[dx][dy] - 1;