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

Send the designated team number as extra data in the order

Browse Source
This commit is contained in:
abcdefg30
2019-04-13 16:12:19 +02:00
committed by Paul Chote
parent 991093df81
commit 9a84ccdd1d
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Network/Order.cs
View File

@@ -195,9 +195,12 @@ namespace OpenRA
// Named constructors for Orders. // Named constructors for Orders.
// Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them. // Now that Orders are resolved by individual Actors, these are weird; you unpack orders manually, but not pack them.
public static Order Chat(bool team, string text) public static Order Chat(bool team, string text, int teamNumber = 0)
{ {
return new Order(team ? "TeamChat" : "Chat", null, false) { IsImmediate = true, TargetString = text }; if (!team)
return new Order("Chat", null, false) { IsImmediate = true, TargetString = text };
return new Order("TeamChat", null, false) { IsImmediate = true, TargetString = text, ExtraData = (uint)teamNumber };
} }
public static Order HandshakeResponse(string text) public static Order HandshakeResponse(string text)

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

@@ -100,14 +100,25 @@ namespace OpenRA.Network
if (orderManager.LocalClient == null) if (orderManager.LocalClient == null)
break; break;
if (client.IsObserver && (orderManager.LocalClient.IsObserver || world.IsReplay)) var player = world.FindPlayerByClient(client);
var localClientIsObserver = orderManager.LocalClient.IsObserver || (world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined);
// ExtraData gives us the team number, 0 means Spectators
if (order.ExtraData == 0 && (localClientIsObserver || world.IsReplay))
{ {
// Validate before adding the line
if (client.IsObserver || (player != null && player.WinState != WinState.Undefined))
Game.AddChatLine(client.Color, "[Spectators] " + client.Name, message); Game.AddChatLine(client.Color, "[Spectators] " + client.Name, message);
break; break;
} }
if (client.Team == orderManager.LocalClient.Team || world.IsReplay) var valid = client.Team == order.ExtraData && player != null && player.WinState == WinState.Undefined;
Game.AddChatLine(client.Color, "[Team" + (world.IsReplay ? " " + client.Team : "") + "] " + client.Name, message); var isSameTeam = order.ExtraData == orderManager.LocalClient.Team && world.LocalPlayer != null
&& world.LocalPlayer.WinState == WinState.Undefined;
if (valid && (isSameTeam || world.IsReplay))
Game.AddChatLine(client.Color, "[Team" + (world.IsReplay ? " " + order.ExtraData : "") + "] " + client.Name, message);
break; break;
} }

9
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs
View File

@@ -124,7 +124,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (chatText.Text != "") if (chatText.Text != "")
{ {
if (!chatText.Text.StartsWith("/", StringComparison.Ordinal)) if (!chatText.Text.StartsWith("/", StringComparison.Ordinal))
orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim())); {
// This should never happen, but avoid a crash if it does somehow (chat will just stay open)
if (!isObserver && orderManager.LocalClient == null && world.LocalPlayer == null)
return true;
var teamNumber = (isObserver || world.LocalPlayer.WinState != WinState.Undefined) ? 0 : orderManager.LocalClient.Team;
orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim(), teamNumber));
}
else if (chatTraits != null) else if (chatTraits != null)
{ {
var text = chatText.Text.Trim(); var text = chatText.Text.Trim();

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

@@ -402,7 +402,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Always scroll to bottom when we've typed something // Always scroll to bottom when we've typed something
lobbyChatPanel.ScrollToBottom(); lobbyChatPanel.ScrollToBottom();
orderManager.IssueOrder(Order.Chat(teamChat, chatTextField.Text)); var teamNumber = 0;
if (teamChat && orderManager.LocalClient != null && !orderManager.LocalClient.IsObserver)
teamNumber = orderManager.LocalClient.Team;
orderManager.IssueOrder(Order.Chat(teamChat, chatTextField.Text, teamNumber));
chatTextField.Text = ""; chatTextField.Text = "";
return true; return true;
}; };