[GEN] Backport Select All Aircraft feature from Zero Hour (TheSuperHackers#834)

Author: Bart Roossien | SkyAero

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

@@ -225,6 +225,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_VIEW_LAST_RADAR_EVENT,							///< center view on last radar event
 		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_SCATTER,														///< selected units scatter
 		MSG_META_STOP,															///< selected units stop
 		MSG_META_DEPLOY,														///< selected units 'deploy'

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

@@ -36,15 +36,16 @@
 #include "Common/GameCommon.h"
 #include "Common/GameType.h"
 #include "Common/MessageStream.h"		// for GameMessageTranslator
+#include "Common/KindOf.h"
 #include "Common/SpecialPowerType.h"
+#include "Common/Snapshot.h"
 #include "Common/STLTypedefs.h"
 #include "Common/SubsystemInterface.h"
 #include "Common/UnicodeString.h"
 #include "GameClient/DisplayString.h"
 #include "GameClient/Mouse.h"
 #include "GameClient/RadiusDecal.h"
 #include "GameClient/View.h"
-#include "Common/Snapshot.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 class Drawable;
@@ -484,10 +485,16 @@ friend class Drawable;	// for selection/deselection transactions
 	Bool canSelectedObjectsOverrideSpecialPowerDestination( const Coord3D *loc, SelectionRules rule, SpecialPowerType spType = SPECIAL_INVALID ) const;
 
 	// Selection Methods
-	virtual Int selectMatchingUnits();                        ///< selects matching units
-	virtual Int selectAcrossScreen();                         ///< selects matching units across screen
-	virtual Int selectAcrossMap();                            ///< selects matching units across map
-	virtual Int selectAcrossRegion( IRegion2D *region );			// -1 = no locally-owned selection, 0+ = # of units selected
+	virtual Int selectUnitsMatchingCurrentSelection();                        ///< selects matching units
+	virtual Int selectMatchingAcrossScreen();                         ///< selects matching units across screen
+	virtual Int selectMatchingAcrossMap();                            ///< selects matching units across map
+	virtual Int selectMatchingAcrossRegion( IRegion2D *region );			// -1 = no locally-owned selection, 0+ = # of units selected
+
+	virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                
+	virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                         
+	virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear);                            
+	virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear );			
+	
 	virtual void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region );  ///< builds a region around the specified coordinates
 
 	virtual Bool getDisplayedMaxWarning( void ) { return m_displayedMaxWarning; }

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

@@ -336,6 +336,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t)
 	CHECK_IF(MSG_META_VIEW_LAST_RADAR_EVENT)
 	CHECK_IF(MSG_META_SELECT_HERO)
 	CHECK_IF(MSG_META_SELECT_ALL)
+	CHECK_IF(MSG_META_SELECT_ALL_AIRCRAFT)
 	CHECK_IF(MSG_META_SCATTER)
 	CHECK_IF(MSG_META_STOP)
 	CHECK_IF(MSG_META_DEPLOY)