Skip to content

feat(quickmatch): Add minimum maps selection in quickmatch from playlist data #522

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
Jun 21, 2026
Merged

feat(quickmatch): Add minimum maps selection in quickmatch from playlist data #522

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
1 change: 1 addition & 0 deletions .../Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_MatchmakingInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ struct PlaylistEntry
std::string Name = std::string();
int MinPlayers = -1;
int DesiredPlayers = -1;
int MinSelectedMaps = 0;
bool AllowTeams = false;
int TeamSize = -1;
bool AllowArmySelection = false;
Expand Down
18 changes: 18 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,6 +2218,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms

std::vector<int> vecSelectedMapIndexes;
uint16_t playlistID = 0;
int minSelectedMaps = 0;

// get maps and playlist ID
std::list<AsciiString> maps;
Expand All @@ -2233,6 +2234,7 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
if (plEntry.PlaylistID != -1)
{
playlistID = plEntry.PlaylistID;
minSelectedMaps = plEntry.MinSelectedMaps;

// maps
Int numMaps = GadgetListBoxGetNumEntries(listboxMapSelect);
Expand All @@ -2255,6 +2257,22 @@ WindowMsgHandledType WOLQuickMatchMenuSystem( GameWindow *window, UnsignedInt ms
{
// TODO_QUICKMATCH: Error?
}

if (static_cast<int>(vecSelectedMapIndexes.size()) < minSelectedMaps)
{
UnicodeString msg;
msg.format(L"You must select at least %d maps.", minSelectedMaps);
Int index = GadgetListBoxAddEntryText(quickmatchTextWindow, msg, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
GadgetListBoxSetItemData(quickmatchTextWindow, (void*)-1, index);

// buttons
buttonWiden->winEnable(FALSE);
buttonStart->winHide(FALSE);
buttonStart->winEnable(TRUE);
buttonStop->winHide(TRUE);

break;
}

// buttons
buttonWiden->winEnable(FALSE);
Expand Down
1 change: 1 addition & 0 deletions ...Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_MatchmakingInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ void NGMP_OnlineServices_MatchmakingInterface::RetrievePlaylists(std::function<v
playlistEntryIter["Name"].get_to(playlistEntry.Name);
playlistEntryIter["MinPlayers"].get_to(playlistEntry.MinPlayers);
playlistEntryIter["DesiredPlayers"].get_to(playlistEntry.DesiredPlayers);
playlistEntryIter["MinSelectedMaps"].get_to(playlistEntry.MinSelectedMaps);
playlistEntryIter["AllowTeams"].get_to(playlistEntry.AllowTeams);
playlistEntryIter["TeamSize"].get_to(playlistEntry.TeamSize);
playlistEntryIter["AllowArmySelection"].get_to(playlistEntry.AllowArmySelection);
Expand Down
Loading