bugfix(controls): Fix double-press group selection logic not reselecting deselected groups (#1355)

Stubbjax · web-flow · commit 6ad992fd0a80 · 2025-08-03T10:35:23.000+02:00
diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -445,6 +445,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual Drawable *getFirstSelectedDrawable( void );							///< get the first selected drawable (if any)
 	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected 
 	virtual Bool isDrawableSelected( DrawableID idToCheck ) const;	///< Return true if the selected ID is in the drawable list
+	virtual Bool areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const;	///< Return true if all of the selected objects are in the drawable list
 	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of 
 	virtual Bool isAllSelectedKindOf( KindOfType kindOf ) const;		///< are all selected objects a kind of
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -3335,6 +3335,21 @@ Bool InGameUI::isDrawableSelected( DrawableID idToCheck ) const
 
 }  // end isDrawableSelected
 
+//-------------------------------------------------------------------------------------------------
+/** Return true if all of the given objects are selected */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const
+{
+	for (std::vector<Object*>::const_iterator it = objectsToCheck.begin(); it != objectsToCheck.end(); ++it)
+	{
+		if (!(*it)->getDrawable()->isSelected())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}  // end areAllObjectsSelected
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -962,6 +962,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
  					if (! TheGlobalData->m_useAlternateMouse || TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)
  					{
  						deselectAll();
+						m_lastGroupSelGroup = -1;
  					}
  				}
 			}
@@ -1024,10 +1025,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
+					// if the group or part of it is somehow deselected between presses.
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1039,12 +1045,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}
 				} 
-				else 
+
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -460,6 +460,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual Drawable *getFirstSelectedDrawable( void );							///< get the first selected drawable (if any)
 	virtual DrawableID getSoloNexusSelectedDrawableID( void ) { return m_soloNexusSelectedDrawableID; }  ///< Return the one drawable of the nexus if only 1 angry mob is selected 
 	virtual Bool isDrawableSelected( DrawableID idToCheck ) const;	///< Return true if the selected ID is in the drawable list
+	virtual Bool areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const;	///< Return true if all of the selected objects are in the drawable list
 	virtual Bool isAnySelectedKindOf( KindOfType kindOf ) const;		///< is any selected object a kind of 
 	virtual Bool isAllSelectedKindOf( KindOfType kindOf ) const;		///< are all selected objects a kind of
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -3425,6 +3425,21 @@ Bool InGameUI::isDrawableSelected( DrawableID idToCheck ) const
 
 }  // end isDrawableSelected
 
+//-------------------------------------------------------------------------------------------------
+/** Return true if all of the given objects are selected */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(const std::vector<Object*>& objectsToCheck) const
+{
+	for (std::vector<Object*>::const_iterator it = objectsToCheck.begin(); it != objectsToCheck.end(); ++it)
+	{
+		if (!(*it)->getDrawable()->isSelected())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}  // end areAllObjectsSelected
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -954,6 +954,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 						if( !TheInGameUI->getPreventLeftClickDeselectionInAlternateMouseModeForOneClick() )
 						{
 							deselectAll();
+							m_lastGroupSelGroup = -1;
 						}
 						else
 						{
@@ -1099,10 +1100,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
+					// if the group or part of it is somehow deselected between presses.
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1114,12 +1120,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}
 				} 
-				else 
+				
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 

Original file line number	Diff line number	Diff line change
`@@ -962,6 +962,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`962`	`962`	`if (! TheGlobalData->m_useAlternateMouse \|\| TheInGameUI->getPendingPlaceSourceObjectID() != INVALID_ID)`
`963`	`963`	`{`
`964`	`964`	`deselectAll();`
	`965`	`+ m_lastGroupSelGroup = -1;`
`965`	`966`	`}`
`966`	`967`	`}`
`967`	`968`	`}`
`@@ -1024,10 +1025,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1024`	`1025`	`m_lastGroupSelTime = now;`
`1025`	`1026`	`}`
`1026`	`1027`
	`1028`	`+ Bool performSelection = TRUE;`
	`1029`	`+`
`1027`	`1030`	`// check for double-press to jump view`
`1028`	`1031`	`if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
`1029`	`1032`	`{`
`1030`	`1033`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
	`1034`	`+ // TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press`
	`1035`	`+ // if the group or part of it is somehow deselected between presses.`
	`1036`	`+ performSelection = FALSE;`
`1031`	`1037`	`Player *player = ThePlayerList->getLocalPlayer();`
`1032`	`1038`	`if (player)`
`1033`	`1039`	`{`
`@@ -1039,12 +1045,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1039`	`1045`	`if (numObjs > 0)`
`1040`	`1046`	`{`
`1041`	`1047`	`// if theres someone in the group, center the camera on them.`
`1042`		`- TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );`
	`1048`	`+ Drawable* drawable = objlist[numObjs - 1]->getDrawable();`
	`1049`	`+ TheTacticalView->lookAt( drawable->getPosition() );`
	`1050`	`+ performSelection = !TheInGameUI->areAllObjectsSelected( objlist );`
`1043`	`1051`	`}`
`1044`	`1052`	`}`
`1045`	`1053`	`}`
`1046`	`1054`	`}`
`1047`		`- else`
	`1055`	`+`
	`1056`	`+ if ( performSelection )`
`1048`	`1057`	`{`
`1049`	`1058`	`TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!`
`1050`	`1059`
Original file line number	Diff line number	Diff line change
`@@ -954,6 +954,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`954`	`954`	`if( !TheInGameUI->getPreventLeftClickDeselectionInAlternateMouseModeForOneClick() )`
`955`	`955`	`{`
`956`	`956`	`deselectAll();`
	`957`	`+ m_lastGroupSelGroup = -1;`
`957`	`958`	`}`
`958`	`959`	`else`
`959`	`960`	`{`
`@@ -1099,10 +1100,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1099`	`1100`	`m_lastGroupSelTime = now;`
`1100`	`1101`	`}`
`1101`	`1102`
	`1103`	`+ Bool performSelection = TRUE;`
	`1104`	`+`
`1102`	`1105`	`// check for double-press to jump view`
`1103`	`1106`	`if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
`1104`	`1107`	`{`
`1105`	`1108`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
	`1109`	`+ // TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press`
	`1110`	`+ // if the group or part of it is somehow deselected between presses.`
	`1111`	`+ performSelection = FALSE;`
`1106`	`1112`	`Player *player = ThePlayerList->getLocalPlayer();`
`1107`	`1113`	`if (player)`
`1108`	`1114`	`{`
`@@ -1114,12 +1120,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1114`	`1120`	`if (numObjs > 0)`
`1115`	`1121`	`{`
`1116`	`1122`	`// if theres someone in the group, center the camera on them.`
`1117`		`- TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );`
	`1123`	`+ Drawable* drawable = objlist[numObjs - 1]->getDrawable();`
	`1124`	`+ TheTacticalView->lookAt( drawable->getPosition() );`
	`1125`	`+ performSelection = !TheInGameUI->areAllObjectsSelected( objlist );`
`1118`	`1126`	`}`
`1119`	`1127`	`}`
`1120`	`1128`	`}`
`1121`	`1129`	`}`
`1122`		`- else`
	`1130`	`+`
	`1131`	`+ if ( performSelection )`
`1123`	`1132`	`{`
`1124`	`1133`	`TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!`
`1125`	`1134`