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

Merge pull request #7722 from penev92/bleed_diplomacyWindow

Browse Source 
Closes #7391
This commit is contained in:
Matthias Mailänder
2015-04-05 08:34:38 +02:00
parent a013cf4fca 2c108a1845
commit 3f48c649f0
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic
@@ -53,9 +54,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
nameLabel.GetColor = () => pp.Color.RGB;
var flag = item.Get<ImageWidget>("FACTIONFLAG");
flag.GetImageName = () => pp.Country.Race;
flag.GetImageCollection = () => "flags";
item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name;
if (lp.Stances[pp] == Stance.Ally || lp.WinState != WinState.Undefined)
{
flag.GetImageName = () => pp.Country.Race;
item.Get<LabelWidget>("FACTION").GetText = () => pp.Country.Name;
}
else
{
flag.GetImageName = () => pp.PlayerReference.RaceFlagName;
item.Get<LabelWidget>("FACTION").GetText = () => pp.PlayerReference.Race;
}
var team = item.Get<LabelWidget>("TEAM");
var teamNumber = (client == null) ? 0 : client.Team;

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

@@ -464,8 +464,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static void AddPlayerFlagAndName(ScrollItemWidget template, Player player)
{
var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageName = () => player.Country.Race;
flag.GetImageCollection = () => "flags";
if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally)
flag.GetImageName = () => player.PlayerReference.RaceFlagName;
else
flag.GetImageName = () => player.Country.Race;
var playerName = template.Get<LabelWidget>("PLAYER");
var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex);