Merge pull request #79 from Crystalwarrior/ClientFixes

Chat tweaks and fixes

Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs

@@ -69,7 +69,10 @@ namespace Barotrauma.Networking
                     textBox.TextColor = ChatMessage.MessageColor[(int)ChatMessageType.Dead];
                     break;
                 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;
             }
 

Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs

@@ -33,6 +33,13 @@ namespace Barotrauma
         private GUIListBox jobList;
 
         private GUITextBox textBox, seedBox;
+        public GUITextBox TextBox
+        {
+            get
+            {
+                return textBox;
+            }
+        }
 
         private GUIFrame defaultModeContainer, campaignContainer;
 
@@ -1092,7 +1099,7 @@ namespace Barotrauma
             }
 
             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,
                 Alignment.Left, Alignment.TopLeft, "", null, true, GUI.SmallFont);
             msg.UserData = message;