chore: Check all squad members when determining reselection

Author: Stubbjax

Generals/Code/GameEngine/Include/GameClient/InGameUI.h

@@ -440,6 +440,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(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
 

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 selected objects are in the drawable list */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(std::vector<Object*> objectsToCheck) const
+{
+	for (DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it)
+	{
+		if (std::find(objectsToCheck.begin(), objectsToCheck.end(), (*it)->getObject()) == objectsToCheck.end())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}  // end areAllObjectsSelected
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const

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

@@ -1045,7 +1045,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 								// if theres someone in the group, center the camera on them.
 								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
 								TheTacticalView->lookAt( drawable->getPosition() );
-								performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}

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

@@ -455,6 +455,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(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
 

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 selected objects are in the drawable list */
+//-------------------------------------------------------------------------------------------------
+Bool InGameUI::areAllObjectsSelected(std::vector<Object*> objectsToCheck) const
+{
+	for (DrawableListCIt it = m_selectedDrawables.begin(); it != m_selectedDrawables.end(); ++it)
+	{
+		if (std::find(objectsToCheck.begin(), objectsToCheck.end(), (*it)->getObject()) == objectsToCheck.end())
+			return FALSE;
+	}
+
+	return TRUE;
+
+}  // end areAllObjectsSelected
+
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 Bool InGameUI::isAnySelectedKindOf( KindOfType kindOf ) const

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

@@ -1120,7 +1120,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 								// if theres someone in the group, center the camera on them.
 								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
 								TheTacticalView->lookAt( drawable->getPosition() );
-								performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );
+								performSelection = !TheInGameUI->areAllObjectsSelected( objlist );
 							}
 						}
 					}