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

Rename Player.DisplayCountry to Player.DisplayFaction

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Player.cs
View File

@@ -37,8 +37,8 @@ namespace OpenRA
public readonly int ClientIndex; public readonly int ClientIndex;
public readonly PlayerReference PlayerReference; public readonly PlayerReference PlayerReference;
// The country (including Random, etc) that was selected in the lobby /// <summary>The faction (including Random, etc) that was selected in the lobby.</summary>
public readonly FactionInfo DisplayCountry; public readonly FactionInfo DisplayFaction;
public WinState WinState = WinState.Undefined; public WinState WinState = WinState.Undefined;
public bool IsBot; public bool IsBot;
@@ -96,7 +96,7 @@ namespace OpenRA
PlayerName = client.Name; PlayerName = client.Name;
botType = client.Bot; botType = client.Bot;
Faction = ChooseCountry(world, client.Race, !pr.LockFaction); Faction = ChooseCountry(world, client.Race, !pr.LockFaction);
DisplayCountry = ChooseDisplayCountry(world, client.Race); DisplayFaction = ChooseDisplayCountry(world, client.Race);
} }
else else
{ {
@@ -109,7 +109,7 @@ namespace OpenRA
Spectating = pr.Spectating; Spectating = pr.Spectating;
botType = pr.Bot; botType = pr.Bot;
Faction = ChooseCountry(world, pr.Faction, false); 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) }); PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

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

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

@@ -456,7 +456,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var flag = template.Get<ImageWidget>("FLAG"); var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags"; flag.GetImageCollection = () => "flags";
if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally) if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally)
flag.GetImageName = () => player.DisplayCountry.InternalName; flag.GetImageName = () => player.DisplayFaction.InternalName;
else else
flag.GetImageName = () => player.Faction.InternalName; flag.GetImageName = () => player.Faction.InternalName;