Skip to content

Select and scroll to locked game when joining #913

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

Open
11EJDE11 wants to merge 2 commits into
base: develop
Choose a base branch
from
+15 −4
Open

Select and scroll to locked game when joining #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
005d6d1
Scroll to locked game when joining
11EJDE11 Jan 31, 2026
569c99c
Add fallback message
11EJDE11 Feb 10, 2026
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
17 changes: 14 additions & 3 deletions DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ private string GetJoinGameError(HostedCnCNetGame hg)
return "Cannot join game. The host is on a different game version than you.".L10N("Client:Main:DisallowJoiningIncompatibleGames");

if (hg.Locked)
return "The selected game is locked!".L10N("Client:Main:GameLocked");
return string.Format("The game {0} is locked!".L10N("Client:Main:GameLockedWithName"), hg.RoomName);

if (hg.IsLoadedGame && !hg.Players.Contains(ProgramConstants.PLAYERNAME))
return "You do not exist in the saved game!".L10N("Client:Main:NotInSavedGame");
Expand Down Expand Up @@ -964,17 +964,21 @@ private void GameChannel_ChannelFull(object sender, EventArgs e) =>

private void GameChannel_InviteOnlyErrorOnJoin(object sender, EventArgs e)
{
connectionManager.MainChannel.AddMessage(new ChatMessage(Color.White, "The selected game is locked!".L10N("Client:Main:GameLocked")));
var channel = (Channel)sender;

var game = FindGameByChannelName(channel.ChannelName);
if (game != null)
{
connectionManager.MainChannel.AddMessage(new ChatMessage(Color.White, string.Format("The game {0} is locked!".L10N("Client:Main:GameLockedWithName"), game.RoomName)));
game.Locked = true;
SortAndRefreshHostedGames();
}
else
{
connectionManager.MainChannel.AddMessage(new ChatMessage(Color.White, "The selected game is locked!".L10N("Client:Main:GameLocked")));
}

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

@pzhlkj6612 pzhlkj6612 Feb 10, 2026

Choose a reason for hiding this comment

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

format

}

private HostedCnCNetGame FindGameByChannelName(string channelName)
Expand Down Expand Up @@ -1795,6 +1799,13 @@ private void JoinUser(IRCUser user, IMessageView messageView)
return;
}

int gameIndex = lbGameList.Items.FindIndex(item => item.Tag == game);
if (gameIndex >= 0)
{
lbGameList.SelectedIndex = gameIndex;
lbGameList.ScrollToSelectedElement();
}

JoinGame(game, string.Empty, messageView);
}
}
Expand Down
2 changes: 1 addition & 1 deletion DXMainClient/DXGUI/Multiplayer/LANLobby.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ private void LbGameList_DoubleLeftClick(object sender, EventArgs e)

if (hg.Locked)
{
AddChatMessage("The selected game is locked!".L10N("Client:Main:GameLocked"));
AddChatMessage(string.Format("The game {0} is locked!".L10N("Client:Main:GameLockedWithName"), hg.RoomName));
return;
}

Expand Down
Loading