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

Fix random country display.

Browse Source
This commit is contained in:
Paul Chote
2015-04-20 03:29:18 +12:00
parent 9df371b393
commit 3cfa96e7a6
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
View File

@@ -50,6 +50,7 @@ namespace OpenRA.Mods.Common.Traits
Name = "Everyone",
NonCombatant = true,
Spectating = true,
Race = "Random",
Allies = w.Players.Where(p => !p.NonCombatant && p.Playable).Select(p => p.InternalName).ToArray()
}));

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

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

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

@@ -467,7 +467,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.PlayerReference.RaceFlagName;
flag.GetImageName = () => player.DisplayCountry.Race;
else
flag.GetImageName = () => player.Country.Race;