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

Allow players locked to unplayable factions in the lobby

Browse Source
This commit is contained in:
Oliver Brakmann
2015-04-17 20:38:29 +02:00
parent f77d6f6044
commit 28310ce2fc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,8 +144,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
colorPreview = lobby.Get<ColorPreviewManagerWidget>("COLOR_MANAGER"); colorPreview = lobby.Get<ColorPreviewManagerWidget>("COLOR_MANAGER");
colorPreview.Color = Game.Settings.Player.Color; colorPreview.Color = Game.Settings.Player.Color;
foreach (var c in modRules.Actors["world"].Traits.WithInterface<CountryInfo>().Where(c => c.Selectable)) foreach (var c in modRules.Actors["world"].Traits.WithInterface<CountryInfo>())
countries.Add(c.Race, new LobbyCountry { Name = c.Name, Side = c.Side, Description = c.Description }); countries.Add(c.Race, new LobbyCountry { Selectable = c.Selectable, Name = c.Name, Side = c.Side, Description = c.Description });
var gameStarting = false; var gameStarting = false;
Func<bool> configurationDisabled = () => !Game.IsHost || gameStarting || Func<bool> configurationDisabled = () => !Game.IsHost || gameStarting ||
@@ -829,6 +829,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public class LobbyCountry public class LobbyCountry
{ {
public bool Selectable;
public string Name; public string Name;
public string Description; public string Description;
public string Side; public string Side;

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

@@ -121,7 +121,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return item; return item;
}; };
var options = countries.GroupBy(c => c.Value.Side).ToDictionary(g => g.Key ?? "", g => g.Select(c => c.Key)); var options = countries.Where(c => c.Value.Selectable).GroupBy(c => c.Value.Side)
.ToDictionary(g => g.Key ?? "", g => g.Select(c => c.Key));
dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, options, setupItem); dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, options, setupItem);
} }