Skip to content

fix: Prevent custom lobby setting mismatches #523

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
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Prevent custom lobby setting mismatches #523

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
44 changes: 30 additions & 14 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,22 @@ static void handleLimitSuperweaponsClick()
#endif
}

static void WOLLockSettings()
{
buttonBack->winEnable(false);
checkBoxLimitSuperweapons->winEnable(false);
comboBoxStartingCash->winEnable(false);

for (Int i = 0; i < MAX_SLOTS; ++i)
{
comboBoxPlayer[i]->winEnable(false);
comboBoxColor[i]->winEnable(false);
comboBoxPlayerTemplate[i]->winEnable(false);
comboBoxTeam[i]->winEnable(false);
buttonMapStartPosition[i]->winEnable(false);
}
}

static void StartPressed()
{
Bool isReady = TRUE;
Expand Down Expand Up @@ -1107,13 +1123,6 @@ static void StartPressed()
std::shared_ptr<WebSocket> pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS != nullptr)
{
// we've started, there's no going back
// i.e. disable the back button.
if (buttonBack != nullptr)
{
buttonBack->winEnable(FALSE);
}

if (buttonStart != nullptr)
{
buttonStart->winEnable(FALSE);
Expand Down Expand Up @@ -1157,6 +1166,7 @@ static void StartPressed()
pLobbyInterface->SendAnnouncementMessageToCurrentLobby(strInform, true);

TheNGMPGame->StartCountdown();
buttonSelectMap->winEnable(FALSE);
}
}
#endif
Expand Down Expand Up @@ -1880,9 +1890,6 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
// TODO_NGMP
//SendStatsToOtherPlayers(TheNGMPGame);

// we've started, there's no going back
// i.e. disable the back button.
buttonBack->winEnable(FALSE);
GameWindow* buttonBuddy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("GameSpyGameOptionsMenu.wnd:ButtonCommunicator"));
if (buttonBuddy)
buttonBuddy->winEnable(FALSE);
Expand Down Expand Up @@ -2468,16 +2475,23 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
// remote msg
UnicodeString strInform;
if (secondsRemaining == 1)
{
// Lock all host controlled lobby settings last second of the match start countdown
// to prevent late local changes not propagating to remote clients in time
WOLLockSettings();

strInform.format(TheGameText->fetch("LAN:GameStartTimerSingular"), secondsRemaining);
}
else
{
strInform.format(TheGameText->fetch("LAN:GameStartTimerPlural"), secondsRemaining);
}

NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
if (pLobbyInterface != nullptr)
{
pLobbyInterface->SendAnnouncementMessageToCurrentLobby(strInform, true);
}


// are we done?
if (secondsRemaining <= 0)
Expand Down Expand Up @@ -2513,6 +2527,11 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
{
buttonStart->winEnable(TRUE);
}

if (buttonStart != nullptr)
{
buttonSelectMap->winEnable(TRUE);
}
}

}
Expand Down Expand Up @@ -2679,9 +2698,6 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)

SendStatsToOtherPlayers(TheNGMPGame);

// we've started, there's no going back
// i.e. disable the back button.
buttonBack->winEnable(FALSE);
GameWindow *buttonBuddy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("GameSpyGameOptionsMenu.wnd:ButtonCommunicator"));
if (buttonBuddy)
buttonBuddy->winEnable(FALSE);
Expand Down
Loading