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

Remove the TeamChat order type

Browse Source
This commit is contained in:
abcdefg30
2019-04-14 14:21:17 +02:00
committed by Paul Chote
parent 83b92ebacb
commit e6feba8884
6 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
View File

@@ -96,7 +96,6 @@ namespace OpenRA.Mods.Common.Traits
switch (order.OrderString)
{
case "Chat":
case "TeamChat":
case "HandshakeResponse":
case "PauseGame":
case "StartGame":

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

@@ -136,8 +136,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
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));
var teamNumber = (uint)0;
if (team)
teamNumber = (isObserver || world.LocalPlayer.WinState != WinState.Undefined) ? uint.MaxValue : (uint)orderManager.LocalClient.Team;
orderManager.IssueOrder(Order.Chat(chatText.Text.Trim(), teamNumber));
}
else if (chatTraits != null)
{

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

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