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

Rename Session.Slot.LockRace

Browse Source
This commit is contained in:
Pavel Penev
2015-08-05 18:11:10 +03:00
parent 2f38239f32
commit faf0da6994
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Network/Session.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Network
public bool Closed; // Host has explicitly closed this slot. public bool Closed; // Host has explicitly closed this slot.
public bool AllowBots; public bool AllowBots;
public bool LockRace; public bool LockFaction;
public bool LockColor; public bool LockColor;
public bool LockTeam; public bool LockTeam;
public bool LockSpawn; public bool LockSpawn;

4
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -749,7 +749,7 @@ namespace OpenRA.Mods.Common.Server
return true; return true;
// Map has disabled race changes // Map has disabled race changes
if (server.LobbyInfo.Slots[targetClient.Slot].LockRace) if (server.LobbyInfo.Slots[targetClient.Slot].LockFaction)
return true; return true;
targetClient.Faction = parts[1]; targetClient.Faction = parts[1];
@@ -900,7 +900,7 @@ namespace OpenRA.Mods.Common.Server
PlayerReference = pr.Name, PlayerReference = pr.Name,
Closed = false, Closed = false,
AllowBots = pr.AllowBots, AllowBots = pr.AllowBots,
LockRace = pr.LockFaction, LockFaction = pr.LockFaction,
LockColor = pr.LockColor, LockColor = pr.LockColor,
LockTeam = pr.LockTeam, LockTeam = pr.LockTeam,
LockSpawn = pr.LockSpawn, LockSpawn = pr.LockSpawn,

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

@@ -398,7 +398,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Dictionary<string, LobbyFaction> factions) Dictionary<string, LobbyFaction> factions)
{ {
var dropdown = parent.Get<DropDownButtonWidget>("FACTION"); var dropdown = parent.Get<DropDownButtonWidget>("FACTION");
dropdown.IsDisabled = () => s.LockRace || orderManager.LocalClient.IsReady; dropdown.IsDisabled = () => s.LockFaction || orderManager.LocalClient.IsReady;
dropdown.OnMouseDown = _ => ShowFactionDropDown(dropdown, c, orderManager, factions); dropdown.OnMouseDown = _ => ShowFactionDropDown(dropdown, c, orderManager, factions);
var factionDescription = factions[c.Faction].Description; var factionDescription = factions[c.Faction].Description;
dropdown.GetTooltipText = () => factionDescription; dropdown.GetTooltipText = () => factionDescription;