Rename Player.DisplayCountry to Player.DisplayFaction

This commit is contained in:
penev92
2015-07-15 04:10:13 +03:00
parent bb648decc3
commit b8aa92c4be
3 changed files with 7 additions and 7 deletions

View File

@@ -67,8 +67,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
else
{
flag.GetImageName = () => pp.DisplayCountry.InternalName;
item.Get<LabelWidget>("FACTION").GetText = () => pp.DisplayCountry.Name;
flag.GetImageName = () => pp.DisplayFaction.InternalName;
item.Get<LabelWidget>("FACTION").GetText = () => pp.DisplayFaction.Name;
}
var team = item.Get<LabelWidget>("TEAM");

View File

@@ -456,7 +456,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var flag = template.Get<ImageWidget>("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;