From 2084d9404edf86e0625a51147627c7eaf92870cc Mon Sep 17 00:00:00 2001 From: ikonomov <5624187+ikonomov@users.noreply.github.com> Date: Sun, 10 Mar 2024 11:23:59 -0500 Subject: [PATCH] Update player.cpp as suggested in https://github.com/diasurgical/devilutionX/pull/7010#issuecomment-1984783650 --- Source/player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/player.cpp b/Source/player.cpp index d1ff13e01aa..f8fbecd9fc1 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -571,7 +571,7 @@ bool PlrHitMonst(Player &player, Monster &monster, bool adjacentDamage = false) { int hper = 0; - if (!monster.isPossibleToHit() || (monster.type().type == MT_GOLEM && sgGameInitInfo.bFriendlyFire == 0 && player.friendlyMode)) + if (!monster.isPossibleToHit() || (monster.type().type == MT_GOLEM && player.friendlyMode)) return false; if (adjacentDamage) {