Skip to content

tweak(input): Remove input latency for group creation in multiplayer games #1471

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 4 commits into from
Aug 24, 2025
Merged

tweak(input): Remove input latency for group creation in multiplayer games #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0905c4d
tweak: Group creation is now immediate and no longer dependent on net…
Stubbjax Aug 17, 2025
c318307
refactor: Ensure the message sender is the local player
Stubbjax Aug 17, 2025
af655ad
chore: Add null player check to match game logic dispatch check
Stubbjax Aug 24, 2025
57137bb
refactor: Align GameLogicDispatch logic flow with CommandXlat
Stubbjax Aug 24, 2025
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/Player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ class Player : public Snapshot
ScoreKeeper* getScoreKeeper( void ) { return &m_scoreKeeper; }

/// time to create a hotkey team based on this GameMessage
void processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg);
void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);

/// time to select a hotkey team based on this GameMessage
void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3181,7 +3181,7 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
//-------------------------------------------------------------------------------------------------
/** Create a hotkey team based on this GameMessage */
//-------------------------------------------------------------------------------------------------
void Player::processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg) {
// GameMessage arguments are the object ID's of the objects that are to be in this team.

if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
Expand Down
20 changes: 20 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,6 +3269,26 @@ 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:
Expand Down
8 changes: 3 additions & 5 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,12 +1901,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Player *player = ThePlayerList->getNthPlayer(playerIndex);
DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));

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

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

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/Player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ class Player : public Snapshot
ScoreKeeper* getScoreKeeper( void ) { return &m_scoreKeeper; }

/// time to create a hotkey team based on this GameMessage
void processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg);
void processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg);

/// time to select a hotkey team based on this GameMessage
void processSelectTeamGameMessage(Int hotkeyNum, GameMessage *msg);
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3682,7 +3682,7 @@ void Player::applyBattlePlanBonusesForPlayerObjects( const BattlePlanBonuses *bo
//-------------------------------------------------------------------------------------------------
/** Create a hotkey team based on this GameMessage */
//-------------------------------------------------------------------------------------------------
void Player::processCreateTeamGameMessage(Int hotkeyNum, GameMessage *msg) {
void Player::processCreateTeamGameMessage(Int hotkeyNum, const GameMessage *msg) {
// GameMessage arguments are the object ID's of the objects that are to be in this team.

if ((hotkeyNum < 0) || (hotkeyNum >= NUM_HOTKEY_SQUADS)) {
Expand Down
20 changes: 20 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3610,6 +3610,26 @@ 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:
Expand Down
8 changes: 3 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,12 +1929,10 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
Player *player = ThePlayerList->getNthPlayer(playerIndex);
DEBUG_ASSERTCRASH(player != NULL, ("Could not find player for create team message"));

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

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

Expand Down
Loading