Skip to content

Commit a9b260a

Browse files
authored
tweak(gamemessage): Remove unused argument of MSG_DESTROY_SELECTED_GROUP (TheSuperHackers#2664)
1 parent af4f950 commit a9b260a

4 files changed

Lines changed: 6 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ class GameMessage : public MemoryPoolObject
472472
* The selected team is created/augmented with the given team members.
473473
* Do not play their selection sounds.
474474
*/
475-
MSG_DESTROY_SELECTED_GROUP, ///< (teamID) the given team is no longer valid
475+
MSG_DESTROY_SELECTED_GROUP, ///< deselect currently selected objects (which can be none)
476476
MSG_REMOVE_FROM_SELECTED_GROUP, /**< (objectID1, objectID2, ... objectIDN)
477477
* Remove these units from the selected group. (N should almost always be 1)
478478
*/

Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3493,10 +3493,8 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
34933493
the order of operations of things happening in the code (CBD) */
34943494
if( postMsg )
34953495
{
3496-
GameMessage *groupMsg = TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
3497-
3498-
//True deletes entire group.
3499-
groupMsg->appendBooleanArgument( true );
3496+
// TheSuperHackers @tweak Originally this message had one boolean argument, but it wasn't used for anything.
3497+
TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
35003498
}
35013499
}
35023500

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ class GameMessage : public MemoryPoolObject
503503
* The selected team is created/augmented with the given team members.
504504
* Do not play their selection sounds.
505505
*/
506-
MSG_DESTROY_SELECTED_GROUP, ///< (teamID) the given team is no longer valid
506+
MSG_DESTROY_SELECTED_GROUP, ///< deselect currently selected objects (which can be none)
507507
MSG_REMOVE_FROM_SELECTED_GROUP, /**< (objectID1, objectID2, ... objectIDN)
508508
* Remove these units from the selected group. (N should almost always be 1)
509509
*/

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3584,10 +3584,8 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
35843584
the order of operations of things happening in the code (CBD) */
35853585
if( postMsg )
35863586
{
3587-
GameMessage *groupMsg = TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
3588-
3589-
//True deletes entire group.
3590-
groupMsg->appendBooleanArgument( true );
3587+
// TheSuperHackers @tweak Originally this message had one boolean argument, but it wasn't used for anything.
3588+
TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
35913589
}
35923590
}
35933591

0 commit comments

Comments
 (0)