Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-03-16 12:53:53 -03:00
parent fa6b6a590f b8a8fc8c95
commit cf88aa4c5d
14 changed files with 34 additions and 21 deletions
@@ -2587,10 +2587,11 @@ namespace Barotrauma

        public static void AddMessage(string message, Color color, float? lifeTime = null, bool playSound = true, GUIFont font = null)
        {
+            var guiMessage = new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont);
            lock (mutex)
            {
                if (messages.Any(msg => msg.Text == message)) { return; }
-                messages.Add(new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont));
+                messages.Add(guiMessage);
            }
            if (playSound) { SoundPlayer.PlayUISound(GUISoundType.UIMessage); }
        }