Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -1,6 +1,5 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System.Linq;
 using System.Xml.Linq;

@@ -70,7 +69,13 @@ namespace Barotrauma.Items.Components

        partial void ShowOnDisplay(string input)
        {
-            while (historyBox.Content.CountChildren > 60)
+            messageHistory.Add(input);
+            while (messageHistory.Count > MaxMessages)
+            {
+                messageHistory.RemoveAt(0);
+            }
+
+            while (historyBox.Content.CountChildren > MaxMessages)
            {
                historyBox.RemoveChild(historyBox.Content.Children.First());
            }
@@ -114,11 +119,6 @@ namespace Barotrauma.Items.Components
        public override void AddToGUIUpdateList()
        {
            base.AddToGUIUpdateList();
-            if (!string.IsNullOrEmpty(DisplayedWelcomeMessage))
-            {
-                ShowOnDisplay(DisplayedWelcomeMessage);
-                DisplayedWelcomeMessage = "";
-            }
            if (shouldSelectInputBox)
            {
                inputBox.Select();