Replicated in Generals.

Author: Caball009

Generals/Code/GameEngine/Include/Common/MessageStream.h

@@ -415,7 +415,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_MOUSEOVER_LOCATION_HINT,								///< (location) The cursor is not over a drawable, but is here.
 		MSG_VALID_GUICOMMAND_HINT,									///< posted when the gui command is valid if the user clicked to execute it.
 		MSG_INVALID_GUICOMMAND_HINT,								///< posted when the gui command is not valid if the user were to click to attempt to execute it.
-		MSG_AREA_SELECTION_HINT,										///< (pixelRegion) rectangular selection area under construction, not confirmed
+		MSG_BEGIN_AREA_SELECTION_HINT,							///< (pixelRegion) rectangular selection area under construction, not confirmed
+		MSG_END_AREA_SELECTION_HINT,                ///< (pixelRegion) rectangular selection area finish construction
 
 		//Command hints
 		MSG_DO_ATTACK_OBJECT_HINT,									///< (victim objectID) If clicked, an attack would be ordered, "Current Selection" is assumed
@@ -532,7 +533,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_EXECUTE_RAILED_TRANSPORT,								///< Execute railed transport sequence
 		MSG_COMBATDROP_AT_LOCATION,									///< dump out all rappellers
 		MSG_COMBATDROP_AT_OBJECT,										///< dump out all rappellers
-		MSG_AREA_SELECTION,													///< (pixelRegion) rectangular selection area
+		MSG_AREA_SELECTION_DEPRECATED,              ///< TheSuperHackers @tweak former MSG_AREA_SELECTION is deprecated as network message.
 		MSG_DO_ATTACK_OBJECT,												///< (objectID, victim objectID)
 		MSG_DO_FORCE_ATTACK_OBJECT,									///< force attack the given object if picked
 		MSG_DO_FORCE_ATTACK_GROUND,									///< (locationID) bombard the given location if picked

Generals/Code/GameEngine/Source/Common/MessageStream.cpp

@@ -513,7 +513,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_MOUSEOVER_LOCATION_HINT)
 	CASE_LABEL(MSG_VALID_GUICOMMAND_HINT)
 	CASE_LABEL(MSG_INVALID_GUICOMMAND_HINT)
-	CASE_LABEL(MSG_AREA_SELECTION_HINT)
+	CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT)
+	CASE_LABEL(MSG_END_AREA_SELECTION_HINT)
 	CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
 	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
@@ -600,7 +601,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_EXECUTE_RAILED_TRANSPORT)
 	CASE_LABEL(MSG_COMBATDROP_AT_LOCATION)
 	CASE_LABEL(MSG_COMBATDROP_AT_OBJECT)
-	CASE_LABEL(MSG_AREA_SELECTION)
+	CASE_LABEL(MSG_AREA_SELECTION_DEPRECATED)
 	CASE_LABEL(MSG_DO_ATTACK_OBJECT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND)

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

@@ -96,15 +96,17 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 			break;
 
 		//-----------------------------------------------------------------------------
-		case GameMessage::MSG_AREA_SELECTION_HINT:
+		case GameMessage::MSG_BEGIN_AREA_SELECTION_HINT:
 			TheInGameUI->beginAreaSelectHint( msg );
+			disp = DESTROY_MESSAGE;
 			break;
 
 		//-----------------------------------------------------------------------------
-		// An AREA_SELECTION_HINT is always followed by an AREA_SELECTION, so
+		// A BEGIN_AREA_SELECTION_HINT is always followed by an END_AREA_SELECTION_HINT, so
 		// watch for it to stop hinting.
-		case GameMessage::MSG_AREA_SELECTION:
+		case GameMessage::MSG_END_AREA_SELECTION_HINT:
 			TheInGameUI->endAreaSelectHint( msg );
+			disp = DESTROY_MESSAGE;
 			break;
 
 		//-----------------------------------------------------------------------------

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

@@ -418,7 +418,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				if (m_dragSelecting)
 				{
 					// insert area selection "hint" message into stream
-					GameMessage *hintMsg = TheMessageStream->appendMessage( GameMessage::MSG_AREA_SELECTION_HINT );
+					GameMessage *hintMsg = TheMessageStream->appendMessage( GameMessage::MSG_BEGIN_AREA_SELECTION_HINT );
 
 					// build rectangular region defined by the drag selection
 					IRegion2D pixelRegion;
@@ -508,7 +508,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					TheInGameUI->selectMatchingAcrossScreen();
 
 				// emit "picked" message
-				GameMessage *pickMsg = TheMessageStream->appendMessage( GameMessage::MSG_AREA_SELECTION );
+				GameMessage *pickMsg = TheMessageStream->appendMessage( GameMessage::MSG_END_AREA_SELECTION_HINT );
 				pickMsg->appendDrawableIDArgument( picked->getID() );  /// note we are putting in a drawable id
 
 				if (TheInGameUI->isInPreferSelectionMode() && !listOfSelectedDrawables.empty()) {
@@ -857,7 +857,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				TheInGameUI->endAreaSelectHint(nullptr);
 
 				// insert area selection message into stream
-				GameMessage *dragMsg = TheMessageStream->appendMessage( GameMessage::MSG_AREA_SELECTION );
+				GameMessage *dragMsg = TheMessageStream->appendMessage( GameMessage::MSG_END_AREA_SELECTION_HINT );
 
 				IRegion2D selectionRegion;
 				buildRegion( &m_selectFeedbackAnchor, &msg->getArgument(0)->pixel, &selectionRegion );