vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Speech bubble icon next to the character when speaking in multiplayer, fixed clients sending every message through radio when wearing a headset

Browse Source
This commit is contained in:
Regalis
2016-04-20 20:31:10 +03:00
parent eae35d139b
commit de2af7f973
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Networking/GameClient.cs
View File

@@ -977,7 +977,7 @@ namespace Barotrauma.Networking
{
string command = ChatMessage.GetChatMessageCommand(message, out message).ToLower();
if (CanUseRadio(Character.Controlled)) type = ChatMessageType.Radio;
if (command=="r" || command=="radio" && CanUseRadio(Character.Controlled)) type = ChatMessageType.Radio;
}
var chatMessage = ChatMessage.Create(

11
Subsurface/Source/Networking/NetworkMember.cs
View File

@@ -243,10 +243,15 @@ namespace Barotrauma.Networking
string displayedText = message.Text;
if (message.Type == ChatMessageType.Default && myCharacter != null && message.Sender != null)
if (message.Sender != null)
{
displayedText = message.ApplyDistanceEffect(myCharacter);
if (string.IsNullOrWhiteSpace(displayedText)) return;
if (message.Type == ChatMessageType.Default && myCharacter != null)
{
displayedText = message.ApplyDistanceEffect(myCharacter);
if (string.IsNullOrWhiteSpace(displayedText)) return;
}
message.Sender.SpeechBubbleTimer = Math.Max(message.Sender.SpeechBubbleTimer, 2.0f);
}
GameMain.NetLobbyScreen.NewChatMessage(message);