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

Rename SpawnOccupant.Country

Browse Source
This commit is contained in:
Pavel Penev
2015-08-05 17:31:00 +03:00
parent 0325f803ab
commit 957af9ac5e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
else else
{ {
labelText = occupant.PlayerName; labelText = occupant.PlayerName;
playerCountry = occupant.Country; playerCountry = occupant.Faction;
playerTeam = occupant.Team; playerTeam = occupant.Team;
widget.Bounds.Height = playerTeam > 0 ? doubleHeight : singleHeight; widget.Bounds.Height = playerTeam > 0 ? doubleHeight : singleHeight;
teamWidth = teamFont.Measure(team.GetText()).X; teamWidth = teamFont.Measure(team.GetText()).X;

6
OpenRA.Mods.Common/Widgets/MapPreviewWidget.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Widgets
public readonly int ClientIndex; public readonly int ClientIndex;
public readonly string PlayerName; public readonly string PlayerName;
public readonly int Team; public readonly int Team;
public readonly string Country; public readonly string Faction;
public readonly int SpawnPoint; public readonly int SpawnPoint;
public SpawnOccupant(Session.Client client) public SpawnOccupant(Session.Client client)
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets
ClientIndex = client.Index; ClientIndex = client.Index;
PlayerName = client.Name; PlayerName = client.Name;
Team = client.Team; Team = client.Team;
Country = client.Race; Faction = client.Race;
SpawnPoint = client.SpawnPoint; SpawnPoint = client.SpawnPoint;
} }
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Widgets
ClientIndex = player.ClientIndex; ClientIndex = player.ClientIndex;
PlayerName = player.Name; PlayerName = player.Name;
Team = player.Team; Team = player.Team;
Country = player.FactionId; Faction = player.FactionId;
SpawnPoint = player.SpawnPoint; SpawnPoint = player.SpawnPoint;
} }
} }