From c0c97bf224f01b1f89736d53f96d9d2d0fbb7055 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 28 Oct 2021 22:47:47 +0200 Subject: [PATCH] [gamepad] Operate object as last option for primery action Fixes #3307 --- Source/controls/plrctrls.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp index 648133b67..a5ea4508f 100644 --- a/Source/controls/plrctrls.cpp +++ b/Source/controls/plrctrls.cpp @@ -488,6 +488,12 @@ void Interact() if (leveltype != DTYPE_TOWN && pcursplr != -1 && !gbFriendlyMode) { NetSendCmdParam1(true, Players[MyPlayerId].UsesRangedWeapon() ? CMD_RATTACKPID : CMD_ATTACKPID, pcursplr); + return; + } + + if (pcursobj != -1) { + NetSendCmdLocParam1(true, CMD_OPOBJXY, cursPosition, pcursobj); + return; } }