Added logic to avoid double deselection on left mouse click.

Author: Caball009

GeneralsMD/Code/GameEngine/Include/Common/Player.h

@@ -645,9 +645,6 @@ class Player : public Snapshot
 	// adds the given AIGroup to the current selection of this player.
 	void addAIGroupToCurrentSelection(AIGroup *group);
 
-	// returns false if player has object(s) currently selected
-	Bool isCurrentlySelectedGroupEmpty() const;
-
 	// return the requested hotkey squad
 	Squad *getHotkeySquad(Int squadNumber);
 

GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h

@@ -42,6 +42,7 @@ class SelectionTranslator : public GameMessageTranslator
 	friend Bool killThemKillThemAllWrapper( Drawable *draw, void *userData );
 private:
 
+	Bool m_pendingDeselection;
 	Bool m_leftMouseButtonIsDown;
 	Bool m_dragSelecting;
 	UnsignedInt m_lastGroupSelTime;

GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -3819,11 +3819,6 @@ void Player::addAIGroupToCurrentSelection(AIGroup *group) {
 	}
 }
 
-Bool Player::isCurrentlySelectedGroupEmpty() const
-{
-	return m_currentSelection->getSizeOfGroup() == 0;
-}
-
 //-------------------------------------------------------------------------------------------------
 /** addTypeOfProductionCostChange adds a production change to the typeof list */
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -3556,7 +3556,7 @@ void InGameUI::deselectDrawable( Drawable *draw )
 void InGameUI::deselectAllDrawables( Bool updateGameLogic )
 {
 	const DrawableList *selected = getAllSelectedDrawables();
-	const Bool emptyDrawableSelection = selected->empty();
+	const Bool emptySelectedDrawables = selected->empty();
 
 	// loop through all the selected drawables
 	for ( DrawableListCIt it = selected->begin(); it != selected->end(); )
@@ -3579,8 +3579,8 @@ void InGameUI::deselectAllDrawables( Bool updateGameLogic )
 
 	if (updateGameLogic)
 	{
-		// TheSuperHackers @tweak Avoid sending this message when no objects are currently selected.
-		if (!emptyDrawableSelection || !ThePlayerList->getLocalPlayer()->isCurrentlySelectedGroupEmpty())
+		// TheSuperHackers @tweak Only send this message when objects are currently selected.
+		if (!emptySelectedDrawables)
 		{
 			// TheSuperHackers @tweak Originally this message had one boolean argument, but it wasn't used for anything.
 			TheMessageStream->appendMessage(GameMessage::MSG_DESTROY_SELECTED_GROUP);

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp

@@ -249,6 +249,7 @@ SelectionTranslator *TheSelectionTranslator = nullptr;
 //-----------------------------------------------------------------------------
 SelectionTranslator::SelectionTranslator()
 {
+	m_pendingDeselection = FALSE;
 	m_leftMouseButtonIsDown = FALSE;
 	m_dragSelecting = FALSE;
 	m_lastGroupSelTime = 0;
@@ -738,6 +739,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			{
 				if (!addToGroup)
 				{
+					m_pendingDeselection = FALSE;
 					TheInGameUI->deselectAllDrawables(FALSE);
 				}
 
@@ -939,7 +941,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					{
 						if( !TheInGameUI->getPreventLeftClickDeselectionInAlternateMouseModeForOneClick() )
 						{
-							TheInGameUI->deselectAllDrawables();
+							m_pendingDeselection = TRUE;
 							m_lastGroupSelGroup = -1;
 						}
 						else
@@ -1318,6 +1320,14 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 #endif
 	}
 
+	// TheSuperHackers @tweak Avoid double deselection when selecting a new object with another object selected,
+	// triggered by RAW_MOUSE_LEFT_BUTTON_UP and MOUSE_LEFT_CLICK, respectively.
+	if (msg->getType() == GameMessage::MSG_MOUSE_LEFT_CLICK && m_pendingDeselection)
+	{
+		m_pendingDeselection = FALSE;
+		TheInGameUI->deselectAllDrawables();
+	}
+
 	return disp;
 }