From 5df7532973662c3638c5967ba9b1b6cf017c875b Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Wed, 13 Aug 2025 15:51:40 +1000 Subject: [PATCH] bugfix: Singular right-click logic now always executes after a double right-click --- .../Source/GameClient/MessageStream/CommandXlat.cpp | 4 ++++ .../Source/GameClient/MessageStream/CommandXlat.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 34b2376c62..59b2d9d383 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3407,6 +3407,10 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage //----------------------------------------------------------------------------- case GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK: + { + m_mouseRightDown = m_mouseRightUp; // Allow isClick to succeed on fall through + FALLTHROUGH; //intentional fall through + } case GameMessage::MSG_MOUSE_RIGHT_CLICK: { // right click is only actioned here if we're in alternate mouse mode diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 23e1f89344..05d8bea927 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3773,6 +3773,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage break; } + + m_mouseRightDown = m_mouseRightUp; // Allow isClick to succeed on fall through FALLTHROUGH; //intentional fall through } case GameMessage::MSG_MOUSE_RIGHT_CLICK: