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

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.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)
{
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
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 = "";
return true;
};