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

Chatmessage GUITextBlock height matches the height of the message (-> multi-line messages don't overlap), fixed the name of the server being added to server chatmessages if there are no recipients

Browse Source
This commit is contained in:
Regalis
2017-03-20 20:52:10 +02:00
parent 2c688f40e3
commit fe4a8b419d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Subsurface/Source/Networking/GameServer.cs
View File

@@ -1409,7 +1409,7 @@ namespace Barotrauma.Networking
UpdateVoteStatus();
AddChatMessage(msg, ChatMessageType.Server);
SendChatMessage(msg, ChatMessageType.Server);
UpdateCrewFrame();
@@ -1544,6 +1544,12 @@ namespace Barotrauma.Networking
break;
}
if (type == ChatMessageType.Server)
{
senderName = null;
senderCharacter = null;
}
//check which clients can receive the message and apply distance effects
foreach (Client client in ConnectedClients)
{
@@ -1571,13 +1577,7 @@ namespace Barotrauma.Networking
if (client != targetClient && client != senderClient) continue;
break;
}
if (type == ChatMessageType.Server)
{
senderName = null;
senderCharacter = null;
}
var chatMsg = ChatMessage.Create(
senderName,
modifiedMessage,

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

@@ -248,7 +248,7 @@ namespace Barotrauma.Networking
displayedText = message.SenderName + ": " + displayedText;
}
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, 0, 20), displayedText,
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width, 0), displayedText,
((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f, message.Color,
Alignment.Left, null, null, true);
msg.Font = GUI.SmallFont;

2
Subsurface/Source/Screens/NetLobbyScreen.cs
View File

@@ -1046,7 +1046,7 @@ namespace Barotrauma
chatBox.RemoveChild(chatBox.children[1]);
}
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, 0, 20),
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width, 0),
message.TextWithSender,
((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black*0.1f, message.Color,
Alignment.Left, GUI.Style, null, true);