Skip to content

Commit 57137bb

Browse files
committed
refactor: Align GameLogicDispatch logic flow with CommandXlat
1 parent af655ad commit 57137bb

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,16 +1901,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
19011901
Player *player = ThePlayerList->getNthPlayer(playerIndex);
19021902
DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));
19031903

1904-
if (player == NULL)
1905-
{
1906-
break;
1907-
}
1908-
19091904
// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
1910-
if (player->isLocalPlayer())
1911-
break;
1905+
if (player && !player->isLocalPlayer())
1906+
player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
19121907

1913-
player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
19141908
break;
19151909
} // end create team command
19161910

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,16 +1929,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
19291929
Player *player = ThePlayerList->getNthPlayer(playerIndex);
19301930
DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));
19311931

1932-
if (player == NULL)
1933-
{
1934-
break;
1935-
}
1936-
19371932
// TheSuperHackers @tweak Stubbjax 17/08/2025 The local player processes this message in CommandXlat for immediate assignment.
1938-
if (player->isLocalPlayer())
1939-
break;
1933+
if (player && !player->isLocalPlayer())
1934+
player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
19401935

1941-
player->processCreateTeamGameMessage(msg->getType() - GameMessage::MSG_CREATE_TEAM0, msg);
19421936
break;
19431937
} // end create team command
19441938

0 commit comments

Comments
 (0)