Fix melee friendly fire when sgOptions.Gameplay.bFriendlyFire is set

5 years ago · 16d98d48c3
1 changed files with 1 additions and 1 deletions
--- 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;