diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index e48dfbfe19..30dc187486 100644 --- a/OpenRA.Game/Player.cs +++ b/OpenRA.Game/Player.cs @@ -37,8 +37,8 @@ namespace OpenRA public readonly int ClientIndex; public readonly PlayerReference PlayerReference; - // The country (including Random, etc) that was selected in the lobby - public readonly FactionInfo DisplayCountry; + /// The faction (including Random, etc) that was selected in the lobby. + public readonly FactionInfo DisplayFaction; public WinState WinState = WinState.Undefined; public bool IsBot; @@ -96,7 +96,7 @@ namespace OpenRA PlayerName = client.Name; botType = client.Bot; Faction = ChooseCountry(world, client.Race, !pr.LockFaction); - DisplayCountry = ChooseDisplayCountry(world, client.Race); + DisplayFaction = ChooseDisplayCountry(world, client.Race); } else { @@ -109,7 +109,7 @@ namespace OpenRA Spectating = pr.Spectating; botType = pr.Bot; Faction = ChooseCountry(world, pr.Faction, false); - DisplayCountry = ChooseDisplayCountry(world, pr.Faction); + DisplayFaction = ChooseDisplayCountry(world, pr.Faction); } PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) }); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs index 29e8f0d42e..d5aeb85000 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs @@ -67,8 +67,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic } else { - flag.GetImageName = () => pp.DisplayCountry.InternalName; - item.Get("FACTION").GetText = () => pp.DisplayCountry.Name; + flag.GetImageName = () => pp.DisplayFaction.InternalName; + item.Get("FACTION").GetText = () => pp.DisplayFaction.Name; } var team = item.Get("TEAM"); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs index a2f0e8f955..0e7eb4bb27 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs @@ -456,7 +456,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var flag = template.Get("FLAG"); flag.GetImageCollection = () => "flags"; if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally) - flag.GetImageName = () => player.DisplayCountry.InternalName; + flag.GetImageName = () => player.DisplayFaction.InternalName; else flag.GetImageName = () => player.Faction.InternalName;