Skip to content

Improve lobby list sorting and highlighting #390

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
x64-dev merged 1 commit into from
Mar 20, 2026
+67 −49
Merged

Improve lobby list sorting and highlighting #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Core/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instD

enum GameSortType CPP_11(: Int)
{
GAMESORT_ALPHA_ASCENDING = 0,
GAMESORT_ALPHA_DESCENDING,
GAMESORT_PING_ASCENDING,
GAMESORT_PING_DESCENDING,
GAMESORT_AGE_ASCENDING = 0, // was alpha
GAMESORT_AGE_DESCENDING, // was alpha
GAMESORT_MAP_ASCENDING, // was ping
GAMESORT_MAP_DESCENDING, // was ping
};

Bool HandleSortButton( NameKeyType sortButton );
Expand Down
108 changes: 63 additions & 45 deletions Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,30 +160,30 @@ static GameWindow *windowSortAlpha = nullptr;
static GameWindow *windowSortPing = nullptr;
static GameWindow *windowSortBuddies = nullptr;

static GameSortType theGameSortType = GAMESORT_ALPHA_ASCENDING;
static GameSortType theGameSortType = GAMESORT_MAP_ASCENDING; // was ping
static Bool sortBuddies = TRUE;
static void showSortIcons(void)
{
if (windowSortAlpha && windowSortPing)
{
switch (theGameSortType)
{
case GAMESORT_ALPHA_ASCENDING:
case GAMESORT_AGE_ASCENDING: // was alpha
windowSortAlpha->winHide(FALSE);
windowSortAlpha->winEnable(TRUE);
windowSortPing->winHide(TRUE);
break;
case GAMESORT_ALPHA_DESCENDING:
case GAMESORT_AGE_DESCENDING: // was alpha
windowSortAlpha->winHide(FALSE);
windowSortAlpha->winEnable(FALSE);
windowSortPing->winHide(TRUE);
break;
case GAMESORT_PING_ASCENDING:
case GAMESORT_MAP_ASCENDING: // was ping
windowSortPing->winHide(FALSE);
windowSortPing->winEnable(TRUE);
windowSortAlpha->winHide(TRUE);
break;
case GAMESORT_PING_DESCENDING:
case GAMESORT_MAP_DESCENDING: // was ping
windowSortPing->winHide(FALSE);
windowSortPing->winEnable(FALSE);
windowSortAlpha->winHide(TRUE);
Expand Down Expand Up @@ -218,25 +218,25 @@ Bool HandleSortButton(NameKeyType sortButton)
}
else if (sortButton == buttonSortAlphaID)
{
if (theGameSortType == GAMESORT_ALPHA_ASCENDING)
if (theGameSortType == GAMESORT_AGE_ASCENDING) // was alpha
{
setSortMode(GAMESORT_ALPHA_DESCENDING);
setSortMode(GAMESORT_AGE_DESCENDING); // was alpha
}
else
{
setSortMode(GAMESORT_ALPHA_ASCENDING);
setSortMode(GAMESORT_AGE_ASCENDING); // was alpha
}
return TRUE;
}
else if (sortButton == buttonSortPingID)
{
if (theGameSortType == GAMESORT_PING_ASCENDING)
if (theGameSortType == GAMESORT_MAP_ASCENDING) // was ping
{
setSortMode(GAMESORT_PING_DESCENDING);
setSortMode(GAMESORT_MAP_DESCENDING); // was ping
}
else
{
setSortMode(GAMESORT_PING_ASCENDING);
setSortMode(GAMESORT_MAP_ASCENDING); // was ping
}
return TRUE;
}
Expand Down Expand Up @@ -562,8 +562,24 @@ void GrabWindowInfo( void )
windowSortBuddiesID = NAMEKEY("WOLCustomLobby.wnd:WindowSortBuddies");

buttonSortAlpha = TheWindowManager->winGetWindowFromId(parent, buttonSortAlphaID);
if (buttonSortAlpha)
{
buttonSortAlpha->winSetText(UnicodeString(L"Sort by Newest"));
buttonSortAlpha->winSetTooltip(UnicodeString::TheEmptyString);
}
buttonSortPing = TheWindowManager->winGetWindowFromId(parent, buttonSortPingID);
if (buttonSortPing)
{
buttonSortPing->winSetText(UnicodeString(L"Sort by Map"));
buttonSortPing->winSetTooltip(UnicodeString::TheEmptyString);
}
buttonSortBuddies = TheWindowManager->winGetWindowFromId(parent, buttonSortBuddiesID);
if (buttonSortBuddies)
{
buttonSortBuddies->winSetText(UnicodeString(L"Sort by Buddies"));
buttonSortBuddies->winSetTooltip(UnicodeString::TheEmptyString);
}

windowSortAlpha = TheWindowManager->winGetWindowFromId(parent, windowSortAlphaID);
windowSortPing = TheWindowManager->winGetWindowFromId(parent, windowSortPingID);
windowSortBuddies = TheWindowManager->winGetWindowFromId(parent, windowSortBuddiesID);
Expand Down Expand Up @@ -617,7 +633,6 @@ static void populateBuddyGames(void)
if (pSocialInterface->IsUserFriend(lobby.owner))
{
theBuddyGames->insert(lobby.lobbyID);
break; // its binary, we don't care how many friends
}
else // does the lobby contain any of our friends
{
Expand Down Expand Up @@ -666,30 +681,13 @@ static void clearBuddyGames(void)
theBuddyGames = nullptr;
}

#if defined(GENERALS_ONLINE)

// Can we join this lobby?
static bool IsLobbyJoinable(const LobbyEntry& g)
{
const Bool isFull =
(g.current_players == g.max_players || g.current_players == MAX_SLOTS);

const Bool hasCrcMismatch =
(g.exe_crc != TheGlobalData->m_exeCRC ||
g.ini_crc != TheGlobalData->m_iniCRC);

return !isFull && !hasCrcMismatch;
}

#endif

#if defined(GENERALS_ONLINE)
struct GameSortStruct
{
bool operator()(const LobbyEntry& g1, const LobbyEntry& g2) const
{
const bool g1Join = IsLobbyJoinable(g1);
const bool g2Join = IsLobbyJoinable(g2);
const bool g1Join = !(g1.exe_crc != TheGlobalData->m_exeCRC || g1.ini_crc != TheGlobalData->m_iniCRC);
const bool g2Join = !(g2.exe_crc != TheGlobalData->m_exeCRC || g2.ini_crc != TheGlobalData->m_iniCRC);

if (g1Join != g2Join)
return g1Join && !g2Join;
Expand All @@ -703,6 +701,10 @@ struct GameSortStruct
return g1Buddy && !g2Buddy;
}

// Push passworded lobbies below open ones
if (g1.passworded != g2.passworded)
return !g1.passworded && g2.passworded;

// NOTE: GO currently does not have private ladders, so this check is moot
/*
// sort games with private ladders to the bottom
Expand All @@ -714,11 +716,24 @@ struct GameSortStruct
}
*/

// 3) Newest first
if (g1.lobbyID != g2.lobbyID)
return g1.lobbyID > g2.lobbyID;
switch (theGameSortType)
{
case GAMESORT_MAP_ASCENDING: // was ping
if (g1.map_name != g2.map_name)
return g1.map_name < g2.map_name;
break;

return false;
case GAMESORT_MAP_DESCENDING: // was ping
if (g1.map_name != g2.map_name)
return g1.map_name > g2.map_name;
break;

case GAMESORT_AGE_ASCENDING: // was alpha
return g1.lobbyID > g2.lobbyID;
case GAMESORT_AGE_DESCENDING: // was alpha
return g1.lobbyID < g2.lobbyID;
}
return g1.lobbyID > g2.lobbyID;
}
};
#else
Expand Down Expand Up @@ -783,13 +798,6 @@ struct GameSortStruct
static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
{
Color gameColor = GameSpyColor[GSCOLOR_GAME];


if (lobbyInfo.current_players == lobbyInfo.max_players || lobbyInfo.current_players == MAX_SLOTS)
{
gameColor = GameSpyColor[GSCOLOR_GAME_FULL];
}

if (lobbyInfo.exe_crc != TheGlobalData->m_exeCRC || lobbyInfo.ini_crc != TheGlobalData->m_iniCRC)
{
gameColor = GameSpyColor[GSCOLOR_GAME_CRCMISMATCH];
Expand All @@ -799,8 +807,7 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
if (theBuddyGames && theBuddyGames->count(lobbyInfo.lobbyID))
{
const bool nonJoinable =
(gameColor == GameSpyColor[GSCOLOR_GAME_FULL] ||
gameColor == GameSpyColor[GSCOLOR_GAME_CRCMISMATCH]);
(gameColor == GameSpyColor[GSCOLOR_GAME_CRCMISMATCH]);

gameColor = nonJoinable
? GameMakeColor(0, 98, 130, 255) // darker cyan
Expand Down Expand Up @@ -865,6 +872,12 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
*/


Int rowCount = GadgetListBoxGetNumEntries(win);
bool bAlternate = (rowCount % 2 == 0);
if (bAlternate && gameColor == GameSpyColor[GSCOLOR_GAME])
{
gameColor = GameMakeColor(191, 198, 201, 255);
}
Int index = GadgetListBoxAddEntryText(win, gameName, gameColor, -1, COLUMN_NAME);
GadgetListBoxSetItemData(win, (void*)gameID, index);

Expand Down Expand Up @@ -922,7 +935,12 @@ static Int insertGame(GameWindow* win, LobbyEntry& lobbyInfo, Bool showMap)
}

s.format(L"%d/%d", numPlayers, maxPlayers);
GadgetListBoxAddEntryText(win, s, gameColor, index, COLUMN_NUMPLAYERS);
const bool bIsFull = (lobbyInfo.current_players == lobbyInfo.max_players || lobbyInfo.current_players == MAX_SLOTS);
const bool bIsAlmostFull = !bIsFull && (maxPlayers > 0) && ((float)numPlayers / (float)maxPlayers >= 0.6f);
Color numPlayersColor = bIsFull ? GameMakeColor(255, 80, 80, 255)
: bIsAlmostFull ? GameMakeColor(16, 173, 144, 255)
: gameColor;
GadgetListBoxAddEntryText(win, s, numPlayersColor, index, COLUMN_NUMPLAYERS);

if (bHasPassword)
{
Expand Down
Loading