epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore lobby UI when a force-start is rejected by the server.

Browse Source
This commit is contained in:
Paul Chote
2025-12-27 19:18:51 +00:00
committed by Gustas Kažukauskas
parent 6ae03038cf
commit 27fbd3ddeb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -105,6 +105,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
MapPreview map; MapPreview map;
Session.MapStatus mapStatus; Session.MapStatus mapStatus;
MapGenerationArgs lastGeneratedMap; MapGenerationArgs lastGeneratedMap;
bool gameStarting;
bool chatEnabled; bool chatEnabled;
bool disableTeamChat; bool disableTeamChat;
@@ -232,7 +233,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var f in modRules.Actors[SystemActors.World].TraitInfos<FactionInfo>()) foreach (var f in modRules.Actors[SystemActors.World].TraitInfos<FactionInfo>())
factions.Add(f.InternalName, new LobbyFaction { Selectable = f.Selectable, Name = f.Name, Side = f.Side, Description = f.Description }); factions.Add(f.InternalName, new LobbyFaction { Selectable = f.Selectable, Name = f.Name, Side = f.Side, Description = f.Description });
var gameStarting = false;
Func<bool> configurationDisabled = () => !Game.IsHost || gameStarting || Func<bool> configurationDisabled = () => !Game.IsHost || gameStarting ||
panel == PanelType.Kick || panel == PanelType.ForceStart || !MapIsPlayable || panel == PanelType.Kick || panel == PanelType.ForceStart || !MapIsPlayable ||
orderManager.LocalClient == null || orderManager.LocalClient.IsReady; orderManager.LocalClient == null || orderManager.LocalClient.IsReady;
@@ -966,6 +966,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void UpdateOptions() void UpdateOptions()
{ {
gameStarting = false;
if (map == null || map.WorldActorInfo == null) if (map == null || map.WorldActorInfo == null)
return; return;