Skip to content

fix(online): Show neutral rank icon for random and unranked-side players #605

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 2 commits into from
Sep 25, 2026
Merged

fix(online): Show neutral rank icon for random and unranked-side players #605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74a5cb8
fix(online): Show neutral rank icon for random and unranked-side players
tintinhamans Sep 23, 2026
f3e56d8
fix(online): Request stats for lobby rows skipped during an in-flight…
tintinhamans Sep 23, 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
49 changes: 35 additions & 14 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,8 @@ static std::unordered_map<int64_t, std::pair<Int, Int>> s_lastKnownRankByUser;
static Bool s_statsBatchInFlight = FALSE;
static UnsignedInt s_statsBatchStartTime = 0;
static UnsignedInt s_statsBatchGeneration = 0; // bumped on lobby init
// Users requested this lobby visit.
static std::unordered_set<int64_t> s_statsRequestedUserIDs;
static const UnsignedInt STATS_BATCH_WATCHDOG_MS = 30000; // recover from a lost response

static Int s_lastVisibleTop = -1;
Expand Down Expand Up @@ -887,9 +889,6 @@ static const Image* ResolveRankIconForUser(int64_t userID, NGMP_OnlineServices_S
}
}

if (favoriteSide < 2) // no real faction
return nullptr;

return LookupSmallRankImage(favoriteSide, rankPoints);
}

Expand Down Expand Up @@ -929,8 +928,8 @@ static void RefreshVisibleLobbyRowIcons()
}

//-------------------------------------------------------------------------------------------------
/** Request stats for visible rows; no-op if the window hasn't moved unless bForce. */
static void EnsureVisibleLobbyStats(Bool bForce)
/** Request stats for stale visible rows; bOnlyUnrequested skips users already requested. */
static void RequestVisibleLobbyStats(Bool bOnlyUnrequested)
{
if (listboxLobbyPlayers == nullptr || s_lobbyPlayerRows.empty())
return;
Expand All @@ -945,22 +944,18 @@ static void EnsureVisibleLobbyStats(Bool bForce)
if (top < 0) top = 0;
if (bottom < 0 || bottom >= rowCount) bottom = rowCount - 1;

if (!bForce && top == s_lastVisibleTop && bottom == s_lastVisibleBottom)
return;
s_lastVisibleTop = top;
s_lastVisibleBottom = bottom;

RefreshVisibleLobbyRowIcons();

const Int firstRow = max(0, top - VISIBLE_STATS_BUFFER);
const Int lastRow = min(rowCount - 1, bottom + VISIBLE_STATS_BUFFER);

std::vector<int64_t> vecUserStatsToRequest;
for (Int row = firstRow; row <= lastRow; ++row)
{
const int64_t userID = s_lobbyPlayerRows[row].userID;
if (!pStatsInterface->HasFreshPlayerStats(userID))
vecUserStatsToRequest.push_back(userID);
if (pStatsInterface->HasFreshPlayerStats(userID))
continue;
if (bOnlyUnrequested && s_statsRequestedUserIDs.count(userID) != 0)
continue;
vecUserStatsToRequest.push_back(userID);
}

if (vecUserStatsToRequest.empty())
Expand All @@ -970,6 +965,8 @@ static void EnsureVisibleLobbyStats(Bool bForce)
if (s_statsBatchInFlight && (now - s_statsBatchStartTime) < STATS_BATCH_WATCHDOG_MS)
return;

s_statsRequestedUserIDs.insert(vecUserStatsToRequest.begin(), vecUserStatsToRequest.end());

s_statsBatchInFlight = TRUE;
s_statsBatchStartTime = now;
const UnsignedInt generation = s_statsBatchGeneration;
Expand All @@ -986,9 +983,32 @@ static void EnsureVisibleLobbyStats(Bool bForce)
return;

RefreshVisibleLobbyRowIcons();
RequestVisibleLobbyStats(TRUE);
});
}

//-------------------------------------------------------------------------------------------------
/** Request stats for visible rows; no-op if the window hasn't moved unless bForce. */
static void EnsureVisibleLobbyStats(Bool bForce)
{
if (listboxLobbyPlayers == nullptr || s_lobbyPlayerRows.empty())
return;

const Int rowCount = (Int)s_lobbyPlayerRows.size();
Int top = GadgetListBoxGetTopVisibleEntry(listboxLobbyPlayers);
Int bottom = GadgetListBoxGetBottomVisibleEntry(listboxLobbyPlayers);
if (top < 0) top = 0;
if (bottom < 0 || bottom >= rowCount) bottom = rowCount - 1;

if (!bForce && top == s_lastVisibleTop && bottom == s_lastVisibleBottom)
return;
s_lastVisibleTop = top;
s_lastVisibleBottom = bottom;

RefreshVisibleLobbyRowIcons();
RequestVisibleLobbyStats(FALSE);
}

//-------------------------------------------------------------------------------------------------
/** Room roster in display order: name, then admins, then friends. */
static void CollectLobbyPlayerRows(std::vector<LobbyPlayerRow>& outRows)
Expand Down Expand Up @@ -1258,6 +1278,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
playerListRefreshTime = 0;
s_statsBatchInFlight = FALSE;
++s_statsBatchGeneration;
s_statsRequestedUserIDs.clear();
s_lastKnownRankByUser.clear();
s_lobbyPlayerRows.clear();
s_lobbyRosterSignature.clear();
Expand Down
Loading