chore: Remove unnecessary retail-unfriendly implementation

Author: Stubbjax

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

@@ -643,15 +643,9 @@ class Player : public Snapshot
 	// sets the currently selected group to be the given AIGroup
 	void setCurrentlySelectedAIGroup(AIGroup *group);
 
-	// is object selected
-	Bool isCurrentlySelected(Object* obj);
-
 	// adds the given AIGroup to the current selection of this player.
 	void addAIGroupToCurrentSelection(AIGroup *group);
 
-	// adds an object to the player's specified hotkey team.
-	void addObjectToSquad(Object* obj, Int squadNumber, Bool newSquad = false);
-
 	// return the requested hotkey squad
 	Squad *getHotkeySquad(Int squadNumber);
 

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

@@ -3768,14 +3768,6 @@ void Player::getCurrentSelectionAsAIGroup(AIGroup *group) {
 	}
 }
 
-Bool Player::isCurrentlySelected(Object* obj)
-{
-	if (m_currentSelection == NULL || obj == NULL)
-		return false;
-
-	return m_currentSelection->isOnSquad(obj);
-}
-
 //-------------------------------------------------------------------------------------------------
 /** Select a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------
@@ -3791,24 +3783,6 @@ void Player::setCurrentlySelectedAIGroup(AIGroup *group) {
 	}
 }
 
-//-------------------------------------------------------------------------------------------------
-/** Add an object to a squad */
-//-------------------------------------------------------------------------------------------------
-void Player::addObjectToSquad(Object* obj, Int squadNumber, Bool newSquad)
-{
-	if (m_squads[squadNumber] == NULL)
-		return;
-
-	if (obj == NULL)
-		return;
-
-	if (newSquad)
-		m_squads[squadNumber]->clearSquad();
-
-	removeObjectFromHotkeySquad(obj);
-	m_squads[squadNumber]->addObject(obj);
-}
-
 //-------------------------------------------------------------------------------------------------
 /** Select a hotkey team based on this GameMessage */
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ReplaceObjectUpgrade.cpp

@@ -84,12 +84,8 @@ void ReplaceObjectUpgrade::upgradeImplementation( )
 		return;
 	}
 
-#if RETAIL_COMPATIBLE_CRC
 	Drawable* selectedDrawable = TheInGameUI->getFirstSelectedDrawable();
 	Bool oldObjectSelected = selectedDrawable && selectedDrawable->getID() == me->getDrawable()->getID();
-#else
-	Bool oldObjectSelected = me->getControllingPlayer()->isCurrentlySelected(me);
-#endif
 	Int oldObjectSquadNumber = me->getControllingPlayer()->getSquadNumberForObject(me);
 
 	// Remove us first since occupation of cells is apparently not a refcount, but a flag.  If I don't remove, then the new
@@ -117,30 +113,22 @@ void ReplaceObjectUpgrade::upgradeImplementation( )
 
 		if (oldObjectSelected)
 		{
-#if RETAIL_COMPATIBLE_CRC
 			if (replacementObject->isLocallyControlled())
 			{
 				GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_CREATE_SELECTED_GROUP_NO_SOUND);
 				msg->appendBooleanArgument(TRUE);
 				msg->appendObjectIDArgument(replacementObject->getID());
 				TheInGameUI->selectDrawable(replacementObject->getDrawable());
 			}
-#else
-			TheGameLogic->selectObject(replacementObject, TRUE, replacementObject->getControllingPlayer()->getPlayerMask(), replacementObject->isLocallyControlled());
-#endif
 		}
 
 		if (oldObjectSquadNumber != NO_HOTKEY_SQUAD)
 		{
-#if RETAIL_COMPATIBLE_CRC
 			if (replacementObject->isLocallyControlled())
 			{
 				GameMessage* msg = TheMessageStream->appendMessage((GameMessage::Type)(GameMessage::MSG_CREATE_TEAM0 + oldObjectSquadNumber));
 				msg->appendObjectIDArgument(replacementObject->getID());
 			}
-#else
-			replacementObject->getControllingPlayer()->addObjectToSquad(replacementObject, oldObjectSquadNumber, true);
-#endif
 		}
 	}
 }