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

disable team-chat when there are no allies listening

Browse Source 
closes #4033
This commit is contained in:
Matthias Mailänder
2013-11-09 18:34:35 +01:00
parent 6c11ae36c7
commit 445b0518ef
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/Logic/CncConquestObjectivesLogic.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
foreach (var p in world.Players.Where(a => !a.NonCombatant)) foreach (var p in world.Players.Where(a => !a.NonCombatant))
{ {
Player pp = p; var pp = p;
var item = itemTemplate.Clone(); var item = itemTemplate.Clone();
var nameLabel = item.Get<LabelWidget>("NAME"); var nameLabel = item.Get<LabelWidget>("NAME");
nameLabel.GetText = () => pp.WinState == WinState.Lost ? pp.PlayerName + " (Dead)" : pp.PlayerName; nameLabel.GetText = () => pp.WinState == WinState.Lost ? pp.PlayerName + " (Dead)" : pp.PlayerName;

16
OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Linq;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -30,7 +31,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public IngameChatLogic(Widget widget, OrderManager orderManager, World world) public IngameChatLogic(Widget widget, OrderManager orderManager, World world)
{ {
teamChat = world.LocalPlayer != null; var players = world.Players.Where(p => p != world.LocalPlayer && !p.NonCombatant && !p.IsBot);
var disableTeamChat = world.LocalPlayer == null || world.LobbyInfo.IsSinglePlayer || !players.Any(p => p.IsAlliedWith(world.LocalPlayer));
teamChat = !disableTeamChat;
var chatPanel = (ContainerWidget)widget; var chatPanel = (ContainerWidget)widget;
chatOverlay = chatPanel.Get<ContainerWidget>("CHAT_OVERLAY"); chatOverlay = chatPanel.Get<ContainerWidget>("CHAT_OVERLAY");
@@ -43,13 +46,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var chatMode = chatChrome.Get<ButtonWidget>("CHAT_MODE"); var chatMode = chatChrome.Get<ButtonWidget>("CHAT_MODE");
chatMode.GetText = () => teamChat ? "Team" : "All"; chatMode.GetText = () => teamChat ? "Team" : "All";
chatMode.OnClick = () => teamChat ^= true; chatMode.OnClick = () => teamChat ^= true;
chatMode.IsDisabled = () => world.LocalPlayer == null; chatMode.IsDisabled = () => disableTeamChat;
chatText = chatChrome.Get<TextFieldWidget>("CHAT_TEXTFIELD"); chatText = chatChrome.Get<TextFieldWidget>("CHAT_TEXTFIELD");
chatText.OnTabKey = () => { teamChat ^= true; return true; }; chatText.OnTabKey = () =>
{
if (!disableTeamChat)
teamChat ^= true;
return true;
};
chatText.OnEnterKey = () => chatText.OnEnterKey = () =>
{ {
var team = teamChat && world.LocalPlayer != null; var team = teamChat && !disableTeamChat;
if (chatText.Text != "") if (chatText.Text != "")
orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim())); orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim()));