v1.4.4.1 (Blood in the Water Update)

2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
@@ -1,7 +1,6 @@
 #nullable enable
-using System;
-using System.Linq;
 using Barotrauma.Networking;
+using System.Linq;

 namespace Barotrauma
 {
@@ -13,7 +12,7 @@ namespace Barotrauma

            if (character != null)
            {
-                Speak(character);
+                character.Speak(text, ChatMessageType.Default);
                return;
            }

@@ -21,23 +20,10 @@ namespace Barotrauma
            {
                if (npc.CampaignInteractionType == CampaignMode.InteractionType.Upgrade)
                {
-                    Speak(npc);
+                    npc.Speak(text, ChatMessageType.Default);
                    break;
                }
            }
-
-            void Speak(Character npc)
-            {
-                ChatMessage message = ChatMessage.Create(npc.Name, text, ChatMessageType.Default, npc);
-                if (!isSinglePlayer)
-                {
-                    GameMain.Client?.AddChatMessage(message);
-                }
-                else
-                {
-                    GameMain.GameSession?.CrewManager?.AddSinglePlayerChatMessage(message);
-                }
-            }
        }
    }
 }