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

Remove HSLColor.

Browse Source
This commit is contained in:
Paul Chote
2018-12-31 08:41:23 +00:00
parent ab4a7e3558
commit 3e404f6ac2
76 changed files with 256 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Network/GameServer.cs
View File

@@ -13,7 +13,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using OpenRA.Graphics;
using OpenRA.Primitives;
namespace OpenRA.Network
{
@@ -21,7 +21,7 @@ namespace OpenRA.Network
{
public readonly string Name;
public readonly string Fingerprint;
public readonly HSLColor Color;
public readonly Color Color;
public readonly string Faction;
public readonly int Team;
public readonly int SpawnPoint;

6
OpenRA.Game/Network/Session.cs
View File

@@ -12,7 +12,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Primitives;
namespace OpenRA.Network
{
@@ -110,8 +110,8 @@ namespace OpenRA.Network
}
public int Index;
public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml.
public HSLColor Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
public Color PreferredColor; // Color that the client normally uses from settings.yaml.
public Color Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
public string Faction;
public int SpawnPoint;
public string Name;

10
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA.Network
if (orderManager.LocalClient != null && client != orderManager.LocalClient && client.Team > 0 && client.Team == orderManager.LocalClient.Team)
suffix += " (Ally)";
Game.AddChatLine(client.Color.RGB, client.Name + suffix, message);
Game.AddChatLine(client.Color, client.Name + suffix, message);
}
else
Game.AddChatLine(Color.White, "(player {0})".F(clientId), message);
@@ -86,17 +86,17 @@ namespace OpenRA.Network
if (world == null)
{
if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team)
Game.AddChatLine(client.Color.RGB, "[Team] " + client.Name, order.TargetString);
Game.AddChatLine(client.Color, "[Team] " + client.Name, order.TargetString);
}
else
{
var player = world.FindPlayerByClient(client);
if (player != null && player.WinState == WinState.Lost)
Game.AddChatLine(client.Color.RGB, client.Name + " (Dead)", order.TargetString);
Game.AddChatLine(client.Color, client.Name + " (Dead)", order.TargetString);
else if ((player != null && world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally) || (world.IsReplay && player != null))
Game.AddChatLine(client.Color.RGB, "[Team" + (world.IsReplay ? " " + client.Team : "") + "] " + client.Name, order.TargetString);
Game.AddChatLine(client.Color, "[Team" + (world.IsReplay ? " " + client.Team : "") + "] " + client.Name, order.TargetString);
else if ((orderManager.LocalClient != null && orderManager.LocalClient.IsObserver && client.IsObserver) || (world.IsReplay && client.IsObserver))
Game.AddChatLine(client.Color.RGB, "[Spectators] " + client.Name, order.TargetString);
Game.AddChatLine(client.Color, "[Spectators] " + client.Name, order.TargetString);
}
}