Skip to content

Commit e3515af

Browse files
authored
bugfix(input): Revert changes to local group creation (TheSuperHackers#2694)
This reverts commit 67f50d1 because it can cause mismatching
1 parent b6a6007 commit e3515af

4 files changed

Lines changed: 2 additions & 48 deletions

File tree

Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3414,26 +3414,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
34143414
break;
34153415
}
34163416

3417-
// --------------------------------------------------------------------------------------------
3418-
case GameMessage::MSG_CREATE_TEAM0:
3419-
case GameMessage::MSG_CREATE_TEAM1:
3420-
case GameMessage::MSG_CREATE_TEAM2:
3421-
case GameMessage::MSG_CREATE_TEAM3:
3422-
case GameMessage::MSG_CREATE_TEAM4:
3423-
case GameMessage::MSG_CREATE_TEAM5:
3424-
case GameMessage::MSG_CREATE_TEAM6:
3425-
case GameMessage::MSG_CREATE_TEAM7:
3426-
case GameMessage::MSG_CREATE_TEAM8:
3427-
case GameMessage::MSG_CREATE_TEAM9:
3428-
{
3429-
Int playerIndex = msg->getPlayerIndex();
3430-
Player* player = ThePlayerList->getNthPlayer(playerIndex);
3431-
if (player && player->isLocalPlayer())
3432-
player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg);
3433-
3434-
break;
3435-
}
3436-
34373417
// --------------------------------------------------------------------------------------------
34383418
case GameMessage::MSG_CREATE_SELECTED_GROUP:
34393419
case GameMessage::MSG_SELECT_TEAM0:

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,10 +1985,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
19851985
case GameMessage::MSG_CREATE_TEAM8:
19861986
case GameMessage::MSG_CREATE_TEAM9:
19871987
{
1988-
// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
1989-
if (!msgPlayer->isLocalPlayer())
1990-
msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
1991-
1988+
msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
19921989
break;
19931990
}
19941991

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,26 +3743,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
37433743
break;
37443744
}
37453745

3746-
// --------------------------------------------------------------------------------------------
3747-
case GameMessage::MSG_CREATE_TEAM0:
3748-
case GameMessage::MSG_CREATE_TEAM1:
3749-
case GameMessage::MSG_CREATE_TEAM2:
3750-
case GameMessage::MSG_CREATE_TEAM3:
3751-
case GameMessage::MSG_CREATE_TEAM4:
3752-
case GameMessage::MSG_CREATE_TEAM5:
3753-
case GameMessage::MSG_CREATE_TEAM6:
3754-
case GameMessage::MSG_CREATE_TEAM7:
3755-
case GameMessage::MSG_CREATE_TEAM8:
3756-
case GameMessage::MSG_CREATE_TEAM9:
3757-
{
3758-
Int playerIndex = msg->getPlayerIndex();
3759-
Player* player = ThePlayerList->getNthPlayer(playerIndex);
3760-
if (player && player->isLocalPlayer())
3761-
player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg);
3762-
3763-
break;
3764-
}
3765-
37663746
// --------------------------------------------------------------------------------------------
37673747
case GameMessage::MSG_CREATE_SELECTED_GROUP:
37683748
case GameMessage::MSG_SELECT_TEAM0:

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,10 +2018,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
20182018
case GameMessage::MSG_CREATE_TEAM8:
20192019
case GameMessage::MSG_CREATE_TEAM9:
20202020
{
2021-
// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
2022-
if (!msgPlayer->isLocalPlayer())
2023-
msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
2024-
2021+
msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
20252022
break;
20262023
}
20272024

0 commit comments

Comments
 (0)