Skip to content

tweak(gamemessage): Remove unused argument of MSG_DESTROY_SELECTED_GROUP #2664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Apr 30, 2026
+6 −10
Merged

tweak(gamemessage): Remove unused argument of MSG_DESTROY_SELECTED_GROUP #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e48f1d
tweak(msg): Remove unused argument of MSG_DESTROY_SELECTED_GROUP.
Caball009 Apr 29, 2026
0037531
Replicated in Generals.
Caball009 Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/Common/MessageStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ class GameMessage : public MemoryPoolObject
* The selected team is created/augmented with the given team members.
* Do not play their selection sounds.
*/
MSG_DESTROY_SELECTED_GROUP, ///< (teamID) the given team is no longer valid
MSG_DESTROY_SELECTED_GROUP, ///< deselect currently selected objects (which can be none)
MSG_REMOVE_FROM_SELECTED_GROUP, /**< (objectID1, objectID2, ... objectIDN)
* Remove these units from the selected group. (N should almost always be 1)
*/
Expand Down
6 changes: 2 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3493,10 +3493,8 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
the order of operations of things happening in the code (CBD) */
if( postMsg )
{
GameMessage *groupMsg = TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );

//True deletes entire group.
groupMsg->appendBooleanArgument( true );
// TheSuperHackers @tweak Originally this message had one boolean argument, but it wasn't used for anything.
TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
}
}

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ class GameMessage : public MemoryPoolObject
* The selected team is created/augmented with the given team members.
* Do not play their selection sounds.
*/
MSG_DESTROY_SELECTED_GROUP, ///< (teamID) the given team is no longer valid
MSG_DESTROY_SELECTED_GROUP, ///< deselect currently selected objects (which can be none)
MSG_REMOVE_FROM_SELECTED_GROUP, /**< (objectID1, objectID2, ... objectIDN)
* Remove these units from the selected group. (N should almost always be 1)
*/
Expand Down
6 changes: 2 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3584,10 +3584,8 @@ void InGameUI::deselectAllDrawables( Bool postMsg )
the order of operations of things happening in the code (CBD) */
if( postMsg )
{
GameMessage *groupMsg = TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );

//True deletes entire group.
groupMsg->appendBooleanArgument( true );
Comment thread
xezon marked this conversation as resolved.
// TheSuperHackers @tweak Originally this message had one boolean argument, but it wasn't used for anything.
TheMessageStream->appendMessage( GameMessage::MSG_DESTROY_SELECTED_GROUP );
}
}

Expand Down
Loading