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

Enable spectator team chat in the lobby

Browse Source
This commit is contained in:
abcdefg30
2019-04-14 14:38:00 +02:00
committed by Paul Chote
parent e6feba8884
commit 6163523334
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,8 +80,9 @@ namespace OpenRA.Network
// We are still in the lobby // We are still in the lobby
if (world == null) if (world == null)
{ {
var prefix = order.ExtraData == uint.MaxValue ? "[Spectators] " : "[Team] ";
if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team) if (orderManager.LocalClient != null && client.Team == orderManager.LocalClient.Team)
Game.AddChatLine(client.Color, "[Team] " + client.Name, message); Game.AddChatLine(client.Color, prefix + client.Name, message);
break; break;
} }

11
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -550,8 +550,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (orderManager.LocalClient == null) if (orderManager.LocalClient == null)
return; return;
disableTeamChat = orderManager.LocalClient.Team == 0 || // Check if we are not assigned to any team, and are no spectator
!orderManager.LobbyInfo.Clients.Any(c => // If we are a spectator, check if there are more and enable spectator chat
// Otherwise check if our assigned team has more players
if (orderManager.LocalClient.Team == 0 && !orderManager.LocalClient.IsObserver)
disableTeamChat = true;
else if (orderManager.LocalClient.IsObserver)
disableTeamChat = !orderManager.LobbyInfo.Clients.Any(c => c != orderManager.LocalClient && c.IsObserver);
else
disableTeamChat = !orderManager.LobbyInfo.Clients.Any(c =>
c != orderManager.LocalClient && c != orderManager.LocalClient &&
c.Bot == null && c.Bot == null &&
c.Team == orderManager.LocalClient.Team); c.Team == orderManager.LocalClient.Team);