refactor: Cleaner solution

Stubbjax · Stubbjax · commit 4466efc7f2eb · 2025-09-20T11:38:57.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3533,6 +3533,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		}
 
 		//-----------------------------------------------------------------------------
+		case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
  		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
  		{
  			// There are two ways in which we can ignore this as a deselect:
@@ -3556,10 +3557,6 @@ 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
@@ -3874,6 +3874,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		}
 
 		//-----------------------------------------------------------------------------
+		case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:
 		case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:
 		{
 			// There are two ways in which we can ignore this as a deselect:
@@ -3922,8 +3923,6 @@ 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:

Original file line number	Diff line number	Diff line change
`@@ -3533,6 +3533,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3533`	`3533`	`}`
`3534`	`3534`
`3535`	`3535`	`//-----------------------------------------------------------------------------`
	`3536`	`+ case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:`
`3536`	`3537`	`case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:`
`3537`	`3538`	`{`
`3538`	`3539`	`// There are two ways in which we can ignore this as a deselect:`
`@@ -3556,10 +3557,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3556`	`3557`
`3557`	`3558`	`//-----------------------------------------------------------------------------`
`3558`	`3559`	`case GameMessage::MSG_MOUSE_RIGHT_DOUBLE_CLICK:`
`3559`		`- {`
`3560`		`- m_mouseRightDown = m_mouseRightUp; // Allow isClick to succeed on fall through`
`3561`		`- FALLTHROUGH; //intentional fall through`
`3562`		`- }`
`3563`	`3560`	`case GameMessage::MSG_MOUSE_RIGHT_CLICK:`
`3564`	`3561`	`{`
`3565`	`3562`	`// right click is only actioned here if we're in alternate mouse mode`
Original file line number	Diff line number	Diff line change
`@@ -3874,6 +3874,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3874`	`3874`	`}`
`3875`	`3875`
`3876`	`3876`	`//-----------------------------------------------------------------------------`
	`3877`	`+ case GameMessage::MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK:`
`3877`	`3878`	`case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN:`
`3878`	`3879`	`{`
`3879`	`3880`	`// There are two ways in which we can ignore this as a deselect:`
`@@ -3922,8 +3923,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3922`	`3923`
`3923`	`3924`	`break;`
`3924`	`3925`	`}`
`3925`		`-`
`3926`		`- m_mouseRightDown = m_mouseRightUp; // Allow isClick to succeed on fall through`
`3927`	`3926`	`FALLTHROUGH; //intentional fall through`
`3928`	`3927`	`}`
`3929`	`3928`	`case GameMessage::MSG_MOUSE_RIGHT_CLICK:`