From 3547e4f038932aae9e675046a63db373d91d56d2 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Fri, 8 May 2026 21:38:32 +0200 Subject: [PATCH 1/2] Reverted local group creation. --- .../GameClient/MessageStream/CommandXlat.cpp | 20 ------------------- .../GameLogic/System/GameLogicDispatch.cpp | 5 +---- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 830faa70ac9..1f15291995a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3743,26 +3743,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage break; } - // -------------------------------------------------------------------------------------------- - case GameMessage::MSG_CREATE_TEAM0: - case GameMessage::MSG_CREATE_TEAM1: - case GameMessage::MSG_CREATE_TEAM2: - case GameMessage::MSG_CREATE_TEAM3: - case GameMessage::MSG_CREATE_TEAM4: - case GameMessage::MSG_CREATE_TEAM5: - case GameMessage::MSG_CREATE_TEAM6: - case GameMessage::MSG_CREATE_TEAM7: - case GameMessage::MSG_CREATE_TEAM8: - case GameMessage::MSG_CREATE_TEAM9: - { - Int playerIndex = msg->getPlayerIndex(); - Player* player = ThePlayerList->getNthPlayer(playerIndex); - if (player && player->isLocalPlayer()) - player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg); - - break; - } - // -------------------------------------------------------------------------------------------- case GameMessage::MSG_CREATE_SELECTED_GROUP: case GameMessage::MSG_SELECT_TEAM0: diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 304b8cd89ab..ccb3fd83c01 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -2018,10 +2018,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) case GameMessage::MSG_CREATE_TEAM8: case GameMessage::MSG_CREATE_TEAM9: { - // TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment. - if (!msgPlayer->isLocalPlayer()) - msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg); - + msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg); break; } From 150e104db97f7b242587a8678e1d42422abeab3c Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 10 May 2026 01:26:42 +0200 Subject: [PATCH 2/2] Replicated in Generals. --- .../GameClient/MessageStream/CommandXlat.cpp | 20 ------------------- .../GameLogic/System/GameLogicDispatch.cpp | 5 +---- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index c6235b0f7da..b657b769b4d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3414,26 +3414,6 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage break; } - // -------------------------------------------------------------------------------------------- - case GameMessage::MSG_CREATE_TEAM0: - case GameMessage::MSG_CREATE_TEAM1: - case GameMessage::MSG_CREATE_TEAM2: - case GameMessage::MSG_CREATE_TEAM3: - case GameMessage::MSG_CREATE_TEAM4: - case GameMessage::MSG_CREATE_TEAM5: - case GameMessage::MSG_CREATE_TEAM6: - case GameMessage::MSG_CREATE_TEAM7: - case GameMessage::MSG_CREATE_TEAM8: - case GameMessage::MSG_CREATE_TEAM9: - { - Int playerIndex = msg->getPlayerIndex(); - Player* player = ThePlayerList->getNthPlayer(playerIndex); - if (player && player->isLocalPlayer()) - player->processCreateTeamGameMessage(t - GameMessage::MSG_CREATE_TEAM0, msg); - - break; - } - // -------------------------------------------------------------------------------------------- case GameMessage::MSG_CREATE_SELECTED_GROUP: case GameMessage::MSG_SELECT_TEAM0: diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 1377003de94..78d051ba60b 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1985,10 +1985,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) case GameMessage::MSG_CREATE_TEAM8: case GameMessage::MSG_CREATE_TEAM9: { - // TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment. - if (!msgPlayer->isLocalPlayer()) - msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg); - + msgPlayer->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg); break; }