2f107db...5202af9

2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
@@ -18,7 +18,7 @@ namespace Barotrauma.Items.Components

        private string prevSignal;

-        public byte TeamID;
+        public Character.TeamType TeamID;

        [Serialize(20000.0f, false)]
        public float Range
@@ -134,12 +134,16 @@ namespace Barotrauma.Items.Components
                        if (chatMsg.Length > ChatMessage.MaxLength) chatMsg = chatMsg.Substring(0, ChatMessage.MaxLength);
                        if (string.IsNullOrEmpty(chatMsg)) continue;

+#if CLIENT
                        if (wifiComp.item.ParentInventory.Owner == Character.Controlled)
                        {
                            if (GameMain.Client == null)
                                GameMain.NetworkMember.AddChatMessage(signal, ChatMessageType.Radio, source == null ? "" : source.Name);
                        }
-                        else if (GameMain.Server != null)
+#endif
+
+#if SERVER
+                        if (GameMain.Server != null)
                        {
                            Client recipientClient = GameMain.Server.ConnectedClients.Find(c => c.Character == wifiComp.item.ParentInventory.Owner);
                            if (recipientClient != null)
@@ -148,6 +152,7 @@ namespace Barotrauma.Items.Components
                                    ChatMessage.Create(source == null ? "" : source.Name, chatMsg, ChatMessageType.Radio, null), recipientClient);
                            }
                        }
+#endif
                        chatMsgSent = true;
                    }
                }