|
36 | 36 | #include "Common/GameCommon.h"
|
37 | 37 | #include "Common/GameType.h"
|
38 | 38 | #include "Common/MessageStream.h" // for GameMessageTranslator
|
| 39 | +#include "Common/KindOf.h" |
39 | 40 | #include "Common/SpecialPowerType.h"
|
| 41 | +#include "Common/Snapshot.h" |
40 | 42 | #include "Common/STLTypedefs.h"
|
41 | 43 | #include "Common/SubsystemInterface.h"
|
42 | 44 | #include "Common/UnicodeString.h"
|
43 | 45 | #include "GameClient/DisplayString.h"
|
44 | 46 | #include "GameClient/Mouse.h"
|
45 | 47 | #include "GameClient/RadiusDecal.h"
|
46 | 48 | #include "GameClient/View.h"
|
47 |
| -#include "Common/Snapshot.h" |
48 | 49 |
|
49 | 50 | // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
|
50 | 51 | class Drawable;
|
@@ -482,10 +483,16 @@ friend class Drawable; // for selection/deselection transactions
|
482 | 483 | Bool canSelectedObjectsOverrideSpecialPowerDestination( const Coord3D *loc, SelectionRules rule, SpecialPowerType spType = SPECIAL_INVALID ) const;
|
483 | 484 |
|
484 | 485 | // Selection Methods
|
485 |
| - virtual Int selectMatchingUnits(); ///< selects matching units |
486 |
| - virtual Int selectAcrossScreen(); ///< selects matching units across screen |
487 |
| - virtual Int selectAcrossMap(); ///< selects matching units across map |
488 |
| - virtual Int selectAcrossRegion( IRegion2D *region ); // -1 = no locally-owned selection, 0+ = # of units selected |
| 486 | + virtual Int selectUnitsMatchingCurrentSelection(); ///< selects matching units |
| 487 | + virtual Int selectMatchingAcrossScreen(); ///< selects matching units across screen |
| 488 | + virtual Int selectMatchingAcrossMap(); ///< selects matching units across map |
| 489 | + virtual Int selectMatchingAcrossRegion( IRegion2D *region ); // -1 = no locally-owned selection, 0+ = # of units selected |
| 490 | + |
| 491 | + virtual Int selectAllUnitsByType(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear); |
| 492 | + virtual Int selectAllUnitsByTypeAcrossScreen(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear); |
| 493 | + virtual Int selectAllUnitsByTypeAcrossMap(KindOfMaskType mustBeSet, KindOfMaskType mustBeClear); |
| 494 | + virtual Int selectAllUnitsByTypeAcrossRegion( IRegion2D *region, KindOfMaskType mustBeSet, KindOfMaskType mustBeClear ); |
| 495 | + |
489 | 496 | virtual void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region ); ///< builds a region around the specified coordinates
|
490 | 497 |
|
491 | 498 | virtual Bool getDisplayedMaxWarning( void ) { return m_displayedMaxWarning; }
|
@@ -700,7 +707,7 @@ friend class Drawable; // for selection/deselection transactions
|
700 | 707 | Int m_maxSelectCount; ///< Max number of objects to select
|
701 | 708 | UnsignedInt m_frameSelectionChanged; ///< Frame when the selection last changed.
|
702 | 709 |
|
703 |
| - |
| 710 | + |
704 | 711 | // Video playback data
|
705 | 712 | VideoBuffer* m_videoBuffer; ///< video playback buffer
|
706 | 713 | VideoStreamInterface* m_videoStream; ///< Video stream;
|
|
0 commit comments