From 4269f71dc24d5b90a25cba59b2f290e42e5e85df Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 14 Dec 2019 21:23:26 +0100 Subject: [PATCH] [controller] Fix player attack each other in town This would render the player invisable and damage equipment --- SourceX/controls/plrctrls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SourceX/controls/plrctrls.cpp b/SourceX/controls/plrctrls.cpp index 547ec5e31..45303ec89 100644 --- a/SourceX/controls/plrctrls.cpp +++ b/SourceX/controls/plrctrls.cpp @@ -425,7 +425,7 @@ void Interact() } else { NetSendCmdParam1(true, CMD_RATTACKID, pcursmonst); } - } else if (pcursplr != -1 && !FriendlyMode) { + } else if (leveltype != DTYPE_TOWN && pcursplr != -1 && !FriendlyMode) { NetSendCmdParam1(true, plr[myplr]._pwtype == WT_RANGED ? CMD_RATTACKPID : CMD_ATTACKPID, pcursplr); } }