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

Adds a [PM] tag

Browse Source 
Fixes .Private message type colors being silly
This commit is contained in:
Alex Noir
2017-12-05 18:50:36 +03:00
parent fdd3db82e6
commit 0e586651e7
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
+4 -1
View File
@@ -69,7 +69,10 @@ namespace Barotrauma.Networking
textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead]; textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
break; break;
default: default:
textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Default]; if (command != "") //PMing
textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Private];
else
textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Default];
break; break;
} }
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+1 -1
View File
@@ -1099,7 +1099,7 @@ namespace Barotrauma
} }
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width - 20, 0), GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width - 20, 0),
message.TextWithSender, (message.Type == ChatMessageType.Private ? "[PM] " : "") + message.TextWithSender,
((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f, message.Color, ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f, message.Color,
Alignment.Left, Alignment.TopLeft, "", null, true, GUI.SmallFont); Alignment.Left, Alignment.TopLeft, "", null, true, GUI.SmallFont);
msg.UserData = message; msg.UserData = message;
Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace Barotrauma.Networking
new Color(63, 72, 204), //dead new Color(63, 72, 204), //dead
new Color(157, 225, 160), //server new Color(157, 225, 160), //server
new Color(238, 208, 0), //radio new Color(238, 208, 0), //radio
new Color(228, 199, 27) //private new Color(64, 240, 89) //private
}; };
public readonly string Text; public readonly string Text;
Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs
+1 -1
View File
@@ -167,7 +167,7 @@ namespace Barotrauma.Networking
if (!string.IsNullOrWhiteSpace(message.SenderName)) if (!string.IsNullOrWhiteSpace(message.SenderName))
{ {
displayedText = message.SenderName + ": " + displayedText; displayedText = (message.Type == ChatMessageType.Private ? "[PM] " : "" ) + message.SenderName + ": " + displayedText;
} }
GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width - 40, 0), displayedText, GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width - 40, 0), displayedText,