Changed area selection enum names.

Author: Caball009

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

@@ -224,7 +224,6 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_SELECT_HERO,                       ///< selects player's hero character, if exists...
 		MSG_META_SELECT_ALL,                        ///< selects all units across screen
 		MSG_META_SELECT_ALL_AIRCRAFT,								///< selects all air units just like select all
-		MSG_META_AREA_SELECTION,                    ///< rectangular selection area (pixelRegion)
 		MSG_META_SCATTER,														///< selected units scatter
 		MSG_META_STOP,															///< selected units stop
 		MSG_META_DEPLOY,														///< selected units 'deploy'
@@ -446,7 +445,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,							///< rectangular selection area (pixelRegion) under construction, not confirmed
+		MSG_END_AREA_SELECTION_HINT,                ///< rectangular selection area (pixelRegion) finish construction
 
 		//Command hints
 		MSG_DO_ATTACK_OBJECT_HINT,									///< (victim objectID) If clicked, an attack would be ordered, "Current Selection" is assumed

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

@@ -331,7 +331,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_SELECT_HERO)
 	CASE_LABEL(MSG_META_SELECT_ALL)
 	CASE_LABEL(MSG_META_SELECT_ALL_AIRCRAFT)
-	CASE_LABEL(MSG_META_AREA_SELECTION)
 	CASE_LABEL(MSG_META_SCATTER)
 	CASE_LABEL(MSG_META_STOP)
 	CASE_LABEL(MSG_META_DEPLOY)
@@ -544,7 +543,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)

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

@@ -97,14 +97,14 @@ GameMessageDisposition HintSpyTranslator::translateGameMessage(const GameMessage
 			break;
 
 		//-----------------------------------------------------------------------------
-		case GameMessage::MSG_AREA_SELECTION_HINT:
+		case GameMessage::MSG_BEGIN_AREA_SELECTION_HINT:
 			TheInGameUI->beginAreaSelectHint( msg );
 			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_META_AREA_SELECTION:
+		case GameMessage::MSG_END_AREA_SELECTION_HINT:
 			TheInGameUI->endAreaSelectHint( msg );
 			break;
 

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

@@ -427,7 +427,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;
@@ -517,7 +517,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					TheInGameUI->selectMatchingAcrossScreen();
 
 				// emit "picked" message
-				GameMessage *pickMsg = TheMessageStream->appendMessage( GameMessage::MSG_META_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()) {
@@ -932,7 +932,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				TheInGameUI->endAreaSelectHint(nullptr);
 
 				// insert area selection message into stream
-				GameMessage *dragMsg = TheMessageStream->appendMessage( GameMessage::MSG_META_AREA_SELECTION );
+				GameMessage *dragMsg = TheMessageStream->appendMessage( GameMessage::MSG_END_AREA_SELECTION_HINT );
 
 				IRegion2D selectionRegion;
 				buildRegion( &m_selectFeedbackAnchor, &msg->getArgument(0)->pixel, &selectionRegion );