Skip to content

Select and scroll to locked game when joining#913

Open
11EJDE11 wants to merge 2 commits intoCnCNet:developfrom
11EJDE11:feat-scroll-to-joingame
Open

Select and scroll to locked game when joining#913
11EJDE11 wants to merge 2 commits intoCnCNet:developfrom
11EJDE11:feat-scroll-to-joingame

Conversation

@11EJDE11
Copy link
Member

Currently when choosing "Join" from the player list context menu, and the game is locked, you get "The selected game is locked.". With this PR, it will now provide the game name, and select and scroll to the game.

@github-actions
Copy link

github-actions bot commented Jan 31, 2026

Nightly build for this pull request:

  • artifacts.zip
    This comment is automatic and is meant to allow guests to get latest automatic builds without registering. It is updated on every successful build.

@SadPencil
Copy link
Member

What if the player wants to join a room by double clicking it? Will the scroll thing happen too and will it causes some trouble?

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the multiplayer lobby join flow so that attempting to join a locked game provides more context (game name) and (for player-list joins) highlights the associated game in the game list.

Changes:

  • Updated “game locked” messaging to include the room name.
  • Adjusted CnCNet “invite-only/locked on join” handling to mark the game locked and refresh the list.
  • Added logic to select + scroll to the user’s game in the CnCNet lobby when joining via player list.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 7 comments.

File Description
DXMainClient/DXGUI/Multiplayer/LANLobby.cs Includes the locked game’s name in the LAN lobby lock message.
DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs Includes the locked game’s name in join errors, adjusts locked-on-join messaging, and selects/scrolls to the target game when joining a user.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@11EJDE11
Copy link
Member Author

What if the player wants to join a room by double clicking it? Will the scroll thing happen too and will it causes some trouble?

No, not an issue. This only applies when joining trying to join a player (like right click on a player and choose Join).

}

ClearGameJoinAttempt((Channel)sender);
ClearGameJoinAttempt((Channel)sender);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants