(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -2172,7 +2172,8 @@ namespace Barotrauma

        public void Speak(string message, ChatMessageType? messageType = null, float delay = 0.0f, string identifier = "", float minDurationBetweenSimilar = 0.0f)
        {
-            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) return;
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
+            if (string.IsNullOrEmpty(message)) { return; }

            //already sent a similar message a moment ago
            if (!string.IsNullOrEmpty(identifier) && minDurationBetweenSimilar > 0.0f &&
@@ -2181,7 +2182,6 @@ namespace Barotrauma
            {
                return;
            }
-
            aiChatMessageQueue.Add(new AIChatMessage(message, messageType, identifier, delay));
        }

@@ -2642,6 +2642,10 @@ namespace Barotrauma
            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif