Skip to content

Commit 2896c82

Browse files
authored
chore(player): Remove unused GameMessage argument from Player member functions (#2669)
1 parent b97d954 commit 2896c82

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,10 @@ class Player : public Snapshot
620620
void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);
621621

622622
/// time to select a hotkey team based on this GameMessage
623-
void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
623+
void processSelectTeamGameMessage(Int hotkeyNum);
624624

625625
// add to the player's current selection this hotkey team.
626-
void processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg);
626+
void processAddTeamGameMessage(Int hotkeyNum);
627627

628628
// fills an AIGroup object that is the currently selected group.
629629
void getCurrentSelectionAsAIGroup(AIGroup *group);

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3486,7 +3486,7 @@ void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg)
34863486
//-------------------------------------------------------------------------------------------------
34873487
/** Select a hotkey team based on this GameMessage */
34883488
//-------------------------------------------------------------------------------------------------
3489-
void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
3489+
void Player::processSelectTeamGameMessage(Int hotkeyNum) {
34903490
if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
34913491
DEBUG_CRASH(("processSelectTeamGameMessage got an invalid hotkey number"));
34923492
return;
@@ -3509,7 +3509,7 @@ void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
35093509
//-------------------------------------------------------------------------------------------------
35103510
/** Select a hotkey team based on this GameMessage */
35113511
//-------------------------------------------------------------------------------------------------
3512-
void Player::processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
3512+
void Player::processAddTeamGameMessage(Int hotkeyNum) {
35133513
if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
35143514
DEBUG_CRASH(("processAddTeamGameMessage got an invalid hotkey number"));
35153515
return;

Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
20032003
case GameMessage::MSG_SELECT_TEAM8:
20042004
case GameMessage::MSG_SELECT_TEAM9:
20052005
{
2006-
msgPlayer->processSelectTeamGameMessage(msg->getType() - GameMessage::MSG_SELECT_TEAM0, msg);
2006+
msgPlayer->processSelectTeamGameMessage(msg->getType() - GameMessage::MSG_SELECT_TEAM0);
20072007
break;
20082008
}
20092009

@@ -2018,7 +2018,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
20182018
case GameMessage::MSG_ADD_TEAM8:
20192019
case GameMessage::MSG_ADD_TEAM9:
20202020
{
2021-
msgPlayer->processAddTeamGameMessage(msg->getType() - GameMessage::MSG_ADD_TEAM0, msg);
2021+
msgPlayer->processAddTeamGameMessage(msg->getType() - GameMessage::MSG_ADD_TEAM0);
20222022
break;
20232023
}
20242024

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,10 +631,10 @@ class Player : public Snapshot
631631
void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);
632632

633633
/// time to select a hotkey team based on this GameMessage
634-
void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
634+
void processSelectTeamGameMessage(Int hotkeyNum);
635635

636636
// add to the player's current selection this hotkey team.
637-
void processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg);
637+
void processAddTeamGameMessage(Int hotkeyNum);
638638

639639
// fills an AIGroup object that is the currently selected group.
640640
void getCurrentSelectionAsAIGroup(AIGroup *group);

GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,7 +3684,7 @@ void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg)
36843684
//-------------------------------------------------------------------------------------------------
36853685
/** Select a hotkey team based on this GameMessage */
36863686
//-------------------------------------------------------------------------------------------------
3687-
void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
3687+
void Player::processSelectTeamGameMessage(Int hotkeyNum) {
36883688
if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
36893689
DEBUG_CRASH(("processSelectTeamGameMessage got an invalid hotkey number"));
36903690
return;
@@ -3714,7 +3714,7 @@ void Player::processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
37143714
//-------------------------------------------------------------------------------------------------
37153715
/** Select a hotkey team based on this GameMessage */
37163716
//-------------------------------------------------------------------------------------------------
3717-
void Player::processAddTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
3717+
void Player::processAddTeamGameMessage(Int hotkeyNum) {
37183718
if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
37193719
DEBUG_CRASH(("processAddTeamGameMessage got an invalid hotkey number"));
37203720
return;

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,7 +2036,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
20362036
case GameMessage::MSG_SELECT_TEAM8:
20372037
case GameMessage::MSG_SELECT_TEAM9:
20382038
{
2039-
msgPlayer->processSelectTeamGameMessage(msg->getType() - GameMessage::MSG_SELECT_TEAM0, msg);
2039+
msgPlayer->processSelectTeamGameMessage(msg->getType() - GameMessage::MSG_SELECT_TEAM0);
20402040
break;
20412041
}
20422042

@@ -2051,7 +2051,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
20512051
case GameMessage::MSG_ADD_TEAM8:
20522052
case GameMessage::MSG_ADD_TEAM9:
20532053
{
2054-
msgPlayer->processAddTeamGameMessage(msg->getType() - GameMessage::MSG_ADD_TEAM0, msg);
2054+
msgPlayer->processAddTeamGameMessage(msg->getType() - GameMessage::MSG_ADD_TEAM0);
20552055
break;
20562056
}
20572057

0 commit comments

Comments
 (0)